diff --git a/demos/includeDependencies.txt b/demos/includeDependencies.txt index 9768c4e44b..598d5e5169 100644 --- a/demos/includeDependencies.txt +++ b/demos/includeDependencies.txt @@ -10,7 +10,7 @@ prosemirror-keymap prosemirror-model prosemirror-schema-list prosemirror-state -prosemirror-tables-contently +@_bdbch/prosemirror-tables prosemirror-transform prosemirror-view react diff --git a/package-lock.json b/package-lock.json index 06294bba5e..d7a01cbff4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -79,6 +79,18 @@ "vue-router": "^4.0.11" } }, + "node_modules/@_bdbch/prosemirror-tables": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@_bdbch/prosemirror-tables/-/prosemirror-tables-1.1.3.tgz", + "integrity": "sha512-txGhmbjTvN/EsBbHap5mvjK6CVeKmLRl9LcjHXiUsKYasbuENqagCi+u2lSi7SFFq4gKBRm1oEL3/FZ4YE4LoQ==", + "dependencies": { + "prosemirror-keymap": "^1.1.2", + "prosemirror-model": "^1.8.1", + "prosemirror-state": "^1.3.1", + "prosemirror-transform": "^1.2.1", + "prosemirror-view": "^1.13.3" + } + }, "node_modules/@ampproject/remapping": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", @@ -13674,18 +13686,6 @@ "prosemirror-transform": "^1.0.0" } }, - "node_modules/prosemirror-tables-contently": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prosemirror-tables-contently/-/prosemirror-tables-contently-1.1.2.tgz", - "integrity": "sha512-REa13GZyVcmwUef6eFfGIZ4IIT3n+95+FEQC0mIg3F7MlwBp5q2lL5y/Pl8EcSIDDagoXp/8oW6uaYy0tWhb6A==", - "dependencies": { - "prosemirror-keymap": "^1.1.2", - "prosemirror-model": "^1.8.1", - "prosemirror-state": "^1.3.1", - "prosemirror-transform": "^1.2.1", - "prosemirror-view": "^1.13.3" - } - }, "node_modules/prosemirror-transform": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/prosemirror-transform/-/prosemirror-transform-1.6.0.tgz", @@ -17560,9 +17560,9 @@ "version": "2.0.0-beta.53", "license": "MIT", "dependencies": { + "@_bdbch/prosemirror-tables": "1.1.3", "prosemirror-model": "1.18.1", "prosemirror-state": "1.4.0", - "prosemirror-tables-contently": "1.1.2", "prosemirror-view": "1.26.1" }, "funding": { @@ -17842,6 +17842,18 @@ } }, "dependencies": { + "@_bdbch/prosemirror-tables": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@_bdbch/prosemirror-tables/-/prosemirror-tables-1.1.3.tgz", + "integrity": "sha512-txGhmbjTvN/EsBbHap5mvjK6CVeKmLRl9LcjHXiUsKYasbuENqagCi+u2lSi7SFFq4gKBRm1oEL3/FZ4YE4LoQ==", + "requires": { + "prosemirror-keymap": "^1.1.2", + "prosemirror-model": "^1.8.1", + "prosemirror-state": "^1.3.1", + "prosemirror-transform": "^1.2.1", + "prosemirror-view": "^1.13.3" + } + }, "@ampproject/remapping": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", @@ -21318,9 +21330,9 @@ "@tiptap/extension-table": { "version": "file:packages/extension-table", "requires": { + "@_bdbch/prosemirror-tables": "1.1.3", "prosemirror-model": "1.18.1", "prosemirror-state": "1.4.0", - "prosemirror-tables-contently": "1.1.2", "prosemirror-view": "1.26.1" } }, @@ -28215,18 +28227,6 @@ "prosemirror-transform": "^1.0.0" } }, - "prosemirror-tables-contently": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prosemirror-tables-contently/-/prosemirror-tables-contently-1.1.2.tgz", - "integrity": "sha512-REa13GZyVcmwUef6eFfGIZ4IIT3n+95+FEQC0mIg3F7MlwBp5q2lL5y/Pl8EcSIDDagoXp/8oW6uaYy0tWhb6A==", - "requires": { - "prosemirror-keymap": "^1.1.2", - "prosemirror-model": "^1.8.1", - "prosemirror-state": "^1.3.1", - "prosemirror-transform": "^1.2.1", - "prosemirror-view": "^1.13.3" - } - }, "prosemirror-transform": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/prosemirror-transform/-/prosemirror-transform-1.6.0.tgz", diff --git a/packages/extension-table/package-lock.json b/packages/extension-table/package-lock.json index 6b6827b31f..9f837650fe 100644 --- a/packages/extension-table/package-lock.json +++ b/packages/extension-table/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "prosemirror-model": "^1.17.0", "prosemirror-state": "^1.4.0", - "prosemirror-tables-contently": "^1.1.2", + "@_bdbch/prosemirror-tables": "^1.1.3", "prosemirror-view": "^1.25.0" }, "funding": { @@ -181,18 +181,6 @@ "prosemirror-transform": "^1.0.0" } }, - "node_modules/prosemirror-tables-contently": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prosemirror-tables-contently/-/prosemirror-tables-contently-1.1.2.tgz", - "integrity": "sha512-REa13GZyVcmwUef6eFfGIZ4IIT3n+95+FEQC0mIg3F7MlwBp5q2lL5y/Pl8EcSIDDagoXp/8oW6uaYy0tWhb6A==", - "dependencies": { - "prosemirror-keymap": "^1.1.2", - "prosemirror-model": "^1.8.1", - "prosemirror-state": "^1.3.1", - "prosemirror-transform": "^1.2.1", - "prosemirror-view": "^1.13.3" - } - }, "node_modules/prosemirror-transform": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/prosemirror-transform/-/prosemirror-transform-1.6.0.tgz", @@ -373,18 +361,6 @@ "prosemirror-transform": "^1.0.0" } }, - "prosemirror-tables-contently": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prosemirror-tables-contently/-/prosemirror-tables-contently-1.1.2.tgz", - "integrity": "sha512-REa13GZyVcmwUef6eFfGIZ4IIT3n+95+FEQC0mIg3F7MlwBp5q2lL5y/Pl8EcSIDDagoXp/8oW6uaYy0tWhb6A==", - "requires": { - "prosemirror-keymap": "^1.1.2", - "prosemirror-model": "^1.8.1", - "prosemirror-state": "^1.3.1", - "prosemirror-transform": "^1.2.1", - "prosemirror-view": "^1.13.3" - } - }, "prosemirror-transform": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/prosemirror-transform/-/prosemirror-transform-1.6.0.tgz", diff --git a/packages/extension-table/package.json b/packages/extension-table/package.json index 23f9ab7c35..5d8645e23e 100644 --- a/packages/extension-table/package.json +++ b/packages/extension-table/package.json @@ -26,7 +26,7 @@ "dependencies": { "prosemirror-model": "1.18.1", "prosemirror-state": "1.4.0", - "prosemirror-tables-contently": "1.1.2", + "@_bdbch/prosemirror-tables": "1.1.3", "prosemirror-view": "1.26.1" }, "repository": { diff --git a/packages/extension-table/src/table.ts b/packages/extension-table/src/table.ts index e7dd2b27c8..fd64da3a43 100644 --- a/packages/extension-table/src/table.ts +++ b/packages/extension-table/src/table.ts @@ -1,11 +1,3 @@ -import { - callOrReturn, - getExtensionField, - mergeAttributes, - Node, - ParentConfig, -} from '@tiptap/core' -import { TextSelection } from 'prosemirror-state' import { addColumnAfter, addColumnBefore, @@ -24,7 +16,15 @@ import { tableEditing, toggleHeader, toggleHeaderCell, -} from 'prosemirror-tables-contently' +} from '@_bdbch/prosemirror-tables' +import { + callOrReturn, + getExtensionField, + mergeAttributes, + Node, + ParentConfig, +} from '@tiptap/core' +import { TextSelection } from 'prosemirror-state' import { NodeView } from 'prosemirror-view' import { TableView } from './TableView' diff --git a/packages/extension-table/src/utilities/isCellSelection.ts b/packages/extension-table/src/utilities/isCellSelection.ts index 1eadd6ae97..3d0e49a09d 100644 --- a/packages/extension-table/src/utilities/isCellSelection.ts +++ b/packages/extension-table/src/utilities/isCellSelection.ts @@ -1,4 +1,4 @@ -import { CellSelection } from 'prosemirror-tables-contently' +import { CellSelection } from '@_bdbch/prosemirror-tables' export function isCellSelection(value: unknown): value is CellSelection { return value instanceof CellSelection