Skip to content

Commit

Permalink
[RNMobile] Merge release 1.48.1 to trunk (#29819)
Browse files Browse the repository at this point in the history
* Release script: Update react-native-editor version to 1.47.0

* Release script: Update with changes from 'npm run core preios'

* [RNMobile] Ignore column width attribute when empty (#29015)

* Ignore empty width attribute in columns

The editor was crashing when attempting to render a column block which contained an empty width attribute (i.e `<!-- wp:column {"width":""} -->`.
The exception occurred when accessing a property of an undefined object, so adding a default object (`|| {}`) fixes this by allowing the property to be accessed.

* Update react-native-editor changelog

* Add missing dependency to useSelect in columns block

Co-authored-by: Carlos Garcia <fluiddot@gmail.com>

* Update editor changelog

* Mobile - RichText - Restore onSelectionChange when its focused (#29074)

* Adds null check before function call

* [RNMobile] Merge 1.46.1 beta fix release to 1.47.0 (#29044)

* Release script: Update react-native-editor version to 1.46.1

* Release script: Update with changes from 'npm run core preios'

* Update react-native-editor CHANGELOG

* [RNMobile] Add capability to bridge to show/hide audio block (#28952)

* [RNMobile] Ignore column width attribute when empty (#29015)

* Update react-native-editor CHANGELOG

* Fixes minor changelog alignement issue

* Add Stories bridge methods for iOS (#29083)

Add missing bridge methods for the Stories block. The absence of these
threw an error, even though Stories block isn't fully supported for iOS
just yet.

Co-authored-by: Ceyhun Ozugur <ceyhunozugur@gmail.com>
Co-authored-by: Paul Von Schrottky <paul.von.schrottky@automattic.com>
Co-authored-by: Antonis Lilis <antonis.lilis@automattic.com>
Co-authored-by: David Calhoun <dpcalhoun@gmail.com>

* Release script: Update react-native-editor version to 1.48.0

* Release script: Update with changes from 'npm run core preios'

* [Mobile] - Fix splitting/merging of Paragraph and Heading (#29502)

* Wip: Mobile RichText - Updating old value after splitting

* Mobile - Fix splitting/merging issues and keyboard jumpiness on Android

* Mobile - RichText - Add isIOS check for componentDidUpdate and use blockEditorStore

* Mobile - RichText - Prevent onTextUpdate on Android

* Update changelog

* Changelog - fix typo

* Revert "[Mobile] - Fix splitting/merging of Paragraph and Heading (#29502)"

This reverts commit a14915f.

* Revert "Rich text: keep block ID on split (#28505)"

This reverts commit 4b9d13f.

* Release script: Update react-native-editor version to 1.47.1

* Release script: Update with changes from 'npm run core preios'

* Change the maximum items per page of reusable block fetch

* Release script: Update react-native-editor version to 1.48.1

* Release script: Update with changes from 'npm run core preios'

* Change the maximum items per page of reusable block fetch

* Add replace block content by clientID

* Add item to release notes about `replaceBlock` method

* Revert "Revert "Rich text: keep block ID on split (#28505)""

This reverts commit 956cdfc.

Co-authored-by: Antonis Lilis <antonis.lilis@automattic.com>
Co-authored-by: Paul Von Schrottky <paul.von.schrottky@automattic.com>
Co-authored-by: David Calhoun <dpcalhoun@gmail.com>
Co-authored-by: Gerardo Pacheco <gerardo.pacheco@automattic.com>
Co-authored-by: Ceyhun Ozugur <ceyhunozugur@gmail.com>
Co-authored-by: Enej Bajgoric <enej.bajgoric@automattic.com>
Co-authored-by: Brandon Titus <b@titus.io>
  • Loading branch information
8 people committed Mar 12, 2021
1 parent e8613cf commit c0dde34
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 7 deletions.
2 changes: 1 addition & 1 deletion packages/react-native-aztec/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wordpress/react-native-aztec",
"version": "1.48.0",
"version": "1.48.1",
"description": "Aztec view for react-native.",
"private": true,
"author": "The WordPress Contributors",
Expand Down
4 changes: 4 additions & 0 deletions packages/react-native-bridge/ios/Gutenberg.swift
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ public class Gutenberg: NSObject {
sendEvent(.replaceBlock, body: ["html": block.content, "clientId": block.id])
}

public func replace(blockID: String, content: String) {
sendEvent(.replaceBlock, body: ["html": content, "clientId": blockID])
}

public func updateCapabilities() {
let capabilites = dataSource.gutenbergCapabilities()
sendEvent(.updateCapabilities, body: capabilites.toJSPayload())
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-bridge/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wordpress/react-native-bridge",
"version": "1.48.0",
"version": "1.48.1",
"description": "Native bridge library used to integrate the block editor into a native App.",
"private": true,
"author": "The WordPress Contributors",
Expand Down
6 changes: 6 additions & 0 deletions packages/react-native-editor/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ For each user feature we should also add a importance categorization label to i
## 1.48.0
* [**] Buttons block: added width setting. [#28543]

## 1.47.2
* [**] Adds a `replaceBlock` method to iOS bridge delegate with a string to match the clientID and the contents to replace with. [#29734]

## 1.47.1
* [**] Reduce the number of items per page when fetching reusable blocks to prevent a crash. [#29626]

## 1.47.0
* [**] Add support for setting Cover block focal point. [#25810]

Expand Down
8 changes: 4 additions & 4 deletions packages/react-native-editor/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ PODS:
- DoubleConversion
- glog
- glog (0.3.5)
- Gutenberg (1.48.0):
- Gutenberg (1.48.1):
- React-Core (= 0.61.5)
- React-CoreModules (= 0.61.5)
- React-RCTImage (= 0.61.5)
Expand Down Expand Up @@ -253,7 +253,7 @@ PODS:
- React-Core
- RNSVG (9.13.6-gb):
- React-Core
- RNTAztecView (1.48.0):
- RNTAztecView (1.48.1):
- React-Core
- WordPress-Aztec-iOS (~> 1.19.4)
- WordPress-Aztec-iOS (1.19.4)
Expand Down Expand Up @@ -402,7 +402,7 @@ SPEC CHECKSUMS:
FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75
Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
glog: 1f3da668190260b06b429bb211bfbee5cd790c28
Gutenberg: 670f7b82bc18bde86a516834b72b7eeded1011e8
Gutenberg: 1f742943f91ab3c6d85978763b5556b1a6ab4ebd
RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1
RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320
React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78
Expand Down Expand Up @@ -435,7 +435,7 @@ SPEC CHECKSUMS:
RNReanimated: f05baf4cd76b6eab2e4d7e2b244424960b968918
RNScreens: 953633729a42e23ad0c93574d676b361e3335e8b
RNSVG: 46c4b680fe18237fa01eb7d7b311d77618fde31f
RNTAztecView: 985f01fae9ea8ce9cb18a6f7af9b571084d7c9f9
RNTAztecView: 8f47afe1354d3d3f78029a1db361192a2085d49d
WordPress-Aztec-iOS: 870c93297849072aadfc2223e284094e73023e82
Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-editor/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wordpress/react-native-editor",
"version": "1.48.0",
"version": "1.48.1",
"description": "Mobile WordPress gutenberg editor.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
Expand Down

0 comments on commit c0dde34

Please sign in to comment.