Skip to content
This repository was archived by the owner on Jul 9, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
726ab5c
Added Toolbar style
marecar3 Nov 8, 2018
d4b4cce
Updated gutenberg submodule
marecar3 Nov 8, 2018
90e8cef
Merge branch 'master' into feature/toolbar_component_ui
marecar3 Nov 13, 2018
1e9922a
Update gutenberg submodule
marecar3 Nov 13, 2018
68d819c
Update gutenberg submodule
marecar3 Nov 13, 2018
b4d93cf
Merge branch 'master' into feature/toolbar_component_ui
marecar3 Nov 13, 2018
7c8d700
Move toolbar style to .scss file
marecar3 Nov 13, 2018
3d9282b
Updated gutenberg submodule
marecar3 Nov 13, 2018
7c0d336
Small fix
marecar3 Nov 13, 2018
b872b00
Updated gutenberg submodule
marecar3 Nov 13, 2018
4bfeac7
Merge
marecar3 Nov 15, 2018
2e9ed0f
Updated yarn lock
marecar3 Nov 15, 2018
e62cff5
Merge branch 'master' into feature/toolbar_component_ui
marecar3 Nov 19, 2018
e4fbc6f
Update gutenberg sumobule
marecar3 Nov 19, 2018
ea80ce6
Updated react-nagive-svg to newest version
marecar3 Nov 19, 2018
b32a820
Merge branch 'master' into feature/toolbar_component_ui
marecar3 Nov 20, 2018
947eebc
Updated gutenberg submodule
marecar3 Nov 20, 2018
6451731
Merge
marecar3 Nov 20, 2018
cefe224
Updated gutenberg submodule
marecar3 Nov 20, 2018
952e52e
Updated yarn file
marecar3 Nov 20, 2018
9c95565
Updated gutenberg submodule
marecar3 Nov 20, 2018
783f76d
Fixes and updates
marecar3 Nov 21, 2018
ead63c5
Updated gutenberg submodule
marecar3 Nov 21, 2018
9a50c82
Updated gutenberg sumobule
marecar3 Nov 21, 2018
815e367
Updated gutenberg submodule
marecar3 Nov 22, 2018
f59548a
Separate KeyboardAvoidingView logic for iOS and Android
marecar3 Nov 22, 2018
5dee6ab
Updated gutenberg submodule
marecar3 Nov 22, 2018
e9483ec
Merge branch 'master' into feature/toolbar_component_ui
marecar3 Nov 22, 2018
f1bb234
Small fix
marecar3 Nov 22, 2018
337dc6f
Removed bad merge data
marecar3 Nov 22, 2018
40d4b50
Removed unused import
marecar3 Nov 22, 2018
8c8033f
Fixed failed tests
marecar3 Nov 22, 2018
31e3b88
Updated gutenberg submodule
marecar3 Nov 22, 2018
e252de2
Small fix
marecar3 Nov 22, 2018
64ab25e
Implemented keyboard hide button (#241)
marecar3 Nov 22, 2018
6e1ba63
Updated gutenberg submobule
marecar3 Nov 22, 2018
034ef45
Updated gutenberg submodule
marecar3 Nov 22, 2018
ab77487
Merge branch 'master' into feature/toolbar_component_ui
marecar3 Nov 22, 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
2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 92 files
+0 −5 .travis.yml
+2 −0 CONTRIBUTORS.md
+1 −2 docs/contributors/scripts.md
+2 −2 docs/designers-developers/developers/block-api/block-registration.md
+5 −3 docs/designers-developers/developers/data/data-core-editor.md
+1 −1 gutenberg.php
+3 −10 lib/client-assets.php
+2 −1 lib/packages-dependencies.php
+5 −0 lib/rest-api.php
+5 −3 package-lock.json
+1 −1 package.json
+2 −1 packages/annotations/package.json
+41 −14 packages/annotations/src/format/annotation.js
+14 −3 packages/annotations/src/store/selectors.js
+1 −1 packages/block-library/package.json
+7 −7 packages/block-library/src/archives/index.php
+1 −1 packages/block-library/src/categories/index.php
+1 −1 packages/block-library/src/columns/editor.scss
+21 −1 packages/block-library/src/cover/style.scss
+1 −0 packages/block-library/src/editor.scss
+7 −4 packages/block-library/src/embed/edit.js
+7 −2 packages/block-library/src/embed/embed-placeholder.js
+11 −1 packages/block-library/src/embed/settings.js
+14 −0 packages/block-library/src/embed/util.js
+3 −3 packages/block-library/src/image/edit.js
+2 −2 packages/block-library/src/image/edit.native.js
+3 −3 packages/block-library/src/latest-comments/index.php
+1 −1 packages/block-library/src/latest-posts/index.php
+1 −0 packages/block-library/src/media-text/index.js
+1 −1 packages/block-library/src/media-text/media-container.js
+6 −0 packages/block-library/src/paragraph/editor.scss
+1 −1 packages/blocks/package.json
+1 −1 packages/components/package.json
+56 −5 packages/components/src/button/index.native.js
+4 −0 packages/components/src/dashicon/icon-class.js
+4 −0 packages/components/src/dashicon/icon-class.native.js
+5 −3 packages/components/src/dashicon/index.js
+4 −6 packages/components/src/icon-button/index.js
+1 −0 packages/components/src/index.native.js
+11 −13 packages/components/src/primitives/svg/index.native.js
+14 −0 packages/components/src/primitives/svg/style.native.scss
+7 −0 packages/components/src/toolbar/style.native.scss
+6 −2 packages/components/src/toolbar/toolbar-container.native.js
+1 −1 packages/edit-post/package.json
+1 −0 packages/edit-post/src/components/header/more-menu/index.js
+2 −0 packages/edit-post/src/components/header/more-menu/test/__snapshots__/index.js.snap
+8 −8 packages/edit-post/src/components/sidebar/settings-header/index.js
+1 −1 packages/editor/package.json
+1 −1 packages/editor/src/components/block-switcher/index.js
+7 −5 packages/editor/src/components/document-outline/index.js
+4 −20 packages/editor/src/components/document-outline/test/__snapshots__/index.js.snap
+1 −0 packages/editor/src/components/inserter/index.js
+0 −4 packages/editor/src/components/rich-text/README.md
+0 −6 packages/editor/src/components/rich-text/style.scss
+9 −0 packages/editor/src/components/rich-text/tinymce.js
+1 −0 packages/editor/src/components/table-of-contents/index.js
+19 −5 packages/editor/src/store/selectors.js
+23 −0 packages/editor/src/store/test/selectors.js
+1 −1 packages/format-library/package.json
+16 −3 packages/format-library/src/link/inline.js
+2 −1 packages/html-entities/package.json
+2 −1 packages/keycodes/package.json
+1 −1 packages/list-reusable-blocks/package.json
+1 −1 packages/nux/package.json
+1 −1 packages/rich-text/package.json
+27 −8 packages/rich-text/src/register-format-type.js
+4 −0 phpcs.xml.dist
+7 −0 test/e2e/specs/__snapshots__/embedding.test.js.snap
+7 −0 test/e2e/specs/__snapshots__/format-api.test.js.snap
+6 −0 test/e2e/specs/__snapshots__/links.test.js.snap
+45 −10 test/e2e/specs/embedding.test.js
+41 −0 test/e2e/specs/format-api.test.js
+25 −0 test/e2e/specs/links.test.js
+1 −1 test/e2e/specs/preferences.test.js
+4 −0 test/e2e/support/utils/are-pre-publish-checks-enabled.js
+3 −0 test/e2e/support/utils/clear-local-storage.js
+9 −0 test/e2e/support/utils/click-button.js
+0 −1 test/e2e/support/utils/click-on-more-menu-item.js
+5 −0 test/e2e/support/utils/convert-block.js
+3 −0 test/e2e/support/utils/disable-pre-publish-checks.js
+3 −0 test/e2e/support/utils/enable-pre-publish-checks.js
+7 −0 test/e2e/support/utils/get-url.js
+6 −0 test/e2e/support/utils/go-to-wp-path.js
+1 −0 test/e2e/support/utils/index.js
+7 −0 test/e2e/support/utils/is-wp-path.js
+6 −0 test/e2e/support/utils/login.js
+28 −10 test/e2e/support/utils/set-up-response-mocking.js
+5 −0 test/e2e/support/utils/set-viewport.js
+4 −0 test/e2e/support/utils/switch-to-editor.js
+6 −1 test/e2e/support/utils/visit-admin.js
+23 −0 test/e2e/test-plugins/format-api.php
+33 −0 test/e2e/test-plugins/format-api/index.js
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
"react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3",
"react-native-modal": "^6.5.0",
"react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#v1.0.0",
"react-native-svg": "6.5.2",
"react-native-svg": "8.0.8",
"react-redux": "^5.0.7",
"redux": "^3.7.2",
"redux-multi": "^0.1.12",
Expand Down
43 changes: 39 additions & 4 deletions src/block-management/block-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,22 @@
import React from 'react';
import { isEqual } from 'lodash';

import { Platform, Switch, Text, View, FlatList, KeyboardAvoidingView } from 'react-native';
import { Switch, Text, View, FlatList, Keyboard } from 'react-native';
import BlockHolder from './block-holder';
import { InlineToolbarButton } from './constants';
import type { BlockType } from '../store/types';
import styles from './block-manager.scss';
import BlockPicker from './block-picker';
import HTMLTextInput from '../components/html-text-input';
import BlockToolbar from './block-toolbar';
import KeyboardAvoidingView from '../components/keyboard-avoiding-view';

// Gutenberg imports
import { createBlock } from '@wordpress/blocks';
import EventEmitter from 'events';

const keyboardDidShow = 'keyboardDidShow';
const keyboardDidHide = 'keyboardDidHide';

export type BlockListType = {
onChange: ( clientId: string, attributes: mixed ) => void,
Expand All @@ -40,9 +45,13 @@ type StateType = {
blocks: Array<BlockType>,
selectedBlockType: string,
refresh: boolean,
isKeyboardVisible: boolean,
};

export default class BlockManager extends React.Component<PropsType, StateType> {
keyboardDidShowListener: EventEmitter;
keyboardDidHideListener: EventEmitter;

constructor( props: PropsType ) {
super( props );

Expand All @@ -59,6 +68,7 @@ export default class BlockManager extends React.Component<PropsType, StateType>
blockTypePickerVisible: false,
selectedBlockType: 'core/paragraph', // just any valid type to start from
refresh: false,
isKeyboardVisible: false,
};
}

Expand All @@ -68,6 +78,10 @@ export default class BlockManager extends React.Component<PropsType, StateType>
this.setState( { ...this.state, blockTypePickerVisible: show } );
}

onKeyboardHide() {
Keyboard.dismiss();
}

onBlockTypeSelected( itemValue: string ) {
this.setState( { ...this.state, selectedBlockType: itemValue, blockTypePickerVisible: false } );

Expand Down Expand Up @@ -114,7 +128,25 @@ export default class BlockManager extends React.Component<PropsType, StateType>
// TODO: implement settings
break;
}
};
}

