@portabletext/editor 2.1.8 → 2.1.10

package/lib/plugins/index.d.ts

@@ -1,5 +1,5 @@
 import { Behavior, Editor, EditorEmittedEvent, EditorSchema } from "../_chunks-dts/behavior.types.action.js";
-import * as react12 from "react";
+import * as react22 from "react";
 import React from "react";
 /**
  * @beta
@@ -181,7 +181,7 @@ type MarkdownPluginConfig = MarkdownBehaviorsConfig & {
  */
 declare function MarkdownPlugin(props: {
   config: MarkdownPluginConfig;
-}): react12.JSX.Element;
+}): react22.JSX.Element;
 /**
  * @beta
  * Restrict the editor to one line. The plugin takes care of blocking
@@ -192,5 +192,5 @@ declare function MarkdownPlugin(props: {
  *
  * @deprecated Install the plugin from `@portabletext/plugin-one-line`
  */
-declare function OneLinePlugin(): react12.JSX.Element;
+declare function OneLinePlugin(): react22.JSX.Element;
 export { BehaviorPlugin, DecoratorShortcutPlugin, EditorRefPlugin, EventListenerPlugin, MarkdownPlugin, type MarkdownPluginConfig, OneLinePlugin };

package/lib/utils/index.d.ts

@@ -1,5 +1,5 @@
 import { BlockOffset, BlockPath, ChildPath, EditorContext, EditorSelection, EditorSelectionPoint } from "../_chunks-dts/behavior.types.action.js";
