Merge pull request #11 from mosne/ver/0.1.3

fix escaping with wp_kses_data
mosne · Jun 9, 2024 · add3f99 · add3f99
2 parents 59e8b8c + 153bcb8
commit add3f99
Show file tree

Hide file tree

Showing 11 changed files with 92 additions and 77 deletions.
diff --git a/.plugin-data b/.plugin-data
@@ -1,4 +1,4 @@
 {
-	"version": "0.1.2",
+	"version": "0.1.3",
 	"slug": "mosne-dark-palette"
 }
diff --git a/README.md b/README.md
@@ -74,6 +74,9 @@ You can change the icons using CSS in your theme or in the customizer.
    ![screenshot-3](https://github.com/mosne/mosne-dark-palette/blob/main/_wordpress-org/screenshot-3.gif)
 
 ## Changelog
+### 0.1.3 - 2023-06-09
+
+* Fix escaping via wp_kses_data and changelogs
 
 ### 0.1.2 - 2023-06-01
 

diff --git a/build/index.css.map b/build/index.css.map
diff --git a/build/index.js.map b/build/index.js.map
diff --git a/build/render.php b/build/render.php
@@ -52,10 +52,11 @@
 
 $unique_id          = wp_unique_id( 'p-' );
 $class_options      = $attributes['classOptions'] ?? '';
-$additional_classes = $class_options . '  wp-block-navigation-item open-on-hover-click wp-block-navigation-submenu';
+$additional_classes = $class_options . '  wp-block-navigation-item open-on-hover-click toto wp-block-navigation-submenu';
 
-sprintf(
-	'<li %s><div class="navigaiton-item__wrapper has-child"
+?>
+<li <?php echo wp_kses_data( get_block_wrapper_attributes( [ 'class' => $additional_classes ] ) ); ?>>
+	<div class="navigaiton-item__wrapper has-child"
 		tabindex="-1"
 		data-wp-interactive="mosne/dark-palette"
 		data-wp-init="callbacks.colorInit"
@@ -65,50 +66,51 @@
 		data-wp-on--keydown="actions.showSubmenu"
 		data-wp-on--focusin="actions.showSubmenu"
 		data-wp-on--focusout="actions.hideSubmenu"
-		%s>',
-	get_block_wrapper_attributes( [ 'class' => $additional_classes ] ),
-	wp_interactivity_data_wp_context(
-		[
-			'mode'    => 'auto',
-			'current' => 'has-icon--auto wp-block-navigation-submenu__toggle',
-			'submenu' => false,
-		]
-	)
-);
-?>
-<button
-	type="button"
-	aria-haspopup="menu"
-	data-wp-bind--class="context.current"
-	data-wp-bind--aria-expanded="context.submenu"
-	class="wp-block-navigation-submenu__toggle">
+		<?php
+		echo wp_kses_data(
+			wp_interactivity_data_wp_context(
+				[
+					'mode'    => 'auto',
+					'current' => 'has-icon--auto wp-block-navigation-submenu__toggle',
+					'submenu' => false,
+				]
+			)
+		);
+		?>
+	>
+		<button
+			type="button"
+			aria-haspopup="menu"
+			data-wp-bind--class="context.current"
+			data-wp-bind--aria-expanded="context.submenu"
+			class="wp-block-navigation-submenu__toggle">
 				<span data-wp-bind--aria-label="context.mode">
 					<?php echo esc_html( $attributes['defaultLabel'] ); ?>
 				</span>
-</button>
-<ul aria-labelledby="themes-menu-button"
-	class="wp-block-navigation__submenu-container wp-block-navigation-submenu">
-	<li class="wp-block-navigation-item">
-		<button type="button" data-wp-on--click="actions.makeAuto">
+		</button>
+		<ul aria-labelledby="themes-menu-button"
+			class="wp-block-navigation__submenu-container wp-block-navigation-submenu">
+			<li class="wp-block-navigation-item">
+				<button type="button" data-wp-on--click="actions.makeAuto">
 				<span>
 					<?php echo esc_html( $attributes['autoLabel'] ); ?>
 				</span>
-		</button>
-	</li>
-	<li class="wp-block-navigation-item">
-		<button type="button" class="has-icon--light" data-wp-on--click="actions.makeLight">
+				</button>
+			</li>
+			<li class="wp-block-navigation-item">
+				<button type="button" class="has-icon--light" data-wp-on--click="actions.makeLight">
 				<span>
 					<?php echo esc_html( $attributes['lightLabel'] ); ?>
 				</span>
-		</button>
-	</li>
-	<li class="wp-block-navigation-item">
-		<button type="button" class="has-icon--dark" data-wp-on--click="actions.makeDark">
+				</button>
+			</li>
+			<li class="wp-block-navigation-item">
+				<button type="button" class="has-icon--dark" data-wp-on--click="actions.makeDark">
 				<span>
 					<?php echo esc_html( $attributes['darkLabel'] ); ?>
 				</span>
-		</button>
-	</li>
-</ul>
-</div>
+				</button>
+			</li>
+		</ul>
+	</div>
 </li>
diff --git a/build/style-index.css.map b/build/style-index.css.map
diff --git a/build/view.js.map b/build/view.js.map
diff --git a/mosne-dark-palette.php b/mosne-dark-palette.php
@@ -4,7 +4,7 @@
  * Description:       Create and apply your dark palette in an accessibility-friendly manner using the new Interactivity API.
  * Requires at least: 6.5
  * Requires PHP:      7.4
- * Version:           0.1.2
+ * Version:           0.1.3
  * Author:            Mosne
  * License:           GPL-2.0-or-later
  * License URI:       https://www.gnu.org/licenses/gpl-2.0.html

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "mosne-dark-palette",
-	"version": "0.1.2",
+	"version": "0.1.3",
 	"description": "Create and apply your dark palette in an a11y friendly way using the new Interactivity API.",
 	"author": "mosne",
 	"license": "GPL-2s.0-or-later",

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags:              block, palette, dark, color, accessibility
 Requires at least: 6.5
 Requires PHP:      7.4
 Tested up to:      6.5
-Stable tag:        0.1.2
+Stable tag:        0.1.3
 License:           GPL-2.0-or-later
 License URI:       https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -77,6 +77,10 @@ You can change the icons using CSS in your theme or in the customizer.
 3. Edit the dark palette
 
 == Changelog ==
+= 0.1.2 - 2023-06-09 =
+
+* Fix escaping via wp_kses_data and changelogs
+
 = 0.1.2 - 2023-06-01 =
 
 * Fix escaping and changelogs

diff --git a/src/render.php b/src/render.php
@@ -54,8 +54,9 @@
 $class_options      = $attributes['classOptions'] ?? '';
 $additional_classes = $class_options . '  wp-block-navigation-item open-on-hover-click wp-block-navigation-submenu';
 
-sprintf(
-	'<li %s><div class="navigaiton-item__wrapper has-child"
+?>
+<li <?php echo wp_kses_data( get_block_wrapper_attributes( [ 'class' => $additional_classes ] ) ); ?>>
+	<div class="navigaiton-item__wrapper has-child"
 		tabindex="-1"
 		data-wp-interactive="mosne/dark-palette"
 		data-wp-init="callbacks.colorInit"
@@ -65,50 +66,51 @@
 		data-wp-on--keydown="actions.showSubmenu"
 		data-wp-on--focusin="actions.showSubmenu"
 		data-wp-on--focusout="actions.hideSubmenu"
-		%s>',
-	get_block_wrapper_attributes( [ 'class' => $additional_classes ] ),
-	wp_interactivity_data_wp_context(
-		[
-			'mode'    => 'auto',
-			'current' => 'has-icon--auto wp-block-navigation-submenu__toggle',
-			'submenu' => false,
-		]
-	)
-);
-?>
-<button
-	type="button"
-	aria-haspopup="menu"
-	data-wp-bind--class="context.current"
-	data-wp-bind--aria-expanded="context.submenu"
-	class="wp-block-navigation-submenu__toggle">
+		<?php
+		echo wp_kses_data(
+			wp_interactivity_data_wp_context(
+				[
+					'mode'    => 'auto',
+					'current' => 'has-icon--auto wp-block-navigation-submenu__toggle',
+					'submenu' => false,
+				]
+			)
+		);
+		?>
+	>
+		<button
+			type="button"
+			aria-haspopup="menu"
+			data-wp-bind--class="context.current"
+			data-wp-bind--aria-expanded="context.submenu"
+			class="wp-block-navigation-submenu__toggle">
 				<span data-wp-bind--aria-label="context.mode">
 					<?php echo esc_html( $attributes['defaultLabel'] ); ?>
 				</span>
-</button>
-<ul aria-labelledby="themes-menu-button"
-	class="wp-block-navigation__submenu-container wp-block-navigation-submenu">
-	<li class="wp-block-navigation-item">
-		<button type="button" data-wp-on--click="actions.makeAuto">
+		</button>
+		<ul aria-labelledby="themes-menu-button"
+			class="wp-block-navigation__submenu-container wp-block-navigation-submenu">
+			<li class="wp-block-navigation-item">
+				<button type="button" data-wp-on--click="actions.makeAuto">
 				<span>
 					<?php echo esc_html( $attributes['autoLabel'] ); ?>
 				</span>
-		</button>
-	</li>
-	<li class="wp-block-navigation-item">
-		<button type="button" class="has-icon--light" data-wp-on--click="actions.makeLight">
+				</button>
+			</li>
+			<li class="wp-block-navigation-item">
+				<button type="button" class="has-icon--light" data-wp-on--click="actions.makeLight">
 				<span>
 					<?php echo esc_html( $attributes['lightLabel'] ); ?>
 				</span>
-		</button>
-	</li>
-	<li class="wp-block-navigation-item">
-		<button type="button" class="has-icon--dark" data-wp-on--click="actions.makeDark">
+				</button>
+			</li>
+			<li class="wp-block-navigation-item">
+				<button type="button" class="has-icon--dark" data-wp-on--click="actions.makeDark">
 				<span>
 					<?php echo esc_html( $attributes['darkLabel'] ); ?>
 				</span>
-		</button>
-	</li>
-</ul>
-</div>
+				</button>
+			</li>
+		</ul>
+	</div>
 </li>