From 26121bbe7768f2c5484b463606ee3ce0437d7348 Mon Sep 17 00:00:00 2001 From: Oliver Wales Date: Thu, 31 Aug 2023 18:11:17 +0100 Subject: [PATCH 1/6] Fix column deletion early return --- packages/table/src/transforms/deleteColumn.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/table/src/transforms/deleteColumn.ts b/packages/table/src/transforms/deleteColumn.ts index 7fd527f86f..d0ed7b45af 100644 --- a/packages/table/src/transforms/deleteColumn.ts +++ b/packages/table/src/transforms/deleteColumn.ts @@ -55,11 +55,11 @@ export const deleteColumn = (editor: PlateEditor) => { const replacePathPos = pathToDelete.length - 2; withoutNormalizing(editor, () => { - tableEntry[0].children.forEach((row, rowIdx) => { + tableNode.children.forEach((row, rowIdx) => { pathToDelete[replacePathPos] = rowIdx; // for rows with different lengths - if ((row.children as TElement[]).length < replacePathPos + 1) return; + if (colIndex > (row.children as TElement[]).length - 1) return; removeNodes(editor, { at: pathToDelete, From 1fe37f2f5591ec829d11e3ad8361fdae78274b35 Mon Sep 17 00:00:00 2001 From: Ziad Beyens Date: Thu, 31 Aug 2023 19:26:16 +0200 Subject: [PATCH 2/6] Create nine-singers-change.md --- .changeset/nine-singers-change.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/nine-singers-change.md diff --git a/.changeset/nine-singers-change.md b/.changeset/nine-singers-change.md new file mode 100644 index 0000000000..cdd43d543f --- /dev/null +++ b/.changeset/nine-singers-change.md @@ -0,0 +1,5 @@ +--- +"@udecode/plate-table": patch +--- + +Fix column deletion early return From 651ea4fcf57fa7f951e59d201307ba0281fe45be Mon Sep 17 00:00:00 2001 From: Oliver Wales Date: Thu, 31 Aug 2023 21:27:14 +0100 Subject: [PATCH 3/6] Fix test import --- packages/table/src/queries/isTableBorderHidden.spec.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/table/src/queries/isTableBorderHidden.spec.tsx b/packages/table/src/queries/isTableBorderHidden.spec.tsx index 29b5422521..dafc085b66 100644 --- a/packages/table/src/queries/isTableBorderHidden.spec.tsx +++ b/packages/table/src/queries/isTableBorderHidden.spec.tsx @@ -1,9 +1,9 @@ /** @jsx jsx */ import { createPlateEditor, PlateEditor } from '@udecode/plate-common'; -import { createTablePlugin } from '@udecode/plate-table'; import { jsx } from '@udecode/plate-test-utils'; +import { createTablePlugin } from '../createTablePlugin'; import { isTableBorderHidden } from './isTableBorderHidden'; jsx; From d681ba6ae1c701a8f8e34a7d93b3263b7a492b65 Mon Sep 17 00:00:00 2001 From: Oliver Wales Date: Thu, 31 Aug 2023 21:45:16 +0100 Subject: [PATCH 4/6] Fix another bug --- packages/table/src/transforms/deleteColumn.spec.tsx | 2 +- packages/table/src/transforms/deleteColumn.ts | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/table/src/transforms/deleteColumn.spec.tsx b/packages/table/src/transforms/deleteColumn.spec.tsx index 04a2d1e805..6594a9794c 100644 --- a/packages/table/src/transforms/deleteColumn.spec.tsx +++ b/packages/table/src/transforms/deleteColumn.spec.tsx @@ -119,7 +119,7 @@ describe('deleteColumn', () => { }); describe('when first row has 2 cells, second row has 1 cell, focus 11', () => { - it('should do nothing', () => { + it('should delete 11', () => { const input = ( diff --git a/packages/table/src/transforms/deleteColumn.ts b/packages/table/src/transforms/deleteColumn.ts index d0ed7b45af..fcd905f7c6 100644 --- a/packages/table/src/transforms/deleteColumn.ts +++ b/packages/table/src/transforms/deleteColumn.ts @@ -58,8 +58,14 @@ export const deleteColumn = (editor: PlateEditor) => { tableNode.children.forEach((row, rowIdx) => { pathToDelete[replacePathPos] = rowIdx; - // for rows with different lengths - if (colIndex > (row.children as TElement[]).length - 1) return; + // for tables containing rows of different lengths + // - don't delete if only one cell in row + // - don't delete if row doesn't have this cell + if ( + (row.children as TElement[]).length === 1 || + colIndex > (row.children as TElement[]).length - 1 + ) + return; removeNodes(editor, { at: pathToDelete, From aa4daf9fb2c0f6c35057b25bffe14b8c5f79b1b7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 1 Sep 2023 06:30:25 +0000 Subject: [PATCH 5/6] Version Packages --- .changeset/nine-singers-change.md | 5 ----- packages/plate/CHANGELOG.md | 2 ++ packages/plate/package.json | 8 ++++---- packages/serializer-csv/CHANGELOG.md | 2 ++ packages/serializer-csv/package.json | 4 ++-- packages/serializer-docx/CHANGELOG.md | 2 ++ packages/serializer-docx/package.json | 4 ++-- packages/table/CHANGELOG.md | 6 ++++++ packages/table/package.json | 2 +- 9 files changed, 21 insertions(+), 14 deletions(-) delete mode 100644 .changeset/nine-singers-change.md diff --git a/.changeset/nine-singers-change.md b/.changeset/nine-singers-change.md deleted file mode 100644 index cdd43d543f..0000000000 --- a/.changeset/nine-singers-change.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@udecode/plate-table": patch ---- - -Fix column deletion early return diff --git a/packages/plate/CHANGELOG.md b/packages/plate/CHANGELOG.md index 8a17fad27e..a2cd976966 100644 --- a/packages/plate/CHANGELOG.md +++ b/packages/plate/CHANGELOG.md @@ -1,5 +1,7 @@ # @udecode/plate +## 23.6.1 + ## 23.6.0 ## 23.5.0 diff --git a/packages/plate/package.json b/packages/plate/package.json index 859dcd2e19..dd16b84d85 100644 --- a/packages/plate/package.json +++ b/packages/plate/package.json @@ -1,6 +1,6 @@ { "name": "@udecode/plate", - "version": "23.6.0", + "version": "23.6.1", "description": "Plate – a plugin system for slate", "license": "MIT", "homepage": "https://platejs.org", @@ -63,13 +63,13 @@ "@udecode/plate-reset-node": "23.6.0", "@udecode/plate-resizable": "23.6.0", "@udecode/plate-select": "23.6.0", - "@udecode/plate-serializer-csv": "23.6.0", - "@udecode/plate-serializer-docx": "23.6.0", + "@udecode/plate-serializer-csv": "23.6.1", + "@udecode/plate-serializer-docx": "23.6.1", "@udecode/plate-serializer-html": "23.6.0", "@udecode/plate-serializer-md": "23.6.0", "@udecode/plate-suggestion": "23.6.0", "@udecode/plate-tabbable": "23.6.0", - "@udecode/plate-table": "23.6.0", + "@udecode/plate-table": "23.6.1", "@udecode/plate-trailing-block": "23.6.0" }, "peerDependencies": { diff --git a/packages/serializer-csv/CHANGELOG.md b/packages/serializer-csv/CHANGELOG.md index cd2cc2e32b..d24810ac49 100644 --- a/packages/serializer-csv/CHANGELOG.md +++ b/packages/serializer-csv/CHANGELOG.md @@ -1,5 +1,7 @@ # @udecode/plate-serializer-csv +## 23.6.1 + ## 23.6.0 ## 23.4.1 diff --git a/packages/serializer-csv/package.json b/packages/serializer-csv/package.json index c097734d09..84ac9c957e 100644 --- a/packages/serializer-csv/package.json +++ b/packages/serializer-csv/package.json @@ -1,6 +1,6 @@ { "name": "@udecode/plate-serializer-csv", - "version": "23.6.0", + "version": "23.6.1", "description": "CSV serializer plugin for Plate", "license": "MIT", "homepage": "https://platejs.org", @@ -31,7 +31,7 @@ }, "dependencies": { "@udecode/plate-common": "23.6.0", - "@udecode/plate-table": "23.6.0", + "@udecode/plate-table": "23.6.1", "papaparse": "^5.4.1" }, "peerDependencies": { diff --git a/packages/serializer-docx/CHANGELOG.md b/packages/serializer-docx/CHANGELOG.md index 1c46b5e433..0bd3efc46e 100644 --- a/packages/serializer-docx/CHANGELOG.md +++ b/packages/serializer-docx/CHANGELOG.md @@ -1,5 +1,7 @@ # @udecode/plate-docx-serializer +## 23.6.1 + ## 23.6.0 ## 23.4.1 diff --git a/packages/serializer-docx/package.json b/packages/serializer-docx/package.json index df32d3bdf8..86368c5af8 100644 --- a/packages/serializer-docx/package.json +++ b/packages/serializer-docx/package.json @@ -1,6 +1,6 @@ { "name": "@udecode/plate-serializer-docx", - "version": "23.6.0", + "version": "23.6.1", "description": "Docx serializer plugin for Plate", "license": "MIT", "homepage": "https://platejs.org", @@ -36,7 +36,7 @@ "@udecode/plate-indent-list": "23.6.0", "@udecode/plate-media": "23.6.0", "@udecode/plate-paragraph": "23.6.0", - "@udecode/plate-table": "23.6.0", + "@udecode/plate-table": "23.6.1", "validator": "^13.9.0" }, "peerDependencies": { diff --git a/packages/table/CHANGELOG.md b/packages/table/CHANGELOG.md index 3c817ac868..9fea86eb9a 100644 --- a/packages/table/CHANGELOG.md +++ b/packages/table/CHANGELOG.md @@ -1,5 +1,11 @@ # @udecode/plate-table +## 23.6.1 + +### Patch Changes + +- [#2594](https://github.com/udecode/plate/pull/2594) by [@OliverWales](https://github.com/OliverWales) – Fix column deletion early return + ## 23.6.0 ## 23.4.1 diff --git a/packages/table/package.json b/packages/table/package.json index 66215464d7..7e9680ade7 100644 --- a/packages/table/package.json +++ b/packages/table/package.json @@ -1,6 +1,6 @@ { "name": "@udecode/plate-table", - "version": "23.6.0", + "version": "23.6.1", "description": "Table plugin for Plate", "license": "MIT", "homepage": "https://platejs.org", From 64248cac0e49de1098481141cb74a872d71387ec Mon Sep 17 00:00:00 2001 From: Ziad Beyens Date: Sat, 2 Sep 2023 16:21:37 +0200 Subject: [PATCH 6/6] Create rotten-cobras-hang.md --- .changeset/rotten-cobras-hang.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/rotten-cobras-hang.md diff --git a/.changeset/rotten-cobras-hang.md b/.changeset/rotten-cobras-hang.md new file mode 100644 index 0000000000..19b37db122 --- /dev/null +++ b/.changeset/rotten-cobras-hang.md @@ -0,0 +1,6 @@ +--- +"@udecode/plate-utils": minor +--- + +- New prop in `createPrimitiveComponent`: `setProps` where the first parameter is the props returned by the "props hook". Returned attributes are passed to the component. You can use this prop to merge or override all props. +- Plate components `className` and `style` props are now merged with the "props hook" ones if defined. To override instead of merging, use `setProps`.