diff --git a/packages/block-library/src/column/edit.native.js b/packages/block-library/src/column/edit.native.js index b3fcb3f84d2cdc..e5ad6c7827d236 100644 --- a/packages/block-library/src/column/edit.native.js +++ b/packages/block-library/src/column/edit.native.js @@ -152,6 +152,11 @@ function ColumnEdit( { ); } + const parentWidth = + contentStyle && + contentStyle[ clientId ] && + contentStyle[ clientId ].width; + return ( <> { isSelected && ( @@ -211,7 +216,7 @@ function ColumnEdit( { > diff --git a/packages/react-native-aztec/package.json b/packages/react-native-aztec/package.json index 35830b49a316b5..8254581bb4652b 100644 --- a/packages/react-native-aztec/package.json +++ b/packages/react-native-aztec/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/react-native-aztec", - "version": "1.87.1", + "version": "1.87.2", "description": "Aztec view for react-native.", "private": true, "author": "The WordPress Contributors", diff --git a/packages/react-native-bridge/package.json b/packages/react-native-bridge/package.json index d3cb662438b436..07df9faa5ab77f 100644 --- a/packages/react-native-bridge/package.json +++ b/packages/react-native-bridge/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/react-native-bridge", - "version": "1.87.1", + "version": "1.87.2", "description": "Native bridge library used to integrate the block editor into a native App.", "private": true, "author": "The WordPress Contributors", diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md index 05075dd17058cc..80ef6c4dd39bb4 100644 --- a/packages/react-native-editor/CHANGELOG.md +++ b/packages/react-native-editor/CHANGELOG.md @@ -11,6 +11,10 @@ For each user feature we should also add a importance categorization label to i ## Unreleased +## 1.87.2 +- [*] Add boolean contentStyle and clientId check to Column Edit InnerBlocks [#47234] +- [*] Line-height and font-size regression fixes [#47284] + ## 1.87.1 - [**] Gallery block: Address styling regression, in which negative margin was added [#47086] - [*] RichText - Parse CSS values and avoid setting undefined ones [#47080] diff --git a/packages/react-native-editor/ios/Gemfile.lock b/packages/react-native-editor/ios/Gemfile.lock index 842ff6acd396fd..f03dae68673787 100644 --- a/packages/react-native-editor/ios/Gemfile.lock +++ b/packages/react-native-editor/ios/Gemfile.lock @@ -89,12 +89,10 @@ GEM PLATFORMS arm64-darwin-21 + arm64-darwin-22 DEPENDENCIES cocoapods (~> 1.11, >= 1.11.2) -RUBY VERSION - ruby 2.7.5p203 - BUNDLED WITH 2.3.18 diff --git a/packages/react-native-editor/ios/Podfile.lock b/packages/react-native-editor/ios/Podfile.lock index e2cae7676b1591..ffc274d5dfee18 100644 --- a/packages/react-native-editor/ios/Podfile.lock +++ b/packages/react-native-editor/ios/Podfile.lock @@ -13,7 +13,7 @@ PODS: - ReactCommon/turbomodule/core (= 0.69.4) - fmt (6.2.1) - glog (0.3.5) - - Gutenberg (1.87.1): + - Gutenberg (1.87.2): - React-Core (= 0.69.4) - React-CoreModules (= 0.69.4) - React-RCTImage (= 0.69.4) @@ -362,7 +362,7 @@ PODS: - React-Core - RNSVG (9.13.6): - React-Core - - RNTAztecView (1.87.1): + - RNTAztecView (1.87.2): - React-Core - WordPress-Aztec-iOS (~> 1.19.8) - SDWebImage (5.11.1): @@ -545,7 +545,7 @@ SPEC CHECKSUMS: FBReactNativeSpec: 2ff441cbe6e58c1778d8a5cf3311831a6a8c0809 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 3d02b25ca00c2d456734d0bcff864cbc62f6ae1a - Gutenberg: b219cca657de7ff779bd54599f2a6a8e6913a451 + Gutenberg: 757eefbcd013a07e4816776bb65af1b1dc6098dc libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c RCT-Folly: b9d9fe1fc70114b751c076104e52f3b1b5e5a95a RCTRequired: bd9d2ab0fda10171fcbcf9ba61a7df4dc15a28f4 @@ -588,7 +588,7 @@ SPEC CHECKSUMS: RNReanimated: 8b189a09da0345d84b33b8cde57a57f8ed847352 RNScreens: 953633729a42e23ad0c93574d676b361e3335e8b RNSVG: 36a7359c428dcb7c6bce1cc546fbfebe069809b0 - RNTAztecView: 9eae3a2810d6ad86d210d78c8069e5a5cf94761d + RNTAztecView: 37b773533f15466aac927b4c0f787edd933c2f87 SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d WordPress-Aztec-iOS: 7d11d598f14c82c727c08b56bd35fbeb7dafb504 diff --git a/packages/react-native-editor/package.json b/packages/react-native-editor/package.json index 985104b707be9f..5a85e8d4f0a9c5 100644 --- a/packages/react-native-editor/package.json +++ b/packages/react-native-editor/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/react-native-editor", - "version": "1.87.1", + "version": "1.87.2", "description": "Mobile WordPress gutenberg editor.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later",