From da74ef126620dc62de470c0b7e719a572434e598 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Wed, 20 Feb 2019 12:24:40 +0300 Subject: [PATCH 01/15] Add focus style borders to title as well --- gutenberg | 2 +- src/block-management/block-holder.js | 22 ++++------------- src/block-management/block-holder.scss | 16 ------------- src/block-management/block-manager.js | 32 ++++++++++++++++++++++--- src/block-management/block-manager.scss | 17 +++++++++++++ 5 files changed, 51 insertions(+), 38 deletions(-) diff --git a/gutenberg b/gutenberg index 23e59d1f36..2f45c941b4 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 23e59d1f3601164788278297e5cbb33d0c1d31e5 +Subproject commit 2f45c941b44c4652d8692833cbc56512fda48b5f diff --git a/src/block-management/block-holder.js b/src/block-management/block-holder.js index 0c0ebc1196..5e6ca4e35f 100644 --- a/src/block-management/block-holder.js +++ b/src/block-management/block-holder.js @@ -8,8 +8,6 @@ import { View, Text, TouchableWithoutFeedback, - Dimensions, - LayoutChangeEvent, NativeSyntheticEvent, NativeTouchEvent, } from 'react-native'; @@ -34,6 +32,7 @@ type PropsType = BlockType & { isFirstBlock: boolean, isLastBlock: boolean, showTitle: boolean, + focusedStyle: mixed, getBlockIndex: ( clientId: string, rootClientId: string ) => number, getPreviousBlockClientId: ( clientId: string ) => string, getNextBlockClientId: ( clientId: string ) => string, @@ -125,19 +124,6 @@ export class BlockHolder extends React.Component { } }; - onBlockHolderLayout = ( event: LayoutChangeEvent ) => { - const { width: fullWidth } = Dimensions.get( 'window' ); - const { width } = event.nativeEvent.layout; - const isFullyBordered = fullWidth > width; - if ( isFullyBordered !== this.state.isFullyBordered ) { - this.setState( { ...this.state, isFullyBordered } ); - } - } - - blockHolderFocusedStyle() { - return this.state.isFullyBordered ? styles.blockHolderFocusedFullBordered : styles.blockHolderFocusedSemiBordered; - } - renderToolbar() { if ( ! this.props.isSelected ) { return null; @@ -178,11 +164,11 @@ export class BlockHolder extends React.Component { } render() { - const { isSelected } = this.props; + const { isSelected, focusedStyle } = this.props; return ( - - + + { this.props.showTitle && this.renderBlockTitle() } { this.getBlockForType() } { this.renderToolbar() } diff --git a/src/block-management/block-holder.scss b/src/block-management/block-holder.scss index 5dd7646924..de18de2591 100644 --- a/src/block-management/block-holder.scss +++ b/src/block-management/block-holder.scss @@ -7,22 +7,6 @@ flex: 1 1 auto; } -.blockHolderFocusedSemiBordered { - border-color: $gray-lighten-30; - border-top-width: 1px; - border-bottom-width: 1px; - border-left-width: 0; - border-right-width: 0; -} - -.blockHolderFocusedFullBordered { - border-color: $gray-lighten-30; - border-top-width: 1px; - border-bottom-width: 1px; - border-left-width: 1px; - border-right-width: 1px; -} - .blockContainer { background-color: white; padding-left: 16; diff --git a/src/block-management/block-manager.js b/src/block-management/block-manager.js index 905abc59a9..532bf8619a 100644 --- a/src/block-management/block-manager.js +++ b/src/block-management/block-manager.js @@ -11,7 +11,7 @@ import { __ } from '@wordpress/i18n'; import React from 'react'; import { identity } from 'lodash'; -import { Text, View, Keyboard, LayoutChangeEvent, SafeAreaView } from 'react-native'; +import { Text, View, Keyboard, LayoutChangeEvent, SafeAreaView, Dimensions } from 'react-native'; import BlockHolder from './block-holder'; import type { BlockType } from '../store/types'; import styles from './block-manager.scss'; @@ -52,6 +52,7 @@ type StateType = { isKeyboardVisible: boolean, rootViewHeight: number; safeAreaBottomInset: number; + isFullyBordered: boolean; }; export class BlockManager extends React.Component { @@ -73,12 +74,16 @@ export class BlockManager extends React.Component { ( this: any ).keyboardDidHide = this.keyboardDidHide.bind( this ); ( this: any ).onCaretVerticalPositionChange = this.onCaretVerticalPositionChange.bind( this ); ( this: any ).scrollViewInnerRef = this.scrollViewInnerRef.bind( this ); + ( this: any ).onTitleFocusStatusChange = this.onTitleFocusStatusChange.bind( this ); + ( this: any ).onContentViewLayout = this.onContentViewLayout.bind( this ); this.state = { blockTypePickerVisible: false, isKeyboardVisible: false, rootViewHeight: 0, safeAreaBottomInset: 0, + isFullyBordered: false, + isTitleFocused: false, }; SafeArea.getSafeAreaInsetsForRootView().then( this.onSafeAreaInsetsUpdate ); } @@ -124,6 +129,19 @@ export class BlockManager extends React.Component { } ); } + onContentViewLayout = ( event: LayoutChangeEvent ) => { + const { width: fullWidth } = Dimensions.get( 'window' ); + const { width } = event.nativeEvent.layout; + const isFullyBordered = fullWidth > width; + if ( isFullyBordered !== this.state.isFullyBordered ) { + this.setState( { ...this.state, isFullyBordered } ); + } + } + + blockHolderFocusedStyle() { + return this.state.isFullyBordered ? styles.blockHolderFocusedFullBordered : styles.blockHolderFocusedSemiBordered; + } + componentDidMount() { Keyboard.addListener( 'keyboardDidShow', this.keyboardDidShow ); Keyboard.addListener( 'keyboardDidHide', this.keyboardDidHide ); @@ -170,11 +188,16 @@ export class BlockManager extends React.Component { ); } + onTitleFocusStatusChange( isFocused: boolean ) { + this.setState( { isTitleFocused: isFocused } ); + } + renderHeader() { const focusTitle = this.props.title === '' && this.props.blockCount === 0; + const { isTitleFocused } = this.state; return ( - + { if ( focusTitle && ref ) { @@ -182,6 +205,7 @@ export class BlockManager extends React.Component { this.titleViewRef = ref; } } } + onFocusStatusChange={ this.onTitleFocusStatusChange } title={ this.props.title } onUpdate={ this.props.setTitleAction } placeholder={ 'Add a Title' } /> @@ -191,7 +215,7 @@ export class BlockManager extends React.Component { renderList() { return ( - + { keyboardShouldPersistTaps="always" style={ styles.list } data={ this.props.blockClientIds } + extraData={ [ this.state.isTitleFocused, this.state.isFullyBordered ] } keyExtractor={ identity } renderItem={ this.renderItem } shouldPreventAutomaticScroll={ this.shouldFlatListPreventAutomaticScroll } @@ -264,6 +289,7 @@ export class BlockManager extends React.Component { clientId={ clientId } rootClientId={ this.props.rootClientId } onCaretVerticalPositionChange={ this.onCaretVerticalPositionChange } + focusedStyle={ this.blockHolderFocusedStyle() } /> { this.state.blockTypePickerVisible && this.props.isBlockSelected( clientId ) && ( diff --git a/src/block-management/block-manager.scss b/src/block-management/block-manager.scss index 673a0f4198..3f908a9f40 100644 --- a/src/block-management/block-manager.scss +++ b/src/block-management/block-manager.scss @@ -1,6 +1,7 @@ /** @format */ @import '../variables.scss'; +@import 'colors.scss'; .container { flex: 1; @@ -56,4 +57,20 @@ bottom: 0; right: 0; left: 0; +} + +.blockHolderFocusedSemiBordered { + border-color: $gray-lighten-30; + border-top-width: 1px; + border-bottom-width: 1px; + border-left-width: 0; + border-right-width: 0; +} + +.blockHolderFocusedFullBordered { + border-color: $gray-lighten-30; + border-top-width: 1px; + border-bottom-width: 1px; + border-left-width: 1px; + border-right-width: 1px; } \ No newline at end of file From 3142ee96076a69ad0be503d6f6b111c879390ef5 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Wed, 20 Feb 2019 14:52:50 +0300 Subject: [PATCH 02/15] Fix isFullyBordered calculated wrong on Android --- src/block-management/block-manager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/block-management/block-manager.js b/src/block-management/block-manager.js index 532bf8619a..feb607c5dd 100644 --- a/src/block-management/block-manager.js +++ b/src/block-management/block-manager.js @@ -132,7 +132,7 @@ export class BlockManager extends React.Component { onContentViewLayout = ( event: LayoutChangeEvent ) => { const { width: fullWidth } = Dimensions.get( 'window' ); const { width } = event.nativeEvent.layout; - const isFullyBordered = fullWidth > width; + const isFullyBordered = fullWidth > width + 1; //+1 is for not letting fraction differences effect the result on Android if ( isFullyBordered !== this.state.isFullyBordered ) { this.setState( { ...this.state, isFullyBordered } ); } From 210ec63a82d121e90cc18e4a44f14fb0abd3c791 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Wed, 20 Feb 2019 15:13:34 +0300 Subject: [PATCH 03/15] Fix flow issue --- src/block-management/block-manager.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/block-management/block-manager.js b/src/block-management/block-manager.js index feb607c5dd..e0d8c82686 100644 --- a/src/block-management/block-manager.js +++ b/src/block-management/block-manager.js @@ -53,6 +53,7 @@ type StateType = { rootViewHeight: number; safeAreaBottomInset: number; isFullyBordered: boolean; + isTitleFocused: boolean; }; export class BlockManager extends React.Component { From b4be10299a120ad0d9f97194ef8e73bcb099fd29 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Wed, 20 Feb 2019 16:45:59 +0300 Subject: [PATCH 04/15] Update gutenberg repo --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 2f45c941b4..c2c0c8be72 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 2f45c941b44c4652d8692833cbc56512fda48b5f +Subproject commit c2c0c8be72cd47126322865821de19dc0b8d63cb From 6b23698e8a32c246990acec29cce0fe9c621b38f Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Thu, 21 Feb 2019 14:07:06 +0300 Subject: [PATCH 05/15] Enable title borders when title is focused programmatically Also border styling mechanism changes, we start just to play with border colors in order to provide smoother animation This also solves Android's re-render title issue on the first tap --- gutenberg | 2 +- src/block-management/block-holder.js | 6 +++-- src/block-management/block-manager.js | 33 +++++++++---------------- src/block-management/block-manager.scss | 7 ------ 4 files changed, 17 insertions(+), 31 deletions(-) diff --git a/gutenberg b/gutenberg index 1c3db32bfa..ab190c5221 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 1c3db32bfa28ebbc734d34fb3bd0c3c57fca024d +Subproject commit ab190c5221e7c42d457d0aa857ba7a3f75d5dd9c diff --git a/src/block-management/block-holder.js b/src/block-management/block-holder.js index 5e6ca4e35f..3fb11713c5 100644 --- a/src/block-management/block-holder.js +++ b/src/block-management/block-holder.js @@ -32,7 +32,7 @@ type PropsType = BlockType & { isFirstBlock: boolean, isLastBlock: boolean, showTitle: boolean, - focusedStyle: mixed, + focusedStyle: Object, getBlockIndex: ( clientId: string, rootClientId: string ) => number, getPreviousBlockClientId: ( clientId: string ) => string, getNextBlockClientId: ( clientId: string ) => string, @@ -166,9 +166,11 @@ export class BlockHolder extends React.Component { render() { const { isSelected, focusedStyle } = this.props; + const borderColor = isSelected ? focusedStyle.borderColor : 'transparent'; + return ( - + { this.props.showTitle && this.renderBlockTitle() } { this.getBlockForType() } { this.renderToolbar() } diff --git a/src/block-management/block-manager.js b/src/block-management/block-manager.js index 029b185239..8bba285701 100644 --- a/src/block-management/block-manager.js +++ b/src/block-management/block-manager.js @@ -58,7 +58,7 @@ type StateType = { export class BlockManager extends React.Component { scrollViewRef: Object; - titleViewRef: Object; + postTitleRef: ?Object; subscriptionParentSetFocusOnTitle: ?Object; constructor( props: PropsType ) { @@ -75,7 +75,6 @@ export class BlockManager extends React.Component { ( this: any ).keyboardDidHide = this.keyboardDidHide.bind( this ); ( this: any ).onCaretVerticalPositionChange = this.onCaretVerticalPositionChange.bind( this ); ( this: any ).scrollViewInnerRef = this.scrollViewInnerRef.bind( this ); - ( this: any ).onTitleFocusStatusChange = this.onTitleFocusStatusChange.bind( this ); ( this: any ).onContentViewLayout = this.onContentViewLayout.bind( this ); this.state = { @@ -148,8 +147,8 @@ export class BlockManager extends React.Component { Keyboard.addListener( 'keyboardDidHide', this.keyboardDidHide ); SafeArea.addEventListener( 'safeAreaInsetsForRootViewDidChange', this.onSafeAreaInsetsUpdate ); this.subscriptionParentSetFocusOnTitle = subscribeSetFocusOnTitle( ( ) => { - if ( this.titleViewRef ) { - this.titleViewRef.focus(); + if ( this.postTitleRef ) { + this.postTitleRef.focus(); } } ); } @@ -189,24 +188,16 @@ export class BlockManager extends React.Component { ); } - onTitleFocusStatusChange( isFocused: boolean ) { - this.setState( { isTitleFocused: isFocused } ); - } - renderHeader() { - const { isTitleFocused } = this.state; - return ( - - { - this.titleViewRef = ref; - } } - onFocusStatusChange={ this.onTitleFocusStatusChange } - title={ this.props.title } - onUpdate={ this.props.setTitleAction } - placeholder={ __( 'Add title' ) } /> - + { + this.postTitleRef = ref; + } } + title={ this.props.title } + onUpdate={ this.props.setTitleAction } + placeholder={ __( 'Add title' ) } + focusedStyle={ this.blockHolderFocusedStyle() } /> ); } @@ -222,7 +213,7 @@ export class BlockManager extends React.Component { keyboardShouldPersistTaps="always" style={ styles.list } data={ this.props.blockClientIds } - extraData={ [ this.state.isTitleFocused, this.state.isFullyBordered ] } + extraData={ [ this.state.isFullyBordered ] } keyExtractor={ identity } renderItem={ this.renderItem } shouldPreventAutomaticScroll={ this.shouldFlatListPreventAutomaticScroll } diff --git a/src/block-management/block-manager.scss b/src/block-management/block-manager.scss index f4747d4666..7ad4a7870d 100644 --- a/src/block-management/block-manager.scss +++ b/src/block-management/block-manager.scss @@ -9,13 +9,6 @@ background-color: #fff; } -.titleContainer { - padding-left: 16; - padding-right: 16; - padding-top: 32; - padding-bottom: 16; -} - .list { flex: 1; } From eaca711c195ee7297bed50cc616688052c7359e5 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Thu, 21 Feb 2019 14:50:13 +0300 Subject: [PATCH 06/15] Fix unittests and update props --- __mocks__/styleMock.js | 3 +++ gutenberg | 2 +- jest/setup.js | 1 + src/block-management/block-holder.js | 9 +++++---- src/block-management/block-manager.js | 10 ++++++---- src/block-management/block-manager.scss | 10 ++++++---- 6 files changed, 22 insertions(+), 13 deletions(-) diff --git a/__mocks__/styleMock.js b/__mocks__/styleMock.js index 505dc720a4..28bd419865 100644 --- a/__mocks__/styleMock.js +++ b/__mocks__/styleMock.js @@ -25,4 +25,7 @@ module.exports = { 'editor-plain-text': { fontFamily: 'serif', }, + blockHolderFocused: { + borderColor: 'gray', + }, }; diff --git a/gutenberg b/gutenberg index ab190c5221..aead0026e3 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit ab190c5221e7c42d457d0aa857ba7a3f75d5dd9c +Subproject commit aead0026e3a19632a64535fc55048d7c9570f80d diff --git a/jest/setup.js b/jest/setup.js index 096ba2d334..1597ba7a95 100644 --- a/jest/setup.js +++ b/jest/setup.js @@ -26,3 +26,4 @@ jest.mock( 'react-native-safe-area', () => { } ); jest.mock( 'react-native-recyclerview-list' ); + diff --git a/src/block-management/block-holder.js b/src/block-management/block-holder.js index 3fb11713c5..42fdedf4af 100644 --- a/src/block-management/block-holder.js +++ b/src/block-management/block-holder.js @@ -32,7 +32,8 @@ type PropsType = BlockType & { isFirstBlock: boolean, isLastBlock: boolean, showTitle: boolean, - focusedStyle: Object, + borderStyle: Object, + focusedBorderColor: string, getBlockIndex: ( clientId: string, rootClientId: string ) => number, getPreviousBlockClientId: ( clientId: string ) => string, getNextBlockClientId: ( clientId: string ) => string, @@ -164,13 +165,13 @@ export class BlockHolder extends React.Component { } render() { - const { isSelected, focusedStyle } = this.props; + const { isSelected, borderStyle, focusedBorderColor } = this.props; - const borderColor = isSelected ? focusedStyle.borderColor : 'transparent'; + const borderColor = isSelected ? focusedBorderColor : 'transparent'; return ( - + { this.props.showTitle && this.renderBlockTitle() } { this.getBlockForType() } { this.renderToolbar() } diff --git a/src/block-management/block-manager.js b/src/block-management/block-manager.js index 8bba285701..73e43ce576 100644 --- a/src/block-management/block-manager.js +++ b/src/block-management/block-manager.js @@ -138,8 +138,8 @@ export class BlockManager extends React.Component { } } - blockHolderFocusedStyle() { - return this.state.isFullyBordered ? styles.blockHolderFocusedFullBordered : styles.blockHolderFocusedSemiBordered; + blockHolderBorderStyle() { + return this.state.isFullyBordered ? styles.blockHolderFullBordered : styles.blockHolderSemiBordered; } componentDidMount() { @@ -197,7 +197,8 @@ export class BlockManager extends React.Component { title={ this.props.title } onUpdate={ this.props.setTitleAction } placeholder={ __( 'Add title' ) } - focusedStyle={ this.blockHolderFocusedStyle() } /> + borderStyle={ this.blockHolderBorderStyle() } + focusedBorderColor={ styles.blockHolderFocused.borderColor } /> ); } @@ -277,7 +278,8 @@ export class BlockManager extends React.Component { clientId={ clientId } rootClientId={ this.props.rootClientId } onCaretVerticalPositionChange={ this.onCaretVerticalPositionChange } - focusedStyle={ this.blockHolderFocusedStyle() } + borderStyle={ this.blockHolderBorderStyle() } + focusedBorderColor={ styles.blockHolder.borderColor } /> { this.state.blockTypePickerVisible && this.props.isBlockSelected( clientId ) && ( diff --git a/src/block-management/block-manager.scss b/src/block-management/block-manager.scss index 7ad4a7870d..742f0f92bc 100644 --- a/src/block-management/block-manager.scss +++ b/src/block-management/block-manager.scss @@ -52,18 +52,20 @@ left: 0; } -.blockHolderFocusedSemiBordered { - border-color: $gray-lighten-30; +.blockHolderSemiBordered { border-top-width: 1px; border-bottom-width: 1px; border-left-width: 0; border-right-width: 0; } -.blockHolderFocusedFullBordered { - border-color: $gray-lighten-30; +.blockHolderFullBordered { border-top-width: 1px; border-bottom-width: 1px; border-left-width: 1px; border-right-width: 1px; +} + +.blockHolderFocused { + border-color: $gray-lighten-30; } \ No newline at end of file From f59c15557d259867b60b73272d55f3a588a06866 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Thu, 21 Feb 2019 14:55:53 +0300 Subject: [PATCH 07/15] Delete unnecessary newline --- jest/setup.js | 1 - 1 file changed, 1 deletion(-) diff --git a/jest/setup.js b/jest/setup.js index 1597ba7a95..096ba2d334 100644 --- a/jest/setup.js +++ b/jest/setup.js @@ -26,4 +26,3 @@ jest.mock( 'react-native-safe-area', () => { } ); jest.mock( 'react-native-recyclerview-list' ); - From 4b679378da490509c1f7efd3f05cfd1c8ca1bf11 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Thu, 21 Feb 2019 14:57:57 +0300 Subject: [PATCH 08/15] Remove unnecessary prop --- src/block-management/block-manager.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/block-management/block-manager.js b/src/block-management/block-manager.js index 73e43ce576..5b67498402 100644 --- a/src/block-management/block-manager.js +++ b/src/block-management/block-manager.js @@ -53,7 +53,6 @@ type StateType = { rootViewHeight: number; safeAreaBottomInset: number; isFullyBordered: boolean; - isTitleFocused: boolean; }; export class BlockManager extends React.Component { @@ -83,7 +82,6 @@ export class BlockManager extends React.Component { rootViewHeight: 0, safeAreaBottomInset: 0, isFullyBordered: false, - isTitleFocused: false, }; SafeArea.getSafeAreaInsetsForRootView().then( this.onSafeAreaInsetsUpdate ); } From 61d2b868153b99cfeb222440b02e2232777e2aa7 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Thu, 21 Feb 2019 15:01:31 +0300 Subject: [PATCH 09/15] Update style name --- src/block-management/block-manager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/block-management/block-manager.js b/src/block-management/block-manager.js index 5b67498402..cb2ba6d79a 100644 --- a/src/block-management/block-manager.js +++ b/src/block-management/block-manager.js @@ -277,7 +277,7 @@ export class BlockManager extends React.Component { rootClientId={ this.props.rootClientId } onCaretVerticalPositionChange={ this.onCaretVerticalPositionChange } borderStyle={ this.blockHolderBorderStyle() } - focusedBorderColor={ styles.blockHolder.borderColor } + focusedBorderColor={ styles.blockHolderFocused.borderColor } /> { this.state.blockTypePickerVisible && this.props.isBlockSelected( clientId ) && ( From 67b509a695a813426ba49cb0e32fb6098933abf8 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Thu, 21 Feb 2019 17:51:20 +0300 Subject: [PATCH 10/15] Update onRef as ref --- gutenberg | 2 +- src/block-management/block-manager.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index aead0026e3..551285b9e3 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit aead0026e3a19632a64535fc55048d7c9570f80d +Subproject commit 551285b9e3e9fd5afa91f83fd927ba360ad5574e diff --git a/src/block-management/block-manager.js b/src/block-management/block-manager.js index cb2ba6d79a..71f88cda57 100644 --- a/src/block-management/block-manager.js +++ b/src/block-management/block-manager.js @@ -189,7 +189,7 @@ export class BlockManager extends React.Component { renderHeader() { return ( { + ref={ ( ref ) => { this.postTitleRef = ref; } } title={ this.props.title } From dc3cc0f87492579ede6309b7a0b38895203b6843 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Thu, 21 Feb 2019 18:02:16 +0300 Subject: [PATCH 11/15] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 551285b9e3..ae02d78ee0 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 551285b9e3e9fd5afa91f83fd927ba360ad5574e +Subproject commit ae02d78ee05824c88762cb3d321f095c8c9e2c5e From eb33a79cfce9c04ba3d81e436a8de99b6f32a991 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Thu, 21 Feb 2019 18:55:42 +0300 Subject: [PATCH 12/15] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index ae02d78ee0..7f763d3e3f 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit ae02d78ee05824c88762cb3d321f095c8c9e2c5e +Subproject commit 7f763d3e3f09e6db57ec9251e9ebfb50f0ba6c50 From 8856e7f1f5942f3a6cd4ae33cdf9cd6967af7462 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Thu, 21 Feb 2019 19:03:08 +0300 Subject: [PATCH 13/15] Update gutenberg repo ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 7f763d3e3f..762f7696c3 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 7f763d3e3f09e6db57ec9251e9ebfb50f0ba6c50 +Subproject commit 762f7696c312e3c2f2ebea47aa30d644e6fc041f From cdd7e9f415d16004b9a7d7a4fae3cf7c9d186627 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Thu, 21 Feb 2019 19:13:15 +0300 Subject: [PATCH 14/15] Update ref as innerRef --- gutenberg | 2 +- src/block-management/block-manager.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index 762f7696c3..672be5c6e4 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 762f7696c312e3c2f2ebea47aa30d644e6fc041f +Subproject commit 672be5c6e4053195f05a803311f7266fe2dff5e7 diff --git a/src/block-management/block-manager.js b/src/block-management/block-manager.js index 71f88cda57..2707592111 100644 --- a/src/block-management/block-manager.js +++ b/src/block-management/block-manager.js @@ -189,7 +189,7 @@ export class BlockManager extends React.Component { renderHeader() { return ( { + innerRef={ ( ref ) => { this.postTitleRef = ref; } } title={ this.props.title } From 85b1a1f1eb4aefdf5a1617a6ade2ad773b062345 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Thu, 21 Feb 2019 20:11:52 +0300 Subject: [PATCH 15/15] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 672be5c6e4..7c32d3aa8b 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 672be5c6e4053195f05a803311f7266fe2dff5e7 +Subproject commit 7c32d3aa8b38e20acd4a17814128e62bf900a331