This repository has been archived by the owner on Jun 26, 2020. It is now read-only.
I/6546: Implement remove column util #300
Merged
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
niegowski
reviewed
Apr 8, 2020
src/tableutils.js
Outdated
| function adjustHeadingColumns( table, removedColumnIndexes, writer ) { | ||
| const headingColumns = table.getAttribute( 'headingColumns' ) || 0; | ||
|
|
||
| if ( headingColumns && removedColumnIndexes.first <= headingColumns ) { |
There was a problem hiding this comment.
removedColumnIndexes.first is an index and headingColumns is count (probably < is enough), if those are equal the resulting headingsRemoved will equal 0 so no change is needed.
| @@ -418,7 +418,7 @@ describe( 'RemoveColumnCommand', () => { | |||
| ] ) ); | |||
| } ); | |||
|
|
|||
| it( 'should work property if the rowspan is in the first column (#1)', () => { | |||
| it( 'should work property if the rowspan is in the first column (the other cell in row is selected)', () => { | |||
| setData( model, modelTable( [ | |||
| [ { rowspan: 2, contents: '00' }, '[]01' ], | |||
| [ '10' ] | |||
| ] ) ); | ||
| } ); | ||
|
|
||
| it( 'should work property if the rowspan is in the first column (#2)', () => { | ||
| it( 'should work property if the rowspan is in the first column (the cell in row below is selected)', () => { | ||
| setData( model, modelTable( [ | ||
| [ { rowspan: 2, contents: '00' }, '01' ], | ||
| [ '[]10' ] |
| ] ) ); | ||
| } ); | ||
|
|
||
| it( 'should work property if the rowspan is in the first column (#3)', () => { | ||
| it( 'should work property if the rowspan is in the first column (the cell with rowspan is selected)', () => { | ||
| setData( model, modelTable( [ | ||
| [ { rowspan: 2, contents: '00[]' }, '01' ], | ||
| [ '10' ] |
tests/tableutils.js
Outdated
Comment on lines
1016
to
1021
| [ { colspan: 4, contents: '00' }, '03' ], | ||
| [ { colspan: 3, contents: '10' }, '13' ], | ||
| [ { colspan: 2, contents: '20' }, '22', '23' ], | ||
| [ '30', { colspan: 2, contents: '31' }, '33' ], | ||
| [ '40', '41', '42', '43' ] | ||
| ] ) ); |
There was a problem hiding this comment.
This table seems invalid:
+----+----+----+----+----+
| 00 | 03 |
+----+----+----+----+----+
| 10 | 13 |
+----+----+----+----+
| 20 | 22 | 23 |
+----+----+----+----+
| 30 | 31 | 33 |
+----+----+----+----+
| 40 | 41 | 42 | 43 |
+----+----+----+----+
tests/tableutils.js
Outdated
Comment on lines
1037
to
1039
| [ { colspan: 3, contents: '00' }, '03' ], | ||
| [ { colspan: 2, contents: '10' }, '13' ], | ||
| [ '20', '21', '22', '23' ] |
There was a problem hiding this comment.
Seems invalid table:
+----+----+----+----+
| 00 | 03 |
+----+----+----+----+
| 10 | 13 |
+----+----+----+----+
| 20 | 21 | 22 | 23 |
+----+----+----+----+
tests/tableutils.js
Outdated
| it( 'should remove column with rowspan (first column)', () => { | ||
| setData( model, modelTable( [ | ||
| [ { rowspan: 2, contents: '00' }, '01' ], | ||
| [ '10' ] |
niegowski
reviewed
Apr 8, 2020
| [ '30', { colspan: 2, contents: '31' }, '33' ], | ||
| [ '40', '41', '42', '43' ] | ||
| [ { colspan: 4, contents: '00' }, '04' ], | ||
| [ { colspan: 3, contents: '10' }, '14' ], |
niegowski
reviewed
Apr 8, 2020
tests/tableutils.js
Outdated
| [ '30', { colspan: 2, contents: '31' }, '33' ], | ||
| [ '40', '41', '42', '43' ] | ||
| [ { colspan: 4, contents: '00' }, '04' ], | ||
| [ { colspan: 3, contents: '10' }, '14' ], |
niegowski
approved these changes
Apr 8, 2020
oleq
reviewed
Apr 8, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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)
Feature: Introduce
TableUtils.removeColumns()method. Closes ckeditor/ckeditor5#6546. Closes ckeditor/ckeditor5#6439.Additional information