From a9da8a9a2ac6ba1253a1f557823dfbc0fa0621fa Mon Sep 17 00:00:00 2001 From: Joel Dean Date: Tue, 14 Sep 2021 17:39:39 -0500 Subject: [PATCH] [RNMobile] [Embed block] - Unavailable preview fallback bottom sheet title update (#34674) * Added the word embed to the bottom sheet title to make it clearer. * Added isDefaultEmbedInfo flag required by the EmbedNoPreview component * isDefaultEmbedInfo determines if generic label should be shown or not * used constant to store embedInfoByProvider to get rid of duplicate calls --- packages/block-library/src/embed/edit.native.js | 5 +++-- .../src/embed/embed-no-preview.native.js | 15 ++++++++++----- .../src/embed/embed-preview.native.js | 2 ++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/packages/block-library/src/embed/edit.native.js b/packages/block-library/src/embed/edit.native.js index 9320f9f196d485..084ba659d61813 100644 --- a/packages/block-library/src/embed/edit.native.js +++ b/packages/block-library/src/embed/edit.native.js @@ -52,8 +52,8 @@ const EmbedEdit = ( props ) => { title: _x( 'Embed', 'block title' ), icon: embedContentIcon, }; - const { icon, title } = - getEmbedInfoByProvider( providerNameSlug ) || defaultEmbedInfo; + const embedInfoByProvider = getEmbedInfoByProvider( providerNameSlug ); + const { icon, title } = embedInfoByProvider || defaultEmbedInfo; const { wasBlockJustInserted } = useSelect( ( select ) => ( { @@ -256,6 +256,7 @@ const EmbedEdit = ( props ) => { previewable={ previewable } type={ type } url={ url } + isDefaultEmbedInfo={ ! embedInfoByProvider } /> diff --git a/packages/block-library/src/embed/embed-no-preview.native.js b/packages/block-library/src/embed/embed-no-preview.native.js index bb3affcfb3b23e..a448cb11bf2e03 100644 --- a/packages/block-library/src/embed/embed-no-preview.native.js +++ b/packages/block-library/src/embed/embed-no-preview.native.js @@ -29,6 +29,7 @@ const EmbedNoPreview = ( { isSelected, onPress, previewable, + isDefaultEmbedInfo, } ) => { const shouldRequestReview = useRef( false ); const [ isSheetVisible, setIsSheetVisible ] = useState( false ); @@ -172,11 +173,15 @@ const EmbedNoPreview = ( { /> - { sprintf( - // translators: %s: embed block variant's label e.g: "Twitter". - __( '%s block previews are coming soon' ), - label - ) } + { isDefaultEmbedInfo + ? __( 'Embed block previews are coming soon' ) + : sprintf( + // translators: %s: embed block variant's label e.g: "Twitter". + __( + '%s embed block previews are coming soon' + ), + label + ) } { comingSoonDescription } diff --git a/packages/block-library/src/embed/embed-preview.native.js b/packages/block-library/src/embed/embed-preview.native.js index be5828fbc3121f..bb8df663baf281 100644 --- a/packages/block-library/src/embed/embed-preview.native.js +++ b/packages/block-library/src/embed/embed-preview.native.js @@ -40,6 +40,7 @@ const EmbedPreview = ( { isProviderPreviewable, type, url, + isDefaultEmbedInfo, } ) => { const [ isCaptionSelected, setIsCaptionSelected ] = useState( false ); const { locale } = useSelect( blockEditorStore ).getSettings(); @@ -137,6 +138,7 @@ const EmbedPreview = ( { isSelected={ isSelected } onPress={ () => setIsCaptionSelected( false ) } previewable={ previewable } + isDefaultEmbedInfo={ isDefaultEmbedInfo } /> ) }