Use tile field controller

Author: codeation

go.mod

@@ -1,10 +1,10 @@
 module github.com/codeation/lineation
 
-go 1.24.1
+go 1.24.2
 
 require (
 	github.com/codeation/impress v1.0.1
-	github.com/codeation/tile v0.1.9
+	github.com/codeation/tile v0.1.10
 )
 
 require github.com/codeation/lru v1.3.0 // indirect

go.sum

@@ -2,5 +2,5 @@ github.com/codeation/impress v1.0.1 h1:X+jUirJArTUU6lumnSws+um86/IkWVFK4huSc/Q24
 github.com/codeation/impress v1.0.1/go.mod h1:DzaGU4d6gCxsisc0PRZuJ0r8xwlFOEG8I546+yENPVk=
 github.com/codeation/lru v1.3.0 h1:BZlD5G4bt0bis9FHV5q3zyyDCAx21ue2CvvM1T8hQl4=
 github.com/codeation/lru v1.3.0/go.mod h1:1C9+zUoRETpelIbMxh6wj9APf2VnKh0tk9aRsrOQUsk=
-github.com/codeation/tile v0.1.9 h1:wZgCLeGHIv6+wcCBzPg4DUSRCJogAgIeQBAyZ2mIt9Q=
-github.com/codeation/tile v0.1.9/go.mod h1:XEw1ez5/RFGlDt8hhvqNNwLvfB0P6XXWuNxPg6lvZOQ=
+github.com/codeation/tile v0.1.10 h1:DX64Clzx1CHL/q60vW+19eGEyOVuLbvcX9Kgqm5SVpw=
+github.com/codeation/tile v0.1.10/go.mod h1:FbITYdsiEGhSqKOgeV3YxcLU+yg55TEdeWwI118qqMQ=

mapcontrol/control.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"image"
-	"unicode"
 
 	"github.com/codeation/impress/clipboard"
 	"github.com/codeation/impress/event"
@@ -18,15 +17,7 @@ import (
 	"github.com/codeation/lineation/xmlfile"
 )
 
-var keypadEnter = event.Keyboard{
-	Name: "KP_Enter",
-}
-
-var keyShiftEnter = event.Keyboard{
-	Rune:  13,
-	Shift: true,
-	Name:  "Return",
-}
+var keypadEnter = event.Keyboard{Name: "KP_Enter"}
 
 type Control struct {
 	mapModel *mapmodel.MindMap
@@ -43,8 +34,7 @@ func New(app eventlink.AppFramer, mapModel *mapmodel.MindMap, mapView *mapview.V
 	}
 }
 
