Blocks: Remove obsolete isSelected usage (part 3) (#6280)

WordPress · Apr 20, 2018 · cb1b92e · cb1b92e
1 parent 3b8f242
commit cb1b92e
Show file tree

Hide file tree

Showing 9 changed files with 216 additions and 208 deletions.
diff --git a/blocks/library/preformatted/index.js b/blocks/library/preformatted/index.js
@@ -58,12 +58,11 @@ export const settings = {
  ],
  },
 
- edit( { attributes, setAttributes, className, isSelected } ) {
+ edit( { attributes, setAttributes, className } ) {
  const { content } = attributes;
 
- return [
+ return (
  <RichText
- key="block"
  tagName="pre"
  value={ content }
  onChange={ ( nextContent ) => {
@@ -73,9 +72,8 @@ export const settings = {
  } }
  placeholder={ __( 'Write preformatted text…' ) }
  wrapperClassName={ className }
- isSelected={ isSelected }
- />,
- ];
+ />
+ );
  },
 
  save( { attributes } ) {

diff --git a/blocks/library/pullquote/index.js b/blocks/library/pullquote/index.js
@@ -8,6 +8,7 @@ import { map } from 'lodash';
  */
 import { __ } from '@wordpress/i18n';
 import { withState } from '@wordpress/components';
+import { Fragment } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -72,47 +73,47 @@ export const settings = {
  const updateAlignment = ( nextAlign ) => setAttributes( { align: nextAlign } );
  const onSetActiveEditable = ( newEditable ) => () => setState( { editable: newEditable } );
 
- return [
- isSelected && (
- <BlockControls key="controls">
+ return (
+ <Fragment>
+ <BlockControls>
  <BlockAlignmentToolbar
  value={ align }
  onChange={ updateAlignment }
  />
  </BlockControls>
- ),
- <blockquote key="quote" className={ className }>
- <RichText
- multiline="p"
- value={ toRichTextValue( value ) }
- onChange={
- ( nextValue ) => setAttributes( {
- value: fromRichTextValue( nextValue ),
- } )
- }
- /* translators: the text of the quotation */
- placeholder={ __( 'Write quote…' ) }
- wrapperClassName="blocks-pullquote__content"
- isSelected={ isSelected && editable === 'content' }
- onFocus={ onSetActiveEditable( 'content' ) }
- />
- { ( citation || isSelected ) && (
+ <blockquote className={ className }>
  <RichText
- tagName="cite"
- value={ citation }
- /* translators: the individual or entity quoted */
- placeholder={ __( 'Write citation…' ) }
+ multiline="p"
+ value={ toRichTextValue( value ) }
  onChange={
- ( nextCitation ) => setAttributes( {
- citation: nextCitation,
+ ( nextValue ) => setAttributes( {
+ value: fromRichTextValue( nextValue ),
  } )
  }
- isSelected={ isSelected && editable === 'cite' }
- onFocus={ onSetActiveEditable( 'cite' ) }
+ /* translators: the text of the quotation */
+ placeholder={ __( 'Write quote…' ) }
+ wrapperClassName="blocks-pullquote__content"
+ isSelected={ isSelected && editable === 'content' }
+ onFocus={ onSetActiveEditable( 'content' ) }
  />
- ) }
- </blockquote>,
- ];
+ { ( citation || isSelected ) && (
+ <RichText
+ tagName="cite"
+ value={ citation }
+ /* translators: the individual or entity quoted */
+ placeholder={ __( 'Write citation…' ) }
+ onChange={
+ ( nextCitation ) => setAttributes( {
+ citation: nextCitation,
+ } )
+ }
+ isSelected={ isSelected && editable === 'cite' }
+ onFocus={ onSetActiveEditable( 'cite' ) }
+ />
+ ) }
+ </blockquote>
+ </Fragment>
+ );
  } ),
 
  save( { attributes } ) {

diff --git a/blocks/library/quote/index.js b/blocks/library/quote/index.js
@@ -9,6 +9,7 @@ import classnames from 'classnames';
  */
 import { __, sprintf } from '@wordpress/i18n';
 import { Toolbar, withState } from '@wordpress/components';
+import { Fragment } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -171,9 +172,9 @@ export const settings = {
  setState( { editable: newEditable } );
  };
 
- return [
- isSelected && (
- <BlockControls key="controls">
+ return (
+ <Fragment>
+ <BlockControls>
  <Toolbar controls={ [ 1, 2 ].map( ( variation ) => ( {
  icon: 1 === variation ? 'format-quote' : 'testimonial',
  title: sprintf( __( 'Quote style %d' ), variation ),
@@ -189,49 +190,48 @@ export const settings = {
  } }
  />
  </BlockControls>
- ),
- <blockquote
- key="quote"
- className={ containerClassname }
- style={ { textAlign: align } }
- >
- <RichText
- multiline="p"
- value={ toRichTextValue( value ) }
- onChange={
- ( nextValue ) => setAttributes( {
- value: fromRichTextValue( nextValue ),
- } )
- }
- onMerge={ mergeBlocks }
- onRemove={ ( forward ) => {
- const hasEmptyCitation = ! citation || citation.length === 0;
- if ( ! forward && hasEmptyCitation ) {
- onReplace( [] );
- }
- } }
- /* translators: the text of the quotation */
- placeholder={ __( 'Write quote…' ) }
- isSelected={ isSelected && editable === 'content' }
- onFocus={ onSetActiveEditable( 'content' ) }
- />
- { ( ( citation && citation.length > 0 ) || isSelected ) && (
+ <blockquote
+ className={ containerClassname }
+ style={ { textAlign: align } }
+ >
  <RichText
- tagName="cite"
- value={ citation }
+ multiline="p"
+ value={ toRichTextValue( value ) }
  onChange={
- ( nextCitation ) => setAttributes( {
- citation: nextCitation,
+ ( nextValue ) => setAttributes( {
+ value: fromRichTextValue( nextValue ),
  } )
  }
- /* translators: the individual or entity quoted */
- placeholder={ __( 'Write citation…' ) }
- isSelected={ isSelected && editable === 'cite' }
- onFocus={ onSetActiveEditable( 'cite' ) }
+ onMerge={ mergeBlocks }
+ onRemove={ ( forward ) => {
+ const hasEmptyCitation = ! citation || citation.length === 0;
+ if ( ! forward && hasEmptyCitation ) {
+ onReplace( [] );
+ }
+ } }
+ /* translators: the text of the quotation */
+ placeholder={ __( 'Write quote…' ) }
+ isSelected={ isSelected && editable === 'content' }
+ onFocus={ onSetActiveEditable( 'content' ) }
  />
- ) }
- </blockquote>,
- ];
+ { ( ( citation && citation.length > 0 ) || isSelected ) && (
+ <RichText
+ tagName="cite"
+ value={ citation }
+ onChange={
+ ( nextCitation ) => setAttributes( {
+ citation: nextCitation,
+ } )
+ }
+ /* translators: the individual or entity quoted */
+ placeholder={ __( 'Write citation…' ) }
+ isSelected={ isSelected && editable === 'cite' }
+ onFocus={ onSetActiveEditable( 'cite' ) }
+ />
+ ) }
+ </blockquote>
+ </Fragment>
+ );
  } ),
 
  save( { attributes } ) {

diff --git a/blocks/library/subhead/index.js b/blocks/library/subhead/index.js
@@ -57,13 +57,12 @@ export const settings = {
  ],
  },
 
- edit( { attributes, setAttributes, isSelected, className } ) {
+ edit( { attributes, setAttributes, className } ) {
  const { content, placeholder } = attributes;
 
  return (
  <RichText
  tagName="p"
- key="editable"
  value={ content }
  onChange={ ( nextContent ) => {
  setAttributes( {
@@ -72,7 +71,6 @@ export const settings = {
  } }
  className={ className }
  placeholder={ placeholder || __( 'Write subhead…' ) }
- isSelected={ isSelected }
  />
  );
  },

diff --git a/blocks/library/table/index.js b/blocks/library/table/index.js
@@ -3,6 +3,11 @@
  */
 import { __ } from '@wordpress/i18n';
 
+/**
+ * WordPress dependencies
+ */
+import { Fragment } from '@wordpress/element';
+
 /**
  * Internal dependencies
  */
@@ -56,25 +61,24 @@ export const settings = {
  edit( { attributes, setAttributes, isSelected, className } ) {
  const { content } = attributes;
  const updateAlignment = ( nextAlign ) => setAttributes( { align: nextAlign } );
- return [
- isSelected && (
- <BlockControls key="toolbar">
+ return (
+ <Fragment>
+ <BlockControls>
  <BlockAlignmentToolbar
  value={ attributes.align }
  onChange={ updateAlignment }
  />
  </BlockControls>
- ),
- <TableBlock
- key="editor"
- onChange={ ( nextContent ) => {
- setAttributes( { content: nextContent } );
- } }
- content={ content }
- className={ className }
- isSelected={ isSelected }
- />,
- ];
+ <TableBlock
+ onChange={ ( nextContent ) => {
+ setAttributes( { content: nextContent } );
+ } }
+ content={ content }
+ className={ className }
+ isSelected={ isSelected }
+ />
+ </Fragment>
+ );
  },
 
  save( { attributes } ) {

diff --git a/blocks/library/table/table-block.js b/blocks/library/table/table-block.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { Component } from '@wordpress/element';
+import { Component, Fragment } from '@wordpress/element';
 import { Toolbar, DropdownMenu } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 
@@ -94,23 +94,21 @@ export default class TableBlock extends Component {
  render() {
  const { content, onChange, className, isSelected } = this.props;
 
- return [
- <RichText
- key="editor"
- tagName="table"
- wrapperClassName={ className }
- getSettings={ ( settings ) => ( {
- ...settings,
- plugins: ( settings.plugins || [] ).concat( 'table' ),
- table_tab_navigation: false,
- } ) }
- onSetup={ ( editor ) => this.handleSetup( editor, isSelected ) }
- onChange={ onChange }
- value={ content }
- isSelected={ isSelected }
- />,
- isSelected && (
- <BlockControls key="menu">
+ return (
+ <Fragment>
+ <RichText
+ tagName="table"
+ wrapperClassName={ className }
+ getSettings={ ( settings ) => ( {
+ ...settings,
+ plugins: ( settings.plugins || [] ).concat( 'table' ),
+ table_tab_navigation: false,
+ } ) }
+ onSetup={ ( editor ) => this.handleSetup( editor, isSelected ) }
+ onChange={ onChange }
+ value={ content }
+ />
+ <BlockControls>
  <Toolbar>
  <DropdownMenu
  icon="editor-table"
@@ -123,7 +121,7 @@ export default class TableBlock extends Component {
  />
  </Toolbar>
  </BlockControls>
- ),
- ];
+ </Fragment>
+ );
  }
 }