sanity 6.6.0-next.96 → 6.6.0-next.99

package/lib/_chunks-es/index2.js

@@ -201,6 +201,7 @@ import getSlug from "speakingurl";
 import { defineBehavior, raise, forward } from "@portabletext/editor/behaviors";
 import { NodePlugin, BehaviorPlugin, EventListenerPlugin } from "@portabletext/editor/plugins";
 import { OneLinePlugin } from "@portabletext/plugin-one-line";
+import { getEnclosingBlock, getSpan } from "@portabletext/editor/traversal";
 import { ResetIcon } from "@sanity/icons/Reset";
 import { HelpCircleIcon } from "@sanity/icons/HelpCircle";
 import { PortableText as PortableText$1, toPlainText as toPlainText$1 } from "@portabletext/react";
@@ -281,7 +282,6 @@ import { ItalicIcon } from "@sanity/icons/Italic";
 import { OlistIcon } from "@sanity/icons/Olist";
 import { StrikethroughIcon } from "@sanity/icons/Strikethrough";
 import { UnderlineIcon } from "@sanity/icons/Underline";
-import { getEnclosingBlock, getSpan } from "@portabletext/editor/traversal";
 import set$2 from "lodash-es/set.js";
 import { htmlToPortableText } from "@portabletext/html";
 import { MarkdownShortcutsPlugin } from "@portabletext/plugin-markdown-shortcuts";
