Merge branch 'main' into pro

udecode · Oct 25, 2024 · 1f0ce40 · 1f0ce40
2 parents 6b9894f + 1953d41
commit 1f0ce40
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 18 deletions.
diff --git a/.changeset/stale-mails-rescue.md → .changeset/thick-jobs-judge.md b/.changeset/stale-mails-rescue.md → .changeset/thick-jobs-judge.md
@@ -2,4 +2,4 @@
 '@udecode/plate-ai': patch
 ---
 
-fix accept + undo
+fix
diff --git a/packages/ai/CHANGELOG.md b/packages/ai/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @udecode/plate-ai
 
+## 39.2.7
+
+### Patch Changes
+
+- [`6a2b3af07b2e14a7906e838dbd843fe3490fd82c`](https://github.com/udecode/plate/commit/6a2b3af07b2e14a7906e838dbd843fe3490fd82c) by [@zbeyens](https://github.com/zbeyens) – Fix undo after accept
+
+## 39.2.6
+
+### Patch Changes
+
+- [`b5dfdc1c3f4cb760685b61e3925e82ff894cf4ab`](https://github.com/udecode/plate/commit/b5dfdc1c3f4cb760685b61e3925e82ff894cf4ab) by [@zbeyens](https://github.com/zbeyens) – fix accept + undo
+
 ## 39.2.5
 
 ### Patch Changes

diff --git a/packages/ai/package.json b/packages/ai/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@udecode/plate-ai",
-  "version": "39.2.5",
+  "version": "39.2.7",
   "description": "Text AI plugin for Plate",
   "keywords": [
     "plate",

diff --git a/packages/ai/src/lib/transforms/removeAIMarks.ts b/packages/ai/src/lib/transforms/removeAIMarks.ts
@@ -1,15 +1,15 @@
 import type { Location } from 'slate';
 
-import { type SlateEditor, getRange, removeMark } from '@udecode/plate-common';
+import { type SlateEditor, unsetNodes } from '@udecode/plate-common';
 
 import { AIPlugin } from '../../react/ai/AIPlugin';
 
 export const removeAIMarks = (
   editor: SlateEditor,
   { at = [] }: { at?: Location } = {}
 ) => {
-  removeMark(editor, {
-    key: AIPlugin.key,
-    at: getRange(editor, at),
+  unsetNodes(editor, AIPlugin.key, {
+    at,
+    match: (n) => (n as any)[AIPlugin.key],
   });
 };
diff --git a/packages/ai/src/lib/transforms/withAIBatch.ts b/packages/ai/src/lib/transforms/withAIBatch.ts
@@ -1,9 +1,12 @@
 import {
+  type History,
   type SlateEditor,
   withMerging,
   withNewBatch,
 } from '@udecode/plate-common';
 
+export type AIBatch = History['undos'][number] & { ai?: boolean };
+
 export const withAIBatch = (
   editor: SlateEditor,
   fn: () => void,
@@ -13,15 +16,15 @@ export const withAIBatch = (
     split?: boolean;
   } = {}
 ) => {
-  if (!split && (editor.history.undos?.at(-1) as any)?.ai) {
+  const lastBatch = editor.history.undos?.at(-1) as AIBatch | undefined;
+
+  if (!split && lastBatch?.ai) {
     withMerging(editor, fn);
   } else {
     withNewBatch(editor, fn);
 
-    const batch = editor.history.undos?.at(-1) as any;
-
-    if (batch) {
-      batch.ai = true;
+    if (lastBatch) {
+      lastBatch.ai = true;
     }
   }
 };
diff --git a/packages/ai/src/react/ai-chat/AIChatPlugin.ts b/packages/ai/src/react/ai-chat/AIChatPlugin.ts
@@ -14,6 +14,8 @@ import {
 } from '@udecode/plate-common/react';
 import { BlockSelectionPlugin } from '@udecode/plate-selection/react';
 
+import type { AIBatch } from '../../lib';
+
 import { AIPlugin } from '../ai/AIPlugin';
 import { acceptAIChat } from './transforms/acceptAIChat';
 import { insertBelowAIChat } from './transforms/insertBelowAIChat';
@@ -139,6 +141,12 @@ export const AIChatPlugin = createTPlatePlugin<AIChatPluginConfig>({
       } else {
         focusEditor(editor);
       }
+
+      const lastBatch = editor.history.undos.at(-1) as AIBatch;
+
+      if (lastBatch?.ai) {
+        delete lastBatch.ai;
+      }
     },
     show: () => {
       api.aiChat.reset();

diff --git a/packages/ai/src/react/ai-chat/useAIChatHook.ts b/packages/ai/src/react/ai-chat/useAIChatHook.ts
@@ -37,9 +37,13 @@ export const useAIChatHooks = () => {
 
       const nodes = deserializeInlineMd(editor, content);
 
-      withAIBatch(editor, () => {
-        tf.ai.insertNodes(nodes);
-      });
+      withAIBatch(
+        editor,
+        () => {
+          tf.ai.insertNodes(nodes);
+        },
+        { split: true }
+      );
     },
   });
 };
diff --git a/templates/plate-playground-template/src/components/plate-editor.tsx b/templates/plate-playground-template/src/components/plate-editor.tsx
@@ -33,10 +33,10 @@ import {
   someNode,
 } from '@udecode/plate-common';
 import {
-  createPlateEditor,
   ParagraphPlugin,
   Plate,
   PlateLeaf,
+  usePlateEditor,
 } from '@udecode/plate-common/react';
 import { DndPlugin } from '@udecode/plate-dnd';
 import { DocxPlugin } from '@udecode/plate-docx';
@@ -164,7 +164,7 @@ export default function PlateEditor() {
 }
 
 export const useMyEditor = () => {
-  const editor = createPlateEditor({
+  return usePlateEditor({
     plugins: [
       // Nodes
       HeadingPlugin,
@@ -450,6 +450,4 @@ export const useMyEditor = () => {
       },
     ],
   });
-
-  return editor;
 };