Writing Flow: Always add an empty at the end of the block list #3623
+134
−366
There are no files selected for viewing
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /** | ||
| * External dependencies | ||
| */ | ||
| import { connect } from 'react-redux'; | ||
| import classnames from 'classnames'; | ||
| import 'element-closest'; | ||
|
|
||
| /** | ||
| * WordPress dependencies | ||
| */ | ||
| import { __ } from '@wordpress/i18n'; | ||
| import { Component } from '@wordpress/element'; | ||
| import { getDefaultBlockName, createBlock } from '@wordpress/blocks'; | ||
|
|
||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import './style.scss'; | ||
| import BlockDropZone from '../block-drop-zone'; | ||
| import { insertBlock } from '../../actions'; | ||
| import { getBlockCount } from '../../selectors'; | ||
|
|
||
| class DefaultBlockAppender extends Component { | ||
| constructor( props ) { | ||
| super( props ); | ||
| this.appendDefaultBlock = this.appendDefaultBlock.bind( this ); | ||
| } | ||
|
|
||
| appendDefaultBlock() { | ||
| const newBlock = createBlock( getDefaultBlockName() ); | ||
| this.props.onInsertBlock( newBlock ); | ||
| } | ||
|
|
||
| render() { | ||
| const { count } = this.props; | ||
|
|
||
| const className = classnames( 'editor-default-block-appender', { | ||
| 'is-visible-placeholder': count === 0, | ||
| } ); | ||
|
|
||
| return ( | ||
| <div className={ className }> | ||
| <BlockDropZone /> | ||
| { count === 0 && | ||
| <input | ||
| className="editor-default-block-appender__content" | ||
| type="text" | ||
| readOnly | ||
| onFocus={ this.appendDefaultBlock } | ||
| onClick={ this.appendDefaultBlock } | ||
| onKeyDown={ this.appendDefaultBlock } | ||
|
There was a problem hiding this comment. In what case could a There was a problem hiding this comment. Good catch, probably a useless event handler. |
||
| value={ __( 'Write your story' ) } | ||
| /> | ||
| } | ||
| { count !== 0 && | ||
| <button | ||
| className="editor-default-block-appender__content" | ||
| onClick={ this.appendDefaultBlock } | ||
| /> | ||
| } | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| export default connect( | ||
|
There was a problem hiding this comment. it would be nice to have 3 unit tests:
I can add them, just ping me :) |
||
| ( state ) => ( { | ||
| count: getBlockCount( state ), | ||
| } ), | ||
| { onInsertBlock: insertBlock } | ||
| )( DefaultBlockAppender ); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| $empty-paragraph-height: $text-editor-font-size * 4; | ||
|
|
||
| .editor-default-block-appender { | ||
| &.is-visible-placeholder .editor-default-block-appender__content { | ||
| height: $empty-paragraph-height; | ||
| color: $dark-gray-300; | ||
| outline: 1px solid transparent; | ||
| transition: 0.2s outline; | ||
|
|
||
| &:hover { | ||
| outline: 1px solid $light-gray-500; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .editor-default-block-appender__content, | ||
| input[type=text].editor-default-block-appender__content { | ||
| border: none; | ||
| background: none; | ||
| box-shadow: none; | ||
| display: block; | ||
| width: 100%; | ||
| height: $empty-paragraph-height * 1.5; | ||
| font-size: $editor-font-size; | ||
| line-height: $editor-line-height; | ||
| cursor: text; | ||
| max-width: none; // fixes a bleed issue from the admin | ||
|
|
||
| &:focus { | ||
| outline: 1px solid $light-gray-500; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it make sense to update
createBlockdefinition to simplify this call to:There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know :)