componentDidMount() {
this.keyboardDidShowListener = Keyboard.addListener( keyboardDidShow, this.keyboardDidShow );
this.keyboardDidHideListener = Keyboard.addListener( keyboardDidHide, this.keyboardDidHide );
}

componentWillUnmount() {
Keyboard.removeListener( keyboardDidShow, this.keyboardDidShow );
Keyboard.removeListener( keyboardDidHide, this.keyboardDidHide );
}

keyboardDidShow = () => {
this.setState( { isKeyboardVisible: true } );
}

keyboardDidHide = () => {
this.setState( { isKeyboardVisible: false } );
}

insertBlocksAfter( clientId: string, blocks: Array<Object> ) {
//TODO: make sure to insert all the passed blocks
Expand Down Expand Up @@ -164,7 +196,6 @@ export default class BlockManager extends React.Component<PropsType, StateType>
}

renderList() {
const behavior = Platform.OS === 'ios' ? 'padding' : null;
// TODO: we won't need this. This just a temporary solution until we implement the RecyclerViewList native code for iOS
// And fix problems with RecyclerViewList on Android
const list = (
Expand All @@ -177,12 +208,16 @@ export default class BlockManager extends React.Component<PropsType, StateType>
/>
);
return (
<KeyboardAvoidingView style={ { flex: 1 } } behavior={ behavior }>
<KeyboardAvoidingView style={ { flex: 1 } }>
{ list }
<BlockToolbar
onInsertClick={ () => {
this.showBlockTypePicker( true );
} }
onKeyboardHide={ () => {
this.onKeyboardHide();
} }
showKeyboardHideButton={ this.state.isKeyboardVisible }
/>
</KeyboardAvoidingView>
);
Expand Down
27 changes: 20 additions & 7 deletions src/block-management/block-toolbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,36 @@

import React, { Component } from 'react';
import { View } from 'react-native';
import { IconButton } from '@wordpress/components';
import { Toolbar, ToolbarButton } from '@wordpress/components';
import { BlockFormatControls, BlockControls } from '@wordpress/editor';
import { __ } from '@wordpress/i18n';

import styles from './block-toolbar.scss';

type PropsType = {
onInsertClick: void => void,
onKeyboardHide: void => void,
showKeyboardHideButton: boolean,
};

export default class BlockToolbar extends Component<PropsType> {
render() {
return (
<View style={ { height: 50, backgroundColor: '#DCDCDC', flexDirection: 'row' } }>
<IconButton
label={ __( 'Add block' ) }
icon="insert"
onClick={ this.props.onInsertClick }
/>
<View style={ styles.container }>
<Toolbar>
<ToolbarButton
label={ __( 'Add block' ) }
icon="insert"
onClick={ this.props.onInsertClick }
/>
</Toolbar>
{ this.props.showKeyboardHideButton && ( <Toolbar>
<ToolbarButton
label={ __( 'Keyboard hide' ) }
icon="arrow-down"
onClick={ this.props.onKeyboardHide }
/>
</Toolbar> ) }
<BlockControls.Slot />
<BlockFormatControls.Slot />
</View>
Expand Down
7 changes: 7 additions & 0 deletions src/block-management/block-toolbar.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.container {
height: 44;
flex-direction: row;
background-color: white;
border-top-color: #e9eff3;
border-top-width: 1;
}
14 changes: 14 additions & 0 deletions src/components/keyboard-avoiding-view.android.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/**
* @format
* @flow
*/

import { KeyboardAvoidingView as AndroidKeyboardAvoidingView } from 'react-native';

const KeyboardAvoidingView = ( props ) => {
return (
<AndroidKeyboardAvoidingView { ...props } />
);
};

export default KeyboardAvoidingView;
48 changes: 48 additions & 0 deletions src/components/keyboard-avoiding-view.ios.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/**
* @format
* @flow
*/

import React from 'react';

import { View, NativeModules, KeyboardAvoidingView as IOSKeyboardAvoidingView } from 'react-native';
const { StatusBarManager } = NativeModules;

type StateType = {
statusBarHeight: number;
};

type PropsType = {
...View.propTypes,
}

export default class KeyboardAvoidingView extends React.Component <PropsType, StateType> {
constructor( props: PropsType ) {
super( props );

this.state = {
statusBarHeight: 0,
};
}

componentDidMount() {
// Due to missing of mocked getHeight() method, our tests would fail
// https://github.com/facebook/react-native/blob/master/jest/setup.js#L228
// so in order to temporary fix this problem, additional check is added
// We have raised an issue https://github.com/facebook/react-native/issues/22385
if ( typeof StatusBarManager.getHeight === 'function' ) {
StatusBarManager.getHeight( ( statusBarFrameData ) => {
this.setState( { statusBarHeight: statusBarFrameData.height } );
} );
}
}

render() {
const behavior = 'padding';
const keyboardVerticalOffset = this.state.statusBarHeight + 44;

return (
<IOSKeyboardAvoidingView { ...this.props } behavior={ behavior } keyboardVerticalOffset={ keyboardVerticalOffset } />
);
}
}
Loading