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

Move BlockPicker to gutenberg as Inserter in @wordpress/block-editor #1122

Merged
merged 2 commits into from
Jun 13, 2019
Merged

Move BlockPicker to gutenberg as Inserter in @wordpress/block-editor #1122

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e57770
Move BlockPicker to gutenberg as Inserter in @wordpress/block-editor
Tug Jun 12, 2019
1962640
Merge remote-tracking branch 'origin/develop' into update/move-picker…
Tug Jun 13, 2019
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
Open in desktop
Submodule gutenberg updated 32 files
+1 −1 .github/actions/milestone-it/entrypoint.sh
+1 −0 packages/block-editor/src/components/index.native.js
+8 −0 packages/block-editor/src/components/inner-blocks/style.scss
+96 −0 packages/block-editor/src/components/inserter/index.native.js
+57 −0 packages/block-editor/src/components/inserter/style.native.scss
+2 −2 packages/block-editor/src/components/media-upload/test/index.native.js
+7 −7 packages/block-editor/src/components/rich-text/test/index.native.js
+18 −4 packages/block-library/src/audio/edit.js
+1 −1 packages/block-library/src/columns/editor.scss
+9 −2 packages/block-library/src/file/edit.js
+30 −2 packages/block-library/src/gallery/edit.js
+2 −16 packages/block-library/src/gallery/transforms.js
+1 −1 packages/block-library/src/group/icon.js
+0 −2 packages/block-library/src/heading/edit.native.js
+13 −3 packages/block-library/src/image/edit.js
+2 −1 packages/block-library/src/rss/index.php
+8 −1 packages/block-library/src/tag-cloud/index.php
+16 −2 packages/block-library/src/video/edit.js
+1 −1 packages/block-library/src/video/video-player.android.js
+4 −0 packages/blocks/src/api/index.native.js
+1 −2 packages/components/src/date-time/README.md
+1 −1 packages/components/src/date-time/style.scss
+0 −2 packages/components/src/modal/index.js
+6 −6 packages/components/src/tab-panel/README.md
+2 −1 packages/components/src/tab-panel/index.js
+1 −1 packages/components/src/text-control/README.md
+1 −1 packages/edit-post/src/components/sidebar/post-link/index.js
+2 −2 packages/editor/src/components/convert-to-group-buttons/icons.js
+1 −1 packages/scripts/scripts/lint-js.js
+2 −2 packages/scripts/scripts/lint-pkg-json.js
+1 −1 packages/scripts/scripts/lint-style.js
+0 −5 playground/src/index.js
5 changes: 2 additions & 3 deletions src/block-management/block-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { withDispatch, withSelect } from '@wordpress/data';
import { compose } from '@wordpress/compose';
import { createBlock, isUnmodifiedDefaultBlock } from '@wordpress/blocks';
import { PostTitle } from '@wordpress/editor';
import { DefaultBlockAppender } from '@wordpress/block-editor';
import { DefaultBlockAppender, Inserter } from '@wordpress/block-editor';
import { sendNativeEditorDidLayout, subscribeSetFocusOnTitle, subscribeMediaAppend } from 'react-native-gutenberg-bridge';
import { KeyboardAvoidingView, KeyboardAwareFlatList, ReadableContentView } from '@wordpress/components';

Expand All @@ -31,7 +31,6 @@ import styles from './block-manager.scss';
import blockHolderStyles from './block-holder.scss';
import inlineToolbarStyles from './inline-toolbar/style.scss';
import toolbarStyles from './block-toolbar.scss';
import BlockPicker from './block-picker';
import HTMLTextInput from '../components/html-text-input';
import BlockToolbar from './block-toolbar';
import SafeArea from 'react-native-safe-area';
Expand Down Expand Up @@ -299,7 +298,7 @@ export class BlockManager extends React.Component<PropsType, StateType> {
this.renderList()
}
{ this.state.blockTypePickerVisible && (
<BlockPicker
<Inserter
onDismiss={ () => this.showBlockTypePicker( false ) }
onValueSelected={ this.onBlockTypeSelected }
isReplacement={ this.isReplaceable( this.props.selectedBlock ) }
Expand Down
87 changes: 0 additions & 87 deletions src/block-management/block-picker.js
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions src/block-management/block-picker.scss
View file
Open in desktop

This file was deleted.