Merge pull request #155 from t-hamano/wp6.2

WP6.2
t-hamano · Mar 15, 2023 · 517be5d · 517be5d
2 parents 097ee1c + f318453
commit 517be5d
Show file tree

Hide file tree

Showing 42 changed files with 3,042 additions and 1,756 deletions.
diff --git a/.github/workflows/run-test-and-deploy.yml b/.github/workflows/run-test-and-deploy.yml
@@ -18,9 +18,9 @@ jobs:
           '8.0'
         ]
         wp-versions: [
-          'WordPress#5.9.4',
+          'WordPress#5.9.5',
           'WordPress#6.0.3',
-          'WordPress#6.1',
+          'WordPress#6.1.1',
           'WordPress'
         ]
     name: PHP ${{ matrix.php-versions }} / ${{ matrix.wp-versions }} Test

diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml
@@ -21,9 +21,9 @@ jobs:
           '8.0'
         ]
         wp-versions: [
-          'WordPress#5.9.4',
+          'WordPress#5.9.5',
           'WordPress#6.0.3',
-          'WordPress#6.1',
+          'WordPress#6.1.1',
           'WordPress'
         ]
     name: PHP ${{ matrix.php-versions }} / ${{ matrix.wp-versions }} Test

diff --git a/.wp-env.json b/.wp-env.json
@@ -1,6 +1,7 @@
 {
 	"plugins": [ "." ],
 	"config": {
-		"WP_DEBUG": true
+		"WP_DEBUG": true,
+		"SCRIPT_DEBUG": true
 	}
 }
diff --git a/classes/class-api.php b/classes/class-api.php
@@ -129,7 +129,7 @@ public function update_options( $request ) {
 		return rest_ensure_response(
 			array(
 				'status'    => 'success',
-				'message'   => __( 'Setting saved.', 'flexible-table-block' ),
+				'message'   => __( 'Global setting saved.', 'flexible-table-block' ),
 				'block_css' => Helper::minify_css( Helper::get_block_css( '.editor-styles-wrapper ' ) ),
 			)
 		);
@@ -149,7 +149,7 @@ public function delete_options() {
 			array(
 				'options'   => Settings::get_options(),
 				'status'    => 'success',
-				'message'   => __( 'Settings have been restored.', 'flexible-table-block' ),
+				'message'   => __( 'Global setting restored.', 'flexible-table-block' ),
 				'block_css' => Helper::minify_css( Helper::get_block_css( '.editor-styles-wrapper ' ) ),
 			)
 		);

diff --git a/classes/class-helper.php b/classes/class-helper.php
@@ -20,10 +20,10 @@ public static function get_block_css( $prefix = '' ) {
 		// CSS selectors.
 		$styles = array(
 			"{$selector} > table"       => '',
-			"{$selector}.is-style-stripes tr:nth-child(odd) th" => '',
-			"{$selector}.is-style-stripes tr:nth-child(odd) td" => '',
-			"{$selector}.is-style-stripes tr:nth-child(even) th" => '',
-			"{$selector}.is-style-stripes tr:nth-child(even) td" => '',
+			"{$selector}.is-style-stripes tbody tr:nth-child(odd) th" => '',
+			"{$selector}.is-style-stripes tbody tr:nth-child(odd) td" => '',
+			"{$selector}.is-style-stripes tbody tr:nth-child(even) th" => '',
+			"{$selector}.is-style-stripes tbody tr:nth-child(even) td" => '',
 			"{$selector} > table tr th, {$selector} > table tr td" => '',
 			"{$selector} > table tr th" => '',
 			"{$selector} > table tr td" => '',
@@ -49,12 +49,12 @@ public static function get_block_css( $prefix = '' ) {
 					$styles[ "{$selector} > table" ] .= "border-collapse:{$value};";
 					break;
 				case 'row_odd_color':
-					$styles[ "{$selector}.is-style-stripes tr:nth-child(odd) th" ] .= "background-color:{$value};";
-					$styles[ "{$selector}.is-style-stripes tr:nth-child(odd) td" ] .= "background-color:{$value};";
+					$styles[ "{$selector}.is-style-stripes tbody tr:nth-child(odd) th" ] .= "background-color:{$value};";
+					$styles[ "{$selector}.is-style-stripes tbody tr:nth-child(odd) td" ] .= "background-color:{$value};";
 					break;
 				case 'row_even_color':
-					$styles[ "{$selector}.is-style-stripes tr:nth-child(even) th" ] .= "background-color:{$value};";
-					$styles[ "{$selector}.is-style-stripes tr:nth-child(even) td" ] .= "background-color:{$value};";
+					$styles[ "{$selector}.is-style-stripes tbody tr:nth-child(even) th" ] .= "background-color:{$value};";
+					$styles[ "{$selector}.is-style-stripes tbody tr:nth-child(even) td" ] .= "background-color:{$value};";
 					break;
 				case 'cell_text_align':
 					$styles[ "{$selector} > table tr th, {$selector} > table tr td" ] .= "text-align:{$value};";

diff --git a/classes/class-settings.php b/classes/class-settings.php
@@ -47,7 +47,7 @@ class Settings {
 			'type'    => 'boolean',
 			'default' => false,
 		),
-		// Set the screen width (breakpoint) as the basis for switching between PC and mobile devices.
+		// Set the screen width (breakpoint) as the basis for switching between desktop and mobile devices.
 		'breakpoint'            => array(
 			'type'    => 'number',
 			'default' => 768,

diff --git a/flexible-table-block.php b/flexible-table-block.php
@@ -4,7 +4,7 @@
  * Description: Easily create flexible configuration tables.
  * Requires at least: 5.9
  * Requires PHP: 7.3
- * Version: 2.8.0
+ * Version: 2.9.0
  * Author: Aki Hamano
  * Author URI: https://github.com/t-hamano
  * License: GPL2 or later