Introduce TableTypeCommand command.
#18109
Merged
Conversation
This file contains hidden or 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
niegowski
reviewed
Mar 13, 2025
packages/ckeditor5-table/src/tablelayout/commands/settabletype.ts
Outdated
Show resolved
Hide resolved
niegowski
reviewed
Mar 13, 2025
packages/ckeditor5-table/src/tablelayout/commands/settabletype.ts
Outdated
Show resolved
Hide resolved
SetTableType command.TableTypeCommand command.
Mati365
approved these changes
Mar 14, 2025
niegowski
reviewed
Mar 14, 2025
packages/ckeditor5-table/src/tablelayout/commands/tabletypecommand.ts
Outdated
Show resolved
Hide resolved
Comment on lines
+72
to
+77
| // Check if all children are allowed for the new table type. | ||
| for ( const child of tableChildren ) { | ||
| if ( !model.schema.checkChild( table, child ) ) { | ||
| writer.remove( child ); | ||
| } | ||
| } |
There was a problem hiding this comment.
Should we add a post-fixer to ensure that some other feature won't break the model structure? I wonder if TC suggestion could alter the structure in an unexpected way.
There was a problem hiding this comment.
Fixed in 91578b1.
pszczesniak
commented
Mar 17, 2025
|
|
||
| import { getSelectionAffectedTable } from '../../utils/common.js'; | ||
|
|
||
| export type TableType = 'layout' | 'content'; |
There was a problem hiding this comment.
Let's import this type from 👉 #18121 (comment) (when this PR will merged).
There was a problem hiding this comment.
Done in 130e16a.
niegowski
reviewed
Mar 18, 2025
Comment on lines
+168
to
+186
| // Remove disallowed attributes and children for layout tables | ||
| // when `tableType` attribute has been changed by `TableTypeCommand`. | ||
| if ( entry.type == 'attribute' && entry.attributeKey == 'tableType' ) { | ||
| for ( const item of entry.range.getItems() ) { | ||
| if ( item.is( 'element', 'table' ) ) { | ||
| editor.model.schema.removeDisallowedAttributes( [ item ], writer ); | ||
|
|
||
| const tableChildren = item.getChildren(); | ||
|
|
||
| // Check if all children are allowed for the new table type. | ||
| for ( const child of tableChildren ) { | ||
| if ( !editor.model.schema.checkChild( item, child ) ) { | ||
| writer.remove( child ); | ||
| hasChanged = true; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
What about some captions added to a layout table? Or a heading cols/rows set on it?
There was a problem hiding this comment.
Ok, let's leave it for a potential follow-up if such a case appears.
niegowski
approved these changes
Mar 18, 2025
Comment on lines
+168
to
+186
| // Remove disallowed attributes and children for layout tables | ||
| // when `tableType` attribute has been changed by `TableTypeCommand`. | ||
| if ( entry.type == 'attribute' && entry.attributeKey == 'tableType' ) { | ||
| for ( const item of entry.range.getItems() ) { | ||
| if ( item.is( 'element', 'table' ) ) { | ||
| editor.model.schema.removeDisallowedAttributes( [ item ], writer ); | ||
|
|
||
| const tableChildren = item.getChildren(); | ||
|
|
||
| // Check if all children are allowed for the new table type. | ||
| for ( const child of tableChildren ) { | ||
| if ( !editor.model.schema.checkChild( item, child ) ) { | ||
| writer.remove( child ); | ||
| hasChanged = true; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Ok, let's leave it for a potential follow-up if such a case appears.
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)
Internal: Introduce
TableTypeCommandcommand. See #18131.Additional information
For example – encountered issues, assumptions you had to make, other affected tickets, etc.