@fiduswriter/editor 0.1.35 → 0.1.36

package/dist/state_plugins/jump_hidden_nodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jump_hidden_nodes.d.ts","sourceRoot":"","sources":["../../src/state_plugins/jump_hidden_nodes.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAA2B,MAAM,mBAAmB,CAAA;AAmBlE,eAAO,MAAM,qBAAqB,GAAI,UAAU;IAAC,MAAM,EAAE,OAAO,CAAA;CAAC,gBA8C3D,CAAA"}
+{"version":3,"file":"jump_hidden_nodes.d.ts","sourceRoot":"","sources":["../../src/state_plugins/jump_hidden_nodes.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAA2B,MAAM,mBAAmB,CAAA;AAmBlE,eAAO,MAAM,qBAAqB,GAAI,UAAU;IAAC,MAAM,EAAE,OAAO,CAAA;CAAC,gBAmC3D,CAAA"}

package/dist/state_plugins/jump_hidden_nodes.js

@@ -16,45 +16,32 @@ const key = new PluginKey("jump-hidden-nodes");
 export const jumpHiddenNodesPlugin = (_options) => new Plugin({
     key,
     appendTransaction: (trs, oldState, state) => {
-        if (state.selection.from !== state.selection.to) {
+        if (!state.selection.empty) {
             // Only applies to collapsed selection
             return;
         }
-        const selection = state.selection;
-        let $pos = selection.$from;
-        if (!posHidden($pos)) {
-            return;
-        }
-        let movedRight = false, movedLeft = false;
-        const startPos = $pos.pos;
-        while ($pos.depth > 1 && posHidden($pos)) {
-            $pos = state.doc.resolve($pos.after());
-            movedRight = true;
-        }
-        if (!movedRight) {
-            $pos = selection.$from;
-            while ($pos.depth > 1 && posHidden($pos)) {
-                $pos = state.doc.resolve($pos.before());
-                movedLeft = true;
+        const selectionSet = trs.find(tr => tr.selectionSet);
+        if (selectionSet && posHidden(state.selection.$from)) {
+            const dir = state.selection.from > oldState.selection.from ? 1 : -1;
+            let newPos = state.selection.from, hidden = true, validTextSelection = false, validGapCursor = false;
+            let $pos = state.selection.$from;
+            while (hidden || (!validGapCursor && !validTextSelection)) {
+                newPos += dir;
+                if (newPos === 0 || newPos === state.doc.nodeSize) {
+                    // Could not find any valid position
+                    return;
+                }
+                $pos = state.doc.resolve(newPos);
+                validTextSelection = $pos.parent.inlineContent;
+                validGapCursor = GapCursor.valid($pos);
+                hidden = posHidden($pos);
             }
+            const selection = validTextSelection
+                ? new TextSelection($pos)
+                : new GapCursor($pos);
+            return state.tr.setSelection(selection);
         }
-        if (!movedRight && !movedLeft) {
-            return;
-        }
-        let tr = state.tr;
-        if ($pos.node().isTextblock &&
-            $pos.pos >= startPos &&
-            $pos.pos <= startPos) {
-            // Try to set text selection
-            tr = tr.setSelection(TextSelection.near($pos));
-        }
-        else if ($pos.pos !== startPos) {
-            tr = tr.setSelection(new GapCursor($pos));
-        }
-        if (trs[trs.length - 1].doc.eq(tr.doc)) {
-            return tr;
-        }
-        return;
+        return undefined;
     }
 });
 //# sourceMappingURL=jump_hidden_nodes.js.map

package/dist/state_plugins/jump_hidden_nodes.js.map

@@ -1 +1 @@
-{"version":3,"file":"jump_hidden_nodes.js","sourceRoot":"","sources":["../../src/state_plugins/jump_hidden_nodes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"jump_hidden_nodes.js","sourceRoot":"","sources":["../../src/state_plugins/jump_hidden_nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,uBAAuB,CAAA;AAC/C,OAAO,EAAC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAC,MAAM,mBAAmB,CAAA;AAGlE,MAAM,SAAS,GAAG,CAAC,IAAiB,EAAE,EAAE;IACpC,IAAI,MAAM,GAAG,KAAK,CAAA;IAClB,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACzB,IACI,IAAI,CAAC,KAAK,CAAC,MAAM;YACjB,CAAC,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;gBACzD,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,KAAK,KAAK,CAAC,EAC/C,CAAC;YACC,MAAM,GAAG,IAAI,CAAA;QACjB,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAA;AACjB,CAAC,CAAA;AAED,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC,mBAAmB,CAAC,CAAA;AAC9C,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,QAA2B,EAAE,EAAE,CACjE,IAAI,MAAM,CAAC;IACP,GAAG;IACH,iBAAiB,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE;QACxC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YACzB,sCAAsC;YACtC,OAAM;QACV,CAAC;QACD,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAA;QACpD,IAAI,YAAY,IAAI,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACnD,MAAM,GAAG,GACL,KAAK,CAAC,SAAS,CAAC,IAAI,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAC3D,IAAI,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,EAC7B,MAAM,GAAG,IAAI,EACb,kBAAkB,GAAG,KAAK,EAC1B,cAAc,GAAG,KAAK,CAAA;YAC1B,IAAI,IAAI,GAAgB,KAAK,CAAC,SAAS,CAAC,KAAK,CAAA;YAC7C,OAAO,MAAM,IAAI,CAAC,CAAC,cAAc,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBACxD,MAAM,IAAI,GAAG,CAAA;gBACb,IAAI,MAAM,KAAK,CAAC,IAAI,MAAM,KAAK,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;oBAChD,oCAAoC;oBACpC,OAAM;gBACV,CAAC;gBACD,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;gBAChC,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAA;gBAC9C,cAAc,GAAI,SAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;gBAC/C,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;YAC5B,CAAC;YACD,MAAM,SAAS,GAAG,kBAAkB;gBAChC,CAAC,CAAC,IAAI,aAAa,CAAC,IAAI,CAAC;gBACzB,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAA;YACzB,OAAO,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;QAC3C,CAAC;QACD,OAAO,SAAS,CAAA;IACpB,CAAC;CACJ,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fiduswriter/editor",
-  "version": "0.1.35",
+  "version": "0.1.36",
   "description": "Fidus Writer browser editor",
   "repository": {
     "type": "git",

package/src/state_plugins/jump_hidden_nodes.ts

@@ -22,46 +22,35 @@ export const jumpHiddenNodesPlugin = (_options: {editor: unknown}) =>
     new Plugin({
         key,
         appendTransaction: (trs, oldState, state) => {
-            if (state.selection.from !== state.selection.to) {
+            if (!state.selection.empty) {
                 // Only applies to collapsed selection
                 return
             }
-            const selection = state.selection
-            let $pos = selection.$from
-            if (!posHidden($pos)) {
-                return
-            }
-            let movedRight = false,
-                movedLeft = false
-            const startPos = $pos.pos
-            while ($pos.depth > 1 && posHidden($pos)) {
-                $pos = state.doc.resolve($pos.after())
-                movedRight = true
-            }
-            if (!movedRight) {
-                $pos = selection.$from
-                while ($pos.depth > 1 && posHidden($pos)) {
-                    $pos = state.doc.resolve($pos.before())
-                    movedLeft = true
+            const selectionSet = trs.find(tr => tr.selectionSet)
+            if (selectionSet && posHidden(state.selection.$from)) {
+                const dir =
+                    state.selection.from > oldState.selection.from ? 1 : -1
+                let newPos = state.selection.from,
+                    hidden = true,
+                    validTextSelection = false,
+                    validGapCursor = false
+                let $pos: ResolvedPos = state.selection.$from
+                while (hidden || (!validGapCursor && !validTextSelection)) {
+                    newPos += dir
+                    if (newPos === 0 || newPos === state.doc.nodeSize) {
+                        // Could not find any valid position
+                        return
+                    }
+                    $pos = state.doc.resolve(newPos)
+                    validTextSelection = $pos.parent.inlineContent
+                    validGapCursor = (GapCursor as any).valid($pos)
+                    hidden = posHidden($pos)
                 }
+                const selection = validTextSelection
+                    ? new TextSelection($pos)
+                    : new GapCursor($pos)
+                return state.tr.setSelection(selection)
             }
-            if (!movedRight && !movedLeft) {
-                return
-            }
-            let tr = state.tr
-            if (
-                $pos.node().isTextblock &&
-                $pos.pos >= startPos &&
-                $pos.pos <= startPos
-            ) {
-                // Try to set text selection
-                tr = tr.setSelection(TextSelection.near($pos))
-            } else if ($pos.pos !== startPos) {
-                tr = tr.setSelection(new GapCursor($pos))
-            }
-            if (trs[trs.length - 1].doc.eq(tr.doc)) {
-                return tr
-            }
-            return
+            return undefined
         }
     })