@lofcz/platejs-list 53.0.2 → 53.2.1

package/dist/index.js

@@ -1,3 +1,3 @@
-import { A as getSiblingList, C as someTodoList, D as getListSiblings, E as getSiblingListStyleType, F as ListStyleType, I as ULIST_STYLE_TYPES, M as expandListItemsWithChildren, N as getListChildren, O as getPreviousList, P as areEqListStyleType, S as normalizeListNotIndented, T as isOrderedList, _ as indentList, a as withList, b as getListExpectedListStart, c as toggleListByPathUnSet, d as toggleListSet, f as setListSiblingNodes, g as outdentList, h as setListNode, i as BaseListPlugin, j as getListAbove, k as getNextList, l as toggleList, m as setIndentTodoNode, n as OrderedListRules, o as withNormalizeList, p as setListNodes, r as BulletedListRules, s as toggleListByPath, t as TaskListRules, u as toggleListUnset, v as indentTodo, w as someList, x as normalizeListStart, y as withInsertBreakList } from "./src-B6T8hhDs.js";
+import { A as getSiblingList, C as someTodoList, D as getListSiblings, E as getSiblingListStyleType, F as ListStyleType, I as ULIST_STYLE_TYPES, M as expandListItemsWithChildren, N as getListChildren, O as getPreviousList, P as areEqListStyleType, S as normalizeListNotIndented, T as isOrderedList, _ as indentList, a as withList, b as getListExpectedListStart, c as toggleListByPathUnSet, d as toggleListSet, f as setListSiblingNodes, g as outdentList, h as setListNode, i as BaseListPlugin, j as getListAbove, k as getNextList, l as toggleList, m as setIndentTodoNode, n as OrderedListRules, o as withNormalizeList, p as setListNodes, r as BulletedListRules, s as toggleListByPath, t as TaskListRules, u as toggleListUnset, v as indentTodo, w as someList, x as normalizeListStart, y as withInsertBreakList } from "./src-DAKg18OL.js";
 
 export { BaseListPlugin, BulletedListRules, ListStyleType, OrderedListRules, TaskListRules, ULIST_STYLE_TYPES, areEqListStyleType, expandListItemsWithChildren, getListAbove, getListChildren, getListExpectedListStart, getListSiblings, getNextList, getPreviousList, getSiblingList, getSiblingListStyleType, indentList, indentTodo, isOrderedList, normalizeListNotIndented, normalizeListStart, outdentList, setIndentTodoNode, setListNode, setListNodes, setListSiblingNodes, someList, someTodoList, toggleList, toggleListByPath, toggleListByPathUnSet, toggleListSet, toggleListUnset, withInsertBreakList, withList, withNormalizeList };

package/dist/react/index.js

@@ -1,4 +1,4 @@
-import { C as someTodoList, F as ListStyleType, i as BaseListPlugin, l as toggleList, w as someList } from "../src-B6T8hhDs.js";
+import { C as someTodoList, F as ListStyleType, i as BaseListPlugin, l as toggleList, w as someList } from "../src-DAKg18OL.js";
 import { c } from "react-compiler-runtime";
 import { toPlatePlugin, useEditorRef, useEditorSelector, useReadOnly } from "platejs/react";
 

package/dist/{src-B6T8hhDs.js → src-DAKg18OL.js}

@@ -294,6 +294,30 @@ const normalizeListNotIndented = (editor, [node, path]) => {
 	}
 };
 
