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

Merge release 1.62.0 to develop #3989

Merged
merged 12 commits into from
Sep 20, 2021
3 changes: 3 additions & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
Unreleased
---

1.62.0
------
* [**] Enable WordPress embed preview [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3853]
* [**] Embed block: Add error bottom sheet with retry and convert to link actions. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3921]
* [**] Embed block: Implemented the No Preview UI when an embed is successful, but we're unable to show an inline preview [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3927]
Expand Down
11 changes: 9 additions & 2 deletions bundle/android/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
<!-- translators: %d: column index. -->
<string name="gutenberg_native_column_d" tools:ignore="UnusedResources">Column %d</string>
<string name="gutenberg_native_columns_settings" tools:ignore="UnusedResources">Columns Settings</string>
<string name="gutenberg_native_convert_to_link" tools:ignore="UnusedResources">Convert to link</string>
<string name="gutenberg_native_copied_block" tools:ignore="UnusedResources">Copied block</string>
<string name="gutenberg_native_copy_block" tools:ignore="UnusedResources">Copy block</string>
<string name="gutenberg_native_copy_file_url" tools:ignore="UnusedResources">Copy file URL</string>
Expand Down Expand Up @@ -125,6 +126,7 @@
<!-- translators: accessibility text (hint for switches) -->
<string name="gutenberg_native_double_tap_to_toggle_setting" tools:ignore="UnusedResources">Double tap to toggle setting</string>
<string name="gutenberg_native_double_tap_to_undo_last_change" tools:ignore="UnusedResources">Double tap to undo last change</string>
<string name="gutenberg_native_double_tap_to_view_embed_options" tools:ignore="UnusedResources">Double tap to view embed options.</string>
<string name="gutenberg_native_drag_to_adjust_focal_point" tools:ignore="UnusedResources">Drag to adjust focal point</string>
<string name="gutenberg_native_duplicate_block" tools:ignore="UnusedResources">Duplicate block</string>
<string name="gutenberg_native_each_block_has_its_own_settings_to_find_them_tap_on_a_block_its_s" tools:ignore="UnusedResources">Each block has its own settings. To find them, tap on a block. Its settings will appear on the toolbar at the bottom of the screen.</string>
Expand All @@ -137,12 +139,14 @@
<string name="gutenberg_native_edit_video" tools:ignore="UnusedResources">Edit video</string>
<string name="gutenberg_native_editing_reusable_blocks_is_not_yet_supported_on_wordpress_for_and" tools:ignore="UnusedResources">Editing reusable blocks is not yet supported on WordPress for Android</string>
<string name="gutenberg_native_editing_reusable_blocks_is_not_yet_supported_on_wordpress_for_ios" tools:ignore="UnusedResources">Editing reusable blocks is not yet supported on WordPress for iOS</string>
<string name="gutenberg_native_embed_block_previews_are_coming_soon" tools:ignore="UnusedResources">Embed block previews are coming soon</string>
<!-- translators: accessibility text. Empty Embed caption. -->
<string name="gutenberg_native_embed_caption_empty" tools:ignore="UnusedResources">Embed caption. Empty</string>
<!-- translators: accessibility text. %s: Embed caption. -->
<string name="gutenberg_native_embed_caption_s" tools:ignore="UnusedResources">Embed caption. %s</string>
<string name="gutenberg_native_embed_link" tools:ignore="UnusedResources">Embed link</string>
<string name="gutenberg_native_embed_media" tools:ignore="UnusedResources">Embed media</string>
<string name="gutenberg_native_embed_options" tools:ignore="UnusedResources">Embed options</string>
<string name="gutenberg_native_error" tools:ignore="UnusedResources">Error</string>
<string name="gutenberg_native_excerpt_length_words" tools:ignore="UnusedResources">Excerpt length (words)</string>
<string name="gutenberg_native_failed_to_insert_audio_file" tools:ignore="UnusedResources">Failed to insert audio file.</string>
Expand Down Expand Up @@ -211,6 +215,8 @@
<string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows" tools:ignore="UnusedResources">No application can handle this request. Please install a Web browser.</string>
<string name="gutenberg_native_no_blocks_found" tools:ignore="UnusedResources">No blocks found</string>
<string name="gutenberg_native_no_custom_placeholder_set" tools:ignore="UnusedResources">No custom placeholder set</string>
<string name="gutenberg_native_no_preview_available" tools:ignore="UnusedResources">No preview available</string>
<string name="gutenberg_native_none" tools:ignore="UnusedResources">None</string>
<string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes" tools:ignore="UnusedResources">Note: Column layout may vary between themes and screen sizes</string>
<string name="gutenberg_native_number_of_columns" tools:ignore="UnusedResources">Number of columns</string>
<string name="gutenberg_native_once_you_become_familiar_with_the_names_of_different_blocks_you_c" tools:ignore="UnusedResources">Once you become familiar with the names of different blocks, you can add a block by typing a forward slash followed by the block name — for example, /image or /heading.</string>
Expand Down Expand Up @@ -245,6 +251,7 @@
<string name="gutenberg_native_replace_file" tools:ignore="UnusedResources">Replace file</string>
<string name="gutenberg_native_replace_image_or_video" tools:ignore="UnusedResources">Replace image or video</string>
<string name="gutenberg_native_replace_video" tools:ignore="UnusedResources">Replace video</string>
<string name="gutenberg_native_retry" tools:ignore="UnusedResources">Retry</string>
<string name="gutenberg_native_rich_text_editing" tools:ignore="UnusedResources">Rich text editing</string>
<!-- translators: %s: Block name e.g. "Image block"
translators: Block name. %s: The localized block name -->
Expand All @@ -255,12 +262,12 @@ translators: Block name. %s: The localized block name -->
<string name="gutenberg_native_s_block_newly_available" tools:ignore="UnusedResources">%s block, newly available</string>
<!-- translators: %s: block title e.g: "Paragraph". -->
<string name="gutenberg_native_s_block_options" tools:ignore="UnusedResources">%s block options</string>
<!-- translators: %s: embed block variant's label e.g: "Twitter". -->
<string name="gutenberg_native_s_block_previews_are_coming_soon" tools:ignore="UnusedResources">%s block previews are coming soon</string>
<!-- translators: accessibility text for blocks with invalid content. %d: localized block title -->
<string name="gutenberg_native_s_block_this_block_has_invalid_content" tools:ignore="UnusedResources">%s block. This block has invalid content</string>
<!-- translators: %s: name of the reusable block -->
<string name="gutenberg_native_s_converted_to_regular_blocks" tools:ignore="UnusedResources">%s converted to regular blocks</string>
<!-- translators: %s: embed block variant's label e.g: "Twitter". -->
<string name="gutenberg_native_s_embed_block_previews_are_coming_soon" tools:ignore="UnusedResources">%s embed block previews are coming soon</string>
<!-- translators: %s: social link name e.g: "Instagram". -->
<string name="gutenberg_native_s_has_no_url_set" tools:ignore="UnusedResources">%s has no URL set</string>
<!-- translators: %s: social link name e.g: "Instagram". -->
Expand Down
3,713 changes: 1,869 additions & 1,844 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.

