@portabletext/editor 4.3.8 → 4.3.9

package/lib/index.js

@@ -1323,6 +1323,9 @@ function DropIndicator() {
     zIndex: 5
   }, children: /* @__PURE__ */ jsx("span", {}) }), $[0] = t0) : t0 = $[0], t0;
 }
+function serializePath(path) {
+  return path.map((segment) => isKeyedSegment(segment) ? segment._key : segment).join(".");
+}
 function defaultCompare(a, b) {
   return a === b;
 }
@@ -1362,8 +1365,8 @@ function getEditorSnapshot({
   };
 }
 const emptySet = /* @__PURE__ */ new Set(), defaultSelectionState = {
-  focusedChildKey: void 0,
-  selectedChildKeys: emptySet,
+  focusedChildPath: void 0,
+  selectedChildPaths: emptySet,
   focusedBlockKey: void 0,
   selectedBlockKeys: emptySet
 }, SelectionStateContext = createContext(defaultSelectionState);
@@ -1380,11 +1383,14 @@ function SelectionStateProvider(t0) {
     if (!snapshot.context.selection)
       return defaultSelectionState;
     const isCollapsed = isSelectionCollapsed$1(snapshot);
-    let focusedChildKey;
-    isCollapsed && (focusedChildKey = getFocusChild$1(snapshot)?.node._key);
+    let focusedChildPath;
+    if (isCollapsed) {
+      const focusChild = getFocusChild$1(snapshot);
+      focusChild && (focusedChildPath = serializePath(focusChild.path));
+    }
     const selectedChildren = getSelectedChildren()(snapshot);
-    let selectedChildKeys = selectedChildren.length > 0 ? new Set(selectedChildren.map(_temp$4)) : emptySet;
-    isCollapsed && focusedChildKey && !selectedChildKeys.has(focusedChildKey) && (selectedChildKeys = new Set(selectedChildKeys), selectedChildKeys.add(focusedChildKey));
+    let selectedChildPaths = selectedChildren.length > 0 ? new Set(selectedChildren.map(_temp$4)) : emptySet;
+    isCollapsed && focusedChildPath && !selectedChildPaths.has(focusedChildPath) && (selectedChildPaths = new Set(selectedChildPaths), selectedChildPaths.add(focusedChildPath));
     const startPoint = getSelectionStartPoint(snapshot), endPoint = getSelectionEndPoint(snapshot), startBlockKey = startPoint ? getBlockKeyFromSelectionPoint(startPoint) : void 0, endBlockKey = endPoint ? getBlockKeyFromSelectionPoint(endPoint) : void 0;
     let selectedBlockKeys = emptySet;
     if (startBlockKey && endBlockKey) {
@@ -1398,8 +1404,8 @@ function SelectionStateProvider(t0) {
     }
     const focusedBlockKey = isCollapsed ? startBlockKey : void 0;
     return {
-      focusedChildKey,
-      selectedChildKeys: selectedChildKeys.size > 0 ? selectedChildKeys : emptySet,
+      focusedChildPath,
+      selectedChildPaths: selectedChildPaths.size > 0 ? selectedChildPaths : emptySet,
       focusedBlockKey,
       selectedBlockKeys: selectedBlockKeys.size > 0 ? selectedBlockKeys : emptySet
     };
@@ -1409,13 +1415,13 @@ function SelectionStateProvider(t0) {
   return $[2] !== children || $[3] !== selectionState ? (t2 = /* @__PURE__ */ jsx(SelectionStateContext.Provider, { value: selectionState, children }), $[2] = children, $[3] = selectionState, $[4] = t2) : t2 = $[4], t2;
 }
 function _temp2$3(prev, next) {
-  if (prev.focusedChildKey !== next.focusedChildKey)
+  if (prev.focusedChildPath !== next.focusedChildPath)
     return !1;
-  if (prev.selectedChildKeys !== next.selectedChildKeys) {
-    if (prev.selectedChildKeys.size !== next.selectedChildKeys.size)
+  if (prev.selectedChildPaths !== next.selectedChildPaths) {
+    if (prev.selectedChildPaths.size !== next.selectedChildPaths.size)
       return !1;
-    for (const key_0 of prev.selectedChildKeys)
-      if (!next.selectedChildKeys.has(key_0))
+    for (const path of prev.selectedChildPaths)
+      if (!next.selectedChildPaths.has(path))
         return !1;
   }
   if (prev.focusedBlockKey !== next.focusedBlockKey)
@@ -1423,14 +1429,14 @@ function _temp2$3(prev, next) {
   if (prev.selectedBlockKeys !== next.selectedBlockKeys) {
     if (prev.selectedBlockKeys.size !== next.selectedBlockKeys.size)
       return !1;
-    for (const key_1 of prev.selectedBlockKeys)
-      if (!next.selectedBlockKeys.has(key_1))
+    for (const key_0 of prev.selectedBlockKeys)
+      if (!next.selectedBlockKeys.has(key_0))
         return !1;
   }
   return !0;
 }
 function _temp$4(child) {
-  return child.node._key;
+  return serializePath(child.path);
 }
 function RenderBlockObject(props) {
   const $ = c(34), blockObjectRef = useRef(null), {
@@ -1496,59 +1502,48 @@ function RenderBlock$1({
   });
 }
 function RenderInlineObject(props) {
-  const $ = c(33), inlineObjectRef = useRef(null), slateEditor = useSlateStatic(), {
-    selectedChildKeys,
-    focusedChildKey
-  } = useContext(SelectionStateContext);
+  const $ = c(26), inlineObjectRef = useRef(null), slateEditor = useSlateStatic();
   let t0;
-  $[0] !== props.element._key || $[1] !== selectedChildKeys ? (t0 = selectedChildKeys.has(props.element._key), $[0] = props.element._key, $[1] = selectedChildKeys, $[2] = t0) : t0 = $[2];
-  const selected = t0, focused = focusedChildKey === props.element._key;
-  let t1;
-  if ($[3] !== props.element._type || $[4] !== props.legacySchema.inlineObjects) {
-    let t22;
-    $[6] !== props.element._type ? (t22 = (inlineObject) => inlineObject.name === props.element._type, $[6] = props.element._type, $[7] = t22) : t22 = $[7], t1 = props.legacySchema.inlineObjects.find(t22), $[3] = props.element._type, $[4] = props.legacySchema.inlineObjects, $[5] = t1;
+  if ($[0] !== props.element._type || $[1] !== props.legacySchema.inlineObjects) {
+    let t12;
+    $[3] !== props.element._type ? (t12 = (inlineObject) => inlineObject.name === props.element._type, $[3] = props.element._type, $[4] = t12) : t12 = $[4], t0 = props.legacySchema.inlineObjects.find(t12), $[0] = props.element._type, $[1] = props.legacySchema.inlineObjects, $[2] = t0;
   } else
-    t1 = $[5];
-  const legacySchemaType = t1;
+    t0 = $[2];
+  const legacySchemaType = t0;
   legacySchemaType || console.error(`Unable to find Inline Object "${props.element._type}" in Schema`);
-  let t2;
-  if ($[8] !== props.element || $[9] !== slateEditor) {
-    const path = DOMEditor.findPath(slateEditor, props.element);
-    t2 = getPointBlock({
-      editor: slateEditor,
-      point: {
-        path,
-        offset: 0
-      }
-    }), $[8] = props.element, $[9] = slateEditor, $[10] = t2;
-  } else
-    t2 = $[10];
-  const [block] = t2;
+  const slatePath = DOMEditor.findPath(slateEditor, props.element), [block] = getPointBlock({
+    editor: slateEditor,
+    point: {
+      path: slatePath,
+      offset: 0
+    }
+  });
   block || console.error(`Unable to find parent block of inline object ${props.element._key}`);
-  let t3;
-  $[11] !== props.element ? (t3 = "value" in props.element && typeof props.element.value == "object" ? props.element.value : {}, $[11] = props.element, $[12] = t3) : t3 = $[12];
-  let t4;
-  $[13] !== props.element._key || $[14] !== props.element._type || $[15] !== t3 ? (t4 = {
-    _key: props.element._key,
-    _type: props.element._type,
-    ...t3
-  }, $[13] = props.element._key, $[14] = props.element._type, $[15] = t3, $[16] = t4) : t4 = $[16];
-  const inlineObject_0 = t4, t5 = !props.readOnly;
-  let t6;
-  $[17] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel") ? (t6 = {
-    display: "inline-block"
-  }, $[17] = t6) : t6 = $[17];
-  let t7;
-  $[18] !== block || $[19] !== focused || $[20] !== inlineObject_0 || $[21] !== legacySchemaType || $[22] !== props.element._key || $[23] !== props.renderChild || $[24] !== selected ? (t7 = /* @__PURE__ */ jsx("span", { ref: inlineObjectRef, style: t6, children: props.renderChild && block && legacySchemaType ? /* @__PURE__ */ jsx(RenderChild$1, { renderChild: props.renderChild, annotations: [], editorElementRef: inlineObjectRef, selected, focused, path: [{
+  const path = block ? [{
     _key: block._key
   }, "children", {
     _key: props.element._key
-  }], schemaType: legacySchemaType, value: inlineObject_0, type: legacySchemaType, children: /* @__PURE__ */ jsx(RenderDefaultInlineObject, { inlineObject: inlineObject_0 }) }) : /* @__PURE__ */ jsx(RenderDefaultInlineObject, { inlineObject: inlineObject_0 }) }), $[18] = block, $[19] = focused, $[20] = inlineObject_0, $[21] = legacySchemaType, $[22] = props.element._key, $[23] = props.renderChild, $[24] = selected, $[25] = t7) : t7 = $[25];
-  let t8;
-  return $[26] !== inlineObject_0._key || $[27] !== inlineObject_0._type || $[28] !== props.attributes || $[29] !== props.children || $[30] !== t5 || $[31] !== t7 ? (t8 = /* @__PURE__ */ jsxs("span", { ...props.attributes, draggable: t5, className: "pt-inline-object", "data-child-key": inlineObject_0._key, "data-child-name": inlineObject_0._type, "data-child-type": "object", children: [
+  }] : void 0, selectionState = useContext(SelectionStateContext), serializedPath = path ? serializePath(path) : void 0, selected = serializedPath ? selectionState.selectedChildPaths.has(serializedPath) : !1, focused = serializedPath ? selectionState.focusedChildPath === serializedPath : !1;
+  let t1;
+  $[5] !== props.element ? (t1 = "value" in props.element && typeof props.element.value == "object" ? props.element.value : {}, $[5] = props.element, $[6] = t1) : t1 = $[6];
+  let t2;
+  $[7] !== props.element._key || $[8] !== props.element._type || $[9] !== t1 ? (t2 = {
+    _key: props.element._key,
+    _type: props.element._type,
+    ...t1
+  }, $[7] = props.element._key, $[8] = props.element._type, $[9] = t1, $[10] = t2) : t2 = $[10];
+  const inlineObject_0 = t2, t3 = !props.readOnly;
+  let t4;
+  $[11] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel") ? (t4 = {
+    display: "inline-block"
+  }, $[11] = t4) : t4 = $[11];
+  let t5;
+  $[12] !== focused || $[13] !== inlineObject_0 || $[14] !== legacySchemaType || $[15] !== path || $[16] !== props.renderChild || $[17] !== selected ? (t5 = /* @__PURE__ */ jsx("span", { ref: inlineObjectRef, style: t4, children: props.renderChild && path && legacySchemaType ? /* @__PURE__ */ jsx(RenderChild$1, { renderChild: props.renderChild, annotations: [], editorElementRef: inlineObjectRef, selected, focused, path, schemaType: legacySchemaType, value: inlineObject_0, type: legacySchemaType, children: /* @__PURE__ */ jsx(RenderDefaultInlineObject, { inlineObject: inlineObject_0 }) }) : /* @__PURE__ */ jsx(RenderDefaultInlineObject, { inlineObject: inlineObject_0 }) }), $[12] = focused, $[13] = inlineObject_0, $[14] = legacySchemaType, $[15] = path, $[16] = props.renderChild, $[17] = selected, $[18] = t5) : t5 = $[18];
+  let t6;
+  return $[19] !== inlineObject_0._key || $[20] !== inlineObject_0._type || $[21] !== props.attributes || $[22] !== props.children || $[23] !== t3 || $[24] !== t5 ? (t6 = /* @__PURE__ */ jsxs("span", { ...props.attributes, draggable: t3, className: "pt-inline-object", "data-child-key": inlineObject_0._key, "data-child-name": inlineObject_0._type, "data-child-type": "object", children: [
     props.children,
-    t7
-  ] }), $[26] = inlineObject_0._key, $[27] = inlineObject_0._type, $[28] = props.attributes, $[29] = props.children, $[30] = t5, $[31] = t7, $[32] = t8) : t8 = $[32], t8;
+    t5
+  ] }), $[19] = inlineObject_0._key, $[20] = inlineObject_0._type, $[21] = props.attributes, $[22] = props.children, $[23] = t3, $[24] = t5, $[25] = t6) : t6 = $[25], t6;
 }
 function RenderChild$1({
   renderChild,
@@ -1764,19 +1759,23 @@ function _temp$3(s) {
   return s.context.schema;
 }
 function RenderSpan(props) {
-  const $ = c(35), slateEditor = useSlateStatic(), editorActor = useContext(EditorActorContext), legacySchema = useSelector(editorActor, _temp$2), spanRef = useRef(null), selectionState = useContext(SelectionStateContext), focused = selectionState.focusedChildKey === props.leaf._key;
+  const $ = c(36), slateEditor = useSlateStatic(), editorActor = useContext(EditorActorContext), legacySchema = useSelector(editorActor, _temp$2), spanRef = useRef(null), parent = props.children.props.parent, block = parent && slateEditor.isTextBlock(parent) ? parent : void 0;
   let t0;
-  $[0] !== props.leaf._key || $[1] !== selectionState.selectedChildKeys ? (t0 = selectionState.selectedChildKeys.has(props.leaf._key), $[0] = props.leaf._key, $[1] = selectionState.selectedChildKeys, $[2] = t0) : t0 = $[2];
-  const selected = t0, parent = props.children.props.parent, block = parent && slateEditor.isTextBlock(parent) ? parent : void 0;
-  let t1;
-  $[3] !== block || $[4] !== props.leaf._key ? (t1 = block ? [{
+  $[0] !== block || $[1] !== props.leaf._key ? (t0 = block ? [{
     _key: block._key
   }, "children", {
     _key: props.leaf._key
-  }] : void 0, $[3] = block, $[4] = props.leaf._key, $[5] = t1) : t1 = $[5];
-  const path = t1;
+  }] : void 0, $[0] = block, $[1] = props.leaf._key, $[2] = t0) : t0 = $[2];
+  const path = t0, selectionState = useContext(SelectionStateContext);
+  let focused, t1;
+  if ($[3] !== path || $[4] !== selectionState) {
+    const serializedPath = path ? serializePath(path) : void 0;
+    focused = serializedPath ? selectionState.focusedChildPath === serializedPath : !1, t1 = serializedPath ? selectionState.selectedChildPaths.has(serializedPath) : !1, $[3] = path, $[4] = selectionState, $[5] = focused, $[6] = t1;
+  } else
+    focused = $[5], t1 = $[6];
+  const selected = t1;
   let annotationMarkDefs, children;
-  if ($[6] !== block || $[7] !== editorActor || $[8] !== focused || $[9] !== legacySchema || $[10] !== path || $[11] !== props.children || $[12] !== props.leaf.marks || $[13] !== props.renderAnnotation || $[14] !== props.renderDecorator || $[15] !== selected) {
+  if ($[7] !== block || $[8] !== editorActor || $[9] !== focused || $[10] !== legacySchema || $[11] !== path || $[12] !== props.children || $[13] !== props.leaf.marks || $[14] !== props.renderAnnotation || $[15] !== props.renderDecorator || $[16] !== selected) {
     const decoratorSchemaTypes = editorActor.getSnapshot().context.schema.decorators.map(_temp2$1), decorators = [...new Set((props.leaf.marks ?? []).filter((mark) => decoratorSchemaTypes.includes(mark)))];
     annotationMarkDefs = (props.leaf.marks ?? []).flatMap((mark_0) => {
       if (decoratorSchemaTypes.includes(mark_0))
@@ -1792,24 +1791,24 @@ function RenderSpan(props) {
       const legacyAnnotationSchemaType = legacySchema.annotations.find((t) => t.name === annotationMarkDef._type);
       legacyAnnotationSchemaType && (block && path && props.renderAnnotation ? children = /* @__PURE__ */ jsx("span", { ref: spanRef, children: /* @__PURE__ */ jsx(RenderAnnotation, { renderAnnotation: props.renderAnnotation, block, editorElementRef: spanRef, focused, path, selected, schemaType: legacyAnnotationSchemaType, value: annotationMarkDef, type: legacyAnnotationSchemaType, children }) }) : children = /* @__PURE__ */ jsx("span", { ref: spanRef, children }));
     }
-    $[6] = block, $[7] = editorActor, $[8] = focused, $[9] = legacySchema, $[10] = path, $[11] = props.children, $[12] = props.leaf.marks, $[13] = props.renderAnnotation, $[14] = props.renderDecorator, $[15] = selected, $[16] = annotationMarkDefs, $[17] = children;
+    $[7] = block, $[8] = editorActor, $[9] = focused, $[10] = legacySchema, $[11] = path, $[12] = props.children, $[13] = props.leaf.marks, $[14] = props.renderAnnotation, $[15] = props.renderDecorator, $[16] = selected, $[17] = annotationMarkDefs, $[18] = children;
   } else
-    annotationMarkDefs = $[16], children = $[17];
+    annotationMarkDefs = $[17], children = $[18];
   if (block && path && props.renderChild) {
     let t22;
-    if ($[18] !== block.children || $[19] !== props.leaf) {
+    if ($[19] !== block.children || $[20] !== props.leaf) {
       let t3;
-      $[21] !== props.leaf ? (t3 = (_child) => _child._key === props.leaf._key, $[21] = props.leaf, $[22] = t3) : t3 = $[22], t22 = block.children.find(t3), $[18] = block.children, $[19] = props.leaf, $[20] = t22;
+      $[22] !== props.leaf ? (t3 = (_child) => _child._key === props.leaf._key, $[22] = props.leaf, $[23] = t3) : t3 = $[23], t22 = block.children.find(t3), $[19] = block.children, $[20] = props.leaf, $[21] = t22;
     } else
-      t22 = $[20];
+      t22 = $[21];
     const child = t22;
     if (child) {
       let t3;
-      $[23] !== annotationMarkDefs || $[24] !== child || $[25] !== children || $[26] !== focused || $[27] !== legacySchema.span || $[28] !== path || $[29] !== props.renderChild || $[30] !== selected ? (t3 = /* @__PURE__ */ jsx(RenderChild, { renderChild: props.renderChild, annotations: annotationMarkDefs, editorElementRef: spanRef, focused, path, schemaType: legacySchema.span, selected, value: child, type: legacySchema.span, children }), $[23] = annotationMarkDefs, $[24] = child, $[25] = children, $[26] = focused, $[27] = legacySchema.span, $[28] = path, $[29] = props.renderChild, $[30] = selected, $[31] = t3) : t3 = $[31], children = t3;
+      $[24] !== annotationMarkDefs || $[25] !== child || $[26] !== children || $[27] !== focused || $[28] !== legacySchema.span || $[29] !== path || $[30] !== props.renderChild || $[31] !== selected ? (t3 = /* @__PURE__ */ jsx(RenderChild, { renderChild: props.renderChild, annotations: annotationMarkDefs, editorElementRef: spanRef, focused, path, schemaType: legacySchema.span, selected, value: child, type: legacySchema.span, children }), $[24] = annotationMarkDefs, $[25] = child, $[26] = children, $[27] = focused, $[28] = legacySchema.span, $[29] = path, $[30] = props.renderChild, $[31] = selected, $[32] = t3) : t3 = $[32], children = t3;
     }
   }
   let t2;
-  return $[32] !== children || $[33] !== props.attributes ? (t2 = /* @__PURE__ */ jsx("span", { ...props.attributes, ref: spanRef, children }), $[32] = children, $[33] = props.attributes, $[34] = t2) : t2 = $[34], t2;
+  return $[33] !== children || $[34] !== props.attributes ? (t2 = /* @__PURE__ */ jsx("span", { ...props.attributes, ref: spanRef, children }), $[33] = children, $[34] = props.attributes, $[35] = t2) : t2 = $[35], t2;
 }
 function _temp2$1(decorator) {
   return decorator.name;