@haklex/rich-editor 0.0.42 → 0.0.43

package/dist/{RichEditor-DnJwe663.js → RichEditor-Cv399wxR.js}

@@ -26,6 +26,7 @@ import { ListNode, ListItemNode } from "@lexical/list";
 import { HeadingNode, QuoteNode, $isQuoteNode, DRAG_DROP_PASTE, $createQuoteNode } from "@lexical/rich-text";
 import { TableNode, TableCellNode, TableRowNode } from "@lexical/table";
 import { useLexicalNodeSelection } from "@lexical/react/useLexicalNodeSelection";
+import { nanoid } from "nanoid";
 import { Dialog, DialogPopup, DialogTitle, SegmentedControl } from "@haklex/rich-editor-ui";
 import { b as clsx, g as getVariantClass } from "./utils-fpeaZV1R.js";
 import { MarkdownShortcutPlugin } from "@lexical/react/LexicalMarkdownShortcutPlugin";
@@ -1330,42 +1331,104 @@ const blockIdState = createState("blockId", {
   parse: (v) => typeof v === "string" ? v : ""
 });
 const NORMALIZATION_TAG = "block-id-normalization";
+function buildPreviousIdIndex(editorState) {
+  return editorState.read(() => {
+    const map = /* @__PURE__ */ new Map();
+    for (const child of $getRoot().getChildren()) {
+      const id = $getState(child, blockIdState);
+      if (!id) continue;
+      const set = map.get(id) ?? /* @__PURE__ */ new Set();
+      set.add(child.getKey());
+      map.set(id, set);
+    }
+    return map;
+  });
+}
+function collectRootChildren(editorState) {
+  return editorState.read(
+    () => $getRoot().getChildren().map((child) => $getState(child, blockIdState))
+  );
+}
+function hasDuplicateOrMissingId(children) {
+  const seen = /* @__PURE__ */ new Set();
+  for (const id of children) {
+    if (!id || seen.has(id)) {
+      return true;
+    }
+    seen.add(id);
+  }
+  return false;
+}
+function generateBlockId(used) {
+  let id = "";
+  do {
+    id = nanoid(8);
+  } while (used.has(id));
+  return id;
+}
+function pickKeeperKey(nodes, previousKeys) {
+  if (!nodes.length) return null;
+  if (previousKeys?.size) {
+    for (const node of nodes) {
+      if (previousKeys.has(node.getKey())) {
+        return node.getKey();
+      }
+    }
+  }
+  return nodes[0]?.getKey() ?? null;
+}
+function normalizeRootBlockIds(editor, previousIdIndex) {
+  editor.update(
+    () => {
+      $addUpdateTag("history-merge");
+      const children = $getRoot().getChildren();
+      const groupedById = /* @__PURE__ */ new Map();
+      for (const child of children) {
+        const id = $getState(child, blockIdState);
+        if (!id) continue;
+        const bucket = groupedById.get(id) ?? [];
+        bucket.push(child);
+        groupedById.set(id, bucket);
+      }
+      const keeperById = /* @__PURE__ */ new Map();
+      for (const [id, nodes] of groupedById) {
+        if (nodes.length <= 1) continue;
+        const keeperKey = pickKeeperKey(nodes, previousIdIndex.get(id));
+        if (keeperKey) {
+          keeperById.set(id, keeperKey);
+        }
+      }
+      const used = /* @__PURE__ */ new Set();
+      for (const child of children) {
+        let id = $getState(child, blockIdState);
+        const keeperKey = id ? keeperById.get(id) : null;
+        const shouldRegenerate = !id || used.has(id) || keeperKey !== void 0 && child.getKey() !== keeperKey;
+        if (shouldRegenerate) {
+          id = generateBlockId(used);
+          $setState(child, blockIdState, id);
+        }
+        used.add(id);
+      }
+    },
+    { tag: NORMALIZATION_TAG }
+  );
+}
 function BlockIdPlugin() {
   const [editor] = useLexicalComposerContext();
   useEffect(() => {
-    return editor.registerUpdateListener(({ tags }) => {
-      if (tags.has(NORMALIZATION_TAG)) return;
-      editor.read(() => {
-        const children = $getRoot().getChildren();
-        let needsUpdate = false;
-        const seen = /* @__PURE__ */ new Set();
-        for (const child of children) {
-          const id = $getState(child, blockIdState);
-          if (id === "" || seen.has(id)) {
-            needsUpdate = true;
-            break;
-          }
-          seen.add(id);
-        }
-        if (!needsUpdate) return;
-        editor.update(
-          () => {
-            $addUpdateTag("history-merge");
-            const children2 = $getRoot().getChildren();
-            const seen2 = /* @__PURE__ */ new Set();
-            for (const child of children2) {
-              let id = $getState(child, blockIdState);
-              if (id === "" || seen2.has(id)) {
-                id = crypto.randomUUID();
-                $setState(child, blockIdState, id);
-              }
-              seen2.add(id);
-            }
-          },
-          { tag: NORMALIZATION_TAG }
-        );
-      });
-    });
+    const initialChildren = collectRootChildren(editor.getEditorState());
+    if (hasDuplicateOrMissingId(initialChildren)) {
+      normalizeRootBlockIds(editor, /* @__PURE__ */ new Map());
+    }
+    return editor.registerUpdateListener(
+      ({ tags, editorState, prevEditorState }) => {
+        if (tags.has(NORMALIZATION_TAG)) return;
+        const children = collectRootChildren(editorState);
+        if (!hasDuplicateOrMissingId(children)) return;
+        const previousIdIndex = buildPreviousIdIndex(prevEditorState);
+        normalizeRootBlockIds(editor, previousIdIndex);
+      }
+    );
   }, [editor]);
   return null;
 }
