Fix: RNMobile borderRadius value setting (#32717)

WordPress · Jun 16, 2021 · 4f9097d · 4f9097d
1 parent b4623e3
commit 4f9097d
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/packages/block-library/src/button/edit.native.js b/packages/block-library/src/button/edit.native.js
@@ -235,11 +235,18 @@ class ButtonEdit extends Component {
 		setAttributes( { text: value } );
 	}
 
-	onChangeBorderRadius( value ) {
-		const { setAttributes } = this.props;
-		setAttributes( {
-			borderRadius: value,
-		} );
+	onChangeBorderRadius( newRadius ) {
+		const { setAttributes, attributes } = this.props;
+		const { style } = attributes;
+		const newStyle = {
+			...style,
+			border: {
+				...style?.border,
+				radius: newRadius,
+			},
+		};
+
+		setAttributes( { style: newStyle } );
 	}
 
 	onShowLinkSettings() {
@@ -373,7 +380,7 @@ class ButtonEdit extends Component {
 		const {
 			placeholder,
 			text,
-			borderRadius,
+			style,
 			url,
 			align = 'center',
 			width,
@@ -385,6 +392,8 @@ class ButtonEdit extends Component {
 			return null;
 		}
 
+		const borderRadius = style?.border?.radius;
+
 		const borderRadiusValue = Number.isInteger( borderRadius )
 			? borderRadius
 			: styles.defaultButton.borderRadius;