@fiduswriter/editor 0.1.35 → 0.1.37

package/dist/state_plugins/citation_render.d.ts

@@ -1,9 +1,15 @@
 import { Plugin } from "prosemirror-state";
+import type { ModCitations } from "../citations/index.js";
 interface CitationRenderState {
     action: string | false;
 }
-export declare const citationRenderPlugin: (_options: {
-    editor: unknown;
-}) => Plugin<CitationRenderState>;
+interface CitationRenderOptions {
+    editor: {
+        mod: {
+            citations: ModCitations;
+        };
+    };
+}
+export declare const citationRenderPlugin: (options: CitationRenderOptions) => Plugin<CitationRenderState>;
 export {};
 //# sourceMappingURL=citation_render.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"citation_render.d.ts","sourceRoot":"","sources":["../../src/state_plugins/citation_render.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAY,MAAM,mBAAmB,CAAA;AAMnD,UAAU,mBAAmB;IACzB,MAAM,EAAE,MAAM,GAAG,KAAK,CAAA;CACzB;AAED,eAAO,MAAM,oBAAoB,GAAI,UAAU;IAAC,MAAM,EAAE,OAAO,CAAA;CAAC,gCA+D1D,CAAA"}
+{"version":3,"file":"citation_render.d.ts","sourceRoot":"","sources":["../../src/state_plugins/citation_render.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAA8B,MAAM,mBAAmB,CAAA;AAIrE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAA;AAIvD,UAAU,mBAAmB;IACzB,MAAM,EAAE,MAAM,GAAG,KAAK,CAAA;CACzB;AAED,UAAU,qBAAqB;IAC3B,MAAM,EAAE;QAAC,GAAG,EAAE;YAAC,SAAS,EAAE,YAAY,CAAA;SAAC,CAAA;KAAC,CAAA;CAC3C;AAED,eAAO,MAAM,oBAAoB,GAAI,SAAS,qBAAqB,gCAsF7D,CAAA"}

package/dist/state_plugins/citation_render.js

@@ -1,7 +1,7 @@
 import { Plugin, PluginKey } from "prosemirror-state";
 import { ReplaceAroundStep, ReplaceStep } from "prosemirror-transform";
 const key = new PluginKey("citationRender");
-export const citationRenderPlugin = (_options) => new Plugin({
+export const citationRenderPlugin = (options) => new Plugin({
     key,
     state: {
         init() {
@@ -27,7 +27,7 @@ export const citationRenderPlugin = (_options) => new Plugin({
                     step instanceof ReplaceAroundStep) {
                     if (step.from !== step.to) {
                         ;
-                        tr.docs[index].nodesBetween(step.from, step.to, node => {
+                        tr.docs[index].nodesBetween(step.from, step.to, (node) => {
                             if (node.type.name === "citation") {
                                 // A citation was replaced. We need to reset
                                 action = "reset";
@@ -39,7 +39,7 @@ export const citationRenderPlugin = (_options) => new Plugin({
                         });
                     }
                     if (step.slice?.content) {
-                        step.slice.content.descendants(node => {
+                        step.slice.content.descendants((node) => {
                             if (node.type.name === "citation") {
                                 // A citation was added. We need to reset
                                 action = "reset";
@@ -54,6 +54,31 @@ export const citationRenderPlugin = (_options) => new Plugin({
             });
             return { action };
         }
+    },
+    view(_view) {
+        options.editor.mod.citations.resetCitations();
+        return {
+            update: (view, _prevState) => {
+                const stateAction = key.getState(view.state);
+                const action = stateAction?.action;
+                if (action === "reset") {
+                    options.editor.mod.citations.resetCitations();
+                    const tr = view.state.tr.setMeta(key, { action: false });
+                    view.dispatch(tr);
+                }
+                else if (action === "numbers") {
+                    options.editor.mod.citations.footnoteNumberOverride();
+                    const tr = view.state.tr.setMeta(key, { action: false });
+                    view.dispatch(tr);
+                }
+                else if (view.dom.querySelector(".citation:empty")) {
+                    options.editor.mod.citations.resetCitations();
+                }
+            },
+            destroy: () => {
+                options.editor.mod.citations.resetCitations();
+            }
+        };
     }
 });
 //# sourceMappingURL=citation_render.js.map

package/dist/state_plugins/citation_render.js.map

@@ -1 +1 @@
-{"version":3,"file":"citation_render.js","sourceRoot":"","sources":["../../src/state_plugins/citation_render.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,SAAS,EAAC,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAC,iBAAiB,EAAE,WAAW,EAAC,MAAM,uBAAuB,CAAA;AAGpE,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC,gBAAgB,CAAC,CAAA;AAM3C,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,QAA2B,EAAE,EAAE,CAChE,IAAI,MAAM,CAAsB;IAC5B,GAAG;IACH,KAAK,EAAE;QACH,IAAI;YACA,OAAO,EAAC,MAAM,EAAE,KAAK,EAAC,CAAA;QAC1B,CAAC;QACD,KAAK,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM;YAC7B,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;YAC5B,IAAI,IAAI,EAAE,CAAC;gBACP,4DAA4D;gBAC5D,qBAAqB;gBACrB,OAAO,IAA2B,CAAA;YACtC,CAAC;YACD,MAAM,cAAc,GAAG,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAoC,CAAA;YAChF,IAAI,CAAC,cAAc,EAAE,CAAC;gBAClB,OAAO,EAAC,MAAM,EAAE,KAAK,EAAC,CAAA;YAC1B,CAAC;YACD,IAAI,EAAC,MAAM,EAAC,GAAG,cAAc,CAAA;YAE7B,IAAI,MAAM,IAAI,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;gBACnC,OAAO,EAAC,MAAM,EAAC,CAAA,CAAC,yHAAyH;YAC7I,CAAC;YACD,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;gBAC7B,IACI,IAAI,YAAY,WAAW;oBAC3B,IAAI,YAAY,iBAAiB,EACnC,CAAC;oBACC,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,EAAE,CAAC;wBACxB,CAAC;wBAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAU,CAAC,YAAY,CAClC,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,EAAE;4BACH,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gCAChC,4CAA4C;gCAC5C,MAAM,GAAG,OAAO,CAAA;4BACpB,CAAC;iCAAM,IACH,CAAC,MAAM;gCACP,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,EAC/B,CAAC;gCACC,MAAM,GAAG,SAAS,CAAA;4BACtB,CAAC;wBACL,CAAC,CACJ,CAAA;oBACL,CAAC;oBACD,IAAI,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC;wBACtB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;4BAClC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gCAChC,yCAAyC;gCACzC,MAAM,GAAG,OAAO,CAAA;4BACpB,CAAC;iCAAM,IACH,CAAC,MAAM;gCACP,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,EAC/B,CAAC;gCACC,MAAM,GAAG,SAAS,CAAA;4BACtB,CAAC;wBACL,CAAC,CAAC,CAAA;oBACN,CAAC;gBACL,CAAC;YACL,CAAC,CAAC,CAAA;YACF,OAAO,EAAC,MAAM,EAAC,CAAA;QACnB,CAAC;KACJ;CACJ,CAAC,CAAA"}
+{"version":3,"file":"citation_render.js","sourceRoot":"","sources":["../../src/state_plugins/citation_render.ts"],"names":[],"mappings":"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"}

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.37",
   "description": "Fidus Writer browser editor",
   "repository": {
     "type": "git",

package/src/state_plugins/citation_render.ts

@@ -1,6 +1,8 @@
-import {Plugin, PluginKey} from "prosemirror-state"
+import {Plugin, PluginKey, type EditorState} from "prosemirror-state"
 import {ReplaceAroundStep, ReplaceStep} from "prosemirror-transform"
+import type {EditorView} from "prosemirror-view"
 import type {Node} from "prosemirror-model"
+import type {ModCitations} from "../citations/index.js"
 
 const key = new PluginKey("citationRender")
 
@@ -8,7 +10,11 @@ interface CitationRenderState {
     action: string | false
 }
 
-export const citationRenderPlugin = (_options: {editor: unknown}) =>
+interface CitationRenderOptions {
+    editor: {mod: {citations: ModCitations}}
+}
+
+export const citationRenderPlugin = (options: CitationRenderOptions) =>
     new Plugin<CitationRenderState>({
         key,
         state: {
@@ -40,7 +46,7 @@ export const citationRenderPlugin = (_options: {editor: unknown}) =>
                             ;(tr.docs[index] as Node).nodesBetween(
                                 step.from,
                                 step.to,
-                                node => {
+                                (node: Node) => {
                                     if (node.type.name === "citation") {
                                         // A citation was replaced. We need to reset
                                         action = "reset"
@@ -54,7 +60,7 @@ export const citationRenderPlugin = (_options: {editor: unknown}) =>
                             )
                         }
                         if (step.slice?.content) {
-                            step.slice.content.descendants(node => {
+                            step.slice.content.descendants((node: Node) => {
                                 if (node.type.name === "citation") {
                                     // A citation was added. We need to reset
                                     action = "reset"
@@ -70,5 +76,28 @@ export const citationRenderPlugin = (_options: {editor: unknown}) =>
                 })
                 return {action}
             }
+        },
+        view(_view: EditorView): {update: (view: EditorView, prevState: EditorState) => void; destroy: () => void} {
+            options.editor.mod.citations.resetCitations()
+            return {
+                update: (view: EditorView, _prevState: EditorState) => {
+                    const stateAction = key.getState(view.state) as CitationRenderState | undefined
+                    const action = stateAction?.action
+                    if (action === "reset") {
+                        options.editor.mod.citations.resetCitations()
+                        const tr = view.state.tr.setMeta(key, {action: false})
+                        view.dispatch(tr)
+                    } else if (action === "numbers") {
+                        options.editor.mod.citations.footnoteNumberOverride()
+                        const tr = view.state.tr.setMeta(key, {action: false})
+                        view.dispatch(tr)
+                    } else if (view.dom.querySelector(".citation:empty")) {
+                        options.editor.mod.citations.resetCitations()
+                    }
+                },
+                destroy: () => {
+                    options.editor.mod.citations.resetCitations()
+                }
+            }
         }
     })

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
         }
     })