-
Notifications
You must be signed in to change notification settings - Fork 116
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.
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
feat: enabling lists in table cells [] #1696
Draft
aodhagan-cf
wants to merge
3
commits into
master
Choose a base branch
from
feat/TOL-2223
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
103 changes: 82 additions & 21 deletions
103
packages/rich-text/src/plugins/List/transforms/unwrapList.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,97 @@ | ||
| /** | ||
| * Credit: Modified version of Plate's list plugin | ||
| * See: https://github.com/udecode/plate/blob/main/packages/nodes/list | ||
| * See: https://github.com/udecode/plate/blob/main/packages/list/src/transforms/unwrapList.ts | ||
| */ | ||
|
|
||
| import { BLOCKS } from '@contentful/rich-text-types'; | ||
| import { getListTypes } from '@udecode/plate-list'; | ||
|
|
||
| import { withoutNormalizing } from '../../../internal'; | ||
| import { getNodeEntries, isElement } from '../../../internal/queries'; | ||
| import { unwrapNodes, liftNodes } from '../../../internal/transforms'; | ||
| import { PlateEditor, Path } from '../../../internal/types'; | ||
| import { | ||
| getAboveNode, | ||
| getBlockAbove, | ||
| getCommonNode, | ||
| getPluginType, | ||
| isElement, | ||
| } from '../../../internal/queries'; | ||
| import { withoutNormalizing, unwrapNodes, setElements } from '../../../internal/transforms'; | ||
| import { PlateEditor, Path, Descendant } from '../../../internal/types'; | ||
|
|
||
| function hasUnliftedListItems(editor: PlateEditor, at?: Path) { | ||
| return getNodeEntries(editor, { | ||
| at, | ||
| match: (node, path) => isElement(node) && node.type === BLOCKS.LIST_ITEM && path.length >= 2, | ||
| }).next().done; | ||
| function handleEmbeddedType( | ||
| editor: PlateEditor, | ||
| blockType: BLOCKS.EMBEDDED_ASSET | BLOCKS.EMBEDDED_ENTRY, | ||
| at?: Path, | ||
| firstChild?: Descendant | ||
| ) { | ||
| if (firstChild) { | ||
| setElements(editor, { | ||
| at, | ||
| type: getPluginType(editor, blockType), | ||
| value: { ...firstChild }, | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| export const unwrapList = (editor: PlateEditor, { at }: { at?: Path } = {}) => { | ||
| const ancestorListTypeCheck = () => { | ||
| if (getAboveNode(editor, { match: { at, type: getListTypes(editor) } })) { | ||
| return true; | ||
| } | ||
| // The selection's common node might be a list type | ||
| if (!at && editor.selection) { | ||
| const commonNode = getCommonNode( | ||
| editor, | ||
| editor.selection.anchor.path, | ||
| editor.selection.focus.path | ||
| ); | ||
|
|
||
| if (isElement(commonNode[0]) && getListTypes(editor).includes(commonNode[0].type)) { | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| return false; | ||
| }; | ||
|
|
||
| withoutNormalizing(editor, () => { | ||
| do { | ||
| // lift list items to the root level | ||
| liftNodes(editor, { | ||
| const licEntry = getBlockAbove(editor, { | ||
| at, | ||
| match: (node) => isElement(node) && node.type === BLOCKS.LIST_ITEM, | ||
| mode: 'lowest', | ||
| match: { type: getPluginType(editor, BLOCKS.LIST_ITEM) }, | ||
| }); | ||
| } while (!hasUnliftedListItems(editor, at)); | ||
|
|
||
| // finally unwrap all lifted items | ||
| unwrapNodes(editor, { | ||
| at, | ||
| match: { type: BLOCKS.LIST_ITEM }, | ||
| split: false, | ||
| }); | ||
| if (licEntry) { | ||
| // Special case for embedded entry and asset | ||
| // if we don't do these they will get replaced by a paragraph and lose | ||
| // their value. | ||
| const firstChild = licEntry[0]?.children[0]; | ||
| if ( | ||
| firstChild.type === BLOCKS.EMBEDDED_ENTRY || | ||
| firstChild.type === BLOCKS.EMBEDDED_ASSET | ||
| ) { | ||
| handleEmbeddedType(editor, firstChild.type, at, firstChild); | ||
| } else { | ||
| setElements(editor, { | ||
| at, | ||
| type: getPluginType(editor, BLOCKS.PARAGRAPH), | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| unwrapNodes(editor, { | ||
| at, | ||
| match: { type: getPluginType(editor, BLOCKS.LIST_ITEM) }, | ||
| // in original code split is set to true | ||
| // ommited here as we get an extra list item when switching off list blocks | ||
| }); | ||
|
|
||
| unwrapNodes(editor, { | ||
| at, | ||
| match: { | ||
| type: [getPluginType(editor, BLOCKS.UL_LIST), getPluginType(editor, BLOCKS.OL_LIST)], | ||
| }, | ||
| // in original code split is set to true | ||
| // ommited here as we get an extra list item when switching off list blocks | ||
| }); | ||
| } while (ancestorListTypeCheck()); | ||
| }); | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Special handling for embedded assets and entries, aside from this everything else is pretty much the same as the original