From 8c165c19e59760f50a0abd2b2b187f279992f874 Mon Sep 17 00:00:00 2001 From: Derek Blank Date: Wed, 30 Aug 2023 10:20:17 +1000 Subject: [PATCH] [RNMobile] Add block outline to all Social Link blocks when selected (#54011) * Update native block outline component to outline all social-link blocks * Remove unneeded container style prop * Update CHANGELOG --- .../src/components/block-list/block-outline.native.js | 7 +++++-- packages/block-library/src/social-link/edit.native.js | 2 +- packages/block-library/src/social-link/editor.native.scss | 4 ---- packages/react-native-editor/CHANGELOG.md | 1 + 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/block-editor/src/components/block-list/block-outline.native.js b/packages/block-editor/src/components/block-list/block-outline.native.js index 753b16f94a755..83c6a58bac365 100644 --- a/packages/block-editor/src/components/block-list/block-outline.native.js +++ b/packages/block-editor/src/components/block-list/block-outline.native.js @@ -13,7 +13,7 @@ import { usePreferredColorSchemeStyle } from '@wordpress/compose'; */ import styles from './block.scss'; -const BLOCKS_WITH_OUTLINE = [ 'core/social-link', 'core/missing' ]; +const TEXT_BLOCKS_WITH_OUTLINE = [ 'core/missing' ]; function BlockOutline( { blockCategory, @@ -22,7 +22,9 @@ function BlockOutline( { isSelected, name, } ) { - const textBlockWithOutline = BLOCKS_WITH_OUTLINE.includes( name ); + const textBlockWithOutline = TEXT_BLOCKS_WITH_OUTLINE.includes( name ); + const socialBlockWithOutline = name.includes( 'core/social-link' ); + const hasBlockTextCategory = blockCategory === 'text' && ! textBlockWithOutline; const hasBlockMediaCategory = @@ -47,6 +49,7 @@ function BlockOutline( { ( ( hasBlockTextCategory && hasInnerBlocks ) || ( ! hasBlockTextCategory && hasInnerBlocks ) || ( ! hasBlockTextCategory && isRootList ) || + socialBlockWithOutline || textBlockWithOutline ); return ( diff --git a/packages/block-library/src/social-link/edit.native.js b/packages/block-library/src/social-link/edit.native.js index 856c6aa704a4e..cdfca2cb17abd 100644 --- a/packages/block-library/src/social-link/edit.native.js +++ b/packages/block-library/src/social-link/edit.native.js @@ -158,7 +158,7 @@ const SocialLinkEdit = ( { ); return ( - + { isSelected && ( <> diff --git a/packages/block-library/src/social-link/editor.native.scss b/packages/block-library/src/social-link/editor.native.scss index f54d3aa484775..be0919d2c33fb 100644 --- a/packages/block-library/src/social-link/editor.native.scss +++ b/packages/block-library/src/social-link/editor.native.scss @@ -1,9 +1,5 @@ @import "./socials-with-bg.scss"; -.container { - margin: $block-selected-margin; -} - .linkSettingsPanel { padding-left: 0; padding-right: 0; diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md index f38723e92153c..7cb02a4848dd6 100644 --- a/packages/react-native-editor/CHANGELOG.md +++ b/packages/react-native-editor/CHANGELOG.md @@ -14,6 +14,7 @@ For each user feature we should also add a importance categorization label to i - [*] Search Control - Prevent calling TextInput's methods when undefined [#53745] - [*] Improve horizontal rule styles to avoid invisible lines [#53883] - [*] Fix horizontal rule style extensions [#53917] +- [*] Add block outline to all Social Link blocks when selected [#54011] ## 1.102.1 - [**] Fix Voice Over and assistive keyboards [#53895]