Skip to content

Quote Block: Adding alignment controls to the quote block #511

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

Closed
youknowriad wants to merge 5 commits into from
Closed

Quote Block: Adding alignment controls to the quote block #511

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
76f8742
Quote Block: Adding alignment controls to the quote block
youknowriad Apr 26, 2017
39abb03
Controls: Take into account mixed controls use-case
youknowriad Apr 26, 2017
95723f3
Document toolbar control normalization
aduth Apr 26, 2017
e5ba308
Simplify the toolbar computing
youknowriad Apr 27, 2017
be27f94
Restore truthiness check to avoid errors on blocks without controls
youknowriad Apr 27, 2017
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
Prev Previous commit
Next Next commit
Controls: Take into account mixed controls use-case
  • Loading branch information
@youknowriad
youknowriad committed Apr 27, 2017
commit 39abb03cc8d9ebbd6ea69e457db8edfc45746951
12 changes: 7 additions & 5 deletions editor/modes/visual-editor/block.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import { connect } from 'react-redux';
import classnames from 'classnames';
import { Slot } from 'react-slot-fill';
import { first } from 'lodash';
import { reduce, last } from 'lodash';

/**
* Internal dependencies
Expand Down Expand Up @@ -138,9 +138,11 @@ class VisualEditorBlock extends wp.element.Component {
wrapperProps = settings.getEditWrapperProps( block.attributes );
}

const toolbars = settings.controls && settings.controls.length && ! Array.isArray( first( settings.controls ) )
? [ settings.controls ]
: settings.controls;
const toolbars = reduce( settings.controls, ( memo, toolbar ) => (
Array.isArray( toolbar )
? [ ...memo, toolbar ]
: [ ...memo.slice( 0, -1 ), [ ...( last( memo ) || [] ), toolbar ] ]
), [] );

// Disable reason: Each block can receive focus but must be able to contain
// block children. Tab keyboard navigation enabled by tabIndex assignment.
Expand All @@ -164,7 +166,7 @@ class VisualEditorBlock extends wp.element.Component {
{ isSelected && ! isTyping &&
<div className="editor-visual-editor__block-controls">
<BlockSwitcher uid={ block.uid } />
{ !! toolbars && toolbars.map( ( controls, index ) => (
{ toolbars.map( ( controls, index ) => (
Copy link
Member

@aduth aduth Apr 27, 2017

Choose a reason for hiding this comment

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

This will error if a block doesn't define controls because toolbars will be undefined. We'll want to restore the truthy test or use Lodash's map.

<Toolbar
key={ index }
controls={ controls.map( ( control ) => ( {
Expand Down