@portabletext/editor 1.54.4 → 1.55.0

package/lib/index.d.cts

@@ -3166,6 +3166,7 @@ export declare type EditorSnapshot = {
     activeAnnotations: Array<string>
     activeDecorators: Array<string>
   }
+  blockIndexMap: Map<string, number>
 }
 
 /**
@@ -4143,6 +4144,8 @@ declare interface PortableTextSlateEditor extends ReactEditor {
   decoratedRanges: Array<DecoratedRange>
   decoratorState: Record<string, boolean | undefined>
   markState: MarkState | undefined
+  blockIndexMap: Map<string, number>
+  listIndexMap: Map<string, number>
   /**
    * Use hotkeys
    */

package/lib/index.d.ts

@@ -3166,6 +3166,7 @@ export declare type EditorSnapshot = {
     activeAnnotations: Array<string>
     activeDecorators: Array<string>
   }
+  blockIndexMap: Map<string, number>
 }
 
 /**
@@ -4143,6 +4144,8 @@ declare interface PortableTextSlateEditor extends ReactEditor {
   decoratedRanges: Array<DecoratedRange>
   decoratorState: Record<string, boolean | undefined>
   markState: MarkState | undefined
+  blockIndexMap: Map<string, number>
+  listIndexMap: Map<string, number>
   /**
    * Use hotkeys
    */

package/lib/index.js

