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

Rewrite table block to use a simpler RichText value #8767

Merged
merged 13 commits into from
Aug 23, 2018
Merged

Rewrite table block to use a simpler RichText value #8767

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4a28996
Rewrite table block to use a simpler RichText value
ellatrix Aug 9, 2018
392f4ff
Remove TinyMCE table plugin
ellatrix Aug 9, 2018
e0f9f81
Add basic tests
ellatrix Aug 10, 2018
2c9a0e3
Restore drop down table controls
ellatrix Aug 10, 2018
36a90f5
move files to package
ellatrix Aug 15, 2018
042dffe
Fixes
ellatrix Aug 16, 2018
ed1ab03
More polish
ellatrix Aug 20, 2018
6701415
Polish initial prompt again.
Aug 22, 2018
66ecf75
Add docs
ellatrix Aug 22, 2018
7b59b4b
Table: Address my own feedback from review
gziolo Aug 23, 2018
19b7cb3
Componnet: Add isDisabled support for DropdownMenu controls
gziolo Aug 23, 2018
b9c92ed
Table block: Fix an issue when removing all columns does not prompt t…
gziolo Aug 23, 2018
ca4af7c
Revert part of 19b7cb3a8fb1ab6b761a92c73ab6a22fe7ca3f8e
ellatrix Aug 23, 2018
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
1 change: 1 addition & 0 deletions packages/block-library/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"url": "^0.11.0"
},
"devDependencies": {
"deep-freeze": "^0.0.1",
"enzyme": "^3.3.0",
"react-test-renderer": "^16.4.1"
},
Expand Down
11 changes: 1 addition & 10 deletions packages/block-library/src/table/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/**
* External dependencies
*/

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added these lines because that was @aduth's preference some time ago. I don't really mind, but it is not a doc block... So maybe it's better with the line, or just one asterisk at the start.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we want to change it, let's update in one batch all of them to match one style.

import classnames from 'classnames';

/**
* WordPress dependencies
*/

import { Fragment, Component } from '@wordpress/element';
import { InspectorControls, BlockControls, RichText } from '@wordpress/editor';
import { __ } from '@wordpress/i18n';
Expand All @@ -23,7 +21,6 @@ import {
/**
* Internal dependencies
*/

import {
createTable,
updateCellContent,
Expand All @@ -33,12 +30,6 @@ import {
deleteColumn,
} from './state';

/**
* Browser dependencies
*/

const { parseInt } = window;

export default class TableEdit extends Component {
constructor() {
super( ...arguments );
Expand Down Expand Up @@ -78,7 +69,7 @@ export default class TableEdit extends Component {
/**
* Updates the initial row count used for table creation.
*
* @param {[type]} initialRowCount New initial row count.
* @param {number} initialRowCount New initial row count.
*/
onChangeInitialRowCount( initialRowCount ) {
this.setState( { initialRowCount } );
Expand Down
3 changes: 0 additions & 3 deletions packages/block-library/src/table/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
/**
* External dependencies
*/

import classnames from 'classnames';

/**
* WordPress dependencies
*/

import { __ } from '@wordpress/i18n';
import { getPhrasingContentSchema } from '@wordpress/blocks';
import { RichText } from '@wordpress/editor';

/**
* Internal dependencies
*/

import edit from './edit';

const tableContentPasteSchema = {
Expand Down
1 change: 0 additions & 1 deletion packages/block-library/src/table/state.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/**
* External dependencies
*/

import { times } from 'lodash';

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/block-library/src/table/test/__snapshots__/index.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`core/embed block edit matches snapshot 1`] = `
exports[`core/table block edit matches snapshot 1`] = `
<form>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is much nicer than providing the default 2x2 table 💯

<div
class="components-base-control"
Expand Down
2 changes: 1 addition & 1 deletion packages/block-library/src/table/test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import { name, settings } from '../';
import { blockEditRender } from '../../test/helpers';

describe( 'core/embed', () => {
describe( 'core/table', () => {
test( 'block edit matches snapshot', () => {
const wrapper = blockEditRender( name, settings );

Expand Down
14 changes: 9 additions & 5 deletions packages/block-library/src/table/test/state.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
/**
* Internal dependencies
* External dependencies
*/
import deepFreeze from 'deep-freeze';

/**
* Internal dependencies
*/
import {
createTable,
updateCellContent,
Expand All @@ -11,7 +15,7 @@ import {
deleteColumn,
} from '../state';

const table = {
const table = deepFreeze( {
body: [
{
cells: [
Expand All @@ -38,9 +42,9 @@ const table = {
],
},
],
};
} );

const tableWithContent = {
const tableWithContent = deepFreeze( {
body: [
{
cells: [
Expand All @@ -67,7 +71,7 @@ const tableWithContent = {
],
},
],
};
} );

describe( 'createTable', () => {
it( 'should create a table', () => {
Expand Down