[codex] Fix discussion and suggestion regressions

.changeset/ai-chat-stop-clears-stream.md

@@ -0,0 +1,5 @@
+---
+"@platejs/ai": patch
+---
+
+Clear block streaming state when `aiChat.stop()` stops generation

.changeset/link-empty-remove-normalize.md

@@ -0,0 +1,5 @@
+---
+"@platejs/link": patch
+---
+
+Fix empty link normalization when suggestion acceptance removes the last link character

.changeset/suggestion-mention-backspace.md

@@ -0,0 +1,5 @@
+---
+"@platejs/suggestion": patch
+---
+
+Fix inline-void delete and replace suggestions around mentions and paragraph boundaries

.changeset/utils-trailing-block-insert.md

@@ -0,0 +1,5 @@
+---
+"@platejs/utils": patch
+---
+
+Add a trailing-block insert hook for normalization-driven insert behavior

apps/www/src/__tests__/package-integration/suggestion-link.spec.tsx

@@ -0,0 +1,169 @@
+/** @jsx jsxt */
+
+import {
+  acceptSuggestion,
+  BaseSuggestionPlugin,
+  getSuggestionKey,
+  rejectSuggestion,
+} from '@platejs/suggestion';
+import { jsxt } from '@platejs/test-utils';
+import type { SlateEditor } from 'platejs';
+import { createSlateEditor } from 'platejs';
+
+import { BaseEditorKit } from '@/registry/components/editor/editor-base-kit';
+
+jsxt;
+
+const createEditor = (input: SlateEditor) =>
+  createSlateEditor({
+    plugins: BaseEditorKit,
+    selection: input.selection,
+    value: input.children,
+  } as any);
+
+describe('suggestion link integration', () => {
+  it('marks only the previous link character when deleting backward after a link', () => {
+    const input = (
+      <editor>
+        <hp>
+          <htext>before </htext>
+          <ha url="https://example.com">link</ha>
+          <htext>
+            <cursor />
+            {' after'}
+          </htext>
+        </hp>
+      </editor>
+    ) as any as SlateEditor;
+
+    const output = (
+      <editor>
+        <hp>
+          <htext>before </htext>
+          <ha url="https://example.com">
+            <htext>lin</htext>
+            <htext
+              suggestion
+              suggestion_1={{
+                id: 'placeholder',
+                createdAt: 0,
+                type: 'remove',
+                userId: 'alice',
+              }}
+            >
+              <cursor />k
+            </htext>
+          </ha>
+          <htext>{' after'}</htext>
+        </hp>
+      </editor>
+    ) as any as SlateEditor;
+
+    const editor = createEditor(input);
+    editor.setOption(BaseSuggestionPlugin, 'isSuggesting', true);
+
+    editor.tf.deleteBackward();
+
+    const outputLinkNode = output.children[0].children[1] as any;
+    const linkNode = editor.children[0].children[1] as any;
+    const suggestionLeaf = linkNode.children[1] as any;
+    const suggestionData = editor
+      .getApi(BaseSuggestionPlugin)
+      .suggestion.suggestionData(suggestionLeaf) as any;
+
+    expect(editor.children[0].children[0]).toEqual(
+      output.children[0].children[0]
+    );
+    expect(linkNode.children[0]).toEqual(outputLinkNode.children[0]);
+    expect(suggestionLeaf.text).toBe(outputLinkNode.children[1].text);
+    expect(suggestionData?.type).toBe('remove');
+    expect(suggestionData?.userId).toBe('alice');
+    expect(linkNode.suggestion).toBeUndefined();
+    expect(
+      Object.keys(linkNode).filter((key) => key.startsWith('suggestion_'))
+    ).toHaveLength(0);
+    expect(editor.children[0].children[2]).toEqual(
+      output.children[0].children[2]
+    );
+    expect(editor.selection).toEqual(output.selection);
+  });
+
+  it('removes an empty link after accepting the last removed character', () => {
+    const removeData = {
+      id: '1',
+      createdAt: Date.now(),
+      type: 'remove',
+      userId: 'alice',
+    };
+
+    const input = (
+      <editor>
+        <hp>
+          before{' '}
+          <ha url="https://reactjs.org">
+            <htext suggestion_1={removeData} suggestion>
+              t
+            </htext>
+          </ha>
+        </hp>
+      </editor>
+    ) as any as SlateEditor;
+
+    const output = (
+      <editor>
+        <hp>before </hp>
+      </editor>
+    ) as any as SlateEditor;
+
+    const editor = createEditor(input);
+    editor.selection = {
+      anchor: { offset: 1, path: [0, 1, 0] },
+      focus: { offset: 1, path: [0, 1, 0] },
+    };
+
+    acceptSuggestion(editor, {
+      keyId: getSuggestionKey('1'),
+      suggestionId: '1',
+    } as any);
+
+    expect(editor.children).toEqual(output.children);
+  });
+
+  it('rejects remove suggestion on inline link elements', () => {
+    const removeData = {
+      id: '1',
+      createdAt: Date.now(),
+      type: 'remove',
+      userId: 'alice',
+    };
+
+    const input = (
+      <editor>
+        <hp>
+          before{' '}
+          <ha suggestion suggestion_1={removeData} url="https://example.com">
+            link
+          </ha>{' '}
+          after
+        </hp>
+      </editor>
+    ) as any as SlateEditor;
+
+    const output = (
+      <editor>
+        <hp>
+          before <ha url="https://example.com">link</ha> after
+        </hp>
+      </editor>
+    ) as any as SlateEditor;
+
+    const editor = createEditor(input);
+
+    rejectSuggestion(editor, {
+      keyId: 'suggestion_1',
+      suggestionId: '1',
+    } as any);
+
+    expect(editor.children).toEqual(output.children);
+  });
+});