@@ -9,12 +9,12 @@ import { Element as Element$1, Text, Range, Editor, Node, Point, Transforms, Pat
 import { useSelected, useSlateSelector, useSlateStatic, withReact, ReactEditor, Slate, useSlate, Editable } from "slate-react";
 import debug$f from "debug";
 import { DOMEditor, isDOMNode } from "slate-dom";
-import { getBlockStartPoint, getBlockKeyFromSelectionPoint, isTextBlock, parseBlock, sliceBlocks, parseAnnotation, blockOffsetToSpanSelectionPoint, parseInlineObject, isKeyedSegment, isSpan$1 as isSpan, isListBlock, isTypedObject, getSelectionStartPoint, getSelectionEndPoint, getTextBlockText, parseBlocks } from "./_chunks-es/selection-point.js";
+import { getBlockStartPoint, getBlockKeyFromSelectionPoint, isTextBlock, parseBlock, parseAnnotation, blockOffsetToSpanSelectionPoint, parseInlineObject, isKeyedSegment, isSpan$1 as isSpan, isListBlock, isTypedObject, getSelectionStartPoint, getSelectionEndPoint, getTextBlockText, parseBlocks } from "./_chunks-es/selection-point.js";
 import { getBlockEndPoint, isEmptyTextBlock, isEqualSelectionPoints } from "./_chunks-es/util.is-equal-selection-points.js";
 import { isSelectionCollapsed, selectionPointToBlockOffset } from "./_chunks-es/util.selection-point-to-block-offset.js";
 import isEqual from "lodash/isEqual.js";
 import { isKeySegment, defineType, defineField } from "@sanity/types";
-import { isSelectionCollapsed as isSelectionCollapsed$1, getFocusTextBlock, getFocusSpan as getFocusSpan$1, isSelectionExpanded, getFocusBlock as getFocusBlock$1, getFocusChild as getFocusChild$1 } from "./_chunks-es/selector.is-selection-expanded.js";
+import { isSelectionCollapsed as isSelectionCollapsed$1, getFocusTextBlock, getFocusSpan as getFocusSpan$1, isSelectionExpanded, getFocusBlock as getFocusBlock$1, getSelectedValue, getFocusChild as getFocusChild$1 } from "./_chunks-es/selector.is-selection-expanded.js";
 import { getFocusInlineObject, getSelectedBlocks, getSelectionStartBlock as getSelectionStartBlock$1, getSelectionEndBlock as getSelectionEndBlock$1, isOverlappingSelection, isSelectingEntireBlocks, getTrimmedSelection, getSelectedSpans, getCaretWordSelection, getFocusBlockObject, getPreviousBlock, getNextBlock, isAtTheEndOfBlock, isAtTheStartOfBlock, getFirstBlock as getFirstBlock$1, getLastBlock as getLastBlock$1, getFocusListBlock, isActiveAnnotation, isActiveDecorator, getSelectedTextBlocks, isActiveListItem, isActiveStyle, getActiveAnnotations as getActiveAnnotations$1 } from "./_chunks-es/selector.is-selecting-entire-blocks.js";
 import getRandomValues from "get-random-values-esm";
 import { defineBehavior, forward, raise, effect } from "./behaviors/index.js";
@@ -684,6 +684,7 @@ function getDragSelection({
 }) {
   let dragSelection = eventSelection;
   if (getFocusInlineObject({
+    ...snapshot,
     context: {
       ...snapshot.context,
       selection: eventSelection
@@ -696,11 +697,13 @@ function getDragSelection({
       selection: eventSelection
     }
   }), draggedTextBlock = getFocusTextBlock({
+    ...snapshot,
     context: {
       ...snapshot.context,
       selection: eventSelection
     }
   }), draggedSpan = getFocusSpan$1({
+    ...snapshot,
     context: {
       ...snapshot.context,
       selection: eventSelection
@@ -785,6 +788,7 @@ function createCoreBlockElementBehaviorsConfig({
         event
       }) => {
         const dropFocusBlock = getFocusBlock$1({
+          ...snapshot,
           context: {
             ...snapshot.context,
             selection: event.position.selection
@@ -800,11 +804,13 @@ function createCoreBlockElementBehaviorsConfig({
           snapshot
         });
         return getSelectedBlocks({
+          ...snapshot,
           context: {
             ...snapshot.context,
             selection: dragSelection
           }
         }).some((draggedBlock) => draggedBlock.node._key === key) ? !1 : isSelectingEntireBlocks({
+          ...snapshot,
           context: {
             ...snapshot.context,
             selection: dragSelection
@@ -936,7 +942,7 @@ function RenderTextBlock(props) {
     key: props.element._key,
     onSetDragPositionBlock: setDragPositionBlock
   });
-  const legacySchema = useSelector(editorActor, (s) => s.context.getLegacySchema());
+  const legacySchema = useSelector(editorActor, (s) => s.context.getLegacySchema()), listIndex = useSlateSelector((editor_0) => editor_0.listIndexMap.get(props.textBlock._key));
   let children = props.children;
   const legacyBlockSchemaType = legacySchema.block;
   if (props.renderStyle && props.textBlock.style) {
@@ -976,6 +982,8 @@ function RenderTextBlock(props) {
     "data-level": props.textBlock.level
   } : {}, ...props.textBlock.style !== void 0 ? {
     "data-style": props.textBlock.style
+  } : {}, ...listIndex !== void 0 ? {
+    "data-list-index": listIndex
   } : {}, children: [
     dragPositionBlock === "start" ? /* @__PURE__ */ jsx(DropIndicator, {}) : null,
     /* @__PURE__ */ jsx("div", { ref: blockRef, children: props.renderBlock ? props.renderBlock({
@@ -1110,21 +1118,14 @@ const converterJson = {
     snapshot,
     event
   }) => {
-    const selection = snapshot.context.selection;
-    if (!selection)
+    if (!snapshot.context.selection)
       return {
         type: "serialization.failure",
         mimeType: "application/x-portable-text",
         originEvent: event.originEvent,
         reason: "No selection"
       };
-    const blocks = sliceBlocks({
-      context: {
-        selection,
-        schema: snapshot.context.schema
-      },
-      blocks: snapshot.context.value
-    });
+    const blocks = getSelectedValue(snapshot);
     return blocks.length === 0 ? {
       type: "serialization.failure",
       mimeType: "application/x-portable-text",
@@ -1177,21 +1178,14 @@ function createConverterTextHtml(legacySchema) {
       snapshot,
       event
     }) => {
-      const selection = snapshot.context.selection;
-      if (!selection)
+      if (!snapshot.context.selection)
         return {
           type: "serialization.failure",
           mimeType: "text/html",
           originEvent: event.originEvent,
           reason: "No selection"
         };
-      const blocks = sliceBlocks({
-        context: {
-          selection,
-          schema: snapshot.context.schema
-        },
-        blocks: snapshot.context.value
-      }), html = toHTML(blocks, {
+      const blocks = getSelectedValue(snapshot), html = toHTML(blocks, {
         onMissingComponent: !1,
         components: {
           unknownType: ({
@@ -1247,27 +1241,18 @@ function createConverterTextPlain(legacySchema) {
     serialize: ({
       snapshot,
       event
-    }) => {
-      const selection = snapshot.context.selection;
-      return selection ? {
-        type: "serialization.success",
-        data: sliceBlocks({
-          context: {
-            selection,
-            schema: snapshot.context.schema
-          },
-          blocks: snapshot.context.value
-        }).map((block) => isTextBlock(snapshot.context, block) ? block.children.map((child) => child._type === snapshot.context.schema.span.name ? child.text : event.originEvent === "drag.dragstart" ? `[${snapshot.context.schema.inlineObjects.find((inlineObjectType) => inlineObjectType.name === child._type)?.title ?? "Object"}]` : "").join("") : event.originEvent === "drag.dragstart" ? `[${snapshot.context.schema.blockObjects.find((blockObjectType) => blockObjectType.name === block._type)?.title ?? "Object"}]` : "").filter((block) => block !== "").join(`
+    }) => snapshot.context.selection ? {
+      type: "serialization.success",
+      data: getSelectedValue(snapshot).map((block) => isTextBlock(snapshot.context, block) ? block.children.map((child) => child._type === snapshot.context.schema.span.name ? child.text : event.originEvent === "drag.dragstart" ? `[${snapshot.context.schema.inlineObjects.find((inlineObjectType) => inlineObjectType.name === child._type)?.title ?? "Object"}]` : "").join("") : event.originEvent === "drag.dragstart" ? `[${snapshot.context.schema.blockObjects.find((blockObjectType) => blockObjectType.name === block._type)?.title ?? "Object"}]` : "").filter((block) => block !== "").join(`
 
 `),
-        mimeType: "text/plain",
-        originEvent: event.originEvent
-      } : {
-        type: "serialization.failure",
-        mimeType: "text/plain",
-        originEvent: event.originEvent,
-        reason: "No selection"
-      };
+      mimeType: "text/plain",
+      originEvent: event.originEvent
+    } : {
+      type: "serialization.failure",
+      mimeType: "text/plain",
+      originEvent: event.originEvent,
+      reason: "No selection"
     },
     deserialize: ({
       snapshot,
@@ -1320,6 +1305,63 @@ function compileType(rawType) {
     types: [rawType]
   }).get(rawType.name);
 }
+function buildIndexMaps(context, value) {
+  const blockIndexMap = /* @__PURE__ */ new Map(), listIndexMap = /* @__PURE__ */ new Map(), levelIndexMap = /* @__PURE__ */ new Map();
+  let previousListItem;
+  for (let blockIndex = 0; blockIndex < value.length; blockIndex++) {
+    const block = value.at(blockIndex);
+    if (block !== void 0) {
+      if (blockIndexMap.set(block._key, blockIndex), !isTextBlock(context, block)) {
+        levelIndexMap.clear(), previousListItem = void 0;
+        continue;
+      }
+      if (block.listItem === void 0 || block.level === void 0) {
+        levelIndexMap.clear(), previousListItem = void 0;
+        continue;
+      }
+      if (!previousListItem) {
+        previousListItem = {
+          listItem: block.listItem,
+          level: block.level
+        }, levelIndexMap.set(block.level, 1), listIndexMap.set(block._key, 1);
+        continue;
+      }
+      if (previousListItem.listItem !== block.listItem) {
+        levelIndexMap.clear(), previousListItem = {
+          listItem: block.listItem,
+          level: block.level
+        }, levelIndexMap.set(block.level, 1), listIndexMap.set(block._key, 1);
+        continue;
+      }
+      if (previousListItem.level === block.level) {
+        const levelCounter = levelIndexMap.get(block.level) ?? 0;
+        levelIndexMap.set(block.level, levelCounter + 1), previousListItem = {
+          listItem: block.listItem,
+          level: block.level
+        }, listIndexMap.set(block._key, levelCounter + 1);
+        continue;
+      }
+      if (previousListItem.level < block.level) {
+        levelIndexMap.set(block.level, 1), previousListItem = {
+          listItem: block.listItem,
+          level: block.level
+        }, listIndexMap.set(block._key, 1);
+        continue;
+      }
+      if (previousListItem.level > block.level) {
+        const levelCounter = levelIndexMap.get(block.level) ?? 0;
+        levelIndexMap.set(block.level, levelCounter + 1), previousListItem = {
+          listItem: block.listItem,
+          level: block.level
+        }, listIndexMap.set(block._key, levelCounter + 1);
+      }
+    }
+  }
+  return {
+    blockIndexMap,
+    listIndexMap
+  };
+}
 function createPlaceholderBlock(context) {
   return {
     _type: context.schema.block.name,
@@ -1473,6 +1515,7 @@ function getEditorSnapshot({
   slateEditorInstance
 }) {
   return {
+    blockIndexMap: slateEditorInstance.blockIndexMap,
     context: {
       converters: [...editorActorSnapshot.context.converters],
       keyGenerator: editorActorSnapshot.context.keyGenerator,
@@ -3175,6 +3218,11 @@ const addAnnotationOperationImplementation = ({
       },
       backward: editorSelection?.backward
     }), trimmedSelection = getTrimmedSelection({
+      blockIndexMap: editor.blockIndexMap,
+      beta: {
+        activeAnnotations: [],
+        activeDecorators: []
+      },
       context: {
         converters: [],
         keyGenerator: context.keyGenerator,
@@ -4786,6 +4834,7 @@ function getMarkState({
       editor,
       range: editor.selection
     }) : null, selectedSpans = getSelectedSpans({
+      blockIndexMap: editor.blockIndexMap,
       context: {
         value: editor.value,
         selection,
@@ -5184,7 +5233,12 @@ function pluginUpdateValue(context, editor) {
       apply2(operation);
       return;
     }
-    editor.value = applyOperationToPortableText(context, editor.value, operation), apply2(operation);
+    editor.value = applyOperationToPortableText(context, editor.value, operation);
+    const {
+      blockIndexMap,
+      listIndexMap
+    } = buildIndexMaps(context, editor.value);
+    editor.blockIndexMap = blockIndexMap, editor.listIndexMap = listIndexMap, apply2(operation);
   }, editor;
 }
 const withPlugins = (editor, options) => {
@@ -5215,7 +5269,14 @@ function createSlateEditor(config) {
     relayActor: config.relayActor,
     subscriptions: config.subscriptions
   });
-  KEY_TO_VALUE_ELEMENT.set(instance, {}), KEY_TO_SLATE_ELEMENT.set(instance, {}), instance.decoratedRanges = [], instance.decoratorState = {}, instance.markState = void 0, instance.value = [createPlaceholderBlock(config.editorActor.getSnapshot().context)];
+  KEY_TO_VALUE_ELEMENT.set(instance, {}), KEY_TO_SLATE_ELEMENT.set(instance, {}), instance.decoratedRanges = [], instance.decoratorState = {}, instance.markState = void 0;
+  const placeholderBlock = createPlaceholderBlock(config.editorActor.getSnapshot().context);
+  instance.value = [placeholderBlock];
+  const {
+    blockIndexMap,
+    listIndexMap
+  } = buildIndexMaps(config.editorActor.getSnapshot().context, instance.value);
+  instance.blockIndexMap = blockIndexMap, instance.listIndexMap = listIndexMap;
   const initialValue = toSlateValue(instance.value, {
     schemaTypes: config.editorActor.getSnapshot().context.schema
   });
@@ -5488,11 +5549,13 @@ const arrowDownOnLonelyBlockObject = defineBehavior({
     if (snapshot.context.readOnly || snapshot.context.selection && !isSelectionCollapsed$1(snapshot))
       return !1;
     const focusBlockObject = getFocusBlockObject({
+      ...snapshot,
       context: {
         ...snapshot.context,
         selection: event.position.selection
       }
     }), previousBlock = getPreviousBlock({
+      ...snapshot,
       context: {
         ...snapshot.context,
         selection: event.position.selection
@@ -5523,11 +5586,13 @@ const arrowDownOnLonelyBlockObject = defineBehavior({
     if (snapshot.context.readOnly || snapshot.context.selection && !isSelectionCollapsed$1(snapshot))
       return !1;
     const focusBlockObject = getFocusBlockObject({
+      ...snapshot,
       context: {
         ...snapshot.context,
         selection: event.position.selection
       }
     }), nextBlock = getNextBlock({
+      ...snapshot,
       context: {
         ...snapshot.context,
         selection: event.position.selection
@@ -5694,6 +5759,7 @@ const coreDndBehaviors = [
         snapshot,
         eventSelection: event.position.selection
       }), selectingEntireBlocks = isSelectingEntireBlocks({
+        ...snapshot,
         context: {
           ...snapshot.context,
           selection: dragSelection
@@ -5882,11 +5948,13 @@ const coreDndBehaviors = [
           selection: dragSelection
         }
       }) : !1, draggingEntireBlocks = isSelectingEntireBlocks({
+        ...snapshot,
         context: {
           ...snapshot.context,
           selection: dragSelection
         }
       }), draggedBlocks = getSelectedBlocks({
+        ...snapshot,
         context: {
           ...snapshot.context,
           selection: dragSelection
@@ -6206,6 +6274,7 @@ const coreDndBehaviors = [
     event
   }) => {
     const blockKey = event.at[0]._key, markDefKey = event.at[2]._key, block = getFocusTextBlock({
+      ...snapshot,
       context: {
         ...snapshot.context,
         selection: {
@@ -6365,6 +6434,7 @@ const coreDndBehaviors = [
     event
   }) => {
     const focusChild = getFocusChild$1({
+      ...snapshot,
       context: {
         ...snapshot.context,
         selection: {
@@ -6422,11 +6492,9 @@ const coreDndBehaviors = [
     if (!selection)
       return !1;
     const trimmedSelection = getTrimmedSelection({
+      ...snapshot,
       context: {
-        converters: [],
-        schema: snapshot.context.schema,
-        keyGenerator: snapshot.context.keyGenerator,
-        readOnly: !1,
+        ...snapshot.context,
         value: snapshot.context.value,
         selection
       }
@@ -6636,6 +6704,7 @@ const coreDndBehaviors = [
     event
   }) => {
     const previousBlock = getPreviousBlock({
+      ...snapshot,
       context: {
         ...snapshot.context,
         selection: {
@@ -6670,6 +6739,7 @@ const coreDndBehaviors = [
     event
   }) => {
     const nextBlock = getNextBlock({
+      ...snapshot,
       context: {
         ...snapshot.context,
         selection: {
@@ -6833,12 +6903,13 @@ const coreDndBehaviors = [
         anchor: selectionStartPoint,
         focus: blockEndPoint
       }, newTextBlock = parseBlock({
-        block: sliceBlocks({
+        block: getSelectedValue({
+          ...snapshot,
           context: {
             ...snapshot.context,
-            selection: newTextBlockSelection
-          },
-          blocks: [focusTextBlock.node]
+            selection: newTextBlockSelection,
+            value: [focusTextBlock.node]
+          }
         }).at(0),
         context: snapshot.context,
         options: {
@@ -7442,16 +7513,17 @@ function createEditorSnapshot({
     schema,
     editor,
     range: editor.selection
-  }) : null;
+  }) : null, context = {
+    converters,
+    keyGenerator,
+    readOnly,
+    schema,
+    selection,
+    value: editor.value
+  };
   return {
-    context: {
-      converters,
-      keyGenerator,
-      readOnly,
-      schema,
-      selection,
-      value: editor.value
-    },
+    blockIndexMap: editor.blockIndexMap,
+    context,
     beta: {
       activeAnnotations: getActiveAnnotations({
         markState: editor.markState,