-func (c *Control) Wait() {
-}
+func (c *Control) Wait() {}
 
 func (c *Control) Action(ctx context.Context, app eventlink.App) {
 	maybeChanged := true
@@ -94,19 +84,6 @@ func (c *Control) Action(ctx context.Context, app eventlink.App) {
 				c.modView.Set(true)
 			}
 
-		case event.KeyLeft:
-			c.mapModel.Left()
-		case event.KeyRight:
-			c.mapModel.Right()
-		case event.KeyBackSpace:
-			if c.mapModel.Selected.Value.Cursor() > 0 {
-				c.mapModel.Backspace()
-				c.modView.Set(true)
-			}
-		case keyShiftEnter:
-			c.mapModel.InsertNL()
-			c.modView.Set(true)
-
 		case event.KeyCopy, menuevent.Copy:
 			app.Application().ClipboardPut(clipboard.Text(c.mapModel.Selected.Value.String()))
 		case event.KeyPaste, menuevent.Paste:
@@ -117,12 +94,6 @@ func (c *Control) Action(ctx context.Context, app eventlink.App) {
 			case event.Configure:
 				c.mapView.Configure(ev.InnerSize)
 
-			case event.Keyboard:
-				if ev.IsGraphic() {
-					c.mapModel.Insert(ev.Rune)
-					c.modView.Set(true)
-				}
-
 			case event.Button:
 				if ev.Action == event.ButtonActionPress && ev.Button == event.ButtonLeft {
 					if node, ok := c.mapView.Select(ev.Point); ok {
@@ -133,19 +104,14 @@ func (c *Control) Action(ctx context.Context, app eventlink.App) {
 					}
 				}
 
-			case event.Clipboard:
-				if text, ok := ev.Data.(clipboard.Text); ok {
-					for _, r := range text {
-						if !unicode.IsGraphic(r) {
-							continue
-						}
-						c.mapModel.Insert(r)
-					}
+			default:
+				oldValue := c.mapModel.Selected.Value.String()
+				c.mapModel.NodeControl(ctx, app, e, func(ctx context.Context, app eventlink.App, e event.Eventer) {
+					anyEvent = false
+				})
+				if oldValue != c.mapModel.Selected.Value.String() {
 					c.modView.Set(true)
 				}
-
-			default:
-				anyEvent = false
 			}
 		}
 

mapmodel/model.go

@@ -1,7 +1,12 @@
 package mapmodel
 
 import (
+	"context"
+
+	"github.com/codeation/impress/event"
 	"github.com/codeation/lineation/xmlfile"
+	"github.com/codeation/tile/control"
+	"github.com/codeation/tile/eventlink"
 )
 
 type MindMap struct {
@@ -79,22 +84,6 @@ func (m *MindMap) Adopt(node *Node, newParent *Node, beforeNode *Node) {
 	m.Selected.Value.End()
 }
 
-func (m *MindMap) Right() {
-	m.Selected.Value.Right()
-}
-
-func (m *MindMap) Left() {
-	m.Selected.Value.Left()
-}
-
-func (m *MindMap) Insert(alpha rune) {
-	m.Selected.Value.Insert(alpha)
-}
-
-func (m *MindMap) InsertNL() {
-	m.Selected.Value.InsertNL()
-}
-
-func (m *MindMap) Backspace() {
-	m.Selected.Value.Backspace()
+func (m *MindMap) NodeControl(ctx context.Context, app eventlink.App, e event.Eventer, prior control.DoFunc) {
+	m.Selected.Control.Control(ctx, app, e, prior)
 }

mapmodel/node.go

@@ -3,15 +3,17 @@ package mapmodel
 import (
 	"slices"
 
+	"github.com/codeation/tile/control/fieldcontrol"
 	"github.com/codeation/tile/elem/field"
 
 	"github.com/codeation/lineation/xmlfile"
 )
 
 type Node struct {
-	Value  *field.Field
-	Parent *Node
-	Childs []*Node
+	Value   *field.Field
+	Control *fieldcontrol.FieldControl
+	Parent  *Node
+	Childs  []*Node
 }
 
 func newXMLNode(elem *xmlfile.Node, parent *Node) *Node {
@@ -21,10 +23,7 @@ func newXMLNode(elem *xmlfile.Node, parent *Node) *Node {
 		Childs: make([]*Node, 0, len(elem.Childs)),
 	}
 	node.Value.Home()
-	if len(elem.Childs) == 0 {
-		return node
-	}
-	node.Childs = make([]*Node, 0, len(elem.Childs))
+	node.Control = fieldcontrol.New(node.Value)
 	for _, child := range elem.Childs {
 		node.Childs = append(node.Childs, newXMLNode(child, node))
 	}
@@ -46,6 +45,7 @@ func (parent *Node) newChild() *Node {
 		Value:  field.New(""),
 		Parent: parent,
 	}
+	newNode.Control = fieldcontrol.New(newNode.Value)
 	parent.Childs = append([]*Node{newNode}, parent.Childs...)
 	return newNode
 }
@@ -56,6 +56,7 @@ func (node *Node) newNext() *Node {
 		Value:  field.New(""),
 		Parent: node.Parent,
 	}
+	newNode.Control = fieldcontrol.New(newNode.Value)
 	node.Parent.Childs = slices.Insert(node.Parent.Childs, i+1, newNode)
 	return newNode
 }