fix: undo/redo pos restore at the end of the text (#35)

* fix: undo/redo pos restore at the end of the text

* chore: upgrade loro-crdt

* chore: use 1.5.13 in storybook

* chore: fix lint issue

Author: zxch3n

examples/stories/package.json

@@ -12,7 +12,7 @@
     "build-storybook": "storybook build"
   },
   "dependencies": {
-    "loro-crdt": "^1.5.5",
+    "loro-crdt": "^1.5.13",
     "loro-prosemirror": "workspace:*",
     "prosemirror-commands": "^1.5.2",
     "prosemirror-example-setup": "^1.2.2",
@@ -27,6 +27,7 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
+    "loro-crdt": "^1.5.13",
     "@chromatic-com/storybook": "^1.3.3",
     "@storybook/addon-essentials": "^8.0.8",
     "@storybook/addon-interactions": "^8.0.8",

examples/stories/src/stories/prompt.ts

@@ -157,7 +157,7 @@ export abstract class Field {
   read(dom: HTMLElement) { return (dom as any).value }
 
   /// A field-type-specific validation function.
-  validateType(value: any): string | null { return null }
+  validateType(_value: any): string | null { return null }
 
   /// @internal
   validate(value: any): string | null {

package.json

@@ -2,7 +2,7 @@
   "name": "loro-prosemirror",
   "version": "0.3.0",
   "description": "Prosemirror Binding for Loro",
-  "packageManager": "pnpm@9.15.2",
+  "packageManager": "pnpm@10.15.0",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -39,13 +39,13 @@
     "prosemirror-view": "^1.28.0"
   },
   "devDependencies": {
-    "loro-crdt": "^1.4.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@typescript-eslint/parser": "^7.4.0",
     "@vitest/coverage-v8": "^1.4.0",
     "chromatic": "^11.5.3",
     "eslint": "^8.57.0",
     "lib0": "^0.2.93",
+    "loro-crdt": "^1.5.13",
     "prettier": "^3.2.5",
     "prosemirror-model": "^1.18.1",
     "prosemirror-state": "^1.4.1",

pnpm-lock.yaml

@@ -30,7 +30,7 @@ const loroCursorPluginKey = new PluginKey<{ awarenessUpdated: boolean }>(
 function createDecorations(
   state: EditorState,
   awareness: CursorAwareness,
-  plugin: Plugin<DecorationSet>,
+  _plugin: Plugin<DecorationSet>,
   createSelection: (user: PeerID) => DecorationAttrs,
   createCursor: (user: PeerID) => Element,
 ): DecorationSet {
@@ -106,13 +106,15 @@ export const LoroCursorPlugin = (
   },
 ) => {
   const getSelection = options.getSelection || ((state) => state.selection);
-  const createSelection = options.createSelection ||
+  const createSelection =
+    options.createSelection ||
     ((user) => ({
       class: "loro-selection",
       "data-peer": user,
       style: `background-color: rgba(228, 208, 102, 0.5)`,
     }));
-  const createCursor = options.createCursor ||
+  const createCursor =
+    options.createCursor ||
     ((user) => {
       const awarenessData = awareness.getAllStates();
       const cursorUserData = awarenessData[user];
@@ -152,9 +154,8 @@ export const LoroCursorPlugin = (
       },
       apply(tr, prevState, _oldState, newState) {
         const loroState = loroSyncPluginKey.getState(newState);
-        const loroCursorState: { awarenessUpdated: boolean } = tr.getMeta(
-          loroCursorPluginKey,
-        );
+        const loroCursorState: { awarenessUpdated: boolean } =
+          tr.getMeta(loroCursorPluginKey);
         if (
           (loroState && loroState.changedBy !== "local") ||
           (loroCursorState && loroCursorState.awarenessUpdated)
@@ -252,14 +253,15 @@ export function convertPmSelectionToCursors(
     loroState.doc as LoroDocType,
     loroState.mapping,
   );
-  const focus = selection.head == selection.anchor
-    ? anchor
-    : absolutePositionToCursor(
-      pmRootNode,
-      selection.head,
-      loroState.doc as LoroDocType,
-      loroState.mapping,
-    );
+  const focus =
+    selection.head == selection.anchor
+      ? anchor
+      : absolutePositionToCursor(
+          pmRootNode,
+          selection.head,
+          loroState.doc as LoroDocType,
+          loroState.mapping,
+        );
   return { anchor, focus };
 }
 
@@ -279,7 +281,8 @@ function absolutePositionToCursor(
   const nodeParent = pos.node(pos.depth);
   const offset = pos.parentOffset;
 
-  const loroId = WEAK_NODE_TO_LORO_CONTAINER_MAPPING.get(nodeParent) ??
+  const loroId =
+    WEAK_NODE_TO_LORO_CONTAINER_MAPPING.get(nodeParent) ??
     getByValue(mapping, nodeParent);
   if (!loroId) {
     if (anchor > 1) {
@@ -301,11 +304,7 @@ function absolutePositionToCursor(
     const child = children.get(childIndex);
     childIndex += 1;
     if (child instanceof LoroText) {
-      if (child.length >= index) {
-        return child.getCursor(index);
-      } else {
-        index -= child.length;
-      }
+      return child.getCursor(index);
     } else {
       if (index == 0) {
         // This happens when user selects an image or a horizontal rule