@@ -2446,6 +2509,7 @@ function RichEditor({
           className: clsx("rich-editor", variantClass, className),
           style,
           "data-theme": theme,
+          suppressHydrationWarning: true,
           children: [
             /* @__PURE__ */ jsx(
               RichTextPlugin,

package/dist/components/RichEditor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RichEditor.d.ts","sourceRoot":"","sources":["../../src/components/RichEditor.tsx"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAI/C,wBAAgB,UAAU,CAAC,EACzB,YAAY,EACZ,QAAQ,EACR,OAAmB,EACnB,KAAe,EACf,WAAkC,EAClC,QAAQ,EACR,SAAiB,EACjB,SAAS,EACT,gBAAgB,EAChB,KAAK,EACL,OAAO,EACP,aAAa,EACb,UAAU,EACV,cAAc,EACd,WAAW,EACX,UAAU,EACV,QAAQ,GACT,EAAE,eAAe,+BA0EjB"}
+{"version":3,"file":"RichEditor.d.ts","sourceRoot":"","sources":["../../src/components/RichEditor.tsx"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAI/C,wBAAgB,UAAU,CAAC,EACzB,YAAY,EACZ,QAAQ,EACR,OAAmB,EACnB,KAAe,EACf,WAAkC,EAClC,QAAQ,EACR,SAAiB,EACjB,SAAS,EACT,gBAAgB,EAChB,KAAK,EACL,OAAO,EACP,aAAa,EACb,UAAU,EACV,cAAc,EACd,WAAW,EACX,UAAU,EACV,QAAQ,GACT,EAAE,eAAe,+BA2EjB"}

package/dist/editor.mjs

@@ -1,4 +1,4 @@
-import { R, a, c, g, s } from "./RichEditor-DnJwe663.js";
+import { R, a, c, g, s } from "./RichEditor-Cv399wxR.js";
 import { a as a2, b, c as c2 } from "./theme-gVNBI_ET.js";
 export {
   R as RichEditor,

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { b as blockIdState } from "./RichEditor-DnJwe663.js";
-import { A, F, d, I, e, f, h, i, N, R, a, c, j, g, s, u } from "./RichEditor-DnJwe663.js";
+import { b as blockIdState } from "./RichEditor-Cv399wxR.js";
+import { A, F, d, I, e, f, h, i, N, R, a, c, j, g, s, u } from "./RichEditor-Cv399wxR.js";
 import { h as useFootnoteContent, j as useFootnoteDisplayNumber } from "./theme-gVNBI_ET.js";
 import { $, o, p, q, r, s as s2, t, v, w, x, y, z, A as A2, B, D, E, G, H, C, F as F2, I as I2, J, K, L, M, O, P, Q, S, T, U, N as N2, V, a as a2, b, W, e as e2, c as c2, X, f as f2, g as g2, u as u2, i as i2, k, l, m, n } from "./theme-gVNBI_ET.js";
 import { a as a3, c as c3, g as g3, n as n2 } from "./utils-fpeaZV1R.js";

package/dist/plugins/BlockIdPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BlockIdPlugin.d.ts","sourceRoot":"","sources":["../../src/plugins/BlockIdPlugin.tsx"],"names":[],"mappings":"AAUA,eAAO,MAAM,YAAY,kDAEvB,CAAA;AAIF,wBAAgB,aAAa,SA6C5B"}
+{"version":3,"file":"BlockIdPlugin.d.ts","sourceRoot":"","sources":["../../src/plugins/BlockIdPlugin.tsx"],"names":[],"mappings":"AAaA,eAAO,MAAM,YAAY,kDAEvB,CAAA;AA8GF,wBAAgB,aAAa,SAwB5B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haklex/rich-editor",
-  "version": "0.0.42",
+  "version": "0.0.43",
   "description": "Core rich text editor based on Lexical",
   "license": "MIT",
   "type": "module",
@@ -28,10 +28,11 @@
     "dist"
   ],
   "dependencies": {
+    "nanoid": "^5.1.6",
     "thumbhash": "^0.1.1",
-    "@haklex/rich-editor-ui": "0.0.42",
-    "@haklex/rich-headless": "0.0.42",
-    "@haklex/rich-style-token": "0.0.42"
+    "@haklex/rich-editor-ui": "0.0.43",
+    "@haklex/rich-style-token": "0.0.43",
+    "@haklex/rich-headless": "0.0.43"
   },
   "devDependencies": {
     "@base-ui/react": "^1.2.0",