Changeset 58677

Timestamp:

07/05/2024 12:50:19 AM (4 weeks ago)

Author:

dmsnell

Message:

HTML API: Support SELECT insertion mode.

As part of work to add more spec support to the HTML API, this patch adds
support for the SELECT, OPTION, and OPTGROUP elements, including the
requisite support for the IN SELECT insertion mode.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/5908
Discussed in https://core.trac.wordpress.org/ticket/61576

Props dmsnell, jonsurrell.
See #61576.

Location:

trunk

Files:

• src/wp-includes/html-api/class-wp-html-open-elements.php (modified) (2 diffs)
• src/wp-includes/html-api/class-wp-html-processor.php (modified) (10 diffs)
• tests/phpunit/tests/html-api/wpHtmlProcessor.php (modified) (2 diffs)
• tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php (modified) (2 diffs)
• tests/phpunit/tests/html-api/wpHtmlSupportRequiredHtmlProcessor.php (modified) (2 diffs)
• tests/phpunit/tests/html-api/wpHtmlSupportRequiredOpenElements.php (modified) (1 diff)

trunk/src/wp-includes/html-api/class-wp-html-open-elements.php

@@ -190 +190 @@
      * Returns whether an element is in a specific scope.
      *
-     * ## HTML Support
-     *
-     * This function skips checking for the termination list because there
-     * are no supported elements which appear in the termination list.
-     *
      * @since 6.4.0
      *
@@ -312 +307 @@
      * Returns whether a particular element is in select scope.
      *
-     * @since 6.4.0
+     * This test differs from the others like it, in that its rules are inverted.
+     * Instead of arriving at a match when one of any tag in a termination group
+     * is reached, this one terminates if any other tag is reached.
+     *
+     * > The stack of open elements is said to have a particular element in select scope when it has
+     * > that element in the specific scope consisting of all element types except the following:
+     * >   - optgroup in the HTML namespace
+     * >   - option in the HTML namespace
+     *
+     * @since 6.4.0 Stub implementation (throws).
+     * @since 6.7.0 Full implementation.
      *
      * @see https://html.spec.whatwg.org/#has-an-element-in-select-scope
      *
-     * @throws WP_HTML_Unsupported_Exception Always until this function is implemented.
-     *
      * @param string $tag_name Name of tag to check.
-     * @return bool Whether given element is in scope.
+     * @return bool Whether  scope.
      */
     public function has_element_in_select_scope( $tag_name ) {
-        throw new WP_HTML_Unsupported_Exception( 'Cannot process elements depending on select scope.' );
-
-        return false; // The linter requires this unreachable code until the function is implemented and can return.
+        foreach ( $this->walk_up() as $node ) {
+            if ( $node->node_name === $tag_name ) {
+                return true;
+            }
+
+            if (
+                'OPTION' !== $node->node_name &&
+                'OPTGROUP' !== $node->node_name
+            ) {
+                return false;
+            }
+        }
+
+        return false;
     }
 

trunk/src/wp-includes/html-api/class-wp-html-processor.php

@@ -102 +102 @@
  *  - Containers: ADDRESS, BLOCKQUOTE, DETAILS, DIALOG, DIV, FOOTER, HEADER, MAIN, MENU, SPAN, SUMMARY.
  *  - Custom elements: All custom elements are supported. :)
- *  - Form elements: BUTTON, DATALIST, FIELDSET, INPUT, LABEL, LEGEND, METER, PROGRESS, SEARCH.
+ *  - Form elements: BUTTON, DATALIST, FIELDSET, INPUT, LABEL, LEGEND, METER, .
  *  - Formatting elements: B, BIG, CODE, EM, FONT, I, PRE, SMALL, STRIKE, STRONG, TT, U, WBR.
  *  - Heading elements: H1, H2, H3, H4, H5, H6, HGROUP.
@@ -757 +757 @@
                 case WP_HTML_Processor_State::INSERTION_MODE_IN_BODY:
                     return $this->step_in_body();
+
+
+
+
+
+
 
                 default:
@@ -1335 +1341 @@
             case '+SOURCE':
             case '+TRACK':
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                 $this->insert_html_element( $this->state->current_token );
                 return true;
