From 32a94add0ba234b762edd439175dc0115c30d10a Mon Sep 17 00:00:00 2001 From: Domenic Denicola Date: Thu, 18 Nov 2021 13:13:15 -0500 Subject: [PATCH] Handle shadow DOM and focusing Closes #2393, by making behave the same as delegatesFocus: they both "delegate focus" to either autofocus="" if it's specified on a (non-shadow-including) descendant, or the first focusable element among their shadow-including descendants if not. --- source | 62 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/source b/source index 6cec40e3e13..234caa8a2f8 100644 --- a/source +++ b/source @@ -58171,16 +58171,9 @@ interface HTMLDialogElement : HTMLElement {

  1. If subject is inert, return.

    2. -
  2. -

    Let control be the first descendant element of subject, in tree - order, that is not inert and has the autofocus attribute specified.

    - -

    If there isn't one, then let control be the first non-inert - descendant element of subject, in tree order. +

  3. Let control be the focus delegate of subject.

    4. -

    If there isn't one of those either, then let control be subject.

    - +

  4. If control is null, then set control to subject.

  5. Run the focusing steps for control.

    @@ -75189,27 +75182,8 @@ END:VCARD currently focused area of a top-level browsing context's DOM anchor, then return null.

    6. -

  6. Let autofocus delegate be the autofocus delegate for - root given focus trigger.

    7. - -

  7. If autofocus delegate is not null, then return autofocus - delegate.

    8. - -

  8. If focus trigger is "click", then let possible - focus delegates be the list of all click focusable focusable areas whose DOM anchor is a shadow-including - descendant of root.

    9. - -

  9. Otherwise, let possible focus delegates be the list of all focusable areas whose DOM anchor is a - shadow-including descendant of root.

    10. - -

  10. If possible focus delegates is empty, then return null.

    11. - -

  11. Sort possible focus delegates by shadow-including tree - order of their DOM anchors.

    12. - -

  12. Return possible focus delegates[0].

    13. +

  13. Return the focus delegate for root given focus + trigger.

For sequential focusability, the @@ -75224,6 +75198,34 @@ END:VCARD

Return null.

+

The focus delegate for a focus target, given an optional string + focus trigger (default "other"), is given by the following + steps:

+ +
    +

  1. Let autofocus delegate be the autofocus delegate for + focus target given focus trigger.

    2. + +

  2. If autofocus delegate is not null, then return autofocus + delegate.

    3. + +

  3. If focus trigger is "click", then let possible + focus delegates be the list of all click focusable focusable areas whose DOM anchor is a shadow-including + descendant of focus target.

    4. + +

  4. Otherwise, let possible focus delegates be the list of all focusable areas whose DOM anchor is a + shadow-including descendant of focus target.

    5. + +

  5. If possible focus delegates is empty, then return null.

    6. + +

  6. Sort possible focus delegates by shadow-including tree order of + their DOM anchors.

    7. + +

  7. Return possible focus delegates[0].

    8. +
+

The autofocus delegate for a focus target given a focus trigger is given by the following steps: