Skip to content

fix: upgrade prosemirror view and use correct clipboard import #1431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
YousefED merged 1 commit into from
Feb 12, 2025
Merged

fix: upgrade prosemirror view and use correct clipboard import #1431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"prosemirror-state": "^1.4.3",
"prosemirror-tables": "^1.6.1",
"prosemirror-transform": "^1.10.2",
"prosemirror-view": "^1.33.7",
"prosemirror-view": "^1.38.0",
"rehype-format": "^5.0.0",
"rehype-parse": "^8.0.4",
"rehype-remark": "^9.1.2",
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/api/clipboard/toClipboard/copyExtension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,7 @@ export function selectedFragmentToHTML<
}

// Uses default ProseMirror clipboard serialization.
const clipboardHTML: string = (pmView as any).__serializeForClipboard(
view,
const clipboardHTML: string = view.serializeForClipboard(
view.state.selection.content()
).dom.innerHTML;

Expand Down
3 changes: 2 additions & 1 deletion packages/core/src/blocks/TableBlockContent/TableBlockContent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { TableRow } from "@tiptap/extension-table-row";
import { Node as PMNode } from "prosemirror-model";
import { TableView } from "prosemirror-tables";

import { NodeView } from "prosemirror-view";
import {
createBlockSpecFromStronglyTypedTiptapNode,
createStronglyTypedTiptapNode,
Expand Down Expand Up @@ -101,7 +102,7 @@ export const TableBlockContent = createStronglyTypedTiptapNode({
return new BlockNoteTableView(node, EMPTY_CELL_WIDTH, {
...(this.options.domAttributes?.blockContent || {}),
...HTMLAttributes,
});
}) as NodeView;
};
},
});
Expand Down
7 changes: 2 additions & 5 deletions packages/core/src/extensions/SideMenu/dragging.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Node } from "prosemirror-model";
import { NodeSelection, Selection } from "prosemirror-state";
import * as pmView from "prosemirror-view";
import { EditorView } from "prosemirror-view";

import { createExternalHTMLExporter } from "../../api/exporters/html/externalHTMLExporter.js";
Expand Down Expand Up @@ -184,10 +183,8 @@ export function dragStart<
const selectedSlice = view.state.selection.content();
const schema = editor.pmSchema;

const clipboardHTML = (pmView as any).__serializeForClipboard(
view,
selectedSlice
).dom.innerHTML;
const clipboardHTML =
view.serializeForClipboard(selectedSlice).dom.innerHTML;

const externalHTMLExporter = createExternalHTMLExporter(schema, editor);

Expand Down
3 changes: 1 addition & 2 deletions packages/react/src/schema/ReactBlockSpec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import {
wrapInBlockStructure,
} from "@blocknote/core";
import {
NodeView,
NodeViewProps,
NodeViewWrapper,
ReactNodeViewRenderer,
Expand Down Expand Up @@ -192,7 +191,7 @@ export function createReactBlockSpec<
{
className: "bn-react-node-view-renderer",
}
)(props) as NodeView<any>;
)(props);

if (blockConfig.isSelectable === false) {
applyNonSelectableBlockFix(nodeView, this.editor);
Expand Down
2 changes: 1 addition & 1 deletion packages/xl-multi-column/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"prosemirror-state": "^1.4.3",
"prosemirror-tables": "^1.3.7",
"prosemirror-transform": "^1.9.0",
"prosemirror-view": "^1.33.7",
"prosemirror-view": "^1.38.0",
"react-icons": "^5.2.1"
},
"devDependencies": {
Expand Down
Loading