Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions packages/block-library/src/column/edit.native.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { View } from 'react-native';
*/
import { withSelect } from '@wordpress/data';
import { compose, withPreferredColorScheme } from '@wordpress/compose';
import { useEffect } from '@wordpress/element';
import {
InnerBlocks,
BlockControls,
Expand Down Expand Up @@ -38,13 +39,20 @@ function ColumnEdit( {
columns,
columnCount,
selectedColumnIndex,
parentAlignment,
} ) {
const { verticalAlignment } = attributes;

const updateAlignment = ( alignment ) => {
setAttributes( { verticalAlignment: alignment } );
};

useEffect( () => {
if ( ! verticalAlignment && parentAlignment ) {
updateAlignment( parentAlignment );
}
}, [] );

const onWidthChange = ( width ) => {
setAttributes( {
width,
Expand Down Expand Up @@ -146,6 +154,7 @@ export default compose( [
getSelectedBlockClientId,
getBlocks,
getBlockOrder,
getBlockAttributes,
} = select( 'core/block-editor' );

const selectedBlockClientId = getSelectedBlockClientId();
Expand All @@ -162,13 +171,17 @@ export default compose( [
const columnCount = getBlockCount( parentId );
const columns = getBlocks( parentId );

const parentAlignment = getBlockAttributes( parentId )
?.verticalAlignment;

return {
hasChildren,
isParentSelected,
isSelected,
selectedColumnIndex,
columns,
columnCount,
parentAlignment,
};
} ),
withPreferredColorScheme,
Expand Down
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.34.0",
"version": "1.35.0",
"description": "Aztec view for react-native.",
"private": true,
"author": "The WordPress Contributors",
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.34.0",
"version": "1.35.0",
"description": "Native bridge library used to integrate the block editor into a native App.",
"private": true,
"author": "The WordPress Contributors",
Expand Down
14 changes: 7 additions & 7 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.34.0):
- Gutenberg (1.35.0):
- React (= 0.61.5)
- React-CoreModules (= 0.61.5)
- React-RCTImage (= 0.61.5)
Expand Down Expand Up @@ -253,7 +253,7 @@ PODS:
- React
- RNSVG (9.13.6-gb):
- React
- RNTAztecView (1.34.0):
- RNTAztecView (1.35.0):
- React-Core
- WordPress-Aztec-iOS (~> 1.19.3)
- WordPress-Aztec-iOS (1.19.3)
Expand Down Expand Up @@ -402,7 +402,7 @@ SPEC CHECKSUMS:
FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75
Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
glog: 1f3da668190260b06b429bb211bfbee5cd790c28
Gutenberg: 9e8d8b1e223c84de3d48f45defb597b6c2362587
Gutenberg: ce261d5bf5f4b5ff8c367c672d858e503c41f4f6
RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1
RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320
React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78
Expand All @@ -416,9 +416,9 @@ SPEC CHECKSUMS:
react-native-get-random-values: 8940331a943a46c165d3ed05802c09c392f8dd46
react-native-keyboard-aware-scroll-view: ffa9152671fec9a571197ed2d02e0fcb90206e60
react-native-safe-area: e8230b0017d76c00de6b01e2412dcf86b127c6a3
react-native-safe-area-context: 4c3249e4840225c61fcd215b136af0a737bccb79
react-native-safe-area-context: 344b969c45af3d8464d36e8dea264942992ef033
react-native-slider: ecb7f25c14f2348d1c1f629a6f2be7611d22a066
react-native-video: 961749da457e73bf0b5565edfbaffc25abfb8974
react-native-video: d01ed7ff1e38fa7dcc6c15c94cf505e661b7bfd0
React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76
React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360
React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72
Expand All @@ -430,12 +430,12 @@ SPEC CHECKSUMS:
React-RCTVibration: a49a1f42bf8f5acf1c3e297097517c6b3af377ad
ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd
ReactNativeDarkMode: f61376360c5d983907e5c316e8e1c853a8c2f348
RNCMaskedView: f5c7d14d6847b7b44853f7acb6284c1da30a3459
RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f
RNGestureHandler: dde546180bf24af0b5f737c8ad04b6f3fa51609a
RNReanimated: b5ccb50650ba06f6e749c7c329a1bc3ae0c88b43
RNScreens: c526239bbe0e957b988dacc8d75ac94ec9cb19da
RNSVG: 68a534a5db06dcbdaebfd5079349191598caef7b
RNTAztecView: b2a8bbc94328376f6cd7a238e826f5d49b20ae1a
RNTAztecView: f558ea94e8b4fc8ebe43df1176b6c60f7de4f2ec
WordPress-Aztec-iOS: b7ac8b30f746992e85d9668453ac87c2cdcecf4f
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.34.0",
"version": "1.35.0",
"description": "Mobile WordPress gutenberg editor.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
Expand Down