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

1264 - Activate Preformatted block #1442

Merged
merged 68 commits into from Nov 13, 2019

Conversation

@SergioEstevao
Copy link
Contributor

SergioEstevao commented Oct 11, 2019

Fixes #1264

GB PR: WordPress/gutenberg#17906
AztecEditor-Android PR: wordpress-mobile/AztecEditor-Android#869
WP-Android PR: wordpress-mobile/WordPress-Android#10764
WP-iOS PR: wordpress-mobile/WordPress-iOS#12934

This PR add the preformated block to the list of available blocks.

Pre-light-dark

To make this work some changes were needed in Aztec and on the refreshFont code to be able to handle scenarios were the active font is not the default font, because pre elements need to use a monospace font.

At the moment this PR also needs an Android Dev to make sure that the pre element is formatted correctly on Android.

To test:

  • Open the demo app
  • Add an PreFormatted block to the content
  • Write around on it
  • Try to merge it with other blocks

Update release notes:

  • If there are user facing changes, I have added an item to RELEASE-NOTES.txt.
marecar3 and others added 30 commits Sep 30, 2019
Increment gb-mobile version to 1.14.0
Update bundle files
# Conflicts:
#	package.json
…pens_safari

Don't allow interactions with URL in Aztec text blocks.
# Conflicts:
#	gutenberg
…witching to HTML mode
…issing-on-long-posts-in-html-mode
…Content-is-missing-on-long-posts-in-html-mode

Fix/1268 content is missing on long posts in html mode
# Conflicts:
#	bundle/android/App.js
#	bundle/android/App.js.map
#	bundle/ios/App.js
#	bundle/ios/App.js.map
#	gutenberg
#	react-native-aztec/ios/Cartfile
#	react-native-aztec/ios/Cartfile.resolved
#	react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
# Conflicts:
#	gutenberg
#	react-native-aztec/ios/RNTAztecView/RCTAztecView.swift
marecar3 added 3 commits Nov 7, 2019
@SergioEstevao

This comment has been minimized.

Copy link
Contributor Author

SergioEstevao commented Nov 8, 2019

@daniloercoli and @etoledom do you mind to give it another look, now that all the issues are sorted.

# Conflicts:
#	gutenberg
# Conflicts:
#	gutenberg
#	react-native-aztec/ios/RNTAztecView/RCTAztecView.swift
@daniloercoli daniloercoli mentioned this pull request Nov 8, 2019
2 of 2 tasks complete
@koke
koke approved these changes Nov 11, 2019
Copy link
Member

koke left a comment

Working well on iOS

@SergioEstevao SergioEstevao changed the base branch from develop to release/1.17 Nov 11, 2019
SergioEstevao and others added 6 commits Nov 11, 2019
# Conflicts:
#	gutenberg
…ith invalid PRE block content sent to the JS side under some circumstances, even without actually changing the content of the block. Ref: wordpress-mobile/AztecEditor-Android#869 (comment)
Copy link
Contributor

daniloercoli left a comment

LGTM!

@SergioEstevao SergioEstevao merged commit 3c5051c into release/1.17 Nov 13, 2019
5 checks passed
5 checks passed
ci/circleci: Check Correctness Your tests passed on CircleCI!
Details
ci/circleci: Test Android Your tests passed on CircleCI!
Details
ci/circleci: Test Android on Device Your tests passed on CircleCI!
Details
ci/circleci: Test iOS Your tests passed on CircleCI!
Details
ci/circleci: Test iOS on Device Your tests passed on CircleCI!
Details
@SergioEstevao SergioEstevao deleted the issue/1264_activate_pre_format_block branch Nov 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.