Merge pull request #31 from t-hamano/wp6.3

Version 2.1.0 (Release for WP6.3)
t-hamano · Jul 24, 2023 · 292c96d · 292c96d
2 parents 738cc36 + 6ed9905
commit 292c96d
Show file tree

Hide file tree

Showing 22 changed files with 10,329 additions and 9,193 deletions.
diff --git a/.github/workflows/run-test-and-deploy.yml b/.github/workflows/run-test-and-deploy.yml
@@ -18,9 +18,8 @@ jobs:
           '8.0'
         ]
         wp-versions: [
-          'WordPress#5.9.5',
-          'WordPress#6.0.3',
-          'WordPress#6.1.1',
+          'WordPress#6.0.5',
+          'WordPress#6.1.3',
           'WordPress'
         ]
     name: PHP ${{ matrix.php-versions }} / ${{ matrix.wp-versions }} Test

diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml
@@ -16,14 +16,12 @@ jobs:
     strategy:
       matrix:
         php-versions: [
-          '7.3',
           '7.4',
           '8.0'
         ]
         wp-versions: [
-          'WordPress#5.9.5',
-          'WordPress#6.0.3',
-          'WordPress#6.1.1',
+          'WordPress#6.0.5',
+          'WordPress#6.1.3',
           'WordPress'
         ]
     name: PHP ${{ matrix.php-versions }} / ${{ matrix.wp-versions }} Test
@@ -57,3 +55,11 @@ jobs:
 
       - name: Running e2e tests
         run: npm run test:e2e
+
+      - name: Archive debug artifacts
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: failures-artifacts
+          path: artifacts
+          if-no-files-found: ignore
diff --git a/.wp-env.json b/.wp-env.json
@@ -1,7 +1,11 @@
 {
 	"plugins": [ "." ],
-  "config": {
-    "WP_DEBUG": true,
-		"SCRIPT_DEBUG": true
-  }
+	"env": {
+		"tests": {
+			"config": {
+				"WP_DEBUG": true,
+				"SCRIPT_DEBUG": true
+			}
+		}
+	}
 }
