From 302c9052188e55f2427885c57f9a549da2183872 Mon Sep 17 00:00:00 2001 From: lukewalczak Date: Mon, 26 Aug 2019 14:33:06 +0200 Subject: [PATCH 01/10] Add isAppender functionality on mobile --- .../components/media-placeholder/README.md | 9 +++ .../media-placeholder/index.native.js | 77 +++++++++++-------- .../media-placeholder/styles.native.scss | 15 ++++ .../block-library/src/image/edit.native.js | 14 ++-- .../block-library/src/video/edit.native.js | 14 ++-- 5 files changed, 81 insertions(+), 48 deletions(-) diff --git a/packages/block-editor/src/components/media-placeholder/README.md b/packages/block-editor/src/components/media-placeholder/README.md index 59795b5469c8c..a46ad755c7e34 100644 --- a/packages/block-editor/src/components/media-placeholder/README.md +++ b/packages/block-editor/src/components/media-placeholder/README.md @@ -80,6 +80,15 @@ If false the default placeholder style is used. - Type: `Boolean` - Required: No - Default: `false` +- Platform: Web | Mobile + +### isSelected + +Whether the block is selected or not. + +- Type: `Boolean` +- Required: No +- Platform: Mobile ### labels diff --git a/packages/block-editor/src/components/media-placeholder/index.native.js b/packages/block-editor/src/components/media-placeholder/index.native.js index a19a28588200c..12521d7a033bc 100644 --- a/packages/block-editor/src/components/media-placeholder/index.native.js +++ b/packages/block-editor/src/components/media-placeholder/index.native.js @@ -8,6 +8,7 @@ import { View, Text, TouchableWithoutFeedback } from 'react-native'; */ import { __, sprintf } from '@wordpress/i18n'; import { MediaUpload, MEDIA_TYPE_IMAGE, MEDIA_TYPE_VIDEO } from '@wordpress/block-editor'; +import { Dashicon } from '@wordpress/components'; /** * Internal dependencies @@ -15,7 +16,7 @@ import { MediaUpload, MEDIA_TYPE_IMAGE, MEDIA_TYPE_VIDEO } from '@wordpress/bloc import styles from './styles.scss'; function MediaPlaceholder( props ) { - const { mediaType, labels = {}, icon, onSelectURL } = props; + const { mediaType, labels = {}, icon, onSelectURL, isAppender, isSelected } = props; const isImage = MEDIA_TYPE_IMAGE === mediaType; const isVideo = MEDIA_TYPE_VIDEO === mediaType; @@ -46,41 +47,53 @@ function MediaPlaceholder( props ) { accessibilityHint = __( 'Double tap to select a video' ); } + if ( isAppender !== undefined && ! isSelected ) { + return null; + } + return ( - { - return ( - + { + return ( + { - props.onFocus( event ); - open(); - } } - > - - { getMediaOptions() } - - { icon } + __( '%s block. Empty' ), + placeholderTitle + ) } + accessibilityRole={ 'button' } + accessibilityHint={ accessibilityHint } + onPress={ ( event ) => { + props.onFocus( event ); + open(); + } } + > + + { getMediaOptions() } + { isAppender ? + : + <> + + { icon } + + + { placeholderTitle } + + + { instructions } + + } - - { placeholderTitle } - - - { instructions } - - - - ); - } } /> + + ); + } } /> + + ); } export default MediaPlaceholder; + diff --git a/packages/block-editor/src/components/media-placeholder/styles.native.scss b/packages/block-editor/src/components/media-placeholder/styles.native.scss index f76be4b8f36a4..c5d2230c147e7 100644 --- a/packages/block-editor/src/components/media-placeholder/styles.native.scss +++ b/packages/block-editor/src/components/media-placeholder/styles.native.scss @@ -33,3 +33,18 @@ align-items: center; fill: $gray-dark; } + +.isAppender { + height: auto; + background-color: $white; + border: $border-width solid $light-gray-500; + border-radius: 4px; +} + +.addBlockButton { + color: $white; + background-color: $dark-gray-500; + border-radius: $icon-button-size-small / 2; + overflow: hidden; + size: $icon-button-size-small; +} diff --git a/packages/block-library/src/image/edit.native.js b/packages/block-library/src/image/edit.native.js index 3eb19a6bfa991..d301131c678fe 100644 --- a/packages/block-library/src/image/edit.native.js +++ b/packages/block-library/src/image/edit.native.js @@ -258,14 +258,12 @@ class ImageEdit extends React.Component { if ( ! url ) { return ( - - - + ); } diff --git a/packages/block-library/src/video/edit.native.js b/packages/block-library/src/video/edit.native.js index 3b0a9d186d308..739f6dfda0154 100644 --- a/packages/block-library/src/video/edit.native.js +++ b/packages/block-library/src/video/edit.native.js @@ -179,14 +179,12 @@ class VideoEdit extends React.Component { if ( ! id ) { return ( - - - + ); } From 5a38e7873daa5725e0a962f181ef93417de8d398 Mon Sep 17 00:00:00 2001 From: lukewalczak Date: Tue, 27 Aug 2019 11:56:23 +0200 Subject: [PATCH 02/10] refactor isAppender conditions --- .../media-placeholder/index.native.js | 68 ++++++++++++------- 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/packages/block-editor/src/components/media-placeholder/index.native.js b/packages/block-editor/src/components/media-placeholder/index.native.js index 12521d7a033bc..48b4ac3591094 100644 --- a/packages/block-editor/src/components/media-placeholder/index.native.js +++ b/packages/block-editor/src/components/media-placeholder/index.native.js @@ -7,7 +7,11 @@ import { View, Text, TouchableWithoutFeedback } from 'react-native'; * WordPress dependencies */ import { __, sprintf } from '@wordpress/i18n'; -import { MediaUpload, MEDIA_TYPE_IMAGE, MEDIA_TYPE_VIDEO } from '@wordpress/block-editor'; +import { + MediaUpload, + MEDIA_TYPE_IMAGE, + MEDIA_TYPE_VIDEO, +} from '@wordpress/block-editor'; import { Dashicon } from '@wordpress/components'; /** @@ -16,7 +20,14 @@ import { Dashicon } from '@wordpress/components'; import styles from './styles.scss'; function MediaPlaceholder( props ) { - const { mediaType, labels = {}, icon, onSelectURL, isAppender, isSelected } = props; + const { + mediaType, + labels = {}, + icon, + onSelectURL, + isAppender, + isSelected, + } = props; const isImage = MEDIA_TYPE_IMAGE === mediaType; const isVideo = MEDIA_TYPE_VIDEO === mediaType; @@ -47,7 +58,28 @@ function MediaPlaceholder( props ) { accessibilityHint = __( 'Double tap to select a video' ); } - if ( isAppender !== undefined && ! isSelected ) { + const renderContent = () => { + if ( isAppender === undefined || ! isAppender ) { + return ( + <> + { icon } + { placeholderTitle } + { instructions } + + ); + } else if ( isAppender && isSelected ) { + return ( + + ); + } + }; + + if ( isAppender && ! isSelected ) { return null; } @@ -60,7 +92,7 @@ function MediaPlaceholder( props ) { return ( { props.onFocus( event ); open(); - } } - > - + } }> + { getMediaOptions() } - { isAppender ? - : - <> - - { icon } - - - { placeholderTitle } - - - { instructions } - - } + { renderContent() } ); - } } /> + } } + /> - ); } export default MediaPlaceholder; - From 24355ca2a254103eea232202955108c20915b0e8 Mon Sep 17 00:00:00 2001 From: lukewalczak Date: Mon, 2 Sep 2019 16:24:10 +0200 Subject: [PATCH 03/10] Replace dropZoneUIOnly in favour of showMediaSelectionUI --- .../block-editor/src/components/media-placeholder/README.md | 6 +++--- .../block-editor/src/components/media-placeholder/index.js | 4 ++-- .../src/components/media-placeholder/index.native.js | 6 +++--- packages/block-library/src/gallery/edit.js | 2 +- packages/block-library/src/image/edit.js | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/block-editor/src/components/media-placeholder/README.md b/packages/block-editor/src/components/media-placeholder/README.md index 1a5d769996cc7..e10a7368cb6ac 100644 --- a/packages/block-editor/src/components/media-placeholder/README.md +++ b/packages/block-editor/src/components/media-placeholder/README.md @@ -87,13 +87,13 @@ If false the default placeholder style is used. - Default: `false` - Platform: Web | Mobile -### isSelected +### showMediaSelectionUI -Whether the block is selected or not. +Whether render a dropzone/placholder without any other additional UI. - Type: `Boolean` - Required: No -- Platform: Mobile +- Platform: Web | Mobile ### labels diff --git a/packages/block-editor/src/components/media-placeholder/index.js b/packages/block-editor/src/components/media-placeholder/index.js index efad860f586e7..f02f24216f62f 100644 --- a/packages/block-editor/src/components/media-placeholder/index.js +++ b/packages/block-editor/src/components/media-placeholder/index.js @@ -387,10 +387,10 @@ export class MediaPlaceholder extends Component { render() { const { - dropZoneUIOnly, + showMediaSelectionUI, } = this.props; - if ( dropZoneUIOnly ) { + if ( showMediaSelectionUI ) { return ( { this.renderDropZone() } diff --git a/packages/block-editor/src/components/media-placeholder/index.native.js b/packages/block-editor/src/components/media-placeholder/index.native.js index 1a57f0fc1cd90..8aabff5f95328 100644 --- a/packages/block-editor/src/components/media-placeholder/index.native.js +++ b/packages/block-editor/src/components/media-placeholder/index.native.js @@ -26,7 +26,7 @@ function MediaPlaceholder( props ) { icon, onSelect, isAppender, - isSelected, + showMediaSelectionUI, theme, } = props; @@ -78,7 +78,7 @@ function MediaPlaceholder( props ) { ); - } else if ( isAppender && isSelected ) { + } else if ( isAppender && showMediaSelectionUI ) { return ( } labels={ { title: ! hasImages && __( 'Gallery' ), diff --git a/packages/block-library/src/image/edit.js b/packages/block-library/src/image/edit.js index e0cc5e751fdaa..50850b0fb0886 100644 --- a/packages/block-library/src/image/edit.js +++ b/packages/block-library/src/image/edit.js @@ -673,7 +673,7 @@ export class ImageEdit extends Component { allowedTypes={ ALLOWED_MEDIA_TYPES } value={ { id, src } } mediaPreview={ mediaPreview } - dropZoneUIOnly={ ! isEditing && url } + showMediaSelectionUI={ ! isEditing && url } /> ); if ( isEditing || ! url ) { From 204be467b9727507665ba77863bfcd86098258f7 Mon Sep 17 00:00:00 2001 From: lukewalczak Date: Mon, 9 Sep 2019 10:55:22 +0200 Subject: [PATCH 04/10] deprecate dropZoneUIOnly and add disableMediaSelection prop --- .../src/components/media-placeholder/README.md | 2 +- .../src/components/media-placeholder/index.js | 10 ++++++++-- .../src/components/media-placeholder/index.native.js | 6 +++--- packages/block-library/src/gallery/edit.js | 2 +- packages/block-library/src/image/edit.js | 2 +- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/packages/block-editor/src/components/media-placeholder/README.md b/packages/block-editor/src/components/media-placeholder/README.md index e10a7368cb6ac..6cef3a3e4f982 100644 --- a/packages/block-editor/src/components/media-placeholder/README.md +++ b/packages/block-editor/src/components/media-placeholder/README.md @@ -87,7 +87,7 @@ If false the default placeholder style is used. - Default: `false` - Platform: Web | Mobile -### showMediaSelectionUI +### disableMediaSelection Whether render a dropzone/placholder without any other additional UI. diff --git a/packages/block-editor/src/components/media-placeholder/index.js b/packages/block-editor/src/components/media-placeholder/index.js index f02f24216f62f..0ec4800b92f01 100644 --- a/packages/block-editor/src/components/media-placeholder/index.js +++ b/packages/block-editor/src/components/media-placeholder/index.js @@ -25,6 +25,7 @@ import { __ } from '@wordpress/i18n'; import { Component } from '@wordpress/element'; import { compose } from '@wordpress/compose'; import { withSelect } from '@wordpress/data'; +import deprecated from '@wordpress/deprecated'; /** * Internal dependencies @@ -387,10 +388,15 @@ export class MediaPlaceholder extends Component { render() { const { - showMediaSelectionUI, + disableMediaSelection, + dropZoneUIOnly, } = this.props; - if ( showMediaSelectionUI ) { + if ( dropZoneUIOnly || disableMediaSelection ) { + deprecated( 'wp.blockEditor.MediaPlaceholder dropZoneUIOnly prop', { + alternative: 'disableMediaSelection', + } ); + return ( { this.renderDropZone() } diff --git a/packages/block-editor/src/components/media-placeholder/index.native.js b/packages/block-editor/src/components/media-placeholder/index.native.js index 8aabff5f95328..88cc6a7706251 100644 --- a/packages/block-editor/src/components/media-placeholder/index.native.js +++ b/packages/block-editor/src/components/media-placeholder/index.native.js @@ -26,7 +26,7 @@ function MediaPlaceholder( props ) { icon, onSelect, isAppender, - showMediaSelectionUI, + disableMediaSelection, theme, } = props; @@ -78,7 +78,7 @@ function MediaPlaceholder( props ) { ); - } else if ( isAppender && showMediaSelectionUI ) { + } else if ( isAppender && disableMediaSelection ) { return ( } labels={ { title: ! hasImages && __( 'Gallery' ), diff --git a/packages/block-library/src/image/edit.js b/packages/block-library/src/image/edit.js index 50850b0fb0886..cb7d892fe6613 100644 --- a/packages/block-library/src/image/edit.js +++ b/packages/block-library/src/image/edit.js @@ -673,7 +673,7 @@ export class ImageEdit extends Component { allowedTypes={ ALLOWED_MEDIA_TYPES } value={ { id, src } } mediaPreview={ mediaPreview } - showMediaSelectionUI={ ! isEditing && url } + disableMediaSelection={ ! isEditing && url } /> ); if ( isEditing || ! url ) { From b0013fcf09342aaab6d4f0f5da7a3ba8bcb7ad95 Mon Sep 17 00:00:00 2001 From: lukewalczak Date: Mon, 9 Sep 2019 11:34:24 +0200 Subject: [PATCH 05/10] Update test --- packages/block-library/src/image/test/edit.js | 3 +++ packages/e2e-tests/specs/block-transforms.test.js | 1 + packages/e2e-tests/specs/demo.test.js | 2 ++ 3 files changed, 6 insertions(+) diff --git a/packages/block-library/src/image/test/edit.js b/packages/block-library/src/image/test/edit.js index 506a3358a54e4..fc87d5db9fa4a 100644 --- a/packages/block-library/src/image/test/edit.js +++ b/packages/block-library/src/image/test/edit.js @@ -27,6 +27,9 @@ describe( 'core/image/edit', () => { url: 'http://www.example.com/myimage.jpeg', alt: 'alt2', } ); + + expect( console ).toHaveWarned(); + expect( setAttributes ).toHaveBeenCalledWith( { id: 1, url: 'http://www.example.com/myimage.jpeg', diff --git a/packages/e2e-tests/specs/block-transforms.test.js b/packages/e2e-tests/specs/block-transforms.test.js index 381facd4c0067..767dc25210d98 100644 --- a/packages/e2e-tests/specs/block-transforms.test.js +++ b/packages/e2e-tests/specs/block-transforms.test.js @@ -114,6 +114,7 @@ describe( 'Block transforms', () => { await setPostContent( '' ); await page.click( '.editor-post-title .editor-post-title__block' ); } + expect( console ).toHaveWarned(); } ); it( 'should contain the expected transforms', async () => { diff --git a/packages/e2e-tests/specs/demo.test.js b/packages/e2e-tests/specs/demo.test.js index f5181a8a0e968..df8a1518cfb72 100644 --- a/packages/e2e-tests/specs/demo.test.js +++ b/packages/e2e-tests/specs/demo.test.js @@ -26,6 +26,7 @@ describe( 'new editor state', () => { }, ] ); await visitAdminPage( 'post-new.php', 'gutenberg-demo' ); + expect( console ).toHaveWarned(); } ); it( 'content should load without making the post dirty', async () => { @@ -33,6 +34,7 @@ describe( 'new editor state', () => { const { select } = window.wp.data; return select( 'core/editor' ).isEditedPostDirty(); } ); + expect( isDirty ).toBeFalsy(); } ); From ceaff0730a709bed54ec47c24d7d49b1ba4a0e59 Mon Sep 17 00:00:00 2001 From: lukewalczak Date: Mon, 23 Sep 2019 15:57:17 +0200 Subject: [PATCH 06/10] Refactor tests and change prop name --- .../src/components/media-placeholder/README.md | 5 +++-- .../src/components/media-placeholder/index.js | 12 +++++++----- .../src/components/media-placeholder/index.native.js | 6 +++--- packages/block-library/src/gallery/edit.js | 2 +- packages/block-library/src/image/edit.js | 2 +- packages/block-library/src/image/test/edit.js | 3 +-- packages/e2e-tests/specs/block-transforms.test.js | 1 - packages/e2e-tests/specs/demo.test.js | 1 - 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/block-editor/src/components/media-placeholder/README.md b/packages/block-editor/src/components/media-placeholder/README.md index 6cef3a3e4f982..5878ecfbfbc48 100644 --- a/packages/block-editor/src/components/media-placeholder/README.md +++ b/packages/block-editor/src/components/media-placeholder/README.md @@ -87,12 +87,13 @@ If false the default placeholder style is used. - Default: `false` - Platform: Web | Mobile -### disableMediaSelection +### disableMediaButtons -Whether render a dropzone/placholder without any other additional UI. +If true, only the Drop Zone will be rendered. No UI controls to upload the media will be shown - Type: `Boolean` - Required: No +- Default: false - Platform: Web | Mobile ### labels diff --git a/packages/block-editor/src/components/media-placeholder/index.js b/packages/block-editor/src/components/media-placeholder/index.js index 0ec4800b92f01..2f49660026903 100644 --- a/packages/block-editor/src/components/media-placeholder/index.js +++ b/packages/block-editor/src/components/media-placeholder/index.js @@ -388,14 +388,16 @@ export class MediaPlaceholder extends Component { render() { const { - disableMediaSelection, + disableMediaButtons, dropZoneUIOnly, } = this.props; - if ( dropZoneUIOnly || disableMediaSelection ) { - deprecated( 'wp.blockEditor.MediaPlaceholder dropZoneUIOnly prop', { - alternative: 'disableMediaSelection', - } ); + if ( dropZoneUIOnly || disableMediaButtons ) { + if ( dropZoneUIOnly ) { + deprecated( 'wp.blockEditor.MediaPlaceholder dropZoneUIOnly prop', { + alternative: 'disableMediaButtons', + } ); + } return ( diff --git a/packages/block-editor/src/components/media-placeholder/index.native.js b/packages/block-editor/src/components/media-placeholder/index.native.js index 39f95e39da01c..04c098a2342a2 100644 --- a/packages/block-editor/src/components/media-placeholder/index.native.js +++ b/packages/block-editor/src/components/media-placeholder/index.native.js @@ -26,7 +26,7 @@ function MediaPlaceholder( props ) { icon, onSelect, isAppender, - disableMediaSelection, + disableMediaButtons, useStyle, } = props; @@ -78,7 +78,7 @@ function MediaPlaceholder( props ) { ); - } else if ( isAppender && disableMediaSelection ) { + } else if ( isAppender && disableMediaButtons ) { return ( } labels={ { title: ! hasImages && __( 'Gallery' ), diff --git a/packages/block-library/src/image/edit.js b/packages/block-library/src/image/edit.js index cb7d892fe6613..8f34fa1be7b29 100644 --- a/packages/block-library/src/image/edit.js +++ b/packages/block-library/src/image/edit.js @@ -673,7 +673,7 @@ export class ImageEdit extends Component { allowedTypes={ ALLOWED_MEDIA_TYPES } value={ { id, src } } mediaPreview={ mediaPreview } - disableMediaSelection={ ! isEditing && url } + disableMediaButtons={ ! isEditing && url } /> ); if ( isEditing || ! url ) { diff --git a/packages/block-library/src/image/test/edit.js b/packages/block-library/src/image/test/edit.js index fc87d5db9fa4a..47c0074cdf7eb 100644 --- a/packages/block-library/src/image/test/edit.js +++ b/packages/block-library/src/image/test/edit.js @@ -28,8 +28,6 @@ describe( 'core/image/edit', () => { alt: 'alt2', } ); - expect( console ).toHaveWarned(); - expect( setAttributes ).toHaveBeenCalledWith( { id: 1, url: 'http://www.example.com/myimage.jpeg', @@ -40,6 +38,7 @@ describe( 'core/image/edit', () => { url: 'http://www.example.com/myimage.jpeg', alt: 'alt2', } ); + expect( setAttributes ).toHaveBeenCalledWith( { id: 2, url: 'http://www.example.com/myimage.jpeg', diff --git a/packages/e2e-tests/specs/block-transforms.test.js b/packages/e2e-tests/specs/block-transforms.test.js index 767dc25210d98..381facd4c0067 100644 --- a/packages/e2e-tests/specs/block-transforms.test.js +++ b/packages/e2e-tests/specs/block-transforms.test.js @@ -114,7 +114,6 @@ describe( 'Block transforms', () => { await setPostContent( '' ); await page.click( '.editor-post-title .editor-post-title__block' ); } - expect( console ).toHaveWarned(); } ); it( 'should contain the expected transforms', async () => { diff --git a/packages/e2e-tests/specs/demo.test.js b/packages/e2e-tests/specs/demo.test.js index df8a1518cfb72..42f9e7128eacd 100644 --- a/packages/e2e-tests/specs/demo.test.js +++ b/packages/e2e-tests/specs/demo.test.js @@ -26,7 +26,6 @@ describe( 'new editor state', () => { }, ] ); await visitAdminPage( 'post-new.php', 'gutenberg-demo' ); - expect( console ).toHaveWarned(); } ); it( 'content should load without making the post dirty', async () => { From a4a0ec67001c1fc2c425619a268cdd448ea17638 Mon Sep 17 00:00:00 2001 From: lukewalczak Date: Mon, 23 Sep 2019 16:06:34 +0200 Subject: [PATCH 07/10] Remove redundant empty lines --- packages/block-library/src/image/test/edit.js | 2 -- packages/e2e-tests/specs/demo.test.js | 1 - 2 files changed, 3 deletions(-) diff --git a/packages/block-library/src/image/test/edit.js b/packages/block-library/src/image/test/edit.js index 47c0074cdf7eb..506a3358a54e4 100644 --- a/packages/block-library/src/image/test/edit.js +++ b/packages/block-library/src/image/test/edit.js @@ -27,7 +27,6 @@ describe( 'core/image/edit', () => { url: 'http://www.example.com/myimage.jpeg', alt: 'alt2', } ); - expect( setAttributes ).toHaveBeenCalledWith( { id: 1, url: 'http://www.example.com/myimage.jpeg', @@ -38,7 +37,6 @@ describe( 'core/image/edit', () => { url: 'http://www.example.com/myimage.jpeg', alt: 'alt2', } ); - expect( setAttributes ).toHaveBeenCalledWith( { id: 2, url: 'http://www.example.com/myimage.jpeg', diff --git a/packages/e2e-tests/specs/demo.test.js b/packages/e2e-tests/specs/demo.test.js index 42f9e7128eacd..f5181a8a0e968 100644 --- a/packages/e2e-tests/specs/demo.test.js +++ b/packages/e2e-tests/specs/demo.test.js @@ -33,7 +33,6 @@ describe( 'new editor state', () => { const { select } = window.wp.data; return select( 'core/editor' ).isEditedPostDirty(); } ); - expect( isDirty ).toBeFalsy(); } ); From 8ac70ad1507f78447937dc8ee3c5f3b55a10cf9a Mon Sep 17 00:00:00 2001 From: lukewalczak Date: Tue, 24 Sep 2019 14:03:20 +0200 Subject: [PATCH 08/10] Refactor conditions inside MediaPlaceholder --- .../block-editor/src/components/media-placeholder/README.md | 2 +- .../src/components/media-placeholder/index.native.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/block-editor/src/components/media-placeholder/README.md b/packages/block-editor/src/components/media-placeholder/README.md index 5878ecfbfbc48..11f451a3ad629 100644 --- a/packages/block-editor/src/components/media-placeholder/README.md +++ b/packages/block-editor/src/components/media-placeholder/README.md @@ -93,7 +93,7 @@ If true, only the Drop Zone will be rendered. No UI controls to upload the media - Type: `Boolean` - Required: No -- Default: false +- Default: `false` - Platform: Web | Mobile ### labels diff --git a/packages/block-editor/src/components/media-placeholder/index.native.js b/packages/block-editor/src/components/media-placeholder/index.native.js index 04c098a2342a2..a9a7d50fce11f 100644 --- a/packages/block-editor/src/components/media-placeholder/index.native.js +++ b/packages/block-editor/src/components/media-placeholder/index.native.js @@ -78,7 +78,7 @@ function MediaPlaceholder( props ) { ); - } else if ( isAppender && disableMediaButtons ) { + } else if ( isAppender && ! disableMediaButtons ) { return ( Date: Wed, 25 Sep 2019 09:27:00 +0200 Subject: [PATCH 09/10] Update block-editor CHANGELOG --- packages/block-editor/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/block-editor/CHANGELOG.md b/packages/block-editor/CHANGELOG.md index 07abd2b81221b..bfbf963542423 100644 --- a/packages/block-editor/CHANGELOG.md +++ b/packages/block-editor/CHANGELOG.md @@ -1,3 +1,9 @@ +## Master + +### Deprecation + +- `dropZoneUIOnly` has been deprecated in favor of `disableMediaButtons`. + ## 3.0.0 (2019-08-05) ### New Features From 22425eedb6cc440ff479cd0325b99973973b22d3 Mon Sep 17 00:00:00 2001 From: Luke Walczak Date: Wed, 25 Sep 2019 09:32:43 +0200 Subject: [PATCH 10/10] Update packages/block-editor/CHANGELOG.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Grzegorz (Greg) Ziółkowski --- packages/block-editor/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/block-editor/CHANGELOG.md b/packages/block-editor/CHANGELOG.md index bfbf963542423..8b2a631518de5 100644 --- a/packages/block-editor/CHANGELOG.md +++ b/packages/block-editor/CHANGELOG.md @@ -2,7 +2,7 @@ ### Deprecation -- `dropZoneUIOnly` has been deprecated in favor of `disableMediaButtons`. +- `dropZoneUIOnly` prop in `MediaPlaceholder` component has been deprecated in favor of `disableMediaButtons` prop. ## 3.0.0 (2019-08-05)