Merge branch 'dev'

Author: sirreal

html-api-debugger/html-api-debugger.php

@@ -3,7 +3,7 @@
  * Plugin Name:       HTML API Debugger
  * Plugin URI:        https://github.com/sirreal/html-api-debugger
  * Description:       Add a page to wp-admin for debugging the HTML API.
- * Version:           2.4
+ * Version:           2.6
  * Requires at least: 6.7
  * Tested up to:      6.8
  * Author:            Jon Surrell
@@ -22,7 +22,7 @@
 require_once __DIR__ . '/html-api-integration.php';
 
 const SLUG    = 'html-api-debugger';
-const VERSION = '2.4';
+const VERSION = '2.6';
 
 /** Set up the plugin. */
 function init() {

html-api-debugger/html-api-integration.php

@@ -26,8 +26,10 @@ class_exists( '\WP_CSS_Complex_Selector_List' )
  * @return string|null The normalized HTML or null if not supported.
  */
 function get_normalized_html( string $html, array $options ): ?string {
-	$cfacn = new ReflectionMethod( WP_HTML_Processor::class, 'create_fragment_at_current_node' );
-	$cfacn->setAccessible( true );
+	if ( method_exists( WP_HTML_Processor::class, 'create_fragment_at_current_node' ) ) {
+		$cfacn = new ReflectionMethod( WP_HTML_Processor::class, 'create_fragment_at_current_node' );
+		$cfacn->setAccessible( true );
+	}
 
 	if (
 		method_exists( WP_HTML_Processor::class, 'create_fragment_at_current_node' ) &&
@@ -98,8 +100,10 @@ function get_tree( string $html, array $options ): array {
 	$processor_bookmarks = new ReflectionProperty( WP_HTML_Processor::class, 'bookmarks' );
 	$processor_bookmarks->setAccessible( true );
 
-	$cfacn = new ReflectionMethod( WP_HTML_Processor::class, 'create_fragment_at_current_node' );
-	$cfacn->setAccessible( true );
+	if ( method_exists( WP_HTML_Processor::class, 'create_fragment_at_current_node' ) ) {
+		$cfacn = new ReflectionMethod( WP_HTML_Processor::class, 'create_fragment_at_current_node' );
+		$cfacn->setAccessible( true );
+	}
 
 	$is_fragment_processor = false;
 

html-api-debugger/interactivity.php

@@ -79,7 +79,7 @@ class="context-html"
 	<div>
 		<h2>Input HTML</h2>
 		<textarea
-			id='input_html'
+			id="input-html"
 			autocapitalize="off"
 			autocomplete="off"
 			spellcheck="false"
@@ -153,7 +153,7 @@ class="context-html"
 				<label>Show invisible <input type="checkbox" data-wp-bind--checked="state.showInvisible" data-wp-on-async--input="handleShowInvisibleClick"></label>
 				<span><label>Show virtual <input type="checkbox" data-wp-bind--checked="state.showVirtual" data-wp-on-async--input="handleShowVirtualClick"></label></span>
 				<div data-wp-bind--hidden="!state.htmlapiResponse.supports.selectors">
-					<label>CSS Selectors <textarea placeholder="CSS selector: .my-class" data-wp-on-async--input="handleSelectorChange"><?php echo "\n" . esc_textarea( str_replace( "\0", '', $options['selector'] ?? '' ) ); ?></textarea></label>
+					<label>CSS Selectors <textarea id="selector-input" placeholder="CSS selector: .my-class" data-wp-on-async--input="handleSelectorChange"><?php echo "\n" . esc_textarea( str_replace( "\0", '', $options['selector'] ?? '' ) ); ?></textarea></label>
 				</div>
 			</div>
 			<div>

html-api-debugger/readme.txt

@@ -3,7 +3,7 @@ Contributors: jonsurrell, bernhard-reiter
 Tags: HTML API, development, debug
 Requires at least: 6.7
 Tested up to: 6.8
-Stable tag: 2.4
+Stable tag: 2.6
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -15,7 +15,15 @@ Please file issues and pull requests on the [GitHub repository](https://github.c
 
 == Changelog ==
 
+= 2.6 =
+* Handle null bytes in selectors and context HTML.
+* Fix another error when using WordPress 6.7.
+
+= 2.5 =
+* Fix a crash when using WordPress 6.7.
+
 = 2.4 =
+* Add experimental support for HTML API selectors.
 * Display document title.
 
 = 2.3 =

html-api-debugger/style.css

@@ -58,7 +58,7 @@
 		font-size: inherit;
 	}
 
-	#input_html {
+	#input-html {
 		width: 100%;
 		min-height: 200px;
 		font-family: var(--monospace-font-family);

html-api-debugger/view.js

@@ -69,7 +69,7 @@ let mutationObserver = null;
  *
  * @typedef  State
  * @property {ReadonlyArray<string>} treeWarnings
- * @property {string|null} selector
+ * @property {string} selector
  * @property {string|null} selectorErrorMessage
  * @property {boolean} showClosers
  * @property {boolean} showInvisible
@@ -354,9 +354,19 @@ const store = createStore(NS, {
 		// Force print them if we have null bytes.
 		if (store.state.html.includes('\0')) {
 			/** @type {HTMLTextAreaElement} */ (
-				document.getElementById('input_html')
+				document.getElementById('input-html')
 			).value = store.state.html;
 		}
+		if (store.state.contextHTML.includes('\0')) {
+			/** @type {HTMLTextAreaElement} */ (
+				document.getElementById('context-html')
+			).value = store.state.contextHTML;
+		}
+		if (store.state.selector.includes('\0')) {
+			/** @type {HTMLTextAreaElement} */ (
+				document.getElementById('selector-input')
+			).value = store.state.selector;
+		}
 
 		store.render();