@@ -1379 +1427 @@
             case 'NOSCRIPT':
             case 'OBJECT':
-            case 'OPTGROUP':
-            case 'OPTION':
             case 'PLAINTEXT':
             case 'RB':
@@ -1388 +1434 @@
             case 'SARCASM':
             case 'SCRIPT':
-            case 'SELECT':
             case 'STYLE':
             case 'SVG':
@@ -1447 +1492 @@
             }
         }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 
@@ -2037 +2283 @@
      *
      * @since 6.4.0
+
      *
      * @see https://html.spec.whatwg.org/#generate-implied-end-tags
@@ -2047 +2294 @@
             'DT',
             'LI',
+
+
             'P',
+
+
+
+
         );
 
-        $current_node = $this->state->stack_of_open_elements->current_node();
+        $no_exclusions = ! isset( $except_for_this_element );
+
         while (
-            $current_node && $current_node->node_name !== $except_for_this_element &&
+             &&
             in_array( $this->state->stack_of_open_elements->current_node(), $elements_with_implied_end_tags, true )
         ) {
@@ -2066 +2320 @@
      *
      * @since 6.4.0
+
      *
      * @see WP_HTML_Processor::generate_implied_end_tags
@@ -2072 +2327 @@
     private function generate_implied_end_tags_thoroughly() {
         $elements_with_implied_end_tags = array(
+
+
             'DD',
             'DT',
             'LI',
+
+
             'P',
+
+
+
+
+
+
+
+
+
+
         );
 

trunk/tests/phpunit/tests/html-api/wpHtmlProcessor.php

@@ -407 +407 @@
             'NOSCRIPT'  => array( 'NOSCRIPT' ),
             'OBJECT'    => array( 'OBJECT' ),
-            'OPTGROUP'  => array( 'OPTGROUP' ),
-            'OPTION'    => array( 'OPTION' ),
             'PLAINTEXT' => array( 'PLAINTEXT' ),
             'RB'        => array( 'RB' ),
@@ -416 +414 @@
             'SARCASM'   => array( 'SARCASM' ),
             'SCRIPT'    => array( 'SCRIPT' ),
-            'SELECT'    => array( 'SELECT' ),
             'STYLE'     => array( 'STYLE' ),
             'SVG'       => array( 'SVG' ),

trunk/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php

@@ -190 +190 @@
             'NOSCRIPT',
             'OBJECT',
-            'OPTGROUP',
-            'OPTION',
             'PLAINTEXT', // Neutralized.
             'RB', // Neutralized.
@@ -198 +196 @@
             'RTC', // Neutralized.
             'SCRIPT',
-            'SELECT',
             'STYLE',
             'SVG',

trunk/tests/phpunit/tests/html-api/wpHtmlSupportRequiredHtmlProcessor.php

@@ -59 +59 @@
      */
     public function test_generate_implied_end_tags_needs_support() {
-        $this->ensure_support_is_added_everywhere( 'OPTGROUP' );
-        $this->ensure_support_is_added_everywhere( 'OPTION' );
         $this->ensure_support_is_added_everywhere( 'RB' );
         $this->ensure_support_is_added_everywhere( 'RP' );
@@ -80 +78 @@
         $this->ensure_support_is_added_everywhere( 'CAPTION' );
         $this->ensure_support_is_added_everywhere( 'COLGROUP' );
-        $this->ensure_support_is_added_everywhere( 'OPTGROUP' );
-        $this->ensure_support_is_added_everywhere( 'OPTION' );
         $this->ensure_support_is_added_everywhere( 'RB' );
         $this->ensure_support_is_added_everywhere( 'RP' );

trunk/tests/phpunit/tests/html-api/wpHtmlSupportRequiredOpenElements.php

@@ -309 +309 @@
          */
         $this->ensure_support_is_added_everywhere( 'SVG' );
-
-        // These elements are specific to SELECT scope.
-        $this->ensure_support_is_added_everywhere( 'OPTGROUP' );
-        $this->ensure_support_is_added_everywhere( 'OPTION' );
     }
 }