From 39902b35461c1fac7c070ac986c905f60ff3f90c Mon Sep 17 00:00:00 2001 From: yousefed Date: Fri, 5 Dec 2025 14:07:27 +0100 Subject: [PATCH] upgrade prosemirror-suggest-changes --- packages/xl-ai/package.json | 2 +- packages/xl-ai/src/AIExtension.ts | 8 +++-- packages/xl-ai/src/prosemirror/rebaseTool.ts | 2 +- .../src/testUtil/suggestChangesTestUtil.ts | 2 +- pnpm-lock.yaml | 36 +++++++++---------- 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/packages/xl-ai/package.json b/packages/xl-ai/package.json index 60dfc54043..d6b5e48bd0 100644 --- a/packages/xl-ai/package.json +++ b/packages/xl-ai/package.json @@ -73,7 +73,7 @@ "@ai-sdk/react": "^2.0.102", "@blocknote/core": "0.44.0", "@blocknote/mantine": "0.44.0", - "@blocknote/prosemirror-suggest-changes": "^0.1.3", + "@handlewithcare/prosemirror-suggest-changes": "^0.1.8", "@blocknote/react": "0.44.0", "@floating-ui/react": "^0.26.28", "@tiptap/core": "^3.11.0", diff --git a/packages/xl-ai/src/AIExtension.ts b/packages/xl-ai/src/AIExtension.ts index 0618762218..472ca4dc7b 100644 --- a/packages/xl-ai/src/AIExtension.ts +++ b/packages/xl-ai/src/AIExtension.ts @@ -14,7 +14,7 @@ import { applySuggestions, revertSuggestions, suggestChanges, -} from "@blocknote/prosemirror-suggest-changes"; +} from "@handlewithcare/prosemirror-suggest-changes"; import { UIMessage } from "ai"; import { Fragment, Slice } from "prosemirror-model"; import { Plugin, PluginKey } from "prosemirror-state"; @@ -75,6 +75,10 @@ export const AIExtension = createExtension( | undefined; let autoScroll = false; + const suggestChangesPlugin = suggestChanges(); + // disable decorations for suggest changes, not needed + // (and the pilcrows are ugly) + suggestChangesPlugin.props.decorations = undefined; return { key: "ai", options, @@ -129,7 +133,7 @@ export const AIExtension = createExtension( return true; }, }), - suggestChanges(), + suggestChangesPlugin, createAgentCursorPlugin( editorOptions?.agentCursor || { name: "AI", color: "#8bc6ff" }, ), diff --git a/packages/xl-ai/src/prosemirror/rebaseTool.ts b/packages/xl-ai/src/prosemirror/rebaseTool.ts index 42afb81a38..7794e208a2 100644 --- a/packages/xl-ai/src/prosemirror/rebaseTool.ts +++ b/packages/xl-ai/src/prosemirror/rebaseTool.ts @@ -1,5 +1,5 @@ import { BlockNoteEditor } from "@blocknote/core"; -import { applySuggestions } from "@blocknote/prosemirror-suggest-changes"; +import { applySuggestions } from "@handlewithcare/prosemirror-suggest-changes"; import { Transaction } from "prosemirror-state"; import { Transform } from "prosemirror-transform"; diff --git a/packages/xl-ai/src/testUtil/suggestChangesTestUtil.ts b/packages/xl-ai/src/testUtil/suggestChangesTestUtil.ts index fac6358d88..d5322fb58c 100644 --- a/packages/xl-ai/src/testUtil/suggestChangesTestUtil.ts +++ b/packages/xl-ai/src/testUtil/suggestChangesTestUtil.ts @@ -1,5 +1,5 @@ import { BlockNoteEditor } from "@blocknote/core"; -import { revertSuggestions } from "@blocknote/prosemirror-suggest-changes"; +import { revertSuggestions } from "@handlewithcare/prosemirror-suggest-changes"; import { Node } from "prosemirror-model"; import { expect } from "vitest"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index aec701f239..8a7f2288d8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4950,15 +4950,15 @@ importers: '@blocknote/mantine': specifier: 0.44.0 version: link:../mantine - '@blocknote/prosemirror-suggest-changes': - specifier: ^0.1.3 - version: 0.1.3(prosemirror-model@1.25.4)(prosemirror-state@1.4.4)(prosemirror-transform@1.10.5)(prosemirror-view@1.41.3) '@blocknote/react': specifier: 0.44.0 version: link:../react '@floating-ui/react': specifier: ^0.26.28 version: 0.26.28(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + '@handlewithcare/prosemirror-suggest-changes': + specifier: ^0.1.8 + version: 0.1.8(prosemirror-model@1.25.4)(prosemirror-state@1.4.4)(prosemirror-transform@1.10.5)(prosemirror-view@1.41.3) '@tiptap/core': specifier: ^3.0.0 version: 3.11.0(@tiptap/pm@3.11.0) @@ -6659,14 +6659,6 @@ packages: '@better-fetch/fetch@1.1.18': resolution: {integrity: sha512-rEFOE1MYIsBmoMJtQbl32PGHHXuG2hDxvEd7rUHE0vCBoFQVSDqaVs9hkZEtHCxRoY+CljXKFCOuJ8uxqw1LcA==} - '@blocknote/prosemirror-suggest-changes@0.1.3': - resolution: {integrity: sha512-g/RxkStEg67bGiujK092aabD6tA/O4jI9jwKAnasP+t00khgyBBIXIvp7K7QT+gjVB6kP+ez27669iiJy8MZ5w==} - peerDependencies: - prosemirror-model: ^1.0.0 - prosemirror-state: ^1.0.0 - prosemirror-transform: ^1.0.0 - prosemirror-view: ^1.0.0 - '@cloudflare/workerd-darwin-64@1.20240718.0': resolution: {integrity: sha512-BsPZcSCgoGnufog2GIgdPuiKicYTNyO/Dp++HbpLRH+yQdX3x4aWx83M+a0suTl1xv76dO4g9aw7SIB6OSgIyQ==} engines: {node: '>=16'} @@ -7160,6 +7152,14 @@ packages: prosemirror-state: ^1.0.0 prosemirror-view: ^1.0.0 + '@handlewithcare/prosemirror-suggest-changes@0.1.8': + resolution: {integrity: sha512-ewrJl4a8dTpPJNhqYySE2ZCjTRpXulWlUmFy3sbyJgPnGtN/zx7+8tbQ1OhHfMzZWfdmA8VjP9ecy+KO4HdOpA==} + peerDependencies: + prosemirror-model: ^1.0.0 + prosemirror-state: ^1.0.0 + prosemirror-transform: ^1.0.0 + prosemirror-view: ^1.0.0 + '@hapi/hoek@9.3.0': resolution: {integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==} @@ -17273,13 +17273,6 @@ snapshots: '@better-fetch/fetch@1.1.18': {} - '@blocknote/prosemirror-suggest-changes@0.1.3(prosemirror-model@1.25.4)(prosemirror-state@1.4.4)(prosemirror-transform@1.10.5)(prosemirror-view@1.41.3)': - dependencies: - prosemirror-model: 1.25.4 - prosemirror-state: 1.4.4 - prosemirror-transform: 1.10.5 - prosemirror-view: 1.41.3 - '@cloudflare/workerd-darwin-64@1.20240718.0': optional: true @@ -17648,6 +17641,13 @@ snapshots: prosemirror-transform: 1.10.5 prosemirror-view: 1.41.3 + '@handlewithcare/prosemirror-suggest-changes@0.1.8(prosemirror-model@1.25.4)(prosemirror-state@1.4.4)(prosemirror-transform@1.10.5)(prosemirror-view@1.41.3)': + dependencies: + prosemirror-model: 1.25.4 + prosemirror-state: 1.4.4 + prosemirror-transform: 1.10.5 + prosemirror-view: 1.41.3 + '@hapi/hoek@9.3.0': {} '@hapi/topo@5.1.0':