Fixed insert table row/column commands when a widget is selected inside the table cell #6752
Conversation
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
…de the table cell.
jodator
suggested changes
May 7, 2020
Comment on lines
75
to
84
| const referencePosition = insertBefore ? selection.getFirstPosition() : selection.getLastPosition(); | ||
| const referenceRange = insertBefore ? selection.getFirstRange() : selection.getLastRange(); | ||
|
|
||
| const tableCell = referenceRange.getContainedElement() || findAncestor( 'tableCell', referencePosition ); | ||
| const table = tableCell.parent.parent; | ||
| const containedElement = referenceRange.getContainedElement(); | ||
| const isTableCell = containedElement && containedElement.is( 'tableCell' ); | ||
|
|
||
| const tableCell = isTableCell ? containedElement : findAncestor( 'tableCell', referencePosition ); | ||
| const table = findAncestor( 'table', tableCell ); | ||
|
|
||
| const { column } = tableUtils.getCellLocation( tableCell ); |
There was a problem hiding this comment.
I would change the whole thing to:
const affectedTableCells = getSelectionAffectedTableCells( selection );
const columnIndexes = getColumnIndexes( affectedTableCells );
const column = insertBefore ? columnIndexes.first : columnIndexes.last;
const table = findAncestor( 'table', affectedTableCells[ 0 ] );if the tests aren't too simplistic it works 🤷♂️.
AFAICS the same thing can be done with inserting rows.
There was a problem hiding this comment.
The reason I would see that change is that it looks like this code tried to copy utility methods behavior that we already have. Using utility method for extracting this data makes me safe that we do it properly.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Suggested merge commit message (convention)
Fix (table): Fixed insert table row/column commands when a widget is selected inside the table cell. Closes #6607.
Additional information