@tarviks/lexical-rich-editor 1.0.8 → 1.0.10

package/dist/index.js

@@ -5145,11 +5145,18 @@ function useDrag(onMove, onEnd, interactingRef) {
   );
   return start;
 }
-var ColorPickerControl = ({ value, title, disabled, onChange, icon }) => {
+var ColorPickerControl = ({ value, title, disabled, onChange, icon, onOpenChange }) => {
   const [open, setOpen] = React9__namespace.useState(false);
   const btnRef = React9__namespace.useRef(null);
+  const setOpenAndNotify = React9__namespace.useCallback(
+    (next) => {
+      setOpen(next);
+      onOpenChange?.(next);
+    },
+    [onOpenChange]
+  );
   const interactingRef = React9__namespace.useRef(false);
-  const handleDismiss = React9__namespace.useCallback(() => setOpen(false), []);
+  const handleDismiss = React9__namespace.useCallback(() => setOpenAndNotify(false), [setOpenAndNotify]);
   const preventDismissOnEvent = React9__namespace.useCallback(
     (ev) => {
       if (interactingRef.current) return true;
@@ -5183,11 +5190,21 @@ var ColorPickerControl = ({ value, title, disabled, onChange, icon }) => {
   const [s, setS] = React9__namespace.useState(hsv.s);
   const [v, setV] = React9__namespace.useState(hsv.v);
   const wasOpenRef = React9__namespace.useRef(open);
+  console.log("[AO-ColorPicker]", title, "render with incoming value prop:", JSON.stringify(value));
   React9__namespace.useEffect(() => {
     const justOpened = open && !wasOpenRef.current;
     wasOpenRef.current = open;
+    console.log("[AO-ColorPicker]", title, "open-seed effect", {
+      open,
+      justOpened,
+      incomingValue: value
+    });
     if (!justOpened) return;
     const n = normalizeHex(value || "#000000");
+    console.log("[AO-ColorPicker]", title, "seeding local state from value on open", {
+      incomingValue: value,
+      normalized: n
+    });
     setHex(n);
     const rgb = hexToRgb(n);
     const next = rgbToHsv(rgb.r, rgb.g, rgb.b);
@@ -5200,10 +5217,11 @@ var ColorPickerControl = ({ value, title, disabled, onChange, icon }) => {
       const rgb = hsvToRgb(hh, ss, vv);
       const nextHex = rgbToHex(rgb.r, rgb.g, rgb.b);
       setHex(nextHex);
+      console.log("[AO-ColorPicker]", title, "commitHsv -> onChange", { nextHex, close: !!close });
       onChange(nextHex);
-      if (close) setOpen(false);
+      if (close) setOpenAndNotify(false);
     },
-    [onChange]
+    [onChange, title, setOpenAndNotify]
   );
   const svRef = React9__namespace.useRef(null);
   const onSVMove = React9__namespace.useCallback(
@@ -5258,7 +5276,11 @@ var ColorPickerControl = ({ value, title, disabled, onChange, icon }) => {
         },
         onClick: () => {
           if (disabled) return;
-          setOpen((p) => !p);
+          console.log("[AO-ColorPicker]", title, "trigger button clicked", {
+            wasOpen: open,
+            activeElementBeforeToggle: document.activeElement?.tagName
+          });
+          setOpenAndNotify(!open);
         }
       }
     ),
@@ -5308,6 +5330,7 @@ var ColorPickerControl = ({ value, title, disabled, onChange, icon }) => {
                   setH(next.h);
                   setS(next.s);
                   setV(next.v);
+                  console.log("[AO-ColorPicker]", title, "hex field blur -> onChange", { raw: hex, normalized: n });
                   onChange(n);
                 }
               }
@@ -5326,6 +5349,7 @@ var ColorPickerControl = ({ value, title, disabled, onChange, icon }) => {
                 setH(next.h);
                 setS(next.s);
                 setV(next.v);
+                console.log("[AO-ColorPicker]", title, "preset swatch click -> onChange", { color: c });
                 onChange(c);
               },
               title: c
@@ -5351,7 +5375,7 @@ var ColorPickerControl = ({ value, title, disabled, onChange, icon }) => {
                 }
               }
             ),
-            /* @__PURE__ */ jsxRuntime.jsx(react.DefaultButton, { type: "button", text: "Close", onClick: () => setOpen(false) })
+            /* @__PURE__ */ jsxRuntime.jsx(react.DefaultButton, { type: "button", text: "Close", onClick: () => setOpenAndNotify(false) })
           ] })
         ] })
       }
@@ -5364,10 +5388,20 @@ var ColorPickerPlugin = ({ disabled }) => {
   const lastRangeSelectionRef = React9__namespace.default.useRef(null);
   const updateToolbar = () => {
     const selection$1 = lexical.$getSelection();
-    if (lexical.$isRangeSelection(selection$1)) {
+    const isRange = lexical.$isRangeSelection(selection$1);
+    console.log("[AO-ColorPicker] updateToolbar", {
+      isRangeSelection: isRange,
+      isCollapsed: isRange ? selection$1.isCollapsed() : null
+    });
+    if (isRange) {
       lastRangeSelectionRef.current = selection$1.clone();
       const c = selection.$getSelectionStyleValueForProperty(selection$1, "color", "#000000");
-      const bg = selection.$getSelectionStyleValueForProperty(selection$1, "background-color", "#ffffff");
+      const bg = selection.$getSelectionStyleValueForProperty(
+        selection$1,
+        "background-color",
+        "#ffffff"
+      );
+      console.log("[AO-ColorPicker] updateToolbar readback", { color: c, bgColor: bg });
       setColors({ color: c, bgColor: bg });
     }
   };
@@ -5386,21 +5420,68 @@ var ColorPickerPlugin = ({ disabled }) => {
       )
     );
   }, [editor]);