diff --git a/classes/class-enqueue.php b/classes/class-enqueue.php
@@ -89,9 +89,12 @@ private function create_editor_config() {
 			'sm' => FSB_BREAKPOINT_SM,
 		);
 		$default_value_defaults = array(
-			'lg' => FSB_DEFAULT_SPACER_HEIGHT,
-			'md' => FSB_DEFAULT_SPACER_HEIGHT,
-			'sm' => FSB_DEFAULT_SPACER_HEIGHT,
+			'lg'      => FSB_DEFAULT_SPACER_HEIGHT,
+			'md'      => FSB_DEFAULT_SPACER_HEIGHT,
+			'sm'      => FSB_DEFAULT_SPACER_HEIGHT,
+			'lg_unit' => FSB_DEFAULT_SPACER_HEIGHT_UNIT,
+			'md_unit' => FSB_DEFAULT_SPACER_HEIGHT_UNIT,
+			'sm_unit' => FSB_DEFAULT_SPACER_HEIGHT_UNIT,
 		);
 
 		$config = array(

diff --git a/classes/class-options.php b/classes/class-options.php
@@ -12,6 +12,15 @@ class Options {
 	private $breakpoints;
 	private $default_value;
 
+	private $units = array(
+		'px',
+		'%',
+		'em',
+		'rem',
+		'vw',
+		'vh',
+	);
+
 	/**
 	 * Constructor
 	 */
@@ -163,6 +172,10 @@ public function flexible_spacer_block_default_value_display_field() {
 		$default_value_sm = isset( $this->default_value['sm'] ) ? $this->default_value['sm'] : FSB_DEFAULT_SPACER_HEIGHT;
 		$default_value_md = isset( $this->default_value['md'] ) ? $this->default_value['md'] : FSB_DEFAULT_SPACER_HEIGHT;
 		$default_value_lg = isset( $this->default_value['lg'] ) ? $this->default_value['lg'] : FSB_DEFAULT_SPACER_HEIGHT;
+
+		$default_value_sm_unit = isset( $this->default_value['sm_unit'] ) ? $this->default_value['sm_unit'] : FSB_DEFAULT_SPACER_HEIGHT_UNIT;
+		$default_value_md_unit = isset( $this->default_value['md_unit'] ) ? $this->default_value['md_unit'] : FSB_DEFAULT_SPACER_HEIGHT_UNIT;
+		$default_value_lg_unit = isset( $this->default_value['lg_unit'] ) ? $this->default_value['lg_unit'] : FSB_DEFAULT_SPACER_HEIGHT_UNIT;
 		?>
 		<div class="fsb-option-default-values">
 			<div class="fsb-option-default-values__col">
@@ -172,7 +185,17 @@ public function flexible_spacer_block_default_value_display_field() {
 				</div>
 				<div class="fsb-option-default-values__input">
 					<input type="number" name="flexible_spacer_block_default_value[sm]" min="<?php echo FSB_MIN_SPACER_HEIGHT; ?>" max="<?php echo FSB_MAX_SPACER_HEIGHT; ?>" value="<?php echo esc_attr( $default_value_sm ); ?>">
-					<span>px</span>
+					<select name="flexible_spacer_block_default_value[sm_unit]">
+						<?php
+						foreach ( $this->units as $unit ) {
+							if ( $unit === $default_value_sm_unit ) {
+								echo '<option value="' . esc_attr( $unit ) . '" selected>' . esc_html( $unit ) . '</option>';
+							} else {
+								echo '<option value="' . esc_attr( $unit ) . '">' . esc_html( $unit ) . '</option>';
+							}
+						}
+						?>
+					</select>
 				</div>
 			</div>
 			<div class="fsb-option-default-values__col">
@@ -182,7 +205,17 @@ public function flexible_spacer_block_default_value_display_field() {
 				</div>
 				<div class="fsb-option-default-values__input">
 					<input type="number" name="flexible_spacer_block_default_value[md]" min="<?php echo FSB_MIN_SPACER_HEIGHT; ?>" max="<?php echo FSB_MAX_SPACER_HEIGHT; ?>" value="<?php echo esc_attr( $default_value_md ); ?>">
-					<span>px</span>
+					<select name="flexible_spacer_block_default_value[md_unit]">
+						<?php
+						foreach ( $this->units as $unit ) {
+							if ( $unit === $default_value_md_unit ) {
+								echo '<option value="' . esc_attr( $unit ) . '" selected>' . esc_html( $unit ) . '</option>';
+							} else {
+								echo '<option value="' . esc_attr( $unit ) . '">' . esc_html( $unit ) . '</option>';
+							}
+						}
+						?>
+					</select>
 				</div>
 			</div>
 			<div class="fsb-option-default-values__col">
@@ -192,7 +225,17 @@ public function flexible_spacer_block_default_value_display_field() {
 				</div>
 				<div class="fsb-option-default-values__input">
 					<input type="number" name="flexible_spacer_block_default_value[lg]" min="<?php echo FSB_MIN_SPACER_HEIGHT; ?>" max="<?php echo FSB_MAX_SPACER_HEIGHT; ?>" value="<?php echo esc_attr( $default_value_lg ); ?>">
-					<span>px</span>
+					<select name="flexible_spacer_block_default_value[lg_unit]">
+						<?php
+						foreach ( $this->units as $unit ) {
+							if ( $unit === $default_value_lg_unit ) {
+								echo '<option value="' . esc_attr( $unit ) . '" selected>' . esc_html( $unit ) . '</option>';
+							} else {
+								echo '<option value="' . esc_attr( $unit ) . '">' . esc_html( $unit ) . '</option>';
+							}
+						}
+						?>
+					</select>
 				</div>
 			</div>
 		</div>
@@ -272,22 +315,32 @@ public function sanitize_default_value( $input ) {
 		$default_value_md = isset( $input['md'] ) ? absint( $input['md'] ) : '';
 		$default_value_lg = isset( $input['lg'] ) ? absint( $input['lg'] ) : '';
 
+		$default_value_sm_unit = isset( $input['sm_unit'] ) && in_array( $input['sm_unit'], $this->units, true ) ? $input['sm_unit'] : 'px';
+		$default_value_md_unit = isset( $input['md_unit'] ) && in_array( $input['md_unit'], $this->units, true ) ? $input['md_unit'] : 'px';
+		$default_value_lg_unit = isset( $input['lg_unit'] ) && in_array( $input['lg_unit'], $this->units, true ) ? $input['lg_unit'] : 'px';
+
 		if ( 0 === $default_value_sm || 0 === $default_value_md || 0 === $default_value_lg ) {
 			add_settings_error(
 				'flexible-spacer-block-default-values',
 				'flexible-spacer-block-default-values-null',
 				__( 'Default Value: Fill in all fields.', 'flexible-spacer-block' )
 			);
 			$new_input = array(
-				'sm' => isset( $this->default_value['sm'] ) ? $this->default_value['sm'] : FSB_DEFAULT_SPACER_HEIGHT,
-				'md' => isset( $this->default_value['md'] ) ? $this->default_value['md'] : FSB_DEFAULT_SPACER_HEIGHT,
-				'lg' => isset( $this->default_value['lg'] ) ? $this->default_value['lg'] : FSB_DEFAULT_SPACER_HEIGHT,
+				'sm'      => isset( $this->default_value['sm'] ) ? $this->default_value['sm'] : FSB_DEFAULT_SPACER_HEIGHT,
+				'md'      => isset( $this->default_value['md'] ) ? $this->default_value['md'] : FSB_DEFAULT_SPACER_HEIGHT,
+				'lg'      => isset( $this->default_value['lg'] ) ? $this->default_value['lg'] : FSB_DEFAULT_SPACER_HEIGHT,
+				'sm_unit' => isset( $this->default_value['sm_unit'] ) ? $this->default_value['sm_unit'] : FSB_DEFAULT_SPACER_HEIGHT_UNIT,
+				'md_unit' => isset( $this->default_value['md_unit'] ) ? $this->default_value['md_unit'] : FSB_DEFAULT_SPACER_HEIGHT_UNIT,
+				'lg_unit' => isset( $this->default_value['lg_unit'] ) ? $this->default_value['lg_unit'] : FSB_DEFAULT_SPACER_HEIGHT_UNIT,
 			);
 		} else {
 			$new_input = array(
-				'sm' => min( max( $default_value_sm, FSB_MIN_SPACER_HEIGHT ), FSB_MAX_SPACER_HEIGHT ),
-				'md' => min( max( $default_value_md, FSB_MIN_SPACER_HEIGHT ), FSB_MAX_SPACER_HEIGHT ),
-				'lg' => min( max( $default_value_lg, FSB_MIN_SPACER_HEIGHT ), FSB_MAX_SPACER_HEIGHT ),
+				'sm'      => min( max( $default_value_sm, FSB_MIN_SPACER_HEIGHT ), FSB_MAX_SPACER_HEIGHT ),
+				'md'      => min( max( $default_value_md, FSB_MIN_SPACER_HEIGHT ), FSB_MAX_SPACER_HEIGHT ),
+				'lg'      => min( max( $default_value_lg, FSB_MIN_SPACER_HEIGHT ), FSB_MAX_SPACER_HEIGHT ),
+				'sm_unit' => $default_value_sm_unit,
+				'md_unit' => $default_value_md_unit,
+				'lg_unit' => $default_value_lg_unit,
 			);
 		}
 		return $new_input;

diff --git a/flexible-spacer-block.php b/flexible-spacer-block.php
@@ -2,7 +2,7 @@
 /**
  * Plugin Name: Flexible Spacer Block
  * Description: Add white space between blocks and customize its height for each device.
- * Version: 2.0.0
+ * Version: 2.1.0
  * Author: Aki Hamano
  * Author URI: https://github.com/t-hamano
  * License: GPL2 or later
@@ -35,7 +35,8 @@
 const FSB_MAX_SPACER_HEIGHT = 500;
 
 // Default spacer height
-const FSB_DEFAULT_SPACER_HEIGHT = 100;
+const FSB_DEFAULT_SPACER_HEIGHT      = 100;
+const FSB_DEFAULT_SPACER_HEIGHT_UNIT = 'px';
 
 require_once __DIR__ . '/classes/class-init.php';
 new Flexible_Spacer_Block\Init();