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.

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

Prompt to keep or replace Featured Image when replacing Image block media that is set as the Featured Image #3930

Merged
merged 20 commits into from
Feb 2, 2022
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
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
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Unreleased
---
* [*] Image block: Replacing the media for an image set as featured prompts to update the featured image [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3930]

1.70.0
---
Expand Down
4 changes: 2 additions & 2 deletions bundle/android/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<string name="gutenberg_native_1_s_2_s_is_3_s_4_s" tools:ignore="UnusedResources">%1$s. %2$s is %3$s %4$s.</string>
<!-- translators: 1: From block title, e.g. Paragraph. 2: To block title, e.g. Header. -->
<string name="gutenberg_native_1_s_transformed_to_2_s" tools:ignore="UnusedResources">%1$s transformed to %2$s</string>
<string name="gutenberg_native_add_a_new_block_at_any_time_by_tapping_on_the_icon_in_the_toolbar" tools:ignore="UnusedResources">Add a new block at any time by tapping on the + icon in the toolbar on the bottom left. </string>
dcalhoun marked this conversation as resolved.
Show resolved Hide resolved
<string name="gutenberg_native_add_a_new_block_at_any_time_by_tapping_on_the_icon_in_the_toolbar" tools:ignore="UnusedResources">Add a new block at any time by tapping on the + icon in the toolbar on the bottom left.</string>
<string name="gutenberg_native_add_a_shortcode" tools:ignore="UnusedResources">Add a shortcode…</string>
<string name="gutenberg_native_add_alt_text" tools:ignore="UnusedResources">Add alt text</string>
<string name="gutenberg_native_add_audio" tools:ignore="UnusedResources">ADD AUDIO</string>
Expand Down Expand Up @@ -99,7 +99,7 @@
<string name="gutenberg_native_customize_blocks" tools:ignore="UnusedResources">Customize blocks</string>
<string name="gutenberg_native_customize_gradient" tools:ignore="UnusedResources">Customize Gradient</string>
<string name="gutenberg_native_cut_block" tools:ignore="UnusedResources">Cut block</string>
<string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur" tools:ignore="UnusedResources">Describe the purpose of the image. Leave empty if the image is purely decorative. </string>
<string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur" tools:ignore="UnusedResources">Describe the purpose of the image. Leave empty if the image is purely decorative.</string>
<string name="gutenberg_native_dismiss" tools:ignore="UnusedResources">Dismiss</string>
<string name="gutenberg_native_double_tap_and_hold_to_edit" tools:ignore="UnusedResources">Double tap and hold to edit</string>
<string name="gutenberg_native_double_tap_to_add_a_block" tools:ignore="UnusedResources">Double tap to add a block</string>
Expand Down
5,764 changes: 2,881 additions & 2,883 deletions bundle/ios/App.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/App.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions bundle/ios/GutenbergNativeTranslations.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ private func dummy() {
_ = NSLocalizedString("%s link", comment: "translators: %s: embed block variant's label e.g: \"Twitter\".")
_ = NSLocalizedString("%s previews not yet available", comment: "translators: %s: embed block variant's label e.g: \"Twitter\".")
_ = NSLocalizedString("%s social icon", comment: "translators: %s: social link name e.g: \"Instagram\".")
_ = NSLocalizedString("Add a new block at any time by tapping on the + icon in the toolbar on the bottom left. ", comment: "")
_ = NSLocalizedString("Add a new block at any time by tapping on the + icon in the toolbar on the bottom left.", comment: "")
_ = NSLocalizedString("Add a shortcode…", comment: "")
_ = NSLocalizedString("Add alt text", comment: "")
_ = NSLocalizedString("ADD AUDIO", comment: "")
Expand Down Expand Up @@ -97,7 +97,7 @@ private func dummy() {
_ = NSLocalizedString("Customize blocks", comment: "")
_ = NSLocalizedString("Customize Gradient", comment: "")
_ = NSLocalizedString("Cut block", comment: "")
_ = NSLocalizedString("Describe the purpose of the image. Leave empty if the image is purely decorative. ", comment: "")
_ = NSLocalizedString("Describe the purpose of the image. Leave empty if the image is purely decorative.", comment: "")
_ = NSLocalizedString("Dismiss", comment: "")
_ = NSLocalizedString("Double tap and hold to edit", comment: "")
_ = NSLocalizedString("Double tap to add a block", comment: "")
Expand Down
2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 80 files
+1 −1 docs/reference-guides/block-api/block-edit-save.md
+43 −4 docs/reference-guides/block-api/block-supports.md
+1 −0 package-lock.json
+1 −0 packages/base-styles/_z-index.scss
+26 −1 packages/block-editor/src/components/block-preview/auto.js
+7 −1 packages/block-editor/src/components/block-tools/block-selection-button.js
+2 −2 packages/block-library/src/comments-pagination-next/edit.js
+1 −1 packages/block-library/src/comments-pagination-next/index.php
+2 −2 packages/block-library/src/comments-pagination-previous/edit.js
+1 −1 packages/block-library/src/comments-pagination-previous/index.php
+65 −15 packages/block-library/src/image/edit.native.js
+150 −1 packages/block-library/src/image/test/edit.native.js
+1 −1 packages/block-library/src/latest-posts/index.php
+9 −1 packages/block-library/src/navigation/edit/index.js
+65 −15 packages/block-library/src/navigation/edit/navigation-menu-selector.js
+9 −44 packages/block-library/src/navigation/edit/placeholder/index.js
+2 −0 packages/block-library/src/navigation/index.php
+58 −0 packages/block-library/src/navigation/use-convert-classic-menu.js
+5 −0 packages/components/CHANGELOG.md
+5 −1 packages/components/src/navigator/context.ts
+29 −21 packages/components/src/navigator/navigator-provider/README.md
+77 −23 packages/components/src/navigator/navigator-provider/component.tsx
+20 −22 packages/components/src/navigator/navigator-screen/component.tsx
+11 −12 packages/components/src/navigator/stories/index.js
+105 −22 packages/components/src/navigator/test/index.js
+10 −11 packages/components/src/navigator/types.ts
+4 −4 packages/components/src/navigator/use-navigator.ts
+1 −1 packages/components/src/range-control/styles/range-control-styles.js
+1 −1 packages/create-block-tutorial-template/templates/readme.txt.mustache
+1 −1 packages/create-block/lib/templates/es5/readme.txt.mustache
+1 −1 packages/create-block/lib/templates/esnext/plugin/readme.txt.mustache
+1 −1 packages/docgen/lib/get-jsdoc-from-token.js
+35 −43 packages/docgen/lib/get-type-annotation.js
+54 −20 packages/docgen/lib/markdown/formatter.js
+44 −153 packages/docgen/test/get-export-entries.js
+52 −351 packages/docgen/test/get-intermediate-representation.js
+5 −9 packages/docgen/test/get-type-annotation.js
+9 −16 packages/edit-post/src/components/preferences-modal/index.js
+3 −9 packages/edit-post/src/components/preferences-modal/test/__snapshots__/index.js.snap
+1 −0 packages/edit-site/package.json
+6 −6 packages/edit-site/src/components/block-editor/style.scss
+79 −0 packages/edit-site/src/components/code-editor/code-editor-text-area.js
+65 −0 packages/edit-site/src/components/code-editor/index.js
+100 −0 packages/edit-site/src/components/code-editor/style.scss
+16 −7 packages/edit-site/src/components/editor/index.js
+1 −1 packages/edit-site/src/components/global-styles/context-menu.js
+3 −5 packages/edit-site/src/components/global-styles/header.js
+14 −10 packages/edit-site/src/components/global-styles/navigation-button.js
+1 −1 packages/edit-site/src/components/global-styles/palette.js
+0 −2 packages/edit-site/src/components/global-styles/screen-background-color.js
+1 −2 packages/edit-site/src/components/global-styles/screen-block-list.js
+1 −1 packages/edit-site/src/components/global-styles/screen-block.js
+0 −2 packages/edit-site/src/components/global-styles/screen-color-palette.js
+1 −2 packages/edit-site/src/components/global-styles/screen-colors.js
+1 −5 packages/edit-site/src/components/global-styles/screen-layout.js
+0 −2 packages/edit-site/src/components/global-styles/screen-link-color.js
+1 −1 packages/edit-site/src/components/global-styles/screen-root.js
+0 −2 packages/edit-site/src/components/global-styles/screen-text-color.js
+0 −4 packages/edit-site/src/components/global-styles/screen-typography-element.js
+2 −3 packages/edit-site/src/components/global-styles/screen-typography.js
+10 −2 packages/edit-site/src/components/header/index.js
+67 −0 packages/edit-site/src/components/header/mode-switcher/index.js
+2 −0 packages/edit-site/src/components/header/more-menu/index.js
+17 −1 packages/edit-site/src/components/keyboard-shortcuts/index.js
+21 −0 packages/edit-site/src/store/actions.js
+1 −0 packages/edit-site/src/store/defaults.js
+6 −0 packages/edit-site/src/store/reducer.js
+11 −0 packages/edit-site/src/store/selectors.js
+1 −0 packages/edit-site/src/style.scss
+5 −0 packages/env/CHANGELOG.md
+12 −0 packages/env/README.md
+6 −0 packages/env/lib/cli.js
+2 −0 packages/env/lib/commands/index.js
+20 −0 packages/env/lib/commands/install-path.js
+1 −0 packages/react-native-editor/CHANGELOG.md
+37 −34 packages/react-native-editor/src/test/index.test.js
+1 −1 packages/scripts/README.md
+4 −4 readme.txt
+4 −3 test/native/helpers.js
+1 −0 test/native/setup.js