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

Backport fixes to WordPress 5.5 beta2 #23903

Merged
merged 15 commits into from Jul 13, 2020
Merged

Conversation

@youknowriad
Copy link
Contributor

@youknowriad youknowriad commented Jul 13, 2020

These are the fixes included in this PR:

  • #23666 Error while drag and dropping blocks.
  • #23668 Fix block inserted in the wrong position.
  • #23703 Pass the edited image src while making edits.
  • #23743 Render the edit mode icon properly.
  • #23744 Fix the margins for block patterns previews.
  • #23777 Fix the handling of the default attributes for Search block.
  • #23784 Fix error when editing newly inserted patterns.
  • #23825 and #23829 Performance improvements.
  • #23851 Add ODC-By-1.0 as a supported license.
  • #23859 Fix closing slash inserter with ESC.
  • #23896 Set quick inserter content width to 100% on small screens.
  • #23900 Order quick inserter items by frecency.
  • #23901 Fix block merging regression.
talldan and others added 14 commits Jul 8, 2020
…sted block list, but root appender is used. (#23668)

* Remove use of getSelectionEnd to determine where blocks should be inserted

* Add e2e tests
Image edit: Fix cases where the edited Image src doesn't match the attachment ID. Includes backwards compatibility for WordPress 5.4 or lower.
* Search: Fix attribute defaults

Prior to d26842b, the Search block's label and buttonText attributes
defaulted to `__( 'Search' )`. This meant that adding a Search block to
a post or page resulted in `<!-- wp:search /-->` being inserted into the
HTML.

In d26842b, the defaults were removed so that Search could use a
block.json file. The default values were instead implemented using a
default block variation.

This, however, meant that Search blocks added prior to d26842b would
render with a blank label and button.

This fix is to default label and buttonText to `__( 'Search' )` in the
render_callback. Care must be taken here to permit these attributes to
be '' in which case the label and/or button are hidden.

* Try to trick GitHub into re-running tests
Co-authored-by: Zebulan Stanphill <zebulanstanphill@protonmail.com>
Co-authored-by: Riad Benguella <benguella@gmail.com>
@github-actions
Copy link

@github-actions github-actions bot commented Jul 13, 2020

Size Change: +267 B (0%)

Total Size: 1.13 MB

Filename Size Change
build/block-editor/index.js 110 kB +40 B (0%)
build/block-editor/style-rtl.css 10.7 kB +7 B (0%)
build/block-editor/style.css 10.7 kB +5 B (0%)
build/block-library/index.js 130 kB +3 B (0%)
build/components/index.js 199 kB +44 B (0%)
build/compose/index.js 9.67 kB +109 B (1%)
build/edit-post/style-rtl.css 5.59 kB +17 B (0%)
build/edit-post/style.css 5.58 kB +17 B (0%)
build/editor/index.js 45 kB +25 B (0%)
ℹ️ View Unchanged
Filename Size Change
build/a11y/index.js 1.14 kB 0 B
build/annotations/index.js 3.68 kB 0 B
build/api-fetch/index.js 3.4 kB 0 B
build/autop/index.js 2.82 kB 0 B
build/blob/index.js 620 B 0 B
build/block-directory/index.js 7.67 kB 0 B
build/block-directory/style-rtl.css 944 B 0 B
build/block-directory/style.css 945 B 0 B
build/block-library/editor-rtl.css 7.57 kB 0 B
build/block-library/editor.css 7.57 kB 0 B
build/block-library/style-rtl.css 7.78 kB 0 B
build/block-library/style.css 7.79 kB 0 B
build/block-library/theme-rtl.css 728 B 0 B
build/block-library/theme.css 729 B 0 B
build/block-serialization-default-parser/index.js 1.88 kB 0 B
build/block-serialization-spec-parser/index.js 3.1 kB 0 B
build/blocks/index.js 48.2 kB 0 B
build/components/style-rtl.css 15.8 kB 0 B
build/components/style.css 15.8 kB 0 B
build/core-data/index.js 11.4 kB 0 B
build/data-controls/index.js 1.29 kB 0 B
build/data/index.js 8.44 kB 0 B
build/date/index.js 5.38 kB 0 B
build/deprecated/index.js 772 B 0 B
build/dom-ready/index.js 569 B 0 B
build/dom/index.js 3.19 kB 0 B
build/edit-navigation/index.js 9.92 kB 0 B
build/edit-navigation/style-rtl.css 1.02 kB 0 B
build/edit-navigation/style.css 1.02 kB 0 B
build/edit-post/index.js 304 kB 0 B
build/edit-site/index.js 16.7 kB 0 B
build/edit-site/style-rtl.css 3.03 kB 0 B
build/edit-site/style.css 3.03 kB 0 B
build/edit-widgets/index.js 9.35 kB 0 B
build/edit-widgets/style-rtl.css 2.45 kB 0 B
build/edit-widgets/style.css 2.45 kB 0 B
build/editor/editor-styles-rtl.css 537 B 0 B
build/editor/editor-styles.css 539 B 0 B
build/editor/style-rtl.css 3.77 kB 0 B
build/editor/style.css 3.77 kB 0 B
build/element/index.js 4.65 kB 0 B
build/escape-html/index.js 733 B 0 B
build/format-library/index.js 7.73 kB 0 B
build/format-library/style-rtl.css 547 B 0 B
build/format-library/style.css 548 B 0 B
build/hooks/index.js 2.13 kB 0 B
build/html-entities/index.js 622 B 0 B
build/i18n/index.js 3.56 kB 0 B
build/is-shallow-equal/index.js 710 B 0 B
build/keyboard-shortcuts/index.js 2.52 kB 0 B
build/keycodes/index.js 1.94 kB 0 B
build/list-reusable-blocks/index.js 3.12 kB 0 B
build/list-reusable-blocks/style-rtl.css 476 B 0 B
build/list-reusable-blocks/style.css 476 B 0 B
build/media-utils/index.js 5.32 kB 0 B
build/notices/index.js 1.79 kB 0 B
build/nux/index.js 3.41 kB 0 B
build/nux/style-rtl.css 671 B 0 B
build/nux/style.css 668 B 0 B
build/plugins/index.js 2.56 kB 0 B
build/primitives/index.js 1.41 kB 0 B
build/priority-queue/index.js 788 B 0 B
build/redux-routine/index.js 2.85 kB 0 B
build/rich-text/index.js 13.9 kB 0 B
build/server-side-render/index.js 2.71 kB 0 B
build/shortcode/index.js 1.69 kB 0 B
build/token-list/index.js 1.28 kB 0 B
build/url/index.js 4.06 kB 0 B
build/viewport/index.js 1.85 kB 0 B
build/warning/index.js 1.14 kB 0 B
build/wordcount/index.js 1.17 kB 0 B

compressed-size-action

@youknowriad youknowriad merged commit 73b6762 into wp/trunk Jul 13, 2020
13 checks passed
13 checks passed
Check Check
Details
build
Details
Admin - 1
Details
pull-request-automation
Details
test (gutenberg-editor-gallery)
Details
test (gutenberg-editor-gallery)
Details
All
Details
JavaScript
Details
Admin - 2
Details
PHP
Details
Admin - 3
Details
Mobile
Details
Admin - 4
Details
@youknowriad youknowriad deleted the update/backport-beta2-fixes branch Jul 13, 2020
@ellatrix
Copy link
Member

@ellatrix ellatrix commented Jul 13, 2020

What's the process for this? Do you remove the label afterwards? Anything more we should include?
https://github.com/WordPress/gutenberg/pulls?q=is%3Apr+label%3A%22Backport+to+WP+Core%22+is%3Aclosed

@youknowriad
Copy link
Contributor Author

@youknowriad youknowriad commented Jul 13, 2020

@ellatrix yes, that's the process, I explicitly left the patterns ones out for this beta. These require their own backport in Core, but better done once they are all ready.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

8 participants
You can’t perform that action at this time.