fixing some off canvas and trigger issues

stellarwp · Aug 8, 2024 · cc3e7c0 · cc3e7c0
1 parent 5203ce3
commit cc3e7c0
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/includes/blocks/header/class-kadence-blocks-off-canvas-trigger-block.php b/includes/blocks/header/class-kadence-blocks-off-canvas-trigger-block.php
@@ -30,7 +30,7 @@ class Kadence_Blocks_Off_Canvas_Trigger_Block extends Kadence_Blocks_Abstract_Bl
 	 *
 	 * @var string
 	 */
-	protected $block_name = 'header-off-canvas-trigger';
+	protected $block_name = 'off-canvas-trigger';
 
 	/**
 	 * Block determines in scripts need to be loaded for block.
@@ -92,26 +92,26 @@ public function build_css( $attributes, $css, $unique_id, $unique_style_id ) {
 		// For the close icon container styles, they need to get applied to the hover state too, due to resets on hover styles in the css
 		//container
 		$css->set_selector( '.wp-block-kadence-off-canvas-trigger' . $unique_id . ', .wp-block-kadence-off-canvas-trigger' . $unique_id . ':hover' );
-		$css->render_measure_output( $attributes, 'padding', 'padding', array(
+		$css->render_measure_output( $merged_attributes, 'padding', 'padding', array(
 			'desktop_key' => 'padding',
 			'tablet_key'  => 'paddingTablet',
 			'mobile_key'  => 'paddingMobile',
 		) );
-		$css->render_measure_output( $attributes, 'margin', 'margin', array(
+		$css->render_measure_output( $merged_attributes, 'margin', 'margin', array(
 			'desktop_key' => 'margin',
 			'tablet_key'  => 'marginTablet',
 			'mobile_key'  => 'marginMobile',
 		) );
-		$css->render_measure_output( $attributes, 'borderRadius', 'border-radius', array(
+		$css->render_measure_output( $merged_attributes, 'borderRadius', 'border-radius', array(
 			'desktop_key' => 'borderRadius',
 			'tablet_key'  => 'borderRadiusTablet',
 			'mobile_key'  => 'borderRadiusMobile',
 		) );
-		$css->render_border_styles( $attributes, 'border' );
+		$css->render_border_styles( $merged_attributes, 'border' );
 
 		//container hover
 		$css->set_selector( '.wp-block-kadence-off-canvas-trigger' . $unique_id . ':hover' );
-		$css->render_border_styles( $attributes, 'borderHover' );
+		$css->render_border_styles( $merged_attributes, 'borderHover' );
 
 		//icon
 		$css->set_selector( '.wp-block-kadence-off-canvas-trigger' . $unique_id . ' svg' );

diff --git a/src/blocks/header/children/off-canvas-trigger/block.json b/src/blocks/header/children/off-canvas-trigger/block.json
@@ -19,10 +19,12 @@
 			"default": 25
 		},
 		"iconSizeTablet": {
-			"type": "number"
+			"type": "number",
+			"default": ""
 		},
 		"iconSizeMobile": {
-			"type": "number"
+			"type": "number",
+			"default": ""
 		},
 		"iconColor": {
 			"type": "string",

diff --git a/src/blocks/header/children/off-canvas/block.json b/src/blocks/header/children/off-canvas/block.json
@@ -123,7 +123,7 @@
 		},
 		"vAlign": {
 			"type": "string",
-			"default": "top"
+			"default": ""
 		},
 		"vAlignTablet": {
 			"type": "string",

diff --git a/src/blocks/header/children/off-canvas/edit.js b/src/blocks/header/children/off-canvas/edit.js
@@ -391,7 +391,7 @@ export function Edit(props) {
 								value={vAlign ? vAlign : ''}
 								tabletValue={vAlignTablet ? vAlignTablet : ''}
 								mobileValue={vAlignMobile ? vAlignMobile : ''}
-								onChange={(nextAlign) => setAttributes({ vAlign: nextAlign ? nextAlign : 'center' })}
+								onChange={(nextAlign) => setAttributes({ vAlign: nextAlign ? nextAlign : '' })}
 								onChangeTablet={(nextAlign) =>
 									setAttributes({ vAlignTablet: nextAlign ? nextAlign : '' })
 								}

diff --git a/src/blocks/header/children/off-canvas/editor.scss b/src/blocks/header/children/off-canvas/editor.scss
@@ -74,7 +74,7 @@
 		padding: 0;
 		z-index: 11;
 		display: inline-flex;
-		justify-content: center;
+		justify-content: top;
 		align-items: center;
 		color: #444444;
 		-webkit-appearance: none;

diff --git a/src/blocks/header/children/off-canvas/style.scss b/src/blocks/header/children/off-canvas/style.scss
@@ -55,7 +55,7 @@ $admin-bar-height-mobile: 46px;
 		padding: 0;
 		z-index: 11;
 		display: inline-flex;
-		justify-content: center;
+		justify-content: top;
 		align-items: center;
 		color: #444444;
 		-webkit-appearance: none;