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

Jump to bottom

Fix Classic Block in the Unsupported Block editor #12679

Closed
wants to merge 196 commits into from
Closed

Fix Classic Block in the Unsupported Block editor #12679

wants to merge 196 commits into from

Conversation

hypest
Copy link
Contributor

@hypest hypest commented Aug 14, 2020 •
edited by marecar3
Loading

This PR introduces a fix for the block editor for better support of the Classic Block.

Gutenberg-mobile PR: wordpress-mobile/gutenberg-mobile#2550

It's based on gb-mobile v1.33.1.

To test:

  1. Switch to html mode and write some text in-between two blocks, making sure the text is not inside the block delimiters
  2. Switch back to visual mode
  3. There should be an unsupported block displayed between the blocks the text was inserted
  4. Use the "?" button of the unsupported block and then "Edit block in web browser" to launch the Unsupported Block editor
  5. Notice the text being displayed inside a "Classic" block without an error 🎉
  6. Make some changes to the text and hit the "✔️" icon in the upper right to commit the changes
  7. Switch to html mode again and notice that the text includes the changes made inside the Unsupported Block editor 🎉

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered adding accessibility improvements for my changes.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

maxme and others added 30 commits January 22, 2018 07:34
@maxme
Merge branch 'release/9.2'
742c9c6
@maxme
Merge branch 'release/9.2'
584cffa
@maxme
Merge branch 'release/9.3'
7e47e36
@maxme
Merge branch 'release/9.4'
e67693e
@mzorz
Merge branch 'release/9.5'
d7eb3a8
@mzorz
Merge branch 'release/9.5'
dd111c2
@maxme
Merge branch 'release/9.6'
afc0b8a
@maxme
Merge branch 'release/9.6'
1979386
@mzorz
Merge branch 'release/9.7'
e5ac194
@maxme
Merge branch 'release/9.8'
c7747a3
@mzorz
Merge branch 'release/9.9'
72f7576
@maxme
Merge branch 'release/10.0'
6232e42
@mzorz
Merge branch 'release/10.1'
f1bacce
@mzorz
Merge branch 'release/10.2'
f31e909
@mzorz
Merge branch 'develop'
66015d0
@mzorz
Merge branch 'release/10.3'
27cff11
@loremattei
Merge branch 'release/10.3'
b4b8b9f
@loremattei
Merge branch 'release/10.3'
3e1a1ba
@loremattei
Merge branch 'release/10.4'
638ed3d
@loremattei
Merge branch 'release/10.4'
9af8366
@akirk
Add placeholder numbering
2ae98fa
@0nko
Merge pull request #8024 from akirk/patch-2
8b424a0 
Rewind: Add placeholder numbering
@0nko
Revert "Merge pull request #8024 from akirk/patch-2"
1f34059 
This reverts commit 8b424a0, reversing
changes made to 9af8366.
@loremattei
Merge branch 'release/10.5'
ae6c016
@loremattei
Merge pull request #8131 from wordpress-mobile/release/10.5
f49fe30 
Merge Release/10.5 into Master
@loremattei
Merge pull request #8141 from wordpress-mobile/release/10.6
f85442b 
Merge Release/10.6 to Master
@loremattei
Merge pull request #8195 from wordpress-mobile/release/10.6
760ab28 
Merge Release/10.6 into Master
@loremattei
Merge pull request #8197 from wordpress-mobile/release/10.7
b2648c3 
Merge Release/10.7 into Master
@loremattei
Fix merge conflicts
6898522
@loremattei
Merge pull request #8251 from wordpress-mobile/merge-release-10.7-int…
91a196e 
…o-master

Merge release/10.7 into master
jkmassel and others added 14 commits June 1, 2020 10:40
@jkmassel
Merge pull request #12066 from wordpress-mobile/merge/15.0-code-freez…
06f3e1a 
…e-to-master

Merge 15.0 code freeze to master
@oguzkocer
Merge pull request #12091 from wordpress-mobile/merge/15.0-release-no…
dd0f46b 
…tes-to-master

Merge 15.0 release notes to master
@loremattei
Merge pull request #12188 from wordpress-mobile/merge/15.0-final-to-m…
abd8a2f 
…aster

Merge 15.0 final to master
@jkmassel
Merge pull request #12203 from wordpress-mobile/merge/15.1-code-freez…
b4fb424 
…e-to-master

Merge 15.1 code freeze to master
@loremattei
Merge pull request #12233 from wordpress-mobile/merge/15.1-rc-2-to-ma…
628190a 
…ster

Merge 15.1-rc-2 to master
@loremattei
Merge pull request #12303 from wordpress-mobile/release/15.1
17098fd 
Merge 15.1 final to master
@loremattei
Merge pull request #12314 from wordpress-mobile/merge/15.2-code-freez…
03f395e 
…e-to-master

Merge 15.2 code freeze to master
@loremattei
Merge pull request #12337 from wordpress-mobile/merge/15.2-release-no…
04cd81f 
…tes-to-master

Merge 15.2 release notes to master
@loremattei
Merge pull request #12383 from wordpress-mobile/release/15.2
0acca82 
Merge 15.2-rc-2 to master
@loremattei
Merge pull request #12431 from wordpress-mobile/release/15.2
7097ad8 
Merge 15.2 final to master
@loremattei
Merge pull request #12433 from wordpress-mobile/release/15.3
f54cc1c 
Merge 15.3-rc-1 to master
@loremattei
Merge pull request #12449 from wordpress-mobile/release/15.3
19b20ae 
Merge 15.3 release notes to master
@oguzkocer
Merge pull request #12513 from wordpress-mobile/release/15.3
199a02c 
Release/15.3
@oguzkocer
Merge pull request #12568 from wordpress-mobile/merge/15.4-release-no…
9d2c230 
…tes-to-master

Merge 15.4 release notes to master
@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Aug 14, 2020 •
edited
Loading

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Aug 14, 2020 •
edited
Loading

Warnings
⚠️ PR is missing at least one label.
⚠️ PR is not assigned to a milestone.

Generated by 🚫 dangerJS

@hypest hypest changed the title Update gb-mobile hash to point to the fix Fix Classic Block in the Unsupported Block editor Aug 14, 2020
@hypest hypest force-pushed the gutenberg/fix-classic-block-in-unsupported-editor branch from 17c7ba3 to 79102ae Compare August 14, 2020 12:34
@peril-wordpress-mobile
Copy link

You can test the changes on this Pull Request by downloading the APK here.

@hypest hypest changed the base branch from master to gutenberg/hotfix_1.33.2 August 14, 2020 12:53
@marecar3 marecar3 self-requested a review August 14, 2020 14:16
@marecar3 marecar3 marked this pull request as ready for review August 14, 2020 15:18
marecar3
marecar3 approved these changes Aug 14, 2020
View reviewed changes
Copy link
Contributor

@marecar3 marecar3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Working as expected on WPAndroid.

@cameronvoell cameronvoell changed the base branch from gutenberg/hotfix_1.33.2 to gutenberg/integrate_hotfix_1.33.2 August 14, 2020 21:51
@cameronvoell cameronvoell mentioned this pull request Aug 14, 2020
Merged
3 tasks
@mchowning
Copy link
Contributor

We can close this one, right @cameronvoell ?

@cameronvoell
Copy link
Contributor

We can close this one, right @cameronvoell ?

Yep! this was merged here: #12685.

Change was brought to WordPressAndroid develop through WordPress/gutenberg#24602 and the regular release process.

@hypest hypest deleted the gutenberg/fix-classic-block-in-unsupported-editor branch December 20, 2021 11:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marecar3 marecar3 marecar3 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.