-import * as _sanity_types9 from "@sanity/types";
+import * as _sanity_types8 from "@sanity/types";
 import { KeyedSegment, PortableTextBlock, PortableTextChild, PortableTextSpan, PortableTextTextBlock } from "@sanity/types";
 /**
  * @public
@@ -150,7 +150,7 @@ declare function mergeTextBlocks({
   context: Pick<EditorContext, 'keyGenerator' | 'schema'>;
   targetBlock: PortableTextTextBlock;
   incomingBlock: PortableTextTextBlock;
-}): PortableTextTextBlock<_sanity_types9.PortableTextObject | _sanity_types9.PortableTextSpan>;
+}): PortableTextTextBlock<_sanity_types8.PortableTextObject | _sanity_types8.PortableTextSpan>;
 /**
  * @public
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portabletext/editor",
-  "version": "2.1.8",
+  "version": "2.1.10",
   "description": "Portable Text Editor made in React",
   "keywords": [
     "sanity",
@@ -79,9 +79,9 @@
     "slate-dom": "^0.117.4",
     "slate-react": "0.117.4",
     "xstate": "^5.20.1",
-    "@portabletext/block-tools": "2.0.6",
-    "@portabletext/keyboard-shortcuts": "1.1.1",
-    "@portabletext/patches": "1.1.6"
+    "@portabletext/block-tools": "2.0.8",
+    "@portabletext/patches": "1.1.6",
+    "@portabletext/keyboard-shortcuts": "1.1.1"
   },
   "devDependencies": {
     "@portabletext/toolkit": "^2.0.17",

package/src/internal-utils/build-index-maps.test.ts

@@ -187,6 +187,58 @@ describe(buildIndexMaps.name, () => {
     )
   })
 
+  test('numbered list broken up by a nested bulleted list', () => {
+    buildIndexMaps(
+      {
+        schema,
+        value: [
+          textBlock('k0', {listItem: 'number', level: 1}),
+          textBlock('k1', {listItem: 'number', level: 1}),
+          textBlock('k2', {listItem: 'bullet', level: 1}),
+          textBlock('k3', {listItem: 'bullet', level: 2}),
+          textBlock('k4', {listItem: 'number', level: 1}),
+        ],
+      },
+      {blockIndexMap, listIndexMap},
+    )
+    expect(listIndexMap).toEqual(
+      new Map([
+        ['k0', 1],
+        ['k1', 2],
+        ['k2', 1],
+        ['k3', 1],
+        ['k4', 1],
+      ]),
+    )
+  })
+
+  test('numbered list broken up by an inverse-indented bulleted list', () => {
+    buildIndexMaps(
+      {
+        schema,
+        value: [
+          textBlock('k0', {listItem: 'number', level: 1}),
+          textBlock('k1', {listItem: 'number', level: 1}),
+          textBlock('k2', {listItem: 'bullet', level: 2}),
+          textBlock('k3', {listItem: 'bullet', level: 1}),
+          textBlock('k4', {listItem: 'bullet', level: 2}),
+          textBlock('k5', {listItem: 'number', level: 1}),
+        ],
+      },
+      {blockIndexMap, listIndexMap},
+    )
+    expect(listIndexMap).toEqual(
+      new Map([
+        ['k0', 1],
+        ['k1', 2],
+        ['k2', 1],
+        ['k3', 1],
+        ['k4', 1],
+        ['k5', 1],
+      ]),
+    )
+  })
+
   test('simple indented list', () => {
     buildIndexMaps(
       {

package/src/internal-utils/build-index-maps.ts

@@ -1,7 +1,9 @@
 import type {EditorContext} from '../editor/editor-snapshot'
 import {isTextBlock} from './parse-blocks'
 
-const levelIndexMap = new Map<number, number>()
+// Maps for each list type, keeping track of the current list count for each
+// level.
+const levelIndexMaps = new Map<string, Map<number, number>>()
 
 /**
  * Mutates the maps in place.
@@ -18,7 +20,7 @@ export function buildIndexMaps(
 ): void {
   blockIndexMap.clear()
   listIndexMap.clear()
-  levelIndexMap.clear()
+  levelIndexMaps.clear()
 
   let previousListItem:
     | {
@@ -36,71 +38,82 @@ export function buildIndexMaps(
 
     blockIndexMap.set(block._key, blockIndex)
 
+    // Clear the state if we encounter a non-text block
     if (!isTextBlock(context, block)) {
-      levelIndexMap.clear()
+      levelIndexMaps.clear()
       previousListItem = undefined
+
       continue
     }
 
+    // Clear the state if we encounter a non-list text block
     if (block.listItem === undefined || block.level === undefined) {
-      levelIndexMap.clear()
+      levelIndexMaps.clear()
       previousListItem = undefined
+
       continue
     }
 
+    // If we encounter a new list item, we set the initial index to 1 for the
+    // list type on that level.
     if (!previousListItem) {
+      const listIndex = 1
+      const levelIndexMap =
+        levelIndexMaps.get(block.listItem) ?? new Map<number, number>()
+      levelIndexMap.set(block.level, listIndex)
+      levelIndexMaps.set(block.listItem, levelIndexMap)
+
+      listIndexMap.set(block._key, listIndex)
+
       previousListItem = {
         listItem: block.listItem,
         level: block.level,
       }
-      levelIndexMap.set(block.level, 1)
-      listIndexMap.set(block._key, 1)
+
       continue
     }
 
+    // If the previous list item is of the same type but on a lower level, we
+    // need to reset the level index map for that type.
     if (
-      previousListItem.listItem !== block.listItem &&
-      previousListItem.level === block.level
+      previousListItem.listItem === block.listItem &&
+      previousListItem.level < block.level
     ) {
-      levelIndexMap.clear()
-      previousListItem = {
-        listItem: block.listItem,
-        level: block.level,
-      }
-      levelIndexMap.set(block.level, 1)
-      listIndexMap.set(block._key, 1)
-      continue
-    }
+      const listIndex = 1
+      const levelIndexMap =
+        levelIndexMaps.get(block.listItem) ?? new Map<number, number>()
+      levelIndexMap.set(block.level, listIndex)
+      levelIndexMaps.set(block.listItem, levelIndexMap)
 
-    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
-    }
+      listIndexMap.set(block._key, listIndex)
 
-    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,
+    // Reset all other list items on this level
+    levelIndexMaps.forEach((levelIndexMap, listItem) => {
+      if (listItem === block.listItem) {
+        return
       }
-      listIndexMap.set(block._key, levelCounter + 1)
+
+      levelIndexMap.set(block.level!, 0)
+    })
+
+    const levelIndexMap =
+      levelIndexMaps.get(block.listItem) ?? new Map<number, number>()
+    const levelCounter = levelIndexMap.get(block.level) ?? 0
+    levelIndexMap.set(block.level, levelCounter + 1)
+
+    listIndexMap.set(block._key, levelCounter + 1)
+
+    previousListItem = {
+      listItem: block.listItem,
+      level: block.level,
     }
   }
 }