+//#endregion
+//#region src/lib/internal/isSameListSequence.ts
+const getHeadingType = (editor, headingKey) => {
+	const getType = editor.getType;
+	return typeof getType === "function" ? getType.call(editor, headingKey) : headingKey;
+};
+const isHeadingListNode = (editor, node) => {
+	const type = node.type;
+	return typeof type === "string" && KEYS.heading.some((headingKey) => type === getHeadingType(editor, headingKey));
+};
+const isSameListSequence = (editor, siblingNode, currentNode) => siblingNode[KEYS.listType] === currentNode[KEYS.listType] && isHeadingListNode(editor, siblingNode) === isHeadingListNode(editor, currentNode);
+const isListSequenceBoundary = (editor, siblingNode, currentNode) => {
+	const siblingListType = siblingNode[KEYS.listType];
+	return siblingNode[KEYS.indent] === currentNode[KEYS.indent] && siblingListType != null && siblingListType === currentNode[KEYS.listType] && isHeadingListNode(editor, siblingNode) !== isHeadingListNode(editor, currentNode);
+};
+const getListSequenceSiblingOptions = (editor, options) => {
+	const { breakQuery, query, ...rest } = options ?? {};
+	return {
+		...rest,
+		breakQuery: (siblingNode, currentNode) => isListSequenceBoundary(editor, siblingNode, currentNode) || !!breakQuery?.(siblingNode, currentNode),
+		query: (siblingNode, currentNode) => isSameListSequence(editor, siblingNode, currentNode) && (query ? !!query(siblingNode, currentNode) : true)
+	};
+};
+
 //#endregion
 //#region src/lib/normalizers/normalizeListStart.ts
 const getListExpectedListStart = (entry, prevEntry) => {
@@ -318,11 +342,10 @@ const normalizeListStart = (editor, entry, options) => editor.tf.withoutNormaliz
 		}
 		return;
 	}
-	const expectedListStart = getListExpectedListStart(entry, getPreviousList(editor, entry, {
+	const expectedListStart = getListExpectedListStart(entry, getPreviousList(editor, entry, getListSequenceSiblingOptions(editor, {
 		breakOnEqIndentNeqListStyleType: false,
-		query: (nextNode, curNode) => nextNode[KEYS.listType] === curNode[KEYS.listType],
 		...options
-	}));
+	})));
 	if (isDefined(listStart) && expectedListStart === 1) {
 		editor.tf.unsetNodes(KEYS.listStart, { at: path });
 		return true;
@@ -491,6 +514,11 @@ const toggleListUnset = (editor, [node, path], { listStyleType = ListStyleType.D
 /** Toggle indent list. */
 const toggleList = (editor, options, getSiblingListOptions) => {
 	const { listRestart, listRestartPolite, listStyleType } = options;
+	const { getSiblingListOptions: pluginGetSiblingListOptions } = editor.getOptions(BaseListPlugin);
+	const mergedGetSiblingListOptions = {
+		...pluginGetSiblingListOptions,
+		...getSiblingListOptions
+	};
 	/**
 	* True - One or more blocks were converted to lists or changed such that they
 	* remain lists.
@@ -500,17 +528,13 @@ const toggleList = (editor, options, getSiblingListOptions) => {
 	* Null - No action was taken.
 	*/
 	const setList = (() => {
-		const { getSiblingListOptions: _getSiblingListOptions } = editor.getOptions(BaseListPlugin);
 		if (editor.api.isCollapsed()) {
 			const entry = editor.api.block();
 			if (!entry) return null;
 			if (toggleListSet(editor, entry, options)) return true;
 			if (toggleListUnset(editor, entry, { listStyleType })) return false;
 			setListSiblingNodes(editor, entry, {
-				getSiblingListOptions: {
-					..._getSiblingListOptions,
-					...getSiblingListOptions
-				},
+				getSiblingListOptions: mergedGetSiblingListOptions,
 				listStyleType
 			});
 			return true;
@@ -543,7 +567,10 @@ const toggleList = (editor, options, getSiblingListOptions) => {
 	if (setList && restartValue) {
 		const entry = getListAbove(editor, { at: editor.api.start(editor.selection) });
 		if (!entry) return;
-		const isFirst = !getPreviousList(editor, entry);
+		const isFirst = !getPreviousList(editor, entry, getListSequenceSiblingOptions(editor, {
+			breakOnEqIndentNeqListStyleType: false,
+			...mergedGetSiblingListOptions
+		}));
 		/**
 		* Only apply listRestartPolite if this is the first item and restartValue >
 		* 1.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lofcz/platejs-list",
-  "version": "53.0.2",
+  "version": "53.2.1",
   "description": "List plugin for Plate",
   "keywords": [
     "plate",
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@plate/scripts": "1.0.0",
-    "platejs": "npm:@lofcz/platejs@53.0.0"
+    "platejs": "npm:@lofcz/platejs@53.1.1"
   },
   "peerDependencies": {
     "platejs": ">=53.0.0",