Release/m26.gardevoir

.github/workflows/eslint.yml

@@ -1,7 +1,13 @@
 name: ESLint
 run-name: '[ESLint] ${{ github.event.head_commit.message }}'
 
-on: push
+on:
+  push:
+  # pull_request:
+
+# permissions:
+#   contents: write
+#   pull-requests: write
 
 jobs:
   run-linters:
@@ -26,11 +32,23 @@ jobs:
             ${{ runner.os }}-bun-
 
       # ESLint and Prettier must be in `package.json`
+      - name: Remove npm lockfile to prevent bun git-clone issues
+        run: rm -f package-lock.json
+
       - name: Install dependencies
-        run: bun install --frozen-lockfile
+        run: bun install
         env:
           BUN_AUTH_TOKEN: ${{ secrets.GH_BOT_TOKEN }}
 
+      - name: Build Kadence workspace packages (for ESLint import resolution)
+        run: |
+          for pkg in helpers icons components; do
+            dir="node_modules/@kadence/${pkg}"
+            if [ -f "$dir/package.json" ]; then
+              (cd "$dir" && npm install --omit=prod && npm run build)
+            fi
+          done
+
       - name: Run linters
         uses: wearerequired/lint-action@v2
         with:

.github/workflows/tests.yml

@@ -49,11 +49,23 @@ jobs:
               with:
                   bun-version: latest
 
-            - run: bun install --frozen-lockfile
+            - name: Remove npm lockfile to prevent bun git-clone issues
+              run: rm -f package-lock.json
+
+            - run: bun install
               env:
                   BUN_AUTH_TOKEN: ${{ secrets.GH_BOT_TOKEN }}
                   PUPPETEER_SKIP_DOWNLOAD: true
 
+            - name: Build Kadence workspace packages
+              run: |
+                  for pkg in helpers icons components; do
+                    dir="node_modules/@kadence/${pkg}"
+                    if [ -f "$dir/package.json" ]; then
+                      (cd "$dir" && npm install --omit=prod && npm run build)
+                    fi
+                  done
+
             - name: Build packages
               run: bun run build
 

.gitignore

@@ -16,3 +16,4 @@ bin/wp-cli.phar
 /.env
 # Remove this when fully transitioning to bun.
 /bun.lock*
+/.kadence-packages-root

includes/blocks/class-kadence-blocks-table-block.php

