Table cells merging #2666

zbeyens · 2023-10-02T15:23:10Z

Follow-up of #2590

…lls-merging-poc-2 # Conflicts: # packages/table/src/transforms/insertTableRow.ts # yarn.lock

…lls-merging-poc-2

…merged cells

…lls-merging-poc-2 # Conflicts: # apps/www/src/registry/default/plate-ui/table-element.tsx # packages/table/src/components/TableCellElement/useTableCellElementResizable.ts # packages/table/src/components/TableCellElement/useTableCellElementState.ts # yarn.lock

changeset-bot · 2023-10-02T15:23:14Z

⚠️ No Changeset found

Latest commit: c2b1fb5

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

vercel · 2023-10-02T15:23:15Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
plate	❌ Failed (Inspect)			Oct 3, 2023 5:59pm

# Conflicts: # yarn.lock

convert AnyObject from interface to type convert TElement from interface to type convert TTest from interface to type remove tsx package & dev script

zbeyens

added disableMergeCells plugin option, it is important to keep the merging cell logic decoupled so we can prevent running that code when disabled. Also important for maintenance, readability and testing. I've created a merge folder to start with.
TTableCellElement: rowIndex and colIndex should not be stored on the element. These can be retrieved using findNodePath, and could even be stored in a WeakMap. I see many colSpan and rowSpan additions in the tests. We should keep the previous default: keep undefined when value is 1. So rowIndex={1} colIndex={1} rowSpan={1} colSpan={1} are redundant.
deleteColumn, deleteRow, insertTableColumn, insertTableRow: decouple and don't call the new logic when merging is disabled
last thing to do is to decouple the state from the UI since it's not versioned. I'll take care of that.

Thanks again for your contribution @dimaanj, I understand that you may be pressed for time regarding this PR. I will try to find some time this month to finalize any remaining point.

zbeyens · 2023-10-03T17:35:38Z

packages/table/src/components/TableElement/useTableElement.ts

-  if (!colSizes.includes(0)) {
-    colSizes.push('100%' as any);
-  }
+  const tableWidth = colSizes.reduce((acc, cur) => acc + cur, 0);


We should support auto width when merging is disabled.

zbeyens · 2023-10-03T17:39:34Z

apps/www/src/registry/default/plate-ui/table-cell-element.tsx

    readOnly,
    selected,
    hovered,
    hoveredLeft,
    rowSize,
    borders,
    isSelectingCell,
+    cellRef,


should come from useTableCellElement

zbeyens · 2023-10-03T17:40:33Z

packages/table/src/components/TableCellElement/useTableCellElementState.ts

+  if (cellRef.current && hoveredColIndex === null && cellOffsets) {
+    const cellOffset = cellRef.current.offsetLeft;
+    const startColIndex = getClosest(cellOffset, cellOffsets);
+
+    startCIndex.current = startColIndex;
+    endColIndex.current = startColIndex + cellElement.colSpan - 1;
+  }


ref and its relative logic is DOM related, so it should be moved to useTableCellElement

zbeyens · 2023-10-03T17:42:20Z