9 changes: 8 additions & 1 deletion bundle/ios/GutenbergNativeTranslations.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ private func dummy() {
_ = NSLocalizedString("%1$s. %2$s is %3$s %4$s.", comment: "translators: accessibility text. Inform about current value. %1$s: Control label %2$s: setting label (example: width), %3$s: Current value. %4$s: value measurement unit (example: pixels)")
_ = NSLocalizedString("%s block", comment: "translators: %s: Block name e.g. \"Image block\"\ntranslators: Block name. %s: The localized block name")
_ = NSLocalizedString("%s block options", comment: "translators: %s: block title e.g: \"Paragraph\".")
_ = NSLocalizedString("%s block previews are coming soon", comment: "translators: %s: embed block variant's label e.g: \"Twitter\".")
_ = NSLocalizedString("%s block, newly available", comment: "translators: Newly available block name. %s: The localized block name")
_ = NSLocalizedString("%s block. Empty", comment: "translators: accessibility text for the media block empty state. %s: media type")
_ = NSLocalizedString("%s block. This block has invalid content", comment: "translators: accessibility text for blocks with invalid content. %d: localized block title")
_ = NSLocalizedString("%s converted to regular blocks", comment: "translators: %s: name of the reusable block")
_ = NSLocalizedString("%s embed block previews are coming soon", comment: "translators: %s: embed block variant's label e.g: \"Twitter\".")
_ = NSLocalizedString("%s has no URL set", comment: "translators: %s: social link name e.g: \"Instagram\".")
_ = NSLocalizedString("%s has URL set", comment: "translators: %s: social link name e.g: \"Instagram\".")
_ = NSLocalizedString("%s previews not yet available", comment: "translators: %s: embed block variant's label e.g: \"Twitter\".")
Expand Down Expand Up @@ -76,6 +76,7 @@ private func dummy() {
_ = NSLocalizedString("Clear search", comment: "")
_ = NSLocalizedString("Column %d", comment: "translators: %d: column index.")
_ = NSLocalizedString("Columns Settings", comment: "")
_ = NSLocalizedString("Convert to link", comment: "")
_ = NSLocalizedString("Copied block", comment: "")
_ = NSLocalizedString("Copy block", comment: "")
_ = NSLocalizedString("Copy file URL", comment: "")
Expand Down Expand Up @@ -119,6 +120,7 @@ private func dummy() {
_ = NSLocalizedString("Double tap to select the option", comment: "translators: accessibility text (hint for selecting option)")
_ = NSLocalizedString("Double tap to toggle setting", comment: "translators: accessibility text (hint for switches)")
_ = NSLocalizedString("Double tap to undo last change", comment: "")
_ = NSLocalizedString("Double tap to view embed options.", comment: "")
_ = NSLocalizedString("double-tap to change unit", comment: "")
_ = NSLocalizedString("Drag to adjust focal point", comment: "")
_ = NSLocalizedString("Duplicate block", comment: "")
Expand All @@ -132,10 +134,12 @@ private func dummy() {
_ = NSLocalizedString("Edit video", comment: "")
_ = NSLocalizedString("Editing reusable blocks is not yet supported on WordPress for Android", comment: "")
_ = NSLocalizedString("Editing reusable blocks is not yet supported on WordPress for iOS", comment: "")
_ = NSLocalizedString("Embed block previews are coming soon", comment: "")
_ = NSLocalizedString("Embed caption. %s", comment: "translators: accessibility text. %s: Embed caption.")
_ = NSLocalizedString("Embed caption. Empty", comment: "translators: accessibility text. Empty Embed caption.")
_ = NSLocalizedString("Embed link", comment: "")
_ = NSLocalizedString("Embed media", comment: "")
_ = NSLocalizedString("Embed options", comment: "")
_ = NSLocalizedString("Error", comment: "")
_ = NSLocalizedString("Excerpt length (words)", comment: "")
_ = NSLocalizedString("Failed to insert audio file.", comment: "")
Expand Down Expand Up @@ -197,6 +201,8 @@ private func dummy() {
_ = NSLocalizedString("No application can handle this request. Please install a Web browser.", comment: "")
_ = NSLocalizedString("No blocks found", comment: "")
_ = NSLocalizedString("No custom placeholder set", comment: "")
_ = NSLocalizedString("No preview available", comment: "")
_ = NSLocalizedString("None", comment: "")
_ = NSLocalizedString("Note: Column layout may vary between themes and screen sizes", comment: "")
_ = NSLocalizedString("Number of columns", comment: "")
_ = NSLocalizedString("Once you become familiar with the names of different blocks, you can add a block by typing a forward slash followed by the block name — for example, /image or /heading.", comment: "")
Expand Down Expand Up @@ -226,6 +232,7 @@ private func dummy() {
_ = NSLocalizedString("Replace file", comment: "")
_ = NSLocalizedString("Replace image or video", comment: "")
_ = NSLocalizedString("Replace video", comment: "")
_ = NSLocalizedString("Retry", comment: "")
_ = NSLocalizedString("Rich text editing", comment: "")
_ = NSLocalizedString("Scrollable block menu closed.", comment: "")
_ = NSLocalizedString("Scrollable block menu opened. Select a block.", comment: "")
Expand Down
2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 68 files
+1 −2 bin/build-plugin-zip.sh
+5 −0 packages/block-editor/src/components/copy-handler/index.js
+3 −3 packages/block-editor/src/components/media-placeholder/index.js
+6 −0 packages/block-library/src/file/block.json
+123 −0 packages/block-library/src/file/deprecated.js
+6 −0 packages/block-library/src/file/edit.js
+2 −0 packages/block-library/src/file/index.js
+3 −0 packages/block-library/src/file/save.js
+13 −2 packages/block-library/src/query-pagination/edit.js
+0 −2 packages/block-library/src/query-pagination/editor.scss
+0 −1 packages/block-library/src/query-pagination/style.scss
+7 −2 packages/components/src/button/index.js
+14 −7 packages/components/src/card/card-media/component.js
+14 −7 packages/components/src/elevation/component.js
+14 −7 packages/components/src/flex/flex-block/component.js
+14 −7 packages/components/src/flex/flex-item/component.js
+14 −7 packages/components/src/grid/component.js
+14 −7 packages/components/src/h-stack/component.js
+1 −2 packages/components/src/panel/style.scss
+1 −1 packages/components/src/unit-control/README.md
+12 −3 packages/components/src/unit-control/index.js
+18 −0 packages/components/src/unit-control/test/index.js
+58 −0 packages/components/src/unit-control/test/utils.js
+69 −15 packages/components/src/unit-control/utils.js
+1 −0 packages/e2e-test-utils/src/press-key-with-modifier.js
+28 −0 packages/e2e-tests/specs/editor/various/__snapshots__/copy-cut-paste-whole-blocks.test.js.snap
+92 −0 packages/e2e-tests/specs/editor/various/copy-cut-paste-whole-blocks.test.js
+13 −9 packages/edit-navigation/src/components/add-menu/index.js
+19 −0 packages/edit-navigation/src/components/add-menu/style.scss
+1 −0 packages/edit-navigation/src/components/header/new-button.js
+1 −1 packages/edit-navigation/src/components/menu-switcher/index.js
+2 −2 packages/edit-navigation/src/components/menu-switcher/style.scss
+2 −0 packages/edit-site/src/components/block-editor/index.js
+57 −0 packages/edit-site/src/components/edit-template-part-menu-button/index.js
+1 −1 packages/react-native-aztec/package.json
+1 −1 packages/react-native-bridge/package.json
+2 −0 packages/react-native-editor/CHANGELOG.md
+3 −0 packages/react-native-editor/ios/Gemfile.lock
+5 −5 packages/react-native-editor/ios/Podfile.lock
+1 −1 packages/react-native-editor/package.json
+1 −1 test/integration/fixtures/blocks/core__file__new-window.html
+2 −1 test/integration/fixtures/blocks/core__file__new-window.json
+2 −2 test/integration/fixtures/blocks/core__file__new-window.parsed.json
+1 −1 test/integration/fixtures/blocks/core__file__new-window.serialized.html
+5 −0 test/integration/fixtures/blocks/core__file__new-window__deprecated-1.html
+18 −0 test/integration/fixtures/blocks/core__file__new-window__deprecated-1.json
+14 −0 test/integration/fixtures/blocks/core__file__new-window__deprecated-1.parsed.json
+3 −0 test/integration/fixtures/blocks/core__file__new-window__deprecated-1.serialized.html
+1 −1 test/integration/fixtures/blocks/core__file__no-download-button.html
+2 −1 test/integration/fixtures/blocks/core__file__no-download-button.json
+2 −2 test/integration/fixtures/blocks/core__file__no-download-button.parsed.json
+1 −1 test/integration/fixtures/blocks/core__file__no-download-button.serialized.html
+3 −0 test/integration/fixtures/blocks/core__file__no-download-button__deprecated-1.html
+17 −0 test/integration/fixtures/blocks/core__file__no-download-button__deprecated-1.json
+14 −0 test/integration/fixtures/blocks/core__file__no-download-button__deprecated-1.parsed.json
+3 −0 test/integration/fixtures/blocks/core__file__no-download-button__deprecated-1.serialized.html
+3 −0 test/integration/fixtures/blocks/core__file__no-text-link__deprecated-1.html
+16 −0 test/integration/fixtures/blocks/core__file__no-text-link__deprecated-1.json
+14 −0 test/integration/fixtures/blocks/core__file__no-text-link__deprecated-1.parsed.json
+3 −0 test/integration/fixtures/blocks/core__file__no-text-link__deprecated-1.serialized.html
+1 −1 test/integration/fixtures/blocks/core__file__pdf-preview.html
+2 −1 test/integration/fixtures/blocks/core__file__pdf-preview.json
+2 −2 test/integration/fixtures/blocks/core__file__pdf-preview.parsed.json
+1 −1 test/integration/fixtures/blocks/core__file__pdf-preview.serialized.html
+3 −0 test/integration/fixtures/blocks/core__file__pdf-preview__deprecated-1.html
+18 −0 test/integration/fixtures/blocks/core__file__pdf-preview__deprecated-1.json
+15 −0 test/integration/fixtures/blocks/core__file__pdf-preview__deprecated-1.parsed.json
+3 −0 test/integration/fixtures/blocks/core__file__pdf-preview__deprecated-1.serialized.html
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gutenberg-mobile",
"version": "1.61.1",
"version": "1.62.0",
"private": true,
"config": {
"jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js",
Expand Down