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

[RNMobile] [Embed block] - Unavailable preview fallback bottom sheet title update #34674

Merged
merged 7 commits into from
Sep 14, 2021
Merged

[RNMobile] [Embed block] - Unavailable preview fallback bottom sheet title update #34674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
678af14
Added the word embed to the bottom sheet title to make it clearer.
jd-alexander Sep 9, 2021
29a3420
Added isDefaultEmbedInfo flag required by the EmbedNoPreview component
jd-alexander Sep 11, 2021
dc2113f
isDefaultEmbedInfo determines if generic label should be shown or not
jd-alexander Sep 11, 2021
023e0bd
Merge branch 'trunk' into rnmobile/embed-block-unavailable-preview-fa…
jd-alexander Sep 11, 2021
a4a1c56
used constant to store embedInfoByProvider to get rid of duplicate calls
jd-alexander Sep 13, 2021
cf54448
Merge branch 'trunk' into rnmobile/embed-block-unavailable-preview-fa…
jd-alexander Sep 13, 2021
9b83582
Merge branch 'trunk' into rnmobile/embed-block-unavailable-preview-fa…
jd-alexander Sep 14, 2021
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
5 changes: 3 additions & 2 deletions packages/block-library/src/embed/edit.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) => ( {
Expand Down Expand Up @@ -256,6 +256,7 @@ const EmbedEdit = ( props ) => {
previewable={ previewable }
type={ type }
url={ url }
isDefaultEmbedInfo={ ! embedInfoByProvider }
/>
</View>
</>
Expand Down
15 changes: 10 additions & 5 deletions packages/block-library/src/embed/embed-no-preview.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const EmbedNoPreview = ( {
isSelected,
onPress,
previewable,
isDefaultEmbedInfo,
} ) => {
const shouldRequestReview = useRef( false );
const [ isSheetVisible, setIsSheetVisible ] = useState( false );
Expand Down Expand Up @@ -172,11 +173,15 @@ const EmbedNoPreview = ( {
/>
</View>
<Text style={ sheetTitleStyle }>
{ 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
) }
</Text>
<Text style={ sheetDescriptionStyle }>
{ comingSoonDescription }
Expand Down
2 changes: 2 additions & 0 deletions packages/block-library/src/embed/embed-preview.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const EmbedPreview = ( {
isProviderPreviewable,
type,
url,
isDefaultEmbedInfo,
} ) => {
const [ isCaptionSelected, setIsCaptionSelected ] = useState( false );
const { locale } = useSelect( blockEditorStore ).getSettings();
Expand Down Expand Up @@ -137,6 +138,7 @@ const EmbedPreview = ( {
isSelected={ isSelected }
onPress={ () => setIsCaptionSelected( false ) }
previewable={ previewable }
isDefaultEmbedInfo={ isDefaultEmbedInfo }
/>
) }
<BlockCaption
Expand Down