From 53651fabcf473a83ba2f7d67a6f4bd48de31532e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Zieli=C5=84ski?= Date: Fri, 18 Sep 2020 14:55:38 +0200 Subject: [PATCH 1/6] Rebase and refresh --- lib/widget-preview-template.php | 44 +++++ lib/widgets.php | 21 +++ packages/edit-widgets/package.json | 1 + .../src/blocks/legacy-widget/edit/index.js | 12 +- .../legacy-widget/edit/widget-preview.js | 48 ++++++ .../src/blocks/legacy-widget/index.php | 151 +++++++++--------- 6 files changed, 194 insertions(+), 83 deletions(-) create mode 100644 lib/widget-preview-template.php create mode 100644 packages/edit-widgets/src/blocks/legacy-widget/edit/widget-preview.js diff --git a/lib/widget-preview-template.php b/lib/widget-preview-template.php new file mode 100644 index 0000000000000..1f74627c97cc1 --- /dev/null +++ b/lib/widget-preview-template.php @@ -0,0 +1,44 @@ + + +> + + + + + + + + +> +
+
+ get_registered( 'core/legacy-widget' ); + echo $block->render( $_GET['widgetPreview'] ); + ?> +
+
+ + + + diff --git a/lib/widgets.php b/lib/widgets.php index a53c870715920..8f88883a21ad4 100644 --- a/lib/widgets.php +++ b/lib/widgets.php @@ -323,3 +323,24 @@ function gutenberg_register_widgets() { } add_action( 'widgets_init', 'gutenberg_register_widgets' ); + +/** + * Overwrites the template WordPress would use to render the currrent request, + * to a widget preview template if widgetPreview parameter was passed in the url. + * + * @param string $template Original template. + * + * @return string The original or the path of widget-preview-template.php file. + */ +function change_post_template_to_widget_preview( $template ) { + if ( + isset( $_GET['widgetPreview'] ) && + current_user_can( 'edit_theme_options' ) + ) { + add_filter( 'show_admin_bar', '__return_false' ); + return dirname( __FILE__ ) . '/widget-preview-template.php'; + } + return $template; +} +add_filter( 'template_include', 'change_post_template_to_widget_preview' ); + diff --git a/packages/edit-widgets/package.json b/packages/edit-widgets/package.json index 3e7dc950a0213..233ec1bcf33a8 100644 --- a/packages/edit-widgets/package.json +++ b/packages/edit-widgets/package.json @@ -49,6 +49,7 @@ "@wordpress/notices": "file:../notices", "@wordpress/plugins": "file:../plugins", "@wordpress/server-side-render": "file:../server-side-render", + "@wordpress/url": "file:../url", "classnames": "^2.2.5", "lodash": "^4.17.19", "rememo": "^3.0.0" diff --git a/packages/edit-widgets/src/blocks/legacy-widget/edit/index.js b/packages/edit-widgets/src/blocks/legacy-widget/edit/index.js index 1506b49b1fc55..28114fd20eed9 100644 --- a/packages/edit-widgets/src/blocks/legacy-widget/edit/index.js +++ b/packages/edit-widgets/src/blocks/legacy-widget/edit/index.js @@ -11,7 +11,6 @@ import { Button, PanelBody, ToolbarGroup } from '@wordpress/components'; import { __ } from '@wordpress/i18n'; import { withDispatch, withSelect } from '@wordpress/data'; import { BlockControls, InspectorControls } from '@wordpress/block-editor'; -import ServerSideRender from '@wordpress/server-side-render'; import { update } from '@wordpress/icons'; /** @@ -19,6 +18,7 @@ import { update } from '@wordpress/icons'; */ import LegacyWidgetEditHandler from './handler'; import LegacyWidgetPlaceholder from './placeholder'; +import WidgetPreview from './widget-preview'; class LegacyWidgetEdit extends Component { constructor() { @@ -187,15 +187,11 @@ class LegacyWidgetEdit extends Component { } renderWidgetPreview() { - const { widgetId, attributes } = this.props; + const { attributes } = this.props; return ( - ); } diff --git a/packages/edit-widgets/src/blocks/legacy-widget/edit/widget-preview.js b/packages/edit-widgets/src/blocks/legacy-widget/edit/widget-preview.js new file mode 100644 index 0000000000000..de9a872e3c7f5 --- /dev/null +++ b/packages/edit-widgets/src/blocks/legacy-widget/edit/widget-preview.js @@ -0,0 +1,48 @@ +/** + * External dependencies + */ +import { get } from 'lodash'; + +/** + * WordPress dependencies + */ +import { addQueryArgs } from '@wordpress/url'; +import { Disabled, FocusableIframe } from '@wordpress/components'; +import { withSelect } from '@wordpress/data'; +import { useState } from '@wordpress/element'; + +function WidgetPreview( { postLink, attributes, ...props } ) { + const DEFAULT_HEIGHT = 300; + const HEIGTH_MARGIN = 20; + const [ height, setHeight ] = useState( DEFAULT_HEIGHT ); + const iframeUrl = addQueryArgs( postLink, { + widgetPreview: attributes, + } ); + return ( + + { + const iframeContentHeight = get( event, [ + 'currentTarget', + 'contentDocument', + 'body', + 'scrollHeight', + ] ); + if ( iframeContentHeight !== height ) { + setHeight( iframeContentHeight ); + } + } } + src={ iframeUrl } + height={ height + HEIGTH_MARGIN } + { ...props } + /> + + ); +} + +export default withSelect( () => { + return { + // @TODO: Don't hardcode preview URL + postLink: '/?p=1', + }; +} )( WidgetPreview ); diff --git a/packages/edit-widgets/src/blocks/legacy-widget/index.php b/packages/edit-widgets/src/blocks/legacy-widget/index.php index 4bf679c0e6677..a4c9755c3f799 100644 --- a/packages/edit-widgets/src/blocks/legacy-widget/index.php +++ b/packages/edit-widgets/src/blocks/legacy-widget/index.php @@ -6,107 +6,108 @@ */ /** - * Returns the result of rendering a widget having its instance id. - * - * @param string $id Widget id. - * - * @return string Returns the rendered widget as a string. + * Register legacy widget block. */ -function block_core_legacy_widget_render_widget_by_id( $id ) { - // Code extracted from src/wp-includes/widgets.php dynamic_sidebar function. - // Todo: When merging to core extract this part of dynamic_sidebar into its own function. - global $wp_registered_widgets; - - if ( ! isset( $wp_registered_widgets[ $id ] ) ) { - return false; - } - $params = array_merge( +function register_block_core_legacy_widget() { + register_block_type_from_metadata( + __DIR__ . '/legacy-widget', array( - array_merge( - array( - 'before_widget' => '
', - 'after_widget' => '
', - 'before_title' => '

', - 'after_title' => '

', - ), - array( - 'widget_id' => $id, - 'widget_name' => $wp_registered_widgets[ $id ]['name'], - ) - ), - ), - (array) $wp_registered_widgets[ $id ]['params'] + 'render_callback' => 'render_block_core_legacy_widget', + ) ); - - // Substitute HTML id and class attributes into before_widget. - $classname_ = ''; - foreach ( (array) $wp_registered_widgets[ $id ]['classname'] as $cn ) { - if ( is_string( $cn ) ) { - $classname_ .= '_' . $cn; - } elseif ( is_object( $cn ) ) { - $classname_ .= '_' . get_class( $cn ); - } - } - $classname_ = ltrim( $classname_, '_' ); - $params[0]['before_widget'] = sprintf( $params[0]['before_widget'], $id, $classname_ ); - - $params = apply_filters( 'dynamic_sidebar_params', $params ); - $callback = $wp_registered_widgets[ $id ]['callback']; - do_action( 'dynamic_sidebar', $wp_registered_widgets[ $id ] ); - - if ( is_callable( $callback ) ) { - ob_start(); - call_user_func_array( $callback, $params ); - return ob_get_clean(); - } - return false; } /** * Renders the `core/legacy-widget` block on server. * - * @see WP_Widget - * * @param array $attributes The block attributes. * * @return string Returns the post content with the legacy widget added. + * @see WP_Widget + * */ function render_block_core_legacy_widget( $attributes ) { - $id = null; - $widget_class = null; if ( isset( $attributes['widgetId'] ) ) { - $id = $attributes['widgetId']; + return 'Rendering legacy widget block using a widget ID is unsupported'; } - if ( isset( $attributes['widgetClass'] ) ) { - $widget_class = $attributes['widgetClass']; - } - - if ( $id ) { - return block_core_legacy_widget_render_widget_by_id( $id ); - } - if ( ! $widget_class ) { + if ( ! isset( $attributes['widgetClass'] ) ) { return ''; } - ob_start(); $instance = null; if ( isset( $attributes['instance'] ) ) { $instance = $attributes['instance']; } - the_widget( $widget_class, $instance ); - return ob_get_clean(); -} -/** - * Register legacy widget block. - */ -function register_block_core_legacy_widget() { - register_block_type_from_metadata( - __DIR__ . '/legacy-widget', + global $wp_widget_factory; + $widget_id = '0'; + $widget_obj = $wp_widget_factory->widgets[ $attributes['widgetClass'] ]; + return render_single_widget( + 'sidebar-1', + $widget_id, + array_merge( + array( + 'classname' => '', + ), + $widget_obj->widget_options, + array( + 'instance' => $instance, + ) + ), + function ( $params ) use ( $widget_obj, $instance ) { + $widget_obj->_set( - 1 ); + $widget_obj->widget( $params, $instance ); + }, array( - 'render_callback' => 'render_block_core_legacy_widget', + 'widget_id' => $widget_id, + 'widget_name' => $widget_obj->name, ) ); } add_action( 'init', 'register_block_core_legacy_widget' ); + + +function render_single_widget( $sidebar_id, $widget_id, $widget_params, $callback, $sidebar_params ) { + global $wp_registered_sidebars; + + $index = $sidebar_id; + + /** This filter is documented in wp-includes/widgets/widgets.php */ + do_action( 'dynamic_sidebar_before', $index, true ); + $sidebar = $wp_registered_sidebars[ $index ]; + + $params = array_merge( + array( + array_merge( + $sidebar, + $sidebar_params + ), + ), + $widget_params + ); + + // Substitute HTML `id` and `class` attributes into `before_widget`. + $classname_ = ''; + foreach ( (array) $widget_params['classname'] as $cn ) { + if ( is_string( $cn ) ) { + $classname_ .= '_' . $cn; + } elseif ( is_object( $cn ) ) { + $classname_ .= '_' . get_class( $cn ); + } + } + $classname_ = ltrim( $classname_, '_' ); + $params[0]['before_widget'] = sprintf( $params[0]['before_widget'], $widget_id, $classname_ ); + + /** This filter is documented in wp-includes/widgets/widgets.php */ + $params = apply_filters( 'dynamic_sidebar_params', $params ); + + /** This filter is documented in wp-includes/widgets/widgets.php */ + do_action( 'dynamic_sidebar', $widget_params ); + + if ( is_callable( $callback ) ) { + ob_start(); + call_user_func_array( $callback, $params ); + return ob_get_clean(); + } +} From 0cd8dd9102b4a2b1bb450bebad1216f373eec2c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Zieli=C5=84ski?= Date: Fri, 18 Sep 2020 15:50:54 +0200 Subject: [PATCH 2/6] Don't hardcode sidebar id --- .../src/blocks/legacy-widget/edit/index.js | 22 ++--- .../legacy-widget/edit/widget-preview.js | 7 +- .../src/blocks/legacy-widget/index.php | 80 +++++++++---------- packages/edit-widgets/src/store/selectors.js | 23 ++++++ 4 files changed, 72 insertions(+), 60 deletions(-) diff --git a/packages/edit-widgets/src/blocks/legacy-widget/edit/index.js b/packages/edit-widgets/src/blocks/legacy-widget/edit/index.js index 28114fd20eed9..df2c23e662e38 100644 --- a/packages/edit-widgets/src/blocks/legacy-widget/edit/index.js +++ b/packages/edit-widgets/src/blocks/legacy-widget/edit/index.js @@ -9,7 +9,7 @@ import { get, omit } from 'lodash'; import { Component } from '@wordpress/element'; import { Button, PanelBody, ToolbarGroup } from '@wordpress/components'; import { __ } from '@wordpress/i18n'; -import { withDispatch, withSelect } from '@wordpress/data'; +import { withSelect } from '@wordpress/data'; import { BlockControls, InspectorControls } from '@wordpress/block-editor'; import { update } from '@wordpress/icons'; @@ -187,10 +187,11 @@ class LegacyWidgetEdit extends Component { } renderWidgetPreview() { - const { attributes } = this.props; + const { attributes, widgetAreaId } = this.props; return ( ); @@ -202,6 +203,9 @@ export default withSelect( ( select, { clientId } ) => { clientId ); const widget = select( 'core/edit-widgets' ).getWidget( widgetId ); + const widgetArea = select( 'core/edit-widgets' ).getWidgetAreaForClientId( + clientId + ); const editorSettings = select( 'core/block-editor' ).getSettings(); const { availableLegacyWidgets, @@ -211,17 +215,7 @@ export default withSelect( ( select, { clientId } ) => { hasPermissionsToManageWidgets, availableLegacyWidgets, widgetId, + widgetAreaId: widgetArea?.id, prerenderedEditForm: widget ? widget.rendered_form : '', }; -} )( - withDispatch( ( dispatch, { clientId } ) => { - return { - setWidgetId( id ) { - dispatch( 'core/edit-widgets' ).setWidgetIdForClientId( - clientId, - id - ); - }, - }; - } )( LegacyWidgetEdit ) -); +} )( LegacyWidgetEdit ); diff --git a/packages/edit-widgets/src/blocks/legacy-widget/edit/widget-preview.js b/packages/edit-widgets/src/blocks/legacy-widget/edit/widget-preview.js index de9a872e3c7f5..6b47ac8d7306a 100644 --- a/packages/edit-widgets/src/blocks/legacy-widget/edit/widget-preview.js +++ b/packages/edit-widgets/src/blocks/legacy-widget/edit/widget-preview.js @@ -11,12 +11,15 @@ import { Disabled, FocusableIframe } from '@wordpress/components'; import { withSelect } from '@wordpress/data'; import { useState } from '@wordpress/element'; -function WidgetPreview( { postLink, attributes, ...props } ) { +function WidgetPreview( { postLink, widgetAreaId, attributes, ...props } ) { const DEFAULT_HEIGHT = 300; const HEIGTH_MARGIN = 20; const [ height, setHeight ] = useState( DEFAULT_HEIGHT ); const iframeUrl = addQueryArgs( postLink, { - widgetPreview: attributes, + widgetPreview: { + ...attributes, + sidebarId: widgetAreaId, + }, } ); return ( diff --git a/packages/edit-widgets/src/blocks/legacy-widget/index.php b/packages/edit-widgets/src/blocks/legacy-widget/index.php index a4c9755c3f799..f8e6e345bdbe7 100644 --- a/packages/edit-widgets/src/blocks/legacy-widget/index.php +++ b/packages/edit-widgets/src/blocks/legacy-widget/index.php @@ -27,64 +27,50 @@ function register_block_core_legacy_widget() { * */ function render_block_core_legacy_widget( $attributes ) { + global $wp_widget_factory, $wp_registered_sidebars; + if ( isset( $attributes['widgetId'] ) ) { return 'Rendering legacy widget block using a widget ID is unsupported'; } - if ( ! isset( $attributes['widgetClass'] ) ) { + $widget_id = - 1; + + if ( ! isset( $attributes['sidebarId'] ) || ! isset( $wp_registered_sidebars[ $attributes['sidebarId'] ] ) ) { return ''; } + $sidebar_id = $attributes['sidebarId']; - $instance = null; - if ( isset( $attributes['instance'] ) ) { - $instance = $attributes['instance']; + if ( ! isset( $attributes['widgetClass'] ) || ! isset( $wp_widget_factory->widgets[ $attributes['widgetClass'] ] ) ) { + return ''; } + $widget_class = $attributes['widgetClass']; + $widget_obj = $wp_widget_factory->widgets[ $widget_class ]; - global $wp_widget_factory; - $widget_id = '0'; - $widget_obj = $wp_widget_factory->widgets[ $attributes['widgetClass'] ]; - return render_single_widget( - 'sidebar-1', - $widget_id, - array_merge( - array( - 'classname' => '', - ), - $widget_obj->widget_options, - array( - 'instance' => $instance, - ) - ), - function ( $params ) use ( $widget_obj, $instance ) { - $widget_obj->_set( - 1 ); - $widget_obj->widget( $params, $instance ); - }, + $instance = isset( $attributes['instance'] ) ? $attributes['instance'] : null; + + $widget_params = array_merge( array( - 'widget_id' => $widget_id, - 'widget_name' => $widget_obj->name, - ) + 'classname' => array(), + ), + $widget_obj->widget_options ); -} - -add_action( 'init', 'register_block_core_legacy_widget' ); - - -function render_single_widget( $sidebar_id, $widget_id, $widget_params, $callback, $sidebar_params ) { - global $wp_registered_sidebars; - - $index = $sidebar_id; /** This filter is documented in wp-includes/widgets/widgets.php */ - do_action( 'dynamic_sidebar_before', $index, true ); - $sidebar = $wp_registered_sidebars[ $index ]; + do_action( 'dynamic_sidebar_before', $sidebar_id, true ); + $sidebar = $wp_registered_sidebars[ $sidebar_id ]; $params = array_merge( array( array_merge( $sidebar, - $sidebar_params + array( + 'widget_id' => $widget_id, + 'widget_name' => $widget_obj->name, + ) ), ), - $widget_params + array( + $instance, + ) ); // Substitute HTML `id` and `class` attributes into `before_widget`. @@ -105,9 +91,15 @@ function render_single_widget( $sidebar_id, $widget_id, $widget_params, $callbac /** This filter is documented in wp-includes/widgets/widgets.php */ do_action( 'dynamic_sidebar', $widget_params ); - if ( is_callable( $callback ) ) { - ob_start(); - call_user_func_array( $callback, $params ); - return ob_get_clean(); - } + $callback = function ( $params ) use ( $widget_obj, $instance ) { + $widget_obj->widget( $params, $instance ); + }; + + ob_start(); + $widget_obj->_set( - 1 ); + call_user_func_array( array( $widget_obj, 'widget' ), $params ); + + return ob_get_clean(); } + +add_action( 'init', 'register_block_core_legacy_widget' ); diff --git a/packages/edit-widgets/src/store/selectors.js b/packages/edit-widgets/src/store/selectors.js index 3fb8af255849c..3941524ca5462 100644 --- a/packages/edit-widgets/src/store/selectors.js +++ b/packages/edit-widgets/src/store/selectors.js @@ -60,6 +60,29 @@ export const getWidgetIdForClientId = ( state, clientId ) => { return clientIdToWidgetId[ clientId ]; }; +/** + * Returns widgetArea containing a block identify by given clientId + * + * @param {string} clientId The ID of the block. + * @return {Object} Containing widget area. + */ +export const getWidgetAreaForClientId = createRegistrySelector( + ( select ) => ( state, clientId ) => { + const widgetAreas = select( 'core/edit-widgets' ).getWidgetAreas(); + for ( const widgetArea of widgetAreas ) { + const post = select( 'core' ).getEditedEntityRecord( + KIND, + POST_TYPE, + buildWidgetAreaPostId( widgetArea.id ) + ); + const clientIds = post.blocks.map( ( block ) => block.clientId ); + if ( clientIds.includes( clientId ) ) { + return widgetArea; + } + } + } +); + export const getEditedWidgetAreas = createRegistrySelector( ( select ) => ( state, ids ) => { let widgetAreas = select( 'core/edit-widgets' ).getWidgetAreas(); From 43ec0cc94562b9ac4a1ec452aa0f55b0fe0c5ee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Zieli=C5=84ski?= Date: Fri, 18 Sep 2020 15:59:49 +0200 Subject: [PATCH 3/6] Don't hardcode preview URL --- .../legacy-widget/edit/widget-preview.js | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/packages/edit-widgets/src/blocks/legacy-widget/edit/widget-preview.js b/packages/edit-widgets/src/blocks/legacy-widget/edit/widget-preview.js index 6b47ac8d7306a..09588a94331da 100644 --- a/packages/edit-widgets/src/blocks/legacy-widget/edit/widget-preview.js +++ b/packages/edit-widgets/src/blocks/legacy-widget/edit/widget-preview.js @@ -8,14 +8,15 @@ import { get } from 'lodash'; */ import { addQueryArgs } from '@wordpress/url'; import { Disabled, FocusableIframe } from '@wordpress/components'; -import { withSelect } from '@wordpress/data'; import { useState } from '@wordpress/element'; -function WidgetPreview( { postLink, widgetAreaId, attributes, ...props } ) { +function WidgetPreview( { widgetAreaId, attributes, ...props } ) { const DEFAULT_HEIGHT = 300; - const HEIGTH_MARGIN = 20; + const HEIGHT_MARGIN = 20; const [ height, setHeight ] = useState( DEFAULT_HEIGHT ); - const iframeUrl = addQueryArgs( postLink, { + const currentUrl = document.location.href; + const siteUrl = currentUrl.substr( 0, currentUrl.indexOf( 'wp-admin/' ) ); + const iframeUrl = addQueryArgs( siteUrl, { widgetPreview: { ...attributes, sidebarId: widgetAreaId, @@ -36,16 +37,11 @@ function WidgetPreview( { postLink, widgetAreaId, attributes, ...props } ) { } } } src={ iframeUrl } - height={ height + HEIGTH_MARGIN } + height={ height + HEIGHT_MARGIN } { ...props } /> ); } -export default withSelect( () => { - return { - // @TODO: Don't hardcode preview URL - postLink: '/?p=1', - }; -} )( WidgetPreview ); +export default WidgetPreview; From 5db74455c35a94264f5e8192080746cc692e54d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Zieli=C5=84ski?= Date: Fri, 18 Sep 2020 16:05:03 +0200 Subject: [PATCH 4/6] lint --- packages/edit-widgets/src/blocks/legacy-widget/index.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/edit-widgets/src/blocks/legacy-widget/index.php b/packages/edit-widgets/src/blocks/legacy-widget/index.php index f8e6e345bdbe7..7f209f3f4fd4b 100644 --- a/packages/edit-widgets/src/blocks/legacy-widget/index.php +++ b/packages/edit-widgets/src/blocks/legacy-widget/index.php @@ -24,13 +24,12 @@ function register_block_core_legacy_widget() { * * @return string Returns the post content with the legacy widget added. * @see WP_Widget - * */ function render_block_core_legacy_widget( $attributes ) { global $wp_widget_factory, $wp_registered_sidebars; if ( isset( $attributes['widgetId'] ) ) { - return 'Rendering legacy widget block using a widget ID is unsupported'; + return __( 'Rendering legacy widget block using widgetId is unsupported.', 'gutenberg' ); } $widget_id = - 1; @@ -91,10 +90,6 @@ function render_block_core_legacy_widget( $attributes ) { /** This filter is documented in wp-includes/widgets/widgets.php */ do_action( 'dynamic_sidebar', $widget_params ); - $callback = function ( $params ) use ( $widget_obj, $instance ) { - $widget_obj->widget( $params, $instance ); - }; - ob_start(); $widget_obj->_set( - 1 ); call_user_func_array( array( $widget_obj, 'widget' ), $params ); From e262e73ca1d99e9d3ba921b51df69877353c8af7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Zieli=C5=84ski?= Date: Mon, 21 Sep 2020 12:27:03 +0200 Subject: [PATCH 5/6] Update package-lock.json --- package-lock.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package-lock.json b/package-lock.json index 004a666df5ad3..628942d8ddded 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15990,6 +15990,7 @@ "@wordpress/notices": "file:packages/notices", "@wordpress/plugins": "file:packages/plugins", "@wordpress/server-side-render": "file:packages/server-side-render", + "@wordpress/url": "file:packages/url", "classnames": "^2.2.5", "lodash": "^4.17.19", "rememo": "^3.0.0" From cdf5ad3ce38c4630acee418019d797fedcfb4aa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Zieli=C5=84ski?= Date: Mon, 21 Sep 2020 14:22:40 +0200 Subject: [PATCH 6/6] Lint --- .../edit-widgets/src/blocks/legacy-widget/edit/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/edit-widgets/src/blocks/legacy-widget/edit/index.js b/packages/edit-widgets/src/blocks/legacy-widget/edit/index.js index 7ef115fb70f86..0863ed992d8b4 100644 --- a/packages/edit-widgets/src/blocks/legacy-widget/edit/index.js +++ b/packages/edit-widgets/src/blocks/legacy-widget/edit/index.js @@ -208,9 +208,9 @@ export default withSelect( clientId ); const widget = select( 'core/edit-widgets' ).getWidget( widgetId ); - const widgetArea = select( 'core/edit-widgets' ).getWidgetAreaForClientId( - clientId - ); + const widgetArea = select( + 'core/edit-widgets' + ).getWidgetAreaForClientId( clientId ); const editorSettings = select( 'core/block-editor' ).getSettings(); const { availableLegacyWidgets,