@portabletext/editor 2.6.7 → 2.6.8

package/lib/plugins/index.d.cts

@@ -1,5 +1,5 @@
 import { Behavior, Editor, EditorEmittedEvent, EditorSchema } from "../_chunks-dts/behavior.types.action.cjs";
-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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portabletext/editor",
-  "version": "2.6.7",
+  "version": "2.6.8",
   "description": "Portable Text Editor made in React",
   "keywords": [
     "sanity",
@@ -78,11 +78,11 @@
     "slate": "0.118.1",
     "slate-dom": "^0.118.1",
     "slate-react": "0.117.4",
-    "xstate": "^5.20.2",
+    "xstate": "^5.21.0",
     "@portabletext/block-tools": "^3.5.1",
+    "@portabletext/patches": "^1.1.8",
     "@portabletext/keyboard-shortcuts": "^1.1.1",
-    "@portabletext/schema": "^1.2.0",
-    "@portabletext/patches": "^1.1.8"
+    "@portabletext/schema": "^1.2.0"
   },
   "devDependencies": {
     "@sanity/diff-match-patch": "^3.2.0",

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

@@ -53,6 +53,9 @@ describe(buildIndexMaps.name, () => {
     expect(listIndexMap).toEqual(new Map())
   })
 
+  /**
+   * #
+   */
   test('single list item', () => {
     buildIndexMaps(
       {schema, value: [textBlock('k0', {listItem: 'number', level: 1})]},
@@ -62,6 +65,9 @@ describe(buildIndexMaps.name, () => {
     expect(listIndexMap).toEqual(new Map([['k0', 1]]))
   })
 
+  /**
+   *   #
+   */
   test('single indented list item', () => {
     buildIndexMaps(
       {schema, value: [textBlock('k0', {listItem: 'number', level: 2})]},
@@ -71,6 +77,13 @@ describe(buildIndexMaps.name, () => {
     expect(listIndexMap).toEqual(new Map([['k0', 1]]))
   })
 
+  /**
+   * #
+   * #
+   *
+   * #
+   * #
+   */
   test('two lists broken up by a paragraph', () => {
     buildIndexMaps(
       {
@@ -104,6 +117,13 @@ describe(buildIndexMaps.name, () => {
     )
   })
 
+  /**
+   * #
+   * #
+   * {image}
+   * #
+   * #
+   */
   test('two lists broken up by an image', () => {
     buildIndexMaps(
       {
@@ -137,6 +157,11 @@ describe(buildIndexMaps.name, () => {
     )
   })
 
+  /**
+   * #
+   * -
+   * #
+   */
   test('numbered lists broken up by a bulleted list', () => {
     buildIndexMaps(
       {
@@ -165,6 +190,11 @@ describe(buildIndexMaps.name, () => {
     )
   })
 
+  /**
+   * #
+   *   -
+   * #
+   */
   test('numbered list broken up by an indented bulleted list', () => {
     buildIndexMaps(
       {
@@ -186,6 +216,13 @@ describe(buildIndexMaps.name, () => {
     )
   })
 
+  /**
+   * #
+   * #
+   * -
+   *   -
+   * #
+   */
   test('numbered list broken up by a nested bulleted list', () => {
     buildIndexMaps(
       {
@@ -211,6 +248,14 @@ describe(buildIndexMaps.name, () => {
     )
   })
 
+  /**
+   * #
+   * #
+   *   -
+   * -
+   *   -
+   * #
+   */
   test('numbered list broken up by an inverse-indented bulleted list', () => {
     buildIndexMaps(
       {
@@ -238,6 +283,12 @@ describe(buildIndexMaps.name, () => {
     )
   })
 
+  /**
+   * #
+   *   #
+   *   #
+   * #
+   */
   test('simple indented list', () => {
     buildIndexMaps(
       {
@@ -269,6 +320,11 @@ describe(buildIndexMaps.name, () => {
     )
   })
 
+  /**
+   *   #
+   * #
+   *   #
+   */
   test('reverse indented list', () => {
     buildIndexMaps(
       {
@@ -297,6 +353,17 @@ describe(buildIndexMaps.name, () => {
     )
   })
 
+  /**
+   * #
+   *     #
+   *   #
+   *     #
+   * #
+   *     #
+   *       #
+   *     #
+   * #
+   */
   test('complex list', () => {
     buildIndexMaps(
       {
@@ -342,4 +409,56 @@ describe(buildIndexMaps.name, () => {
       ]),
     )
   })
+
+  /**
+   * -
+   *   #
+   *   #
+   */
+  test('bulleted list with indented numbered list', () => {
+    buildIndexMaps(
+      {
+        schema,
+        value: [
+          textBlock('k0', {listItem: 'bullet', level: 1}),
+          textBlock('k1', {listItem: 'number', level: 2}),
+          textBlock('k2', {listItem: 'number', level: 2}),
+        ],
+      },
+      {blockIndexMap, listIndexMap},
+    )
+    expect(listIndexMap).toEqual(
+      new Map([
+        ['k0', 1],
+        ['k1', 1],
+        ['k2', 2],
+      ]),
+    )
+  })
+
+  /**
+   *   #
+   * -
+   *   #
+   */
+  test('indented numbered list broken up by outdented bulleted list', () => {
+    buildIndexMaps(
+      {
+        schema,
+        value: [
+          textBlock('k0', {listItem: 'number', level: 2}),
+          textBlock('k1', {listItem: 'bullet', level: 1}),
+          textBlock('k3', {listItem: 'number', level: 2}),
+        ],
+      },
+      {blockIndexMap, listIndexMap},
+    )
+    expect(listIndexMap).toEqual(
+      new Map([
+        ['k0', 1],
+        ['k1', 1],
+        ['k3', 1],
+      ]),
+    )
+  })
 })

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

@@ -95,19 +95,31 @@ export function buildIndexMaps(
       continue
     }
 
-    // Reset all other list items on this level
+    // Reset other list types at current level and deeper
     levelIndexMaps.forEach((levelIndexMap, listItem) => {
       if (listItem === block.listItem) {
         return
       }
 
-      levelIndexMap.set(block.level!, 0)
+      // Reset all levels that are >= current level
+      const levelsToDelete: number[] = []
+
+      levelIndexMap.forEach((_, level) => {
+        if (level >= block.level!) {
+          levelsToDelete.push(level)
+        }
+      })
+
+      levelsToDelete.forEach((level) => {
+        levelIndexMap.delete(level)
+      })
     })
 
     const levelIndexMap =
       levelIndexMaps.get(block.listItem) ?? new Map<number, number>()
     const levelCounter = levelIndexMap.get(block.level) ?? 0
     levelIndexMap.set(block.level, levelCounter + 1)
+    levelIndexMaps.set(block.listItem, levelIndexMap)
 
     listIndexMap.set(block._key, levelCounter + 1)
 

package/src/operations/behavior.operation.delete.ts

@@ -12,7 +12,7 @@ import {createPlaceholderBlock} from '../internal-utils/create-placeholder-block
 import {getBlockPath} from '../internal-utils/slate-utils'
 import {toSlateRange} from '../internal-utils/to-slate-range'
 import {getBlockKeyFromSelectionPoint} from '../selection/selection-point'
-import {PortableTextSlateEditor} from '../types/editor'
+import type {PortableTextSlateEditor} from '../types/editor'
 import type {BehaviorOperationImplementation} from './behavior.operations'
 
 export const deleteOperationImplementation: BehaviorOperationImplementation<