+  const wasEditorActiveRef = React9__namespace.default.useRef(false);
+  const handleOpenChange = (open) => {
+    if (open) {
+      const root = editor.getRootElement();
+      wasEditorActiveRef.current = !!root && (document.activeElement === root || root.contains(document.activeElement));
+    } else if (wasEditorActiveRef.current) {
+      editor.focus();
+    }
+  };
   const applyStyle = (args) => {
     if (disabled) return;
-    const root = editor.getRootElement();
-    const editorIsActive = !!lastRangeSelectionRef.current && !!root && (document.activeElement === root || root.contains(document.activeElement));
-    if (editorIsActive) editor.focus();
-    editor.update(() => {
-      const saved = lastRangeSelectionRef.current;
-      if (saved) {
-        lexical.$setSelection(saved.clone());
-      }
-      const selection$1 = lexical.$getSelection();
-      if (lexical.$isRangeSelection(selection$1)) {
-        selection.$patchStyleText(selection$1, { [args.property]: args.color });
-      }
+    console.log("[AO-ColorPicker] applyStyle called", {
+      property: args.property,
+      color: args.color,
+      hasSavedSelection: !!lastRangeSelectionRef.current,
+      savedSelectionIsCollapsed: lastRangeSelectionRef.current?.isCollapsed() ?? null,
+      wasEditorActiveAtOpen: wasEditorActiveRef.current,
+      activeElementTag: document.activeElement?.tagName,
+      activeElementClass: document.activeElement?.className
     });
+    editor.update(
+      () => {
+        const saved = lastRangeSelectionRef.current;
+        if (saved) {
+          lexical.$setSelection(saved.clone());
+        }
+        const selection$1 = lexical.$getSelection();
+        const isRange = lexical.$isRangeSelection(selection$1);
+        console.log("[AO-ColorPicker] applyStyle inside editor.update", {
+          hadSavedSelection: !!saved,
+          selectionAfterRestoreIsRange: isRange,
+          selectionAfterRestoreIsCollapsed: isRange ? selection$1.isCollapsed() : null
+        });
+        if (isRange) {
+          selection.$patchStyleText(selection$1, { [args.property]: args.color });
+          const verify = selection.$getSelectionStyleValueForProperty(
+            selection$1,
+            args.property,
+            "<none>"
+          );
+          console.log("[AO-ColorPicker] applyStyle after patchStyleText, readback in same update", {
+            property: args.property,
+            appliedColor: args.color,
+            readBack: verify
+          });
+        } else {
+          console.warn(
+            "[AO-ColorPicker] applyStyle: no range selection available \u2014 style was NOT applied",
+            { property: args.property, color: args.color }
+          );
+        }
+      },
+      // Without this tag, Lexical's reconciler force-focuses the editor root
+      // whenever this update's selection diff finds the root isn't already
+      // focused (see Lexical.dev.mjs ~8112) — which it never is while the
+      // color picker's Callout legitimately holds focus. That forced focus
+      // then fights Fluent's Callout for focus on every single drag-driven
+      // commit, repeatedly bouncing focus (and, via FocusEventsPlugin,
+      // nulling and restoring the selection) between the editor and the
+      // popover until the drag's tracked color desynced from the cursor.
+      { tag: lexical.SKIP_SELECTION_FOCUS_TAG }
+    );
   };
   const containerStyle = disabled ? {
     display: "flex",
@@ -5424,7 +5505,8 @@ var ColorPickerPlugin = ({ disabled }) => {
         title: "Text color",
         disabled,
         icon: /* @__PURE__ */ jsxRuntime.jsx(reactIcons.TextColorRegular, { style: { color: iconColor } }),
-        onChange: (c) => applyStyle({ property: "color", color: c })
+        onChange: (c) => applyStyle({ property: "color", color: c }),
+        onOpenChange: handleOpenChange
       }
     ),
     /* @__PURE__ */ jsxRuntime.jsx(
@@ -5434,7 +5516,8 @@ var ColorPickerPlugin = ({ disabled }) => {
         title: "Background color",
         disabled,
         icon: /* @__PURE__ */ jsxRuntime.jsx(reactIcons.PaintBucket16Filled, { style: { color: iconColor } }),
-        onChange: (c) => applyStyle({ property: "background-color", color: c })
+        onChange: (c) => applyStyle({ property: "background-color", color: c }),
+        onOpenChange: handleOpenChange
       }
     )
   ] });
@@ -6742,6 +6825,12 @@ function FocusEventsPlugin({
       const next = e.relatedTarget;
       const container = containerRef.current;
       const stillInside = !!next && (container ? container.contains(next) : root.contains(next));
+      console.log("[AO-ColorPicker] FocusEventsPlugin focusout", {
+        relatedTargetTag: next ? next.tagName : null,
+        relatedTargetClass: next ? next.className : null,
+        stillInside,
+        willClearSelection: !stillInside
+      });
       if (stillInside) return;
       editor.update(() => {
         lexical.$setSelection(null);