click to select

src/RichText/Config/Decorations.elm

@@ -29,7 +29,6 @@ import RichText.Internal.Editor exposing (Message(..), Tagger)
 import RichText.Model.Element exposing (Element, annotations)
 import RichText.Model.Mark exposing (Mark)
 import RichText.Model.Node exposing (Path)
-import RichText.Model.Selection exposing (caret)
 import Set
 
 
@@ -229,6 +228,6 @@ selectableDecoration tagger editorNodePath elementParameters _ =
     )
         ++ [ Html.Events.onClick
                 (tagger <|
-                    SelectionEvent (Just (caret editorNodePath 0)) False
+                    SelectElement editorNodePath
                 )
            ]

src/RichText/Editor.elm

@@ -187,8 +187,8 @@ commandMap cfg =
             c.commandMap
 
 
-updateSelection : Maybe Selection -> Bool -> Spec -> Editor -> Editor
-updateSelection maybeSelection isDomPath spec_ editor_ =
+updateSelection : Maybe Selection -> Spec -> Editor -> Editor
+updateSelection maybeSelection spec_ editor_ =
     let
         editorState =
             state editor_
@@ -200,11 +200,7 @@ updateSelection maybeSelection isDomPath spec_ editor_ =
         Just selection ->
             let
                 translatedSelection =
-                    if isDomPath then
-                        domToEditor spec_ (State.root editorState) selection
-
-                    else
-                        Just selection
+                    domToEditor spec_ (State.root editorState) selection
             in
             if isComposing editor_ then
                 let
@@ -217,6 +213,23 @@ updateSelection maybeSelection isDomPath spec_ editor_ =
                 editor_ |> withState (editorState |> withSelection translatedSelection)
 
 
+selectElement : Path -> Spec -> Editor -> Editor
+selectElement path _ editor_ =
+    let
+        editorState =
+            state editor_
+
+        selection =
+            case RichText.Node.next path (State.root editorState) of
+                Just ( b, _ ) ->
+                    range b 0 path 0
+
+                Nothing ->
+                    RichText.Model.Selection.caret path 0
+    in
+    editor_ |> withState (editorState |> withSelection (Just selection)) |> forceReselection
+
+
 {-| The editor's internal update function. It's important that the editor process all `Message`
 events with the update function so it doesn't go out of sync with the virtual DOM.
 
@@ -242,8 +255,11 @@ update cfg msg editor_ =
                 ChangeEvent change ->
                     updateChangeEvent change spec_ editor_
 
-                SelectionEvent selection isDomPath ->
-                    updateSelection selection isDomPath spec_ editor_
+                SelectionEvent selection ->
+                    updateSelection selection spec_ editor_
+
+                SelectElement path ->
+                    selectElement path spec_ editor_
 
                 BeforeInputEvent inputEvent ->
                     BeforeInput.handleBeforeInput inputEvent commandMap_ spec_ editor_
@@ -504,9 +520,8 @@ selectionDecoder =
 
 editorSelectionChangeDecoder : D.Decoder Message
 editorSelectionChangeDecoder =
-    D.map2 SelectionEvent
+    D.map SelectionEvent
         (D.at [ "detail" ] selectionDecoder)
-        (D.succeed True)
 
 
 pasteWithDataDecoder : D.Decoder Message

src/RichText/Internal/Editor.elm

@@ -10,6 +10,7 @@ import RichText.Config.Keys exposing (meta)
 import RichText.Config.Spec exposing (Spec)
 import RichText.Internal.Event exposing (EditorChange, InitEvent, InputEvent, KeyboardEvent, PasteEvent)
 import RichText.Internal.History exposing (History, contents, empty, fromContents)
+import RichText.Model.Node exposing (Path)
 import RichText.Model.Selection exposing (Selection)
 import RichText.Model.State exposing (State)
 import RichText.State exposing (reduce, validate)
@@ -62,7 +63,8 @@ editor iState =
 {-| The internal events that an editor has to respond to. These events should be mapped via a Tagger.
 -}
 type Message
-    = SelectionEvent (Maybe Selection) Bool
+    = SelectionEvent (Maybe Selection)
+    | SelectElement Path
     | ChangeEvent EditorChange
     | BeforeInputEvent InputEvent
     | KeyDownEvent KeyboardEvent