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

Blocks: Support reusable nested blocks (reusable blocks refactor) #5228

Merged
merged 17 commits into from
Mar 16, 2018
Merged

Blocks: Support reusable nested blocks (reusable blocks refactor) #5228

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e53d036
Revert "Blocks: Disable Convert to Reusable for nested blocks"
aduth Feb 14, 2018
e0ea667
Block: Move block context provides into BlockEdit
aduth Feb 12, 2018
8501e7d
Blocks: Avoid dismissing editable controls
aduth Feb 12, 2018
edc7681
State: Enhance history reducer utils to support ignores
aduth Feb 23, 2018
928c2d1
Block List: Hide disabled default block appender
aduth Feb 23, 2018
7aff115
State: Update reusable blocks as pointers to state blocks
aduth Feb 28, 2018
f7dabde
Block List: Inject inner block list creator as function
aduth Mar 7, 2018
d5da664
Typo: saved -> fetched
noisysocks Mar 9, 2018
4aac14a
Typo: preferencially -> preferentially
noisysocks Mar 9, 2018
b4afb64
Explain why dispatching RECEIVE_BLOCKS is necessary
noisysocks Mar 9, 2018
b2f16d0
Remove unnecessary getState variable
noisysocks Mar 9, 2018
04bfd26
Update getInserterItems to respect new reusable block data layout
noisysocks Mar 9, 2018
c169500
Provide createInnerBlockList context in BlockPreview
noisysocks Mar 9, 2018
2ede29e
Fix flash of 'Not found' error message when fetching a reusable block
noisysocks Mar 9, 2018
1b3f1ba
When converting reusable -> regular, replace the block with a copy
noisysocks Mar 9, 2018
4025b7a
Avoid iterating through reusable blocks twice
noisysocks Mar 14, 2018
3f0180c
Move createInnerBlockList into `editor/utils`
noisysocks Mar 14, 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
Prev Previous commit
Next Next commit
Blocks: Avoid dismissing editable controls 
In nested context, block selection changes from reusable block to the inner block being edited, but we want to keep the UI shown
  • Loading branch information
@aduth @noisysocks
aduth authored and noisysocks committed Mar 14, 2018
commit 8501e7d9fbd2c12efd47d4f191543e7b00f03c7b
8 changes: 1 addition & 7 deletions blocks/library/block/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@ class ReusableBlockEdit extends Component {
}
}

componentWillReceiveProps( nextProps ) {
if ( this.props.focus && ! nextProps.focus ) {
this.stopEditing();
}
}

startEditing() {
this.setState( { isEditing: true } );
}
Expand Down Expand Up @@ -114,7 +108,7 @@ class ReusableBlockEdit extends Component {
return (
<Fragment>
{ element }
{ isSelected && (
{ ( isSelected || isEditing ) && (
<ReusableBlockEditPanel
isEditing={ isEditing }
title={ title !== null ? title : reusableBlock.title }
Expand Down