Merge pull request #37 from wordpress-mobile/feature/new-more-block

Support for the more block
WordPress · Apr 18, 2018 · 8c8deee · 8c8deee
2 parents bdd4f60 + 359eae6
commit 8c8deee
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/block-management/block-holder.js b/block-management/block-holder.js
@@ -49,6 +49,7 @@ export default class BlockHolder extends React.Component<PropsType, StateType> {
 					attributes={ { ...this.props.attributes } }
 					// pass a curried version of onChanged with just one argument
 					setAttributes={ attrs => this.props.onChange( this.props.uid, attrs ) }
+					isSelected={ this.props.focused }
 					style={ style }
 				/>
 			);

diff --git a/gutenberg b/gutenberg
diff --git a/store/index.js b/store/index.js
@@ -14,7 +14,7 @@ export type BlockType = {
 	uid: string,
 	name: string,
 	isValid: boolean,
-	attributes: { content: string },
+	attributes: Object,
 	innerBlocks: Array<BlockType>,
 	focused: boolean,
 };
@@ -30,6 +30,10 @@ const codeBlockInstance = createBlock( 'core/code', {
 	content: 'if name == "World":\n    return "Hello World"\nelse:\n    return "Hello Pony"',
 } );
 
+const moreBlockInstance = createBlock( 'core/more', {
+	customText: undefined,
+} );
+
 const initialState: StateType = {
 	// TODO: get blocks list block state should be externalized (shared with Gutenberg at some point?).
 	// If not it should be created from a string parsing (commented HTML to json).
@@ -67,6 +71,7 @@ const initialState: StateType = {
 			focused: false,
 		},
 		{ ...codeBlockInstance, focused: false },
+		{ ...moreBlockInstance, focused: false },
 		{
 			uid: '4',
 			name: 'paragraph',

diff --git a/store/reducers/index.js b/store/reducers/index.js
@@ -65,6 +65,7 @@ export const reducer = (
 				...block,
 				attributes: nextAttributes,
 			};
+
 			return { blocks: blocks, refresh: ! state.refresh };
 		}
 		case ActionTypes.BLOCK.FOCUS: {
+2 −2		blocks/library/index.native.js
+65 −0		blocks/library/more/edit.js
+36 −0		blocks/library/more/edit.native.js
+25 −0		blocks/library/more/editor.native.scss
+3 −56		blocks/library/more/index.js
+1 −1		blocks/plain-text/style.native.scss