packages/table/src/queries/getTableColumnCount.ts

 export const getTableColumnCount = (tableNode: TElement) => {
-  return (tableNode.children as TElement[])?.[0]?.children?.length ?? 0;


New logic should be called only when merging not disabled

zbeyens · 2023-10-03T17:46:53Z

packages/table/src/queries/getTableOverriddenColSizes.ts

+ * colSizes with default widths. Since colSizes should always return valid widths
+ * of the columns for table cells merging feature.


0-filled array was used for auto layout. We need to keep support for it when merging is disabled.

dimaanj and others added 21 commits August 24, 2023 17:35

[SlateEditor] implement merge and unmerge

29c6ea7

[TablePlugin] fix resize

79c3548

[TablePlugin] fix pasting table from word and other sites

2f33bf0

[TablePlugin] add comment

278bfd1

[TablePlugin] change icon for unmerge button

b9b8bdb

[TablePlugin] fix bug in ff

00197fc

Merge branch 'main' of https://github.com/udecode/plate into table-ce…

831b583

…lls-merging-poc-2 # Conflicts: # packages/table/src/transforms/insertTableRow.ts # yarn.lock

[TablePlugin] fix lint problems

c06db8c

[TablePlugin] fix types and tests

32c75d4

[TablePlugin] fix serialisation tests for table element

f56a9ec

Merge branch 'main' of https://github.com/udecode/plate into table-ce…

da2fb2a

…lls-merging-poc-2

[TablePlugin] fix some issues

ecf14a8

[TablePlugin] implement handy selection, make merge and unmerge stable

5a79d1b

[TablePlugin] implement column / row adding / removal functions with …

d777438

…merged cells

[SlateEditor] remove logs

7cc1c84

[SlateEditor] do not push empty cells to merged cell

595e4f1

[TablePlugin] fix some tests

b07eae0

[TablePlugin] update remaining tests

9ef9bd7

[TablePlugin] remove logs

884cea7

✨

734140b

zbeyens changed the title ~~Table cells merging poc 3~~ Table cells merging Oct 2, 2023

reviewpad bot added the large Pull request is large label Oct 2, 2023

zbeyens added 3 commits October 2, 2023 17:23

✨

36d3031

Merge branch 'main' into table-cells-merging-poc-2

fe2e601

# Conflicts: # yarn.lock

✨

1c62e6c

vercel bot deployed to Preview October 2, 2023 15:38 View deployment

Merge branch 'main' into table-cells-merging-poc-2

18e4caa

✨

4ee33e5

vercel bot deployed to Preview October 2, 2023 19:22 View deployment

zbeyens and others added 18 commits October 3, 2023 18:38

🐛

69b9df9

test vercel deployment

3156954

revert <AnyObject> changes

748f132

convert AnyObject from interface to type convert TElement from interface to type convert TTest from interface to type remove tsx package & dev script

👷

f235424

👷

e94456d

Disable tabbable when editor is read-only

954292c

Version Packages

5abf727

✨

1f4c8c7

✨

a08587a

✨

0723474

👷

8e82f0d

Version Packages

a8b9134

👷

004974c

👷

6af32b2

Create four-hornets-decide.md

161e016

Version Packages

e92d8c5

👷

fc70584

Merge branch 'main' into table-cells-merging-poc-2

f4a8914

vercel bot had a problem deploying to Preview October 3, 2023 16:49 Failure

zbeyens added 2 commits October 3, 2023 19:43

🎨

bc6af88

🎨

c2b1fb5

vercel bot had a problem deploying to Preview October 3, 2023 17:59 Failure

zbeyens commented Oct 3, 2023

View reviewed changes

zbeyens mentioned this pull request Oct 3, 2023

[TablePlugin] Table cells merging POC #2590

Closed

zbeyens closed this Nov 23, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Table cells merging #2666

Table cells merging #2666

zbeyens commented Oct 2, 2023

changeset-bot bot commented Oct 2, 2023 •

edited

Loading

vercel bot commented Oct 2, 2023 •

edited

Loading

zbeyens left a comment

zbeyens Oct 3, 2023

zbeyens Oct 3, 2023

zbeyens Oct 3, 2023

zbeyens Oct 3, 2023 •

edited

Loading

zbeyens Oct 3, 2023

		export const getTableColumnCount = (tableNode: TElement) => {
		return (tableNode.children as TElement[])?.[0]?.children?.length ?? 0;

		* colSizes with default widths. Since colSizes should always return valid widths
		* of the columns for table cells merging feature.

Table cells merging #2666

Table cells merging #2666

Conversation

zbeyens commented Oct 2, 2023

changeset-bot bot commented Oct 2, 2023 • edited Loading

⚠️ No Changeset found

vercel bot commented Oct 2, 2023 • edited Loading

zbeyens left a comment

Choose a reason for hiding this comment

zbeyens Oct 3, 2023

Choose a reason for hiding this comment

zbeyens Oct 3, 2023

Choose a reason for hiding this comment

zbeyens Oct 3, 2023

Choose a reason for hiding this comment

zbeyens Oct 3, 2023 • edited Loading

Choose a reason for hiding this comment

zbeyens Oct 3, 2023

Choose a reason for hiding this comment

changeset-bot bot commented Oct 2, 2023 •

edited

Loading

vercel bot commented Oct 2, 2023 •

edited

Loading

zbeyens Oct 3, 2023 •

edited

Loading