@@ -32737,10 +32737,16 @@ function _getValueAtPath(value, path) {
 function keyGenerator() {
   return randomKey$1(12);
 }
+const LegacyEditorRefPlugin = forwardRef((_, ref) => {
+  const $ = c(3), portableTextEditor = usePortableTextEditor();
+  let t0, t1;
+  return $[0] !== portableTextEditor ? (t0 = () => portableTextEditor, t1 = [portableTextEditor], $[0] = portableTextEditor, $[1] = t0, $[2] = t1) : (t0 = $[1], t1 = $[2]), useImperativeHandle(ref, t0, t1), null;
+});
+LegacyEditorRefPlugin.displayName = "LegacyEditorRefPlugin";
 const EditorRefPlugin$1 = forwardRef((_, ref) => {
-  const $ = c(2), portableTextEditor = usePortableTextEditor(), portableTextEditorRef = useRef(portableTextEditor);
+  const $ = c(3), editor2 = useEditor();
   let t0, t1;
-  return $[0] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel") ? (t0 = () => portableTextEditorRef.current, t1 = [], $[0] = t0, $[1] = t1) : (t0 = $[0], t1 = $[1]), useImperativeHandle(ref, t0, t1), null;
+  return $[0] !== editor2 ? (t0 = () => editor2, t1 = [editor2], $[0] = editor2, $[1] = t0, $[2] = t1) : (t0 = $[1], t1 = $[2]), useImperativeHandle(ref, t0, t1), null;
 });
 EditorRefPlugin$1.displayName = "EditorRefPlugin";
 function PortableTextInput(props2) {
@@ -32770,7 +32776,7 @@ function PortableTextInput(props2) {
   } = props2, {
     onBlur,
     ref: elementRef
-  } = elementProps, defaultEditorRef = useRef(null), editorRef = editorRefProp || defaultEditorRef, presenceCursorDecorations = usePresenceCursorDecorations(useMemo(() => ({
+  } = elementProps, defaultLegacyEditorRef = useRef(null), editorRef = useRef(null), legacyEditorRef = editorRefProp || defaultLegacyEditorRef, presenceCursorDecorations = usePresenceCursorDecorations(useMemo(() => ({
     path: props2.path
   }), [props2.path])), {
     selectedPerspective
@@ -32819,19 +32825,16 @@ function PortableTextInput(props2) {
   useEffect(() => {
     hasFocusWithin && setIsActive(!0);
   }, [hasFocusWithin]);
-  const setFocusPathFromEditorSelection = useCallback((nextSelection) => {
+  const setFocusPathFromEditorSelection = useCallback((nextSelection, snapshot2) => {
     const focusPath = nextSelection?.focus.path;
     if (!focusPath) return;
-    const nextFocusPath = focusPath.length === 3 && // A span path is always 3 segments long
-    focusPath[1] === "children" && // Is a child of a block
-    isKeySegment(focusPath[2]) && // Contains the key of the child
-    !portableTextMemberItems.some((item) => isKeySegment(focusPath[2]) && item.member.key === focusPath[2]._key) ? focusPath.concat(["text"]) : focusPath;
+    const nextFocusPath = snapshot2 && getSpan(snapshot2, focusPath) ? focusPath.concat(["text"]) : focusPath;
     startTransition(() => {
       onPathFocus(nextFocusPath, {
         selection: nextSelection
       });
     });
-  }, [onPathFocus, portableTextMemberItems]), handleEditorChange = useCallback(
+  }, [onPathFocus]), handleEditorChange = useCallback(
     // oxlint-disable-next-line react/react-compiler
     (change) => {
       switch (change.type) {
@@ -32839,7 +32842,7 @@ function PortableTextInput(props2) {
           onChange(toFormPatches(change.patches));
           break;
         case "selection":
-          setFocusPathFromEditorSelection(change.selection);
+          setFocusPathFromEditorSelection(change.selection, editorRef.current?.getSnapshot() ?? null);
           break;
         case "focus":
           setIsActive(!0), setHasFocusWithin(!0);
@@ -32860,9 +32863,9 @@ function PortableTextInput(props2) {
           setReady(!0);
           break;
       }
-      editorRef.current && onEditorChange && onEditorChange(change, editorRef.current);
+      legacyEditorRef.current && onEditorChange && onEditorChange(change, legacyEditorRef.current);
     },
-    [editorRef, onEditorChange, onChange, setFocusPathFromEditorSelection, onBlur, toast]
+    [legacyEditorRef, editorRef, onEditorChange, onChange, setFocusPathFromEditorSelection, onBlur, toast]
   );
   useEffect(() => {
     setIgnoreValidationError(!1);
@@ -32870,8 +32873,8 @@ function PortableTextInput(props2) {
   const handleIgnoreInvalidValue = useCallback(() => {
     setIgnoreValidationError(!0);
   }, []), respondToInvalidContent = useMemo(() => invalidValue && invalidValue.resolution ? /* @__PURE__ */ jsx(Box, { marginBottom: 2, children: /* @__PURE__ */ jsx(InvalidValue, { onChange: handleEditorChange, onIgnore: handleIgnoreInvalidValue, resolution: invalidValue.resolution, readOnly }) }) : null, [handleEditorChange, handleIgnoreInvalidValue, invalidValue, readOnly]), handleActivate = useCallback(() => {
-    isActive || (setIsActive(!0), editorRef.current && PortableTextEditor.focus(editorRef.current));
-  }, [editorRef, isActive]), previousRangeDecorations = useRef([]), rangeDecorations = useMemo(() => {
+    isActive || (setIsActive(!0), legacyEditorRef.current && PortableTextEditor.focus(legacyEditorRef.current));
+  }, [legacyEditorRef, isActive]), previousRangeDecorations = useRef([]), rangeDecorations = useMemo(() => {
     const result = displayInlineChanges ? diffRangeDecorations : [...rangeDecorationsProp || [], ...presenceCursorDecorations], reconciled = immutableReconcile(previousRangeDecorations.current, result);
     return previousRangeDecorations.current = reconciled, reconciled;
   }, [diffRangeDecorations, displayInlineChanges, presenceCursorDecorations, rangeDecorationsProp]);
@@ -32884,6 +32887,7 @@ function PortableTextInput(props2) {
       schemaDefinition: sanitySchemaToPortableTextSchema(schemaType)
     }, children: [
       /* @__PURE__ */ jsx(EditorChangePlugin, { onChange: handleEditorChange, onOptimisticChange }),
+      /* @__PURE__ */ jsx(LegacyEditorRefPlugin, { ref: legacyEditorRef }),
       /* @__PURE__ */ jsx(EditorRefPlugin$1, { ref: editorRef }),
       /* @__PURE__ */ jsx(PatchesPlugin, { path }),
       /* @__PURE__ */ jsx(UpdateReadOnlyPlugin$1, { readOnly: readOnly || !ready }),