apps/www/src/registry/components/editor/plugins/ai-kit.tsx

@@ -94,10 +94,7 @@ export const aiChatPlugin = AIChatPlugin.extend({
         }
       },
       onFinish: () => {
-        editor.setOption(AIChatPlugin, 'streaming', false);
-        editor.setOption(AIChatPlugin, '_blockChunks', '');
-        editor.setOption(AIChatPlugin, '_blockPath', null);
-        editor.setOption(AIChatPlugin, '_mdxName', null);
+        editor.getApi(AIChatPlugin).aiChat.stop();
       },
     });
   },

apps/www/src/registry/components/editor/plugins/comment-kit.tsx

@@ -7,63 +7,45 @@ import {
   BaseCommentPlugin,
   getDraftCommentKey,
 } from '@platejs/comment';
-import { isSlateString } from 'platejs';
 import { toTPlatePlugin } from 'platejs/react';
 
 import { CommentLeaf } from '@/registry/ui/comment-node';
+import { getDiscussionClickTarget } from './discussion-kit';
 
 type CommentConfig = ExtendConfig<
   BaseCommentConfig,
   {
     activeId: string | null;
     commentingBlock: Path | null;
     hoverId: string | null;
-    uniquePathMap: Map<string, Path>;
   }
 >;
 
 export const commentPlugin = toTPlatePlugin<CommentConfig>(BaseCommentPlugin, {
   handlers: {
     onClick: ({ api, event, setOption, type }) => {
-      let leaf = event.target as HTMLElement;
-      let isSet = false;
+      const activeTarget = getDiscussionClickTarget({
+        selector: `.slate-${type}`,
+        target: event.target,
+      });
 
-      const unsetActiveSuggestion = () => {
+      if (!activeTarget) {
         setOption('activeId', null);
-        isSet = true;
-      };
-
-      if (!isSlateString(leaf)) unsetActiveSuggestion();
-
-      while (leaf.parentElement) {
-        if (leaf.classList.contains(`slate-${type}`)) {
-          const commentsEntry = api.comment!.node();
-
-          if (!commentsEntry) {
-            unsetActiveSuggestion();
-
-            break;
-          }
-
-          const id = api.comment!.nodeId(commentsEntry[0]);
-
-          setOption('activeId', id ?? null);
-          isSet = true;
-
-          break;
-        }
-
-        leaf = leaf.parentElement;
+        return;
       }
 
-      if (!isSet) unsetActiveSuggestion();
+      const commentEntry = api.comment?.node();
+
+      setOption(
+        'activeId',
+        commentEntry ? (api.comment?.nodeId(commentEntry[0]) ?? null) : null
+      );
     },
   },
   options: {
     activeId: null,
     commentingBlock: null,
     hoverId: null,
-    uniquePathMap: new Map(),
   },
 })
   .extendTransforms(

apps/www/src/registry/components/editor/plugins/discussion-kit.tsx

@@ -15,6 +15,41 @@ export type TDiscussion = {
   documentContent?: string;
 };
 
+const BLOCK_SUGGESTION_SELECTOR = '[data-block-suggestion="true"]';
+
+const getTargetElement = (target: EventTarget | null) => {
+  if (target instanceof HTMLElement) return target;
+  if (target instanceof Node) return target.parentElement;
+
+  return null;
+};
+
+export const getDiscussionClickTarget = ({
+  selector,
+  target,
+}: {
+  selector: string;
+  target: EventTarget | null;
+}) => {
+  const element = getTargetElement(target);
+
+  if (!element) return null;
+
+  return element.closest(selector) as HTMLElement | null;
+};
+
+export const getDiscussionBlockClickTarget = ({
+  selector = BLOCK_SUGGESTION_SELECTOR,
+  target,
+}: {
+  selector?: string;
+  target: EventTarget | null;
+}) =>
+  getDiscussionClickTarget({
+    selector,
+    target,
+  });
+
 const discussionsData: TDiscussion[] = [
   {
     id: 'discussion1',

apps/www/src/registry/components/editor/plugins/suggestion-base-kit.spec.ts

@@ -0,0 +1,73 @@
+import { afterAll, describe, expect, it, mock } from 'bun:test';
+
+mock.module('@platejs/suggestion', () => ({
+  BaseSuggestionPlugin: {
+    configure: (config: any) => config,
+  },
+}));
+
+mock.module('platejs', () => ({
+  KEYS: {
+    date: 'date',
+    inlineEquation: 'inline_equation',
+    link: 'link',
+    mention: 'mention',
+  },
+  TextApi: {
+    isText: (node: any) => typeof node?.text === 'string',
+  },
+}));
+
+mock.module('@/registry/ui/suggestion-node-static', () => ({
+  SuggestionLeafStatic: () => null,
+  VoidRemoveSuggestionOverlayStatic: () => null,
+}));
+
+describe('BaseSuggestionKit', () => {
+  afterAll(() => {
+    mock.restore();
+  });
+
+  it('injects inline suggestion type for static inline element rendering', async () => {
+    const { BaseSuggestionKit } = await import(
+      `./suggestion-base-kit?test=${Math.random().toString(36).slice(2)}`
+    );
+
+    const transformProps = (BaseSuggestionKit[0] as any).inject.nodeProps
+      .transformProps;
+    const editor = {
+      getApi: () => ({
+        suggestion: {
+          dataList: (node: any) =>
+            Object.keys(node)
+              .filter((key) => key.startsWith('suggestion_'))
+              .map((key) => node[key]),
+          suggestionData: (element: any) => element.suggestion,
+        },
+      }),
+    };
+
+    expect(
+      transformProps({
+        editor,
+        element: {
+          children: [
+            {
+              suggestion_1: {
+                createdAt: 0,
+                id: 'suggestion-1',
+                type: 'remove',
+                userId: 'alice',
+              },
+              text: '',
+            },
+          ],
+          type: 'date',
+        },
+        props: {},
+      })
+    ).toEqual({
+      'data-inline-suggestion': 'remove',
+    });
+  });
+});