@@ -100,8 +100,7 @@ public function build_css( $attributes, $css, $unique_id, $unique_style_id ) {
 					$width_unit = ! empty( $settings['unit'] ) ? $settings['unit'] : '%';
 
 					if( isset( $settings['width'] ) && '' !== $settings['width'] ) {
-						$css->set_selector('.kb-table' . esc_attr($unique_id) . ' td:nth-of-type(' . ($index + 1) . '), ' .
-							'.kb-table' . esc_attr($unique_id) . ' th:nth-of-type(' . ($index + 1) . ')');
+						$css->set_selector('.kb-table' . esc_attr($unique_id) . ' tr > *:nth-child(' . ($index + 1) . ')');
 						$css->add_property('width', $settings['width'] . $width_unit);
 					}
 

includes/blocks/class-kadence-blocks-table-data-block.php

@@ -93,26 +93,58 @@ public function build_css( $attributes, $css, $unique_id, $unique_style_id ) {
 	 * @return mixed
 	 */
 	public function build_html( $attributes, $unique_id, $content, $block_instance ) {
-		$tag = $this->is_this_block_header( $attributes, $block_instance->context ) ? 'th' : 'td';
+		$scope = $this->get_block_header_scope( $attributes, $block_instance->context );
+		$tag   = $scope ? 'th' : 'td';
+
+		$scope_attr = $scope ? sprintf( ' scope="%s"', esc_attr( $scope ) ) : '';
 
 		return sprintf(
-			'<%s class="kb-table-data kb-table-data%2$s">%3$s</%4$s>',
+			'<%1$s %2$s class="kb-table-data kb-table-data%3$s">%4$s</%1$s>',
 			$tag,
+			$scope_attr,
 			esc_attr( $unique_id ),
-			$content,
-			$tag
+			$content
 		);
 	}
 
-	private function is_this_block_header( $attributes, $context ) {
-		$isFirstRowHeader = ! empty( $context['kadence/table/isFirstRowHeader'] );
-		$isFirstColumnHeader = ! empty( $context['kadence/table/isFirstColumnHeader'] );
+	/**
+	 * Get the header scope for a table data cell.
+	 *
+	 * @param array $attributes Block attributes.
+	 * @param array $context    Block context.
+	 *
+	 * @since 3.7.3
+	 *
+	 * @return string|false 'col', 'row', or false when the cell is not a header.
+	 */
+	private function get_block_header_scope( $attributes, $context ) {
+		$is_first_row_header    = ! empty( $context['kadence/table/isFirstRowHeader'] );
+		$is_first_column_header = ! empty( $context['kadence/table/isFirstColumnHeader'] );
 
 		$column = $attributes['column'] ?? -1;
-		$row = $context['kadence/table/parentRow'] ?? -1;
+		$row    = $context['kadence/table/parentRow'] ?? -1;
+
+		if ( 0 === $row && $is_first_row_header ) {
+			/**
+			 * Filter the scope for the table data cell.
+			 * Scope is 'row', 'col', or false when the cell is not a header.
+			 * https://www.w3schools.com/tags/att_th_scope.asp
+			 *
+			 * @param string $scope The scope.
+			 * @param array $attributes The block attributes.
+			 * @param array $context The block context.
+			 * @return string The scope.
+			 * 
+			 * @since 3.7.3
+			 */
+			return apply_filters( 'kadence_blocks_table_data_scope_attributes', 'col', $attributes, $context );
+		}
 
-		return ( $column === 0 && $isFirstColumnHeader ) || ( $row === 0 && $isFirstRowHeader );
+		if ( 0 === $column && $is_first_column_header ) {
+			return apply_filters( 'kadence_blocks_table_data_scope_attributes', 'row', $attributes, $context );
+		}
 
+		return apply_filters( 'kadence_blocks_table_data_scope_attributes', false, $attributes, $context );
 	}
 
 }

includes/blocks/form/class-kadence-blocks-captcha-block.php

@@ -135,7 +135,7 @@ function (token) {
 		wp_add_inline_script( 'kadence-blocks-recaptcha', $recaptcha_v3_script, 'after' );
 		$this->enqueue_script( 'kadence-blocks-recaptcha' );
 
-		$output = '<input type="hidden" name="recaptcha_response" class="kb_recaptcha_response kb_recaptcha_' . esc_attr( $unique_id ) . '" />';
+		$output = '<input type="hidden" name="recaptcha_response" class="kb_recaptcha_response kb_recaptcha_' . esc_attr( $unique_id ) . '" data-sitekey="' . esc_attr( $captcha_settings->public_key ) . '" />';
 
 		// Handle Kadence Captcha plugin settings
 		$recaptcha_notice_html = '<span style="max-width: 100%%; font-size: 11px; color: #555; line-height: 1.2; display: block; margin-bottom: 16px; padding: 10px; background: #f2f2f2;" class="kt-recaptcha-branding-string">%s</span>';

includes/settings/class-kadence-blocks-settings.php

@@ -455,10 +455,20 @@ public function load_color_palette_theme_json( $theme_json ) {
 					);
 				} else {
 					// Merge mode: add custom colors to theme palette.
-					$existing_theme = isset( $data['settings']['color']['palette']['theme'] )
+					$existing_theme = isset( $data['settings']['color']['palette']['theme'] ) && ! empty( $data['settings']['color']['palette']['theme'] )
 						? $data['settings']['color']['palette']['theme']
 						: [];
 
+					// If theme.json has no colors, fall back to colors registered via
+					// add_theme_support( 'editor-color-palette' ) — e.g. Blocksy registers
+					// its palette this way rather than through theme.json.
+					if ( empty( $existing_theme ) ) {
+						$theme_support = get_theme_support( 'editor-color-palette' );
+						if ( is_array( $theme_support ) && ! empty( $theme_support[0] ) ) {
+							$existing_theme = $theme_support[0];
+						}
+					}
+
 					// Merge custom colors with theme palette.
 					$merged_palette = array_merge( $existing_theme, $san_palette );
 					$merged_palette = array_values( array_map( 'unserialize', array_unique( array_map( 'serialize', $merged_palette ) ) ) );

kadence-blocks.php

@@ -5,7 +5,7 @@
  * Description: Advanced Page Building Blocks for Gutenberg. Create custom column layouts, backgrounds, dual buttons, icons etc.
  * Author: Kadence WP
  * Author URI: https://www.kadencewp.com
- * Version: 3.7.2
+ * Version: 3.7.3
  * Requires PHP: 7.4
  * Text Domain: kadence-blocks
  * License: GPL2+
@@ -20,7 +20,7 @@
 }
 define( 'KADENCE_BLOCKS_PATH', realpath( plugin_dir_path( __FILE__ ) ) . DIRECTORY_SEPARATOR );
 define( 'KADENCE_BLOCKS_URL', plugin_dir_url( __FILE__ ) );
-define( 'KADENCE_BLOCKS_VERSION', '3.7.2' );
+define( 'KADENCE_BLOCKS_VERSION', '3.7.3' );
 
 /**
  * Plugin basename, e.g. "kadence-blocks/kadence-blocks.php".