@portabletext/editor 2.1.4 → 2.1.5

package/lib/plugins/index.d.ts

@@ -1,5 +1,5 @@
 import { Behavior, Editor, EditorEmittedEvent, EditorSchema } from "../_chunks-dts/behavior.types.action.js";
-import * as react22 from "react";
+import * as react12 from "react";
 import React from "react";
 /**
  * @beta
@@ -181,7 +181,7 @@ type MarkdownPluginConfig = MarkdownBehaviorsConfig & {
  */
 declare function MarkdownPlugin(props: {
   config: MarkdownPluginConfig;
-}): react22.JSX.Element;
+}): react12.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(): react22.JSX.Element;
+declare function OneLinePlugin(): react12.JSX.Element;
 export { BehaviorPlugin, DecoratorShortcutPlugin, EditorRefPlugin, EventListenerPlugin, MarkdownPlugin, type MarkdownPluginConfig, OneLinePlugin };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portabletext/editor",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Portable Text Editor made in React",
   "keywords": [
     "sanity",
@@ -81,8 +81,8 @@
     "use-effect-event": "^1.0.2",
     "xstate": "^5.20.1",
     "@portabletext/block-tools": "2.0.5",
-    "@portabletext/keyboard-shortcuts": "1.1.1",
-    "@portabletext/patches": "1.1.6"
+    "@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

@@ -139,18 +139,16 @@ describe(buildIndexMaps.name, () => {
   })
 
   test('numbered lists broken up by a bulleted list', () => {
-    expect(
-      buildIndexMaps(
-        {
-          schema,
-          value: [
-            textBlock('k0', {listItem: 'number', level: 1}),
-            textBlock('k1', {listItem: 'bullet', level: 1}),
-            textBlock('k2', {listItem: 'number', level: 1}),
-          ],
-        },
-        {blockIndexMap, listIndexMap},
-      ),
+    buildIndexMaps(
+      {
+        schema,
+        value: [
+          textBlock('k0', {listItem: 'number', level: 1}),
+          textBlock('k1', {listItem: 'bullet', level: 1}),
+          textBlock('k2', {listItem: 'number', level: 1}),
+        ],
+      },
+      {blockIndexMap, listIndexMap},
     )
     expect(blockIndexMap).toEqual(
       new Map([
@@ -168,6 +166,27 @@ describe(buildIndexMaps.name, () => {
     )
   })
 
+  test('numbered list broken up by an indented bulleted list', () => {
+    buildIndexMaps(
+      {
+        schema,
+        value: [
+          textBlock('k0', {listItem: 'number', level: 1}),
+          textBlock('k1', {listItem: 'bullet', level: 2}),
+          textBlock('k2', {listItem: 'number', level: 1}),
+        ],
+      },
+      {blockIndexMap, listIndexMap},
+    )
+    expect(listIndexMap).toEqual(
+      new Map([
+        ['k0', 1],
+        ['k1', 1],
+        ['k2', 2],
+      ]),
+    )
+  })
+
   test('simple indented list', () => {
     buildIndexMaps(
       {
@@ -200,18 +219,16 @@ describe(buildIndexMaps.name, () => {
   })
 
   test('reverse indented list', () => {
-    expect(
-      buildIndexMaps(
-        {
-          schema,
-          value: [
-            textBlock('k0', {listItem: 'number', level: 2}),
-            textBlock('k1', {listItem: 'number', level: 1}),
-            textBlock('k2', {listItem: 'number', level: 2}),
-          ],
-        },
-        {blockIndexMap, listIndexMap},
-      ),
+    buildIndexMaps(
+      {
+        schema,
+        value: [
+          textBlock('k0', {listItem: 'number', level: 2}),
+          textBlock('k1', {listItem: 'number', level: 1}),
+          textBlock('k2', {listItem: 'number', level: 2}),
+        ],
+      },
+      {blockIndexMap, listIndexMap},
     )
     expect(blockIndexMap).toEqual(
       new Map([

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

@@ -58,7 +58,10 @@ export function buildIndexMaps(
       continue
     }
 
-    if (previousListItem.listItem !== block.listItem) {
+    if (
+      previousListItem.listItem !== block.listItem &&
+      previousListItem.level === block.level
+    ) {
       levelIndexMap.clear()
       previousListItem = {
         listItem: block.listItem,