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

Merge gutenberg-mobile 1.32.0 release to master #23883

Merged
merged 9 commits into from
Jul 13, 2020
Merged

Merge gutenberg-mobile 1.32.0 release to master #23883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8e89636
Update react-native-editor version to: 1.32.0
SergioEstevao Jul 8, 2020
fa8b3f1
Update podfile.
SergioEstevao Jul 8, 2020
473f734
Enable unsupported block editor on Atomic sites (#23830)
marecar3 Jul 9, 2020
829941b
Check feature flag for mentions feature on Android (#23804)
mchowning Jul 9, 2020
70b6573
Update release notes order.
SergioEstevao Jul 10, 2020
be841f9
Update release notes for 1.32.0 react-native-editor.
SergioEstevao Jul 10, 2020
d5a5e9f
Merge remote-tracking branch 'origin/master' into rnmobile/merge_1.32…
mchowning Jul 10, 2020
9c5c122
Update podfile
mchowning Jul 10, 2020
a6373d7
Fix release notes order of releases.
SergioEstevao Jul 12, 2020
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
9 changes: 5 additions & 4 deletions ...ve-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public interface OnLogGutenbergUserEventListener {
public interface OnGutenbergDidRequestUnsupportedBlockFallbackListener {
void gutenbergDidRequestUnsupportedBlockFallback(UnsupportedBlock unsupportedBlock);
}

public interface OnStarterPageTemplatesTooltipShownEventListener {
void onSetStarterPageTemplatesTooltipShown(boolean tooltipShown);
boolean onRequestStarterPageTemplatesTooltipShown();
Expand Down Expand Up @@ -433,7 +433,8 @@ public void onCreateView(Context initContext,
Consumer<String> breadcrumbLogger,
@Nullable Boolean isSiteUsingWpComRestApi,
@Nullable Bundle editorTheme,
boolean siteJetpackIsConnected) {
boolean isUnsupportedBlockEditorEnabled,
boolean enableMentionsFlag) {
mIsDarkMode = isDarkMode;
mExceptionLogger = exceptionLogger;
mBreadcrumbLogger = breadcrumbLogger;
Expand Down Expand Up @@ -468,9 +469,9 @@ public void onCreateView(Context initContext,

Bundle capabilities = new Bundle();
if (isSiteUsingWpComRestApi != null) {
capabilities.putBoolean(PROP_NAME_CAPABILITIES_MENTIONS, isSiteUsingWpComRestApi);
capabilities.putBoolean(PROP_NAME_CAPABILITIES_UNSUPPORTED_BLOCK_EDITOR, !siteJetpackIsConnected);
capabilities.putBoolean(PROP_NAME_CAPABILITIES_MENTIONS, isSiteUsingWpComRestApi && enableMentionsFlag);
}
capabilities.putBoolean(PROP_NAME_CAPABILITIES_UNSUPPORTED_BLOCK_EDITOR, isUnsupportedBlockEditorEnabled);
initialProps.putBundle(PROP_NAME_CAPABILITIES, capabilities);

Serializable colors = editorTheme != null ? editorTheme.getSerializable(PROP_NAME_COLORS) : null;
Expand Down
10 changes: 7 additions & 3 deletions packages/react-native-editor/RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
* [***] Media editing support in Media & Text block.
* [***] New block: Social Icons

1.32.0
------
* [***] Adds Copy, Cut, Paste, and Duplicate functionality to blocks
* [***] Add support for mentions.
* [***] Users can now individually edit unsupported blocks found in posts or pages.
* [*] [iOS] Improved editor loading experience with Ghost Effect.

1.31.1
------
* Fix for pullquote stylying in dark mode.
* Fix for button style.
1.32.0
------
* [***] The block editor now gives users the ability to individually edit unsupported blocks found in posts or pages.

1.31.0
------
Expand Down
6 changes: 3 additions & 3 deletions packages/react-native-editor/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ PODS:
- DoubleConversion
- glog
- glog (0.3.5)
- Gutenberg (8.5.0):
- Gutenberg (8.5.1):
- React (= 0.61.5)
- React-CoreModules (= 0.61.5)
- React-RCTImage (= 0.61.5)
Expand Down Expand Up @@ -377,7 +377,7 @@ SPEC CHECKSUMS:
FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75
Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
glog: 1f3da668190260b06b429bb211bfbee5cd790c28
Gutenberg: c5583ab0c80c08e17e40c27ae2ec14a244acf8f5
Gutenberg: 04a90a71ab9a5e61b9dd185270dec12dff3c2777
RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1
RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320
React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78
Expand All @@ -392,7 +392,7 @@ SPEC CHECKSUMS:
react-native-keyboard-aware-scroll-view: ffa9152671fec9a571197ed2d02e0fcb90206e60
react-native-safe-area: e8230b0017d76c00de6b01e2412dcf86b127c6a3
react-native-slider: f81b89fa0c1f9a65742d33f889a194ca6653a985
react-native-video: 961749da457e73bf0b5565edfbaffc25abfb8974
react-native-video: d01ed7ff1e38fa7dcc6c15c94cf505e661b7bfd0
React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76
React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360
React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72
Expand Down
Loading