@haklex/rich-plugin-floating-toolbar 0.0.44 → 0.0.46

package/dist/FloatingToolbarPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FloatingToolbarPlugin.d.ts","sourceRoot":"","sources":["../src/FloatingToolbarPlugin.tsx"],"names":[],"mappings":"AAkCA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAsKzC,wBAAgB,qBAAqB,IAAI,YAAY,GAAG,IAAI,CAkgB3D"}
+{"version":3,"file":"FloatingToolbarPlugin.d.ts","sourceRoot":"","sources":["../src/FloatingToolbarPlugin.tsx"],"names":[],"mappings":"AAuCA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAkMzC,wBAAgB,qBAAqB,IAAI,YAAY,GAAG,IAAI,CAghB3D"}

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { jsxs, Fragment, jsx } from "react/jsx-runtime";
 import { $createRubyNode, $isRubyNode } from "@haklex/rich-editor";
 import { ColorPicker } from "@haklex/rich-editor-ui";
 import { usePortalTheme, vars } from "@haklex/rich-style-token";
-import { $isLinkNode, TOGGLE_LINK_COMMAND } from "@lexical/link";
+import { TOGGLE_LINK_COMMAND, $isLinkNode, $isAutoLinkNode } from "@lexical/link";
 import { useLexicalComposerContext } from "@lexical/react/LexicalComposerContext";
 import { $patchStyleText, $getSelectionStyleValueForProperty } from "@lexical/selection";
 import { $getSelection, $isRangeSelection, SELECTION_CHANGE_COMMAND, COMMAND_PRIORITY_LOW, FORMAT_TEXT_COMMAND, $createTextNode, $getNodeByKey } from "lexical";
@@ -22,6 +22,26 @@ var rubyInput = "_1m6axz7a";
 var rubyActionBtn = "_1m6axz7b";
 var rubyHint = "_1m6axz7c";
 var separator = "_1m6axz7d";
+function isEffectiveLinkNode(node) {
+  if (!$isLinkNode(node)) return false;
+  return !$isAutoLinkNode(node) || !node.getIsUnlinked();
+}
+function isRegularLinkNode(node) {
+  return $isLinkNode(node) && !$isAutoLinkNode(node);
+}
+function collectSelectedActiveAutoLinkNodes(selection) {
+  const autoLinkNodes = /* @__PURE__ */ new Map();
+  for (const node of selection.getNodes()) {
+    if ($isAutoLinkNode(node) && !node.getIsUnlinked()) {
+      autoLinkNodes.set(node.getKey(), node);
+    }
+    const parent = node.getParent();
+    if ($isAutoLinkNode(parent) && !parent.getIsUnlinked()) {
+      autoLinkNodes.set(parent.getKey(), parent);
+    }
+  }
+  return Array.from(autoLinkNodes.values());
+}
 const INITIAL_STATE = {
   isBold: false,
   isItalic: false,
@@ -59,7 +79,7 @@ function getSelectionState(selection) {
   const nodes = selection.getNodes();
   const hasLink = nodes.some((node) => {
     const parent = node.getParent();
-    return $isLinkNode(parent) || $isLinkNode(node);
+    return isEffectiveLinkNode(parent) || isEffectiveLinkNode(node);
   });
   const hasRuby = getSelectedRubyNodes(nodes).length > 0;
   return {
@@ -234,16 +254,28 @@ function FloatingToolbarPlugin() {
     [editor]
   );
   const handleLink = useCallback(() => {
-    editor.getEditorState().read(() => {
+    editor.update(() => {
       const selection = $getSelection();
       if (!$isRangeSelection(selection)) return;
       const nodes = selection.getNodes();
       const hasLink = nodes.some((node) => {
         const parent = node.getParent();
-        return $isLinkNode(parent) || $isLinkNode(node);
+        return isEffectiveLinkNode(parent) || isEffectiveLinkNode(node);
       });
       if (hasLink) {
-        editor.dispatchCommand(TOGGLE_LINK_COMMAND, null);
+        for (const autoLinkNode of collectSelectedActiveAutoLinkNodes(
+          selection
+        )) {
+          autoLinkNode.setIsUnlinked(true);
+          autoLinkNode.markDirty();
+        }
+        const hasRegularLink = nodes.some((node) => {
+          const parent = node.getParent();
+          return isRegularLinkNode(parent) || isRegularLinkNode(node);
+        });
+        if (hasRegularLink) {
+          editor.dispatchCommand(TOGGLE_LINK_COMMAND, null);
+        }
       } else {
         const text = selection.getTextContent();
         const url = /^https?:\/\//.test(text) ? text : "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haklex/rich-plugin-floating-toolbar",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "description": "Floating toolbar plugin",
   "license": "MIT",
   "type": "module",
@@ -16,9 +16,9 @@
     "dist"
   ],
   "dependencies": {
-    "@haklex/rich-editor": "0.0.44",
-    "@haklex/rich-editor-ui": "0.0.44",
-    "@haklex/rich-style-token": "0.0.44"
+    "@haklex/rich-editor-ui": "0.0.46",
+    "@haklex/rich-editor": "0.0.46",
+    "@haklex/rich-style-token": "0.0.46"
   },
   "devDependencies": {
     "@lexical/link": "^0.41.0",