@magic-marker/prosemirror-suggest-changes 0.3.3-wrap-unwrap.28 → 0.3.3-wrap-unwrap.29

package/dist/__tests__/playwrightPage.d.ts

@@ -7,7 +7,10 @@ export declare class EditorPage {
     constructor(page: Page, deletionMarksVisibility?: "hidden" | "visible");
     get editor(): Locator;
     getParagraphText(index: number, childIndexes?: number[]): Promise<string>;
+    getParagraphAt(index: number): Locator;
     getParagraphCount(): Promise<number>;
+    getListItems(): Locator;
+    getParagraphs(): Locator;
     getListItemCount(): Promise<number>;
     getProseMirrorMarkCount(name: string): Promise<number>;
     getProseMirrorMarksJSON(): Promise<unknown[]>;

package/dist/commands.js

@@ -370,11 +370,18 @@ export function applySuggestionsToRange(doc, from, to) {
         suggestionsTransform.steps.forEach((step)=>{
             structureTransform.step(step);
         });
-        restoredStructureSuggestionIds.forEach((suggestionId)=>{
+        if (restoredStructureSuggestionIds.has(suggestionId)) {
             const restoredStructureTransform = revertStructureSuggestion(structureTransform.doc, suggestionId);
             restoredStructureTransform.steps.forEach((step)=>{
                 structureTransform.step(step);
             });
+        }
+        restoredStructureSuggestionIds.forEach((restoredSuggestionId)=>{
+            if (restoredSuggestionId === suggestionId) return;
+            const restoredStructureTransform = revertStructureSuggestion(structureTransform.doc, restoredSuggestionId);
+            restoredStructureTransform.steps.forEach((step)=>{
+                structureTransform.step(step);
+            });
         });
         // apply the structure transform to the transaction
         const transaction = state.tr;

package/dist/features/joinOnDelete/__tests__/listWithJoinsAndStructureMarks.playwright.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/features/transactionShaping/tipTapParagraphIntoListJoin/handleTipTapParagraphIntoListJoin.js

@@ -1,5 +1,6 @@
 import { EditorState } from "prosemirror-state";
 import { preserveTransactionData, transformToSuggestionTransaction } from "../../../transformToSuggestionTransaction.js";
+import { generateNextNumberId } from "../../../generateId.js";
 import { suggestStructureChanges } from "../../wrapUnwrap/structureChangesPlugin.js";
 import { detectSpecialTransactionShape } from "../detectSpecialTransactionShape.js";
 // handle the specific TipTap pattern when backspacing from a paragraph into a list above
@@ -14,6 +15,8 @@ export function handleTipTapParagraphIntoListJoin(args) {
     const docBefore = args.transaction.docs[0];
     if (!docBefore) return null;
     const trackedTransaction = args.state.tr;
+    const sharedSuggestionId = args.generateId ? args.generateId(args.state.schema, docBefore) : generateNextNumberId(args.state.schema, docBefore);
+    const generateSharedSuggestionId = ()=>sharedSuggestionId;
     try {
         trackedTransaction.step(shape.deleteStep);
         trackedTransaction.step(shape.insertStep);
@@ -26,7 +29,7 @@ export function handleTipTapParagraphIntoListJoin(args) {
     uniqueNodeIdsTransform.steps.forEach((step)=>{
         trackedTransaction.step(step);
     });
-    const structureChangesResult = suggestStructureChanges(docBefore, uniqueNodeIdsTransform.doc, args.structuralContextPaths, args.generateId);
+    const structureChangesResult = suggestStructureChanges(docBefore, uniqueNodeIdsTransform.doc, args.structuralContextPaths, generateSharedSuggestionId);
     if (!structureChangesResult.handled) {
         return null;
     }
@@ -43,7 +46,7 @@ export function handleTipTapParagraphIntoListJoin(args) {
     } catch  {
         return null;
     }
-    const trackedJoinTransaction = transformToSuggestionTransaction(joinTransaction, intermediateState, args.generateId);
+    const trackedJoinTransaction = transformToSuggestionTransaction(joinTransaction, intermediateState, generateSharedSuggestionId);
     trackedJoinTransaction.steps.forEach((step)=>{
         trackedTransaction.step(step);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magic-marker/prosemirror-suggest-changes",
-  "version": "0.3.3-wrap-unwrap.28",
+  "version": "0.3.3-wrap-unwrap.29",
   "license": "MIT",
   "type": "module",
   "module": "dist/index.js",