Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Table: remove wrapper around cells #17711

Merged
merged 1 commit into from
Oct 23, 2019
Merged

Table: remove wrapper around cells #17711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 7 additions & 23 deletions packages/block-library/src/table/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ import {
deleteColumn,
toggleSection,
isEmptyTableSection,
isCellSelected,
} from './state';
import icon from './icon';

Expand Down Expand Up @@ -435,7 +434,6 @@ export class TableEdit extends Component {
}

const Tag = `t${ name }`;
const { selectedCell } = this.state;

return (
<Tag>
Expand All @@ -447,35 +445,21 @@ export class TableEdit extends Component {
rowIndex,
columnIndex,
};
const isSelected = isCellSelected( cellLocation, selectedCell );

const cellClasses = classnames( {
'is-selected': isSelected,
[ `has-text-align-${ align }` ]: align,
} );
const richTextClassName = 'wp-block-table__cell-content';
}, 'wp-block-table__cell-content' );

return (
<CellTag
<RichText
tagName={ CellTag }
key={ columnIndex }
className={ cellClasses }
scope={ CellTag === 'th' ? scope : undefined }
onClick={ ( event ) => {
// When a cell is selected, forward focus to the child RichText. This solves an issue where the
// user may click inside a cell, but outside of the RichText, resulting in nothing happening.
const richTextElement = event && event.target && event.target.querySelector( `.${ richTextClassName }` );
if ( richTextElement ) {
richTextElement.focus();
}
} }
>
<RichText
className={ richTextClassName }
value={ content }
onChange={ this.onChange }
unstableOnFocus={ this.createOnFocus( cellLocation ) }
/>
</CellTag>
value={ content }
onChange={ this.onChange }
unstableOnFocus={ this.createOnFocus( cellLocation ) }
/>
);
} ) }
</tr>
Expand Down
4 changes: 0 additions & 4 deletions packages/block-library/src/table/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@

td,
th {
padding: 0;
border: $border-width solid;
}

Expand All @@ -47,9 +46,6 @@
border-style: double;
}

&__cell-content {
padding: 0.5em;
}
// Extra specificity to override default Placeholder styles.
&__placeholder-form.wp-block-table__placeholder-form {
text-align: left;
Expand Down
16 changes: 8 additions & 8 deletions packages/e2e-tests/specs/editor/blocks/table.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ describe( 'Table', () => {
await clickButton( createButtonLabel );

// Click the first cell and add some text.
await page.click( '.wp-block-table__cell-content' );
await page.click( 'td' );
await page.keyboard.type( 'This' );

// Tab to the next cell and add some text.
Expand Down Expand Up @@ -114,13 +114,13 @@ describe( 'Table', () => {
await headerSwitch[ 0 ].click();
await footerSwitch[ 0 ].click();

await page.click( 'thead .wp-block-table__cell-content' );
await page.click( 'thead th' );
await page.keyboard.type( 'header' );

await page.click( 'tbody .wp-block-table__cell-content' );
await page.click( 'tbody td' );
await page.keyboard.type( 'body' );

await page.click( 'tfoot .wp-block-table__cell-content' );
await page.click( 'tfoot td' );
await page.keyboard.type( 'footer' );

// Expect the table to have a header, body and footer with written content.
Expand All @@ -146,7 +146,7 @@ describe( 'Table', () => {
await headerSwitch[ 0 ].click();
await footerSwitch[ 0 ].click();

await page.click( '.wp-block-table__cell-content' );
await page.click( 'td' );

// Add a column.
await clickBlockToolbarButton( 'Edit table' );
Expand All @@ -155,7 +155,7 @@ describe( 'Table', () => {
// Expect the table to have 3 columns across the header, body and footer.
expect( await getEditedPostContent() ).toMatchSnapshot();

await page.click( '.wp-block-table__cell-content' );
await page.click( 'td' );

// Delete a column.
await clickBlockToolbarButton( 'Edit table' );
Expand All @@ -177,7 +177,7 @@ describe( 'Table', () => {
await clickButton( createButtonLabel );

// Click the first cell and add some text. Don't align.
const cells = await page.$$( '.wp-block-table__cell-content' );
const cells = await page.$$( 'td,th' );
await cells[ 0 ].click();
await page.keyboard.type( 'None' );

Expand Down Expand Up @@ -212,7 +212,7 @@ describe( 'Table', () => {
await fixedWidthSwitch.click();

// Add multiple new lines to the first cell to make it taller.
await page.click( '.wp-block-table__cell-content' );
await page.click( 'td' );
await page.keyboard.type( '\n\n\n\n' );

// Get the bounding client rect for the second cell.
Expand Down