From b8a9caba7e0a3cc7b1e0e4e4a31f2f235fd2e0f8 Mon Sep 17 00:00:00 2001
From: girishpanchal30 <girish@krishaweb.com>
Date: Tue, 24 Sep 2024 14:34:20 +0530
Subject: [PATCH] Fix border width and border radius issue

---
 inc/css/class-css-utility.php                 |  7 +++++
 src/blocks/blocks/button-group/button/save.js | 28 +++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/inc/css/class-css-utility.php b/inc/css/class-css-utility.php
index 0a4dd4fb0..a35f8e7f7 100644
--- a/inc/css/class-css-utility.php
+++ b/inc/css/class-css-utility.php
@@ -327,6 +327,13 @@ public function generate() {
 	 * @return string
 	 */
 	public static function box_values( $box, $box_default = array() ) {
+		$box = array_map(
+			function ( $value ) {
+				return is_numeric( $value ) ? $value . 'px' : $value;
+			},
+			$box
+		);
+
 		return self::render_box(
 			array_merge(
 				array(
diff --git a/src/blocks/blocks/button-group/button/save.js b/src/blocks/blocks/button-group/button/save.js
index 2486ae214..ce8e3fcc2 100644
--- a/src/blocks/blocks/button-group/button/save.js
+++ b/src/blocks/blocks/button-group/button/save.js
@@ -21,6 +21,34 @@ const Save = ({
 }) => {
 	const Icon = themeIsleIcons.icons[ attributes.icon ];
 
+	// Border radius
+	if ( ! isNaN( attributes?.borderRadius?.top ) ) {
+		attributes.borderRadius.top += 'px';
+	}
+	if ( ! isNaN( attributes?.borderRadius?.right ) ) {
+		attributes.borderRadius.right += 'px';
+	}
+	if ( ! isNaN( attributes?.borderRadius?.left ) ) {
+		attributes.borderRadius.left += 'px';
+	}
+	if ( ! isNaN( attributes?.borderRadius?.bottom ) ) {
+		attributes.borderRadius.bottom += 'px';
+	}
+
+	// border size
+	if ( ! isNaN( attributes?.borderSize?.top ) ) {
+		attributes.borderSize.top += 'px';
+	}
+	if ( ! isNaN( attributes?.borderSize?.right ) ) {
+		attributes.borderSize.right += 'px';
+	}
+	if ( ! isNaN( attributes?.borderSize?.left ) ) {
+		attributes.borderSize.left += 'px';
+	}
+	if ( ! isNaN( attributes?.borderSize?.bottom ) ) {
+		attributes.borderSize.bottom += 'px';
+	}
+
 	const blockProps = useBlockProps.save({
 		id: attributes.id,
 		className: 'wp-block-button'