@sveltia/ui 0.90.0 → 0.92.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/bottom-navigation/bottom-navigation.svelte +3 -9
- package/dist/components/bottom-navigation/bottom-navigation.svelte.d.ts +4 -39
- package/dist/components/button/button-group.svelte +2 -4
- package/dist/components/button/button-group.svelte.d.ts +3 -19
- package/dist/components/button/select-button-group.svelte +2 -13
- package/dist/components/button/select-button-group.svelte.d.ts +5 -67
- package/dist/components/calendar/calendar.d.ts +9 -0
- package/dist/components/calendar/calendar.js +43 -0
- package/dist/components/calendar/calendar.svelte +26 -27
- package/dist/components/checkbox/checkbox-group.svelte +2 -8
- package/dist/components/checkbox/checkbox-group.svelte.d.ts +4 -39
- package/dist/components/dialog/alert-dialog.svelte.d.ts +2 -3
- package/dist/components/dialog/confirmation-dialog.svelte.d.ts +2 -3
- package/dist/components/dialog/dialog.svelte +6 -7
- package/dist/components/dialog/dialog.svelte.d.ts +2 -3
- package/dist/components/dialog/prompt-dialog.svelte +2 -2
- package/dist/components/dialog/prompt-dialog.svelte.d.ts +2 -3
- package/dist/components/disclosure/disclosure.svelte +14 -16
- package/dist/components/disclosure/disclosure.svelte.d.ts +4 -38
- package/dist/components/drawer/drawer.svelte +22 -39
- package/dist/components/drawer/drawer.svelte.d.ts +3 -24
- package/dist/components/grid/grid-body.svelte +2 -3
- package/dist/components/grid/grid-body.svelte.d.ts +3 -18
- package/dist/components/grid/grid-cell.svelte +2 -8
- package/dist/components/grid/grid-cell.svelte.d.ts +3 -22
- package/dist/components/grid/grid-col-header.svelte +2 -4
- package/dist/components/grid/grid-col-header.svelte.d.ts +3 -19
- package/dist/components/grid/grid-foot.svelte +4 -9
- package/dist/components/grid/grid-foot.svelte.d.ts +3 -22
- package/dist/components/grid/grid-head.svelte +4 -9
- package/dist/components/grid/grid-head.svelte.d.ts +3 -22
- package/dist/components/grid/grid-row-header.svelte +2 -8
- package/dist/components/grid/grid-row-header.svelte.d.ts +3 -22
- package/dist/components/grid/grid-row.svelte +4 -5
- package/dist/components/grid/grid-row.svelte.d.ts +3 -19
- package/dist/components/grid/grid.d.ts +10 -0
- package/dist/components/grid/grid.js +11 -0
- package/dist/components/grid/grid.svelte +6 -7
- package/dist/components/grid/grid.svelte.d.ts +5 -21
- package/dist/components/listbox/listbox.svelte +34 -15
- package/dist/components/listbox/listbox.svelte.d.ts +5 -69
- package/dist/components/listbox/option-group.svelte +2 -8
- package/dist/components/listbox/option-group.svelte.d.ts +4 -39
- package/dist/components/listbox/option.svelte +2 -1
- package/dist/components/menu/menu-item-group.svelte +2 -6
- package/dist/components/menu/menu-item-group.svelte.d.ts +3 -22
- package/dist/components/menu/menu-item.svelte +5 -1
- package/dist/components/menu/menu.svelte +2 -8
- package/dist/components/menu/menu.svelte.d.ts +4 -39
- package/dist/components/radio/radio-group.svelte +2 -17
- package/dist/components/radio/radio-group.svelte.d.ts +5 -67
- package/dist/components/radio/radio.svelte +19 -22
- package/dist/components/radio/radio.svelte.d.ts +10 -40
- package/dist/components/resizable-pane/resizable-handle.svelte +42 -49
- package/dist/components/resizable-pane/resizable-pane-group.svelte +44 -58
- package/dist/components/resizable-pane/resizable-pane-group.svelte.d.ts +3 -19
- package/dist/components/resizable-pane/resizable-pane.svelte +2 -5
- package/dist/components/resizable-pane/resizable-pane.svelte.d.ts +3 -19
- package/dist/components/resizable-pane/sizing.d.ts +24 -0
- package/dist/components/resizable-pane/sizing.js +83 -0
- package/dist/components/select/combobox.svelte +35 -39
- package/dist/components/select/select-tags.svelte +3 -13
- package/dist/components/select/select-tags.svelte.d.ts +5 -67
- package/dist/components/slider/slider.d.ts +5 -4
- package/dist/components/slider/slider.js +28 -23
- package/dist/components/slider/slider.svelte +64 -62
- package/dist/components/slider/slider.svelte.d.ts +4 -37
- package/dist/components/switch/switch.svelte +2 -13
- package/dist/components/switch/switch.svelte.d.ts +5 -67
- package/dist/components/table/table-body.svelte +2 -4
- package/dist/components/table/table-body.svelte.d.ts +3 -19
- package/dist/components/table/table-cell.svelte +2 -8
- package/dist/components/table/table-cell.svelte.d.ts +3 -22
- package/dist/components/table/table-col-header.svelte +2 -8
- package/dist/components/table/table-col-header.svelte.d.ts +3 -22
- package/dist/components/table/table-foot.svelte +2 -8
- package/dist/components/table/table-foot.svelte.d.ts +3 -22
- package/dist/components/table/table-head.svelte +2 -8
- package/dist/components/table/table-head.svelte.d.ts +3 -22
- package/dist/components/table/table-part.svelte +2 -4
- package/dist/components/table/table-part.svelte.d.ts +3 -19
- package/dist/components/table/table-row-header.svelte +2 -8
- package/dist/components/table/table-row-header.svelte.d.ts +3 -22
- package/dist/components/table/table-row.svelte +2 -8
- package/dist/components/table/table-row.svelte.d.ts +3 -22
- package/dist/components/table/table.svelte +2 -4
- package/dist/components/table/table.svelte.d.ts +3 -19
- package/dist/components/tabs/tab-box.svelte +2 -4
- package/dist/components/tabs/tab-box.svelte.d.ts +3 -19
- package/dist/components/tabs/tab-list.svelte +2 -7
- package/dist/components/tabs/tab-list.svelte.d.ts +4 -37
- package/dist/components/tabs/tab-panel.svelte +2 -8
- package/dist/components/tabs/tab-panel.svelte.d.ts +3 -22
- package/dist/components/tabs/tab-panels.svelte +2 -8
- package/dist/components/tabs/tab-panels.svelte.d.ts +3 -22
- package/dist/components/text-editor/code-editor.js +14 -7
- package/dist/components/text-editor/code-editor.svelte +14 -22
- package/dist/components/text-editor/code-editor.svelte.d.ts +5 -103
- package/dist/components/text-editor/config.d.ts +73 -0
- package/dist/components/text-editor/config.js +110 -0
- package/dist/components/text-editor/constants.d.ts +40 -6
- package/dist/components/text-editor/constants.js +81 -7
- package/dist/components/text-editor/conversion/editor-components.js +4 -4
- package/dist/components/text-editor/conversion/html/components.d.ts +16 -0
- package/dist/components/text-editor/conversion/html/components.js +87 -0
- package/dist/components/text-editor/conversion/html/export.d.ts +10 -0
- package/dist/components/text-editor/conversion/html/export.js +360 -0
- package/dist/components/text-editor/conversion/html/import-rules.d.ts +12 -0
- package/dist/components/text-editor/conversion/html/import-rules.js +234 -0
- package/dist/components/text-editor/conversion/html/index.d.ts +10 -0
- package/dist/components/text-editor/conversion/html/index.js +33 -0
- package/dist/components/text-editor/conversion/html/paragraph.d.ts +1 -0
- package/dist/components/text-editor/conversion/html/paragraph.js +123 -0
- package/dist/components/text-editor/conversion/html/task-list.d.ts +13 -0
- package/dist/components/text-editor/conversion/html/task-list.js +82 -0
- package/dist/components/text-editor/conversion/html/unsupported.d.ts +2 -0
- package/dist/components/text-editor/conversion/html/unsupported.js +122 -0
- package/dist/components/text-editor/conversion/html/utils.d.ts +6 -0
- package/dist/components/text-editor/conversion/html/utils.js +34 -0
- package/dist/components/text-editor/conversion/import.js +33 -27
- package/dist/components/text-editor/conversion/markdown/block-conversion.d.ts +4 -0
- package/dist/components/text-editor/conversion/markdown/block-conversion.js +154 -0
- package/dist/components/text-editor/conversion/markdown/block-structure.d.ts +16 -0
- package/dist/components/text-editor/conversion/markdown/block-structure.js +254 -0
- package/dist/components/text-editor/conversion/markdown/code-blocks.d.ts +57 -0
- package/dist/components/text-editor/conversion/markdown/code-blocks.js +279 -0
- package/dist/components/text-editor/conversion/markdown/code-spans.d.ts +19 -0
- package/dist/components/text-editor/conversion/markdown/code-spans.js +71 -0
- package/dist/components/text-editor/conversion/markdown/formatting.d.ts +22 -0
- package/dist/components/text-editor/conversion/markdown/formatting.js +451 -0
- package/dist/components/text-editor/conversion/markdown/index.d.ts +10 -0
- package/dist/components/text-editor/conversion/markdown/index.js +55 -0
- package/dist/components/text-editor/conversion/markdown/placeholders.d.ts +2 -0
- package/dist/components/text-editor/conversion/markdown/placeholders.js +229 -0
- package/dist/components/text-editor/conversion/markdown/syntax.d.ts +99 -0
- package/dist/components/text-editor/conversion/markdown/syntax.js +206 -0
- package/dist/components/text-editor/conversion/placeholder-chars.d.ts +43 -0
- package/dist/components/text-editor/conversion/placeholder-chars.js +51 -0
- package/dist/components/text-editor/conversion/transformers/block-escape.d.ts +1 -0
- package/dist/components/text-editor/conversion/transformers/block-escape.js +53 -26
- package/dist/components/text-editor/conversion/transformers/code.d.ts +3 -14
- package/dist/components/text-editor/conversion/transformers/code.js +78 -16
- package/dist/components/text-editor/conversion/transformers/formatted-code.js +3 -18
- package/dist/components/text-editor/conversion/transformers/inline-code.js +3 -1
- package/dist/components/text-editor/conversion/transformers/link.js +3 -1
- package/dist/components/text-editor/conversion/transformers/raw-syntax.d.ts +0 -19
- package/dist/components/text-editor/conversion/transformers/raw-syntax.js +22 -93
- package/dist/components/text-editor/conversion/transformers/table.js +57 -16
- package/dist/components/text-editor/conversion/transformers/task-list.d.ts +24 -0
- package/dist/components/text-editor/conversion/transformers/task-list.js +53 -0
- package/dist/components/text-editor/conversion/update.d.ts +19 -2
- package/dist/components/text-editor/conversion/update.js +64 -40
- package/dist/components/text-editor/core.d.ts +12 -51
- package/dist/components/text-editor/core.js +47 -77
- package/dist/components/text-editor/editing/commands.js +9 -18
- package/dist/components/text-editor/editing/guards.d.ts +7 -0
- package/dist/components/text-editor/editing/guards.js +123 -0
- package/dist/components/text-editor/editing/raw-markdown.d.ts +7 -2
- package/dist/components/text-editor/editing/raw-markdown.js +68 -8
- package/dist/components/text-editor/editing/selection.js +6 -2
- package/dist/components/text-editor/lexical-root.svelte +89 -47
- package/dist/components/text-editor/lexical-root.svelte.d.ts +4 -67
- package/dist/components/text-editor/shiki/{facade.d.ts → engine.d.ts} +8 -8
- package/dist/components/text-editor/shiki/{facade.js → engine.js} +53 -156
- package/dist/components/text-editor/shiki/highlighter.js +5 -5
- package/dist/components/text-editor/shiki/lexical.d.ts +6 -0
- package/dist/components/text-editor/shiki/lexical.js +165 -0
- package/dist/components/text-editor/shiki/preload.js +1 -1
- package/dist/components/text-editor/shiki/source-highlight.svelte.d.ts +15 -0
- package/dist/components/text-editor/shiki/source-highlight.svelte.js +120 -0
- package/dist/components/text-editor/shiki/version.d.ts +1 -1
- package/dist/components/text-editor/shiki/version.js +1 -1
- package/dist/components/text-editor/store.svelte.js +65 -16
- package/dist/components/text-editor/text-editor.svelte +57 -146
- package/dist/components/text-editor/text-editor.svelte.d.ts +9 -105
- package/dist/components/text-editor/toolbar/actions.d.ts +25 -0
- package/dist/components/text-editor/toolbar/actions.js +107 -0
- package/dist/components/text-editor/toolbar/align-menu-button.svelte +16 -14
- package/dist/components/text-editor/toolbar/format-text-button.svelte +27 -19
- package/dist/components/text-editor/toolbar/insert-horizontal-rule-button.svelte +23 -23
- package/dist/components/text-editor/toolbar/insert-item-button.svelte +1 -1
- package/dist/components/text-editor/toolbar/insert-link-button.svelte +47 -51
- package/dist/components/text-editor/toolbar/insert-menu-button.svelte +1 -1
- package/dist/components/text-editor/toolbar/insert-table-button.svelte +35 -52
- package/dist/components/text-editor/toolbar/table-action-menu.svelte +19 -17
- package/dist/components/text-editor/toolbar/text-editor-toolbar.svelte +34 -11
- package/dist/components/text-editor/toolbar/text-editor-toolbar.svelte.d.ts +0 -8
- package/dist/components/text-editor/toolbar/toggle-block-menu-item.svelte +35 -41
- package/dist/components/text-editor/widgets/emoji-autocomplete.svelte +7 -6
- package/dist/components/text-editor/widgets/floating-link-editor.svelte +19 -32
- package/dist/components/text-editor/widgets/table-cell-menu-button.svelte +28 -32
- package/dist/components/text-field/date-time-input.svelte +7 -8
- package/dist/components/text-field/date-time-input.svelte.d.ts +3 -32
- package/dist/components/text-field/number-input.d.ts +0 -2
- package/dist/components/text-field/number-input.js +25 -25
- package/dist/components/text-field/number-input.svelte +18 -9
- package/dist/components/text-field/number-input.svelte.d.ts +1 -1
- package/dist/components/text-field/text-area.d.ts +2 -0
- package/dist/components/text-field/text-area.js +31 -0
- package/dist/components/text-field/text-area.svelte +12 -25
- package/dist/components/text-field/text-area.svelte.d.ts +5 -67
- package/dist/components/toast/toast.svelte +31 -8
- package/dist/components/toast/toast.svelte.d.ts +6 -6
- package/dist/components/toolbar/toolbar.svelte +2 -7
- package/dist/components/toolbar/toolbar.svelte.d.ts +4 -37
- package/dist/components/tree/tree-item.svelte +2 -6
- package/dist/components/tree/tree-item.svelte.d.ts +3 -22
- package/dist/components/tree/tree.svelte +3 -10
- package/dist/components/tree/tree.svelte.d.ts +4 -39
- package/dist/components/util/group.svelte +2 -7
- package/dist/components/util/group.svelte.d.ts +4 -37
- package/dist/components/util/modal.d.ts +9 -0
- package/dist/components/util/modal.js +30 -0
- package/dist/components/util/modal.svelte +16 -12
- package/dist/index.d.ts +1 -1
- package/dist/index.js +1 -1
- package/dist/locales/ar.yaml +2 -0
- package/dist/locales/bg.yaml +2 -0
- package/dist/locales/ca.yaml +2 -0
- package/dist/locales/cs.yaml +2 -0
- package/dist/locales/da.yaml +2 -0
- package/dist/locales/de.yaml +2 -0
- package/dist/locales/el.yaml +2 -0
- package/dist/locales/en-CA.yaml +2 -0
- package/dist/locales/en-GB.yaml +2 -0
- package/dist/locales/en-US.yaml +2 -0
- package/dist/locales/en-ZA.yaml +2 -0
- package/dist/locales/es-CO.yaml +2 -0
- package/dist/locales/es-ES.yaml +2 -0
- package/dist/locales/fa.yaml +2 -0
- package/dist/locales/fi.yaml +2 -0
- package/dist/locales/fr.yaml +2 -0
- package/dist/locales/he.yaml +2 -0
- package/dist/locales/hr.yaml +2 -0
- package/dist/locales/hu.yaml +176 -0
- package/dist/locales/it.yaml +2 -0
- package/dist/locales/ja.yaml +2 -0
- package/dist/locales/ko.yaml +2 -0
- package/dist/locales/nl.yaml +2 -0
- package/dist/locales/pl.yaml +2 -0
- package/dist/locales/pt-BR.yaml +2 -0
- package/dist/locales/pt-PT.yaml +2 -0
- package/dist/locales/ru.yaml +2 -0
- package/dist/locales/sk.yaml +2 -0
- package/dist/locales/sv.yaml +2 -0
- package/dist/locales/tr.yaml +2 -0
- package/dist/locales/uk.yaml +2 -0
- package/dist/locales/vi.yaml +2 -0
- package/dist/locales/zh-CN.yaml +2 -0
- package/dist/locales/zh-TW.yaml +2 -0
- package/dist/services/composite-widget.svelte.d.ts +76 -0
- package/dist/services/composite-widget.svelte.js +157 -0
- package/dist/services/focus.d.ts +2 -0
- package/dist/services/focus.js +68 -0
- package/dist/services/group.svelte.d.ts +17 -69
- package/dist/services/group.svelte.js +128 -391
- package/dist/services/label.d.ts +9 -0
- package/dist/services/label.js +22 -0
- package/dist/services/menu.d.ts +8 -0
- package/dist/services/menu.js +237 -0
- package/dist/services/navigation.d.ts +9 -0
- package/dist/services/navigation.js +13 -0
- package/dist/services/number.d.ts +2 -0
- package/dist/services/number.js +27 -0
- package/dist/services/pointer-drag.d.ts +14 -0
- package/dist/services/pointer-drag.js +89 -0
- package/dist/services/popup.svelte.js +123 -103
- package/dist/services/text.d.ts +3 -0
- package/dist/services/text.js +17 -0
- package/dist/services/tree.svelte.d.ts +29 -43
- package/dist/services/tree.svelte.js +58 -105
- package/dist/services/type-ahead.d.ts +10 -1
- package/dist/services/type-ahead.js +56 -34
- package/dist/typedefs.d.ts +108 -6
- package/dist/typedefs.js +63 -6
- package/package.json +5 -5
- package/dist/components/text-editor/conversion/html.d.ts +0 -30
- package/dist/components/text-editor/conversion/html.js +0 -857
- package/dist/components/text-editor/conversion/markdown.d.ts +0 -56
- package/dist/components/text-editor/conversion/markdown.js +0 -949
- package/dist/components/text-editor/toolbar/code-editor-toolbar.svelte +0 -28
- package/dist/components/text-editor/toolbar/code-editor-toolbar.svelte.d.ts +0 -37
- package/dist/components/text-editor/toolbar/insert-component.d.ts +0 -3
- package/dist/components/text-editor/toolbar/insert-component.js +0 -37
|
@@ -1,22 +1,17 @@
|
|
|
1
1
|
import { isRTL } from '@sveltia/i18n';
|
|
2
2
|
import { generateElementId } from '@sveltia/utils/element';
|
|
3
|
-
import {
|
|
4
|
-
import { untrack } from 'svelte';
|
|
3
|
+
import { CompositeWidget, createWidgetAttachment } from './composite-widget.svelte.js';
|
|
5
4
|
import { scrollIntoViewIfNeeded } from './scroll.js';
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
/**
|
|
17
|
-
* CSS selector matching the members that are disabled or hidden, which are left out of navigation.
|
|
18
|
-
*/
|
|
19
|
-
const INACTIVE_MEMBER_SELECTOR = '[aria-disabled="true"], [aria-hidden="true"]';
|
|
5
|
+
import { getItemLabel, normalize } from './text.js';
|
|
6
|
+
import { isPrintableKey } from './type-ahead.js';
|
|
7
|
+
import { handleMenuKey } from './menu.js';
|
|
8
|
+
import {
|
|
9
|
+
getArrowKeys,
|
|
10
|
+
getGridTargetIndex,
|
|
11
|
+
getLinearTargetIndex,
|
|
12
|
+
hasModifier,
|
|
13
|
+
INACTIVE_MEMBER_SELECTOR,
|
|
14
|
+
} from './navigation.js';
|
|
20
15
|
|
|
21
16
|
/**
|
|
22
17
|
* Set an element’s `tabindex` attribute, leaving the DOM alone if it already holds that value.
|
|
@@ -99,80 +94,6 @@ const config = {
|
|
|
99
94
|
},
|
|
100
95
|
};
|
|
101
96
|
|
|
102
|
-
/**
|
|
103
|
-
* Selector for the elements that can hold focus.
|
|
104
|
-
*/
|
|
105
|
-
const FOCUSABLE_SELECTOR = 'a[href], button, input, select, textarea, summary, [tabindex]';
|
|
106
|
-
|
|
107
|
-
/**
|
|
108
|
-
* Move focus to the tab stop next to the given element in document order. Positive `tabindex`
|
|
109
|
-
* values, which reorder the sequence, are not accounted for; they’re discouraged and absent from
|
|
110
|
-
* this library.
|
|
111
|
-
*
|
|
112
|
-
* The candidates are narrowed by attribute alone before any of them is measured, and the measuring
|
|
113
|
-
* — `getClientRects()`, which forces the browser to lay the page out — then walks outward from the
|
|
114
|
-
* element and stops at the first candidate that is actually rendered. Measuring every focusable
|
|
115
|
-
* element in the document up front is what a menu sitting on a large page cannot afford.
|
|
116
|
-
* @internal
|
|
117
|
-
* @param {HTMLElement} element Element to start from.
|
|
118
|
-
* @param {boolean} backwards Whether to move to the previous tab stop rather than the next.
|
|
119
|
-
*/
|
|
120
|
-
const focusAdjacentTabStop = (element, backwards) => {
|
|
121
|
-
const candidates = /** @type {HTMLElement[]} */ ([
|
|
122
|
-
...document.querySelectorAll(FOCUSABLE_SELECTOR),
|
|
123
|
-
]).filter(
|
|
124
|
-
(candidate) =>
|
|
125
|
-
candidate === element ||
|
|
126
|
-
(candidate.tabIndex >= 0 &&
|
|
127
|
-
!candidate.matches(':disabled, [aria-disabled="true"], [hidden], [inert], [inert] *')),
|
|
128
|
-
);
|
|
129
|
-
|
|
130
|
-
const index = candidates.indexOf(element);
|
|
131
|
-
|
|
132
|
-
if (index === -1) {
|
|
133
|
-
return;
|
|
134
|
-
}
|
|
135
|
-
|
|
136
|
-
const step = backwards ? -1 : 1;
|
|
137
|
-
|
|
138
|
-
for (let i = index + step; i >= 0 && i < candidates.length; i += step) {
|
|
139
|
-
if (candidates[i].getClientRects().length) {
|
|
140
|
-
candidates[i].focus();
|
|
141
|
-
|
|
142
|
-
return;
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
};
|
|
146
|
-
|
|
147
|
-
/**
|
|
148
|
-
* Find the element that opens the menu the given element belongs to. A menu lives outside its
|
|
149
|
-
* opener in the DOM tree, so the link runs the other way: the opener points at the menu’s container
|
|
150
|
-
* with `aria-controls`.
|
|
151
|
-
* @internal
|
|
152
|
-
* @param {HTMLElement} element Element within the menu.
|
|
153
|
-
* @returns {HTMLElement | null} Menu button or parent menu item, if any.
|
|
154
|
-
*/
|
|
155
|
-
const getMenuOpener = (element) => {
|
|
156
|
-
/** @type {HTMLElement | null} */
|
|
157
|
-
let current = element;
|
|
158
|
-
|
|
159
|
-
while (current) {
|
|
160
|
-
if (current.id) {
|
|
161
|
-
const opener = /** @type {HTMLElement | null} */ (
|
|
162
|
-
document.querySelector(`[aria-haspopup="menu"][aria-controls="${CSS.escape(current.id)}"]`)
|
|
163
|
-
);
|
|
164
|
-
|
|
165
|
-
if (opener) {
|
|
166
|
-
return opener;
|
|
167
|
-
}
|
|
168
|
-
}
|
|
169
|
-
|
|
170
|
-
current = current.parentElement;
|
|
171
|
-
}
|
|
172
|
-
|
|
173
|
-
return null;
|
|
174
|
-
};
|
|
175
|
-
|
|
176
97
|
/**
|
|
177
98
|
* Check whether the given member can hold a selected state. A plain menu item is an action, not a
|
|
178
99
|
* choice, so it has no checked state, and a member marked with `data-selectable="false"`, such as
|
|
@@ -186,27 +107,33 @@ const isSelectable = (element, role = element.getAttribute('role')) =>
|
|
|
186
107
|
role !== 'menuitem' && element.dataset.selectable !== 'false';
|
|
187
108
|
|
|
188
109
|
/**
|
|
189
|
-
*
|
|
110
|
+
* Move the cursor of a composite widget that keeps focus on itself, such as a listbox, onto the
|
|
111
|
+
* given member: mark the member with the `focused` class, taking it off any other, and point the
|
|
112
|
+
* widget’s `aria-activedescendant` at it.
|
|
113
|
+
* @param {HTMLElement} parent Widget root element.
|
|
114
|
+
* @param {HTMLElement} element Member element.
|
|
190
115
|
*/
|
|
191
|
-
export
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
116
|
+
export const setFocusedMember = (parent, element) => {
|
|
117
|
+
parent.querySelectorAll('.focused').forEach((member) => {
|
|
118
|
+
if (member !== element) {
|
|
119
|
+
member.classList.remove('focused');
|
|
120
|
+
}
|
|
121
|
+
});
|
|
197
122
|
|
|
123
|
+
element.classList.add('focused');
|
|
124
|
+
parent.setAttribute('aria-activedescendant', element.id);
|
|
125
|
+
};
|
|
126
|
+
|
|
127
|
+
/**
|
|
128
|
+
* Implement keyboard and mouse interactions for a grouping composite widget.
|
|
129
|
+
*/
|
|
130
|
+
export class Group extends CompositeWidget {
|
|
198
131
|
/**
|
|
199
132
|
* Observer of the members’ selected state, for the widgets whose panels or tab stop follow it.
|
|
200
133
|
* @type {MutationObserver | undefined}
|
|
201
134
|
*/
|
|
202
135
|
selectionObserver = undefined;
|
|
203
136
|
|
|
204
|
-
/**
|
|
205
|
-
* Whether {@link destroy} has run, so a pending {@link activate} must not run.
|
|
206
|
-
* @type {boolean}
|
|
207
|
-
*/
|
|
208
|
-
#destroyed = false;
|
|
209
|
-
|
|
210
137
|
/**
|
|
211
138
|
* Timer for the pending {@link scrollIntoViewLater} call, if any.
|
|
212
139
|
* @type {ReturnType<typeof setTimeout> | undefined}
|
|
@@ -236,12 +163,6 @@ export class Group {
|
|
|
236
163
|
*/
|
|
237
164
|
#hiddenState = new WeakMap();
|
|
238
165
|
|
|
239
|
-
/**
|
|
240
|
-
* Keystroke buffer for type-ahead.
|
|
241
|
-
* @type {TypeAhead}
|
|
242
|
-
*/
|
|
243
|
-
#typeAhead = new TypeAhead();
|
|
244
|
-
|
|
245
166
|
/**
|
|
246
167
|
* Whether {@link selectTarget} is clicking a radio button to have its component check it, so the
|
|
247
168
|
* click that comes back to {@link onClick} is not handled as a second selection.
|
|
@@ -256,12 +177,7 @@ export class Group {
|
|
|
256
177
|
* @returns {string} Normalized search value.
|
|
257
178
|
*/
|
|
258
179
|
#getNormalizedSearchValue(member) {
|
|
259
|
-
const raw =
|
|
260
|
-
member.dataset.searchValue ??
|
|
261
|
-
member.dataset.label ??
|
|
262
|
-
member.querySelector('.label')?.textContent ??
|
|
263
|
-
/** @type {string} */ (member.textContent);
|
|
264
|
-
|
|
180
|
+
const raw = member.dataset.searchValue ?? getItemLabel(member);
|
|
265
181
|
const cached = this.#searchValueCache.get(member);
|
|
266
182
|
|
|
267
183
|
if (cached?.raw === raw) {
|
|
@@ -306,20 +222,14 @@ export class Group {
|
|
|
306
222
|
* @param {boolean} [options.clickToSelect] Whether to select an item by clicking on it.
|
|
307
223
|
*/
|
|
308
224
|
constructor(parent, { clickToSelect = true } = {}) {
|
|
309
|
-
parent
|
|
225
|
+
super(parent);
|
|
310
226
|
|
|
311
|
-
this.parent = parent;
|
|
312
227
|
this.role = /** @type {string} */ (parent.getAttribute('role'));
|
|
313
228
|
this.multi = this.parent.getAttribute('aria-multiselectable') === 'true';
|
|
314
229
|
this.id = generateElementId(this.role);
|
|
315
230
|
this.parentGroupSelector = `[role="group"], [role="${this.role}"]`;
|
|
316
231
|
this.clickToSelect = clickToSelect;
|
|
317
232
|
|
|
318
|
-
/** @type {(event: MouseEvent) => void} */
|
|
319
|
-
this._onClick = activateBefore(this, (event) => this.onClick(event));
|
|
320
|
-
/** @type {(event: KeyboardEvent) => void} */
|
|
321
|
-
this._onKeyDown = activateBefore(this, (event) => this.onKeyDown(event));
|
|
322
|
-
|
|
323
233
|
const {
|
|
324
234
|
orientation,
|
|
325
235
|
childRoles,
|
|
@@ -402,24 +312,16 @@ export class Group {
|
|
|
402
312
|
|
|
403
313
|
// Listen right away: a click or a key press that comes before the activation below activates
|
|
404
314
|
// the members first, rather than being lost
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
// Wait a bit before the relevant components, including the `aria-controls` target are mounted
|
|
409
|
-
activateLater(this, () => this.#destroyed);
|
|
315
|
+
this.listen('click', (event) => this.onClick(event));
|
|
316
|
+
this.listen('keydown', (event) => this.onKeyDown(event));
|
|
410
317
|
}
|
|
411
318
|
|
|
412
319
|
/**
|
|
413
|
-
*
|
|
320
|
+
* Set up the members on activation.
|
|
321
|
+
* @override
|
|
414
322
|
*/
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
return;
|
|
418
|
-
}
|
|
419
|
-
|
|
420
|
-
const { parent, allMembers, selected: defaultSelected } = this;
|
|
421
|
-
|
|
422
|
-
this.activated = true;
|
|
323
|
+
setUp() {
|
|
324
|
+
const { allMembers, selected: defaultSelected } = this;
|
|
423
325
|
|
|
424
326
|
allMembers.forEach((element, index) => {
|
|
425
327
|
// Select the first one if no member has the `selected` attribute
|
|
@@ -448,7 +350,6 @@ export class Group {
|
|
|
448
350
|
});
|
|
449
351
|
|
|
450
352
|
this.updateTabStop();
|
|
451
|
-
parent.dispatchEvent(new CustomEvent('Initialized'));
|
|
452
353
|
}
|
|
453
354
|
|
|
454
355
|
/**
|
|
@@ -630,123 +531,6 @@ export class Group {
|
|
|
630
531
|
return this.#members.active;
|
|
631
532
|
}
|
|
632
533
|
|
|
633
|
-
/**
|
|
634
|
-
* The element that opens this menu, either a menu button or a menu item in the menu above.
|
|
635
|
-
* @type {HTMLElement | null}
|
|
636
|
-
*/
|
|
637
|
-
get opener() {
|
|
638
|
-
return getMenuOpener(this.parent);
|
|
639
|
-
}
|
|
640
|
-
|
|
641
|
-
/**
|
|
642
|
-
* The menu item that opens this menu, when this menu is a submenu. A menu button is deliberately
|
|
643
|
-
* excluded, because closing a top-level menu is not what “back to the parent item” means.
|
|
644
|
-
* @type {HTMLElement | null}
|
|
645
|
-
*/
|
|
646
|
-
get parentMenuItem() {
|
|
647
|
-
const { opener } = this;
|
|
648
|
-
|
|
649
|
-
return opener?.matches('[role^="menuitem"]') ? opener : null;
|
|
650
|
-
}
|
|
651
|
-
|
|
652
|
-
/**
|
|
653
|
-
* Close this menu along with every menu above it.
|
|
654
|
-
* @returns {HTMLElement | null} The element that opens the outermost menu, so the caller can
|
|
655
|
-
* hand focus back to it.
|
|
656
|
-
*/
|
|
657
|
-
closeMenuChain() {
|
|
658
|
-
const { opener: innermost } = this;
|
|
659
|
-
/** @type {HTMLElement | null} */
|
|
660
|
-
let opener = innermost;
|
|
661
|
-
/** @type {HTMLElement | null} */
|
|
662
|
-
let outermost = null;
|
|
663
|
-
|
|
664
|
-
// Bounded, so a malformed `aria-controls` cycle can’t hang the page
|
|
665
|
-
for (let i = 0; i < 10 && opener; i += 1) {
|
|
666
|
-
outermost = opener;
|
|
667
|
-
|
|
668
|
-
if (opener.getAttribute('aria-expanded') === 'true') {
|
|
669
|
-
opener.click();
|
|
670
|
-
}
|
|
671
|
-
|
|
672
|
-
const menu = /** @type {HTMLElement | null} */ (
|
|
673
|
-
opener.closest('[role="menu"], [role="menubar"]')
|
|
674
|
-
);
|
|
675
|
-
|
|
676
|
-
opener = menu ? getMenuOpener(menu) : null;
|
|
677
|
-
}
|
|
678
|
-
|
|
679
|
-
return outermost;
|
|
680
|
-
}
|
|
681
|
-
|
|
682
|
-
/**
|
|
683
|
-
* Leave the menu the way Tab should: close it along with every menu above it, then carry focus on
|
|
684
|
-
* to whatever follows the outermost opener. The browser can’t be left to do this itself, because
|
|
685
|
-
* a modal `<dialog>` confines Tab to its own contents.
|
|
686
|
-
* @param {boolean} backwards Whether to move to the previous tab stop instead, as Shift+Tab.
|
|
687
|
-
*/
|
|
688
|
-
async leaveMenu(backwards) {
|
|
689
|
-
const opener = this.closeMenuChain();
|
|
690
|
-
|
|
691
|
-
if (!opener) {
|
|
692
|
-
return;
|
|
693
|
-
}
|
|
694
|
-
|
|
695
|
-
// Somewhere to stand while the menu is torn down, and the fallback if there’s nothing beyond
|
|
696
|
-
opener.focus();
|
|
697
|
-
await sleep(50);
|
|
698
|
-
focusAdjacentTabStop(opener, backwards);
|
|
699
|
-
}
|
|
700
|
-
|
|
701
|
-
/**
|
|
702
|
-
* Open the submenu of the given menu item if needed, and move focus onto its first item.
|
|
703
|
-
* @param {HTMLElement} item Menu item with `aria-haspopup="menu"`.
|
|
704
|
-
*/
|
|
705
|
-
async enterSubmenu(item) {
|
|
706
|
-
const submenuId = item.getAttribute('aria-controls');
|
|
707
|
-
|
|
708
|
-
if (!submenuId) {
|
|
709
|
-
return;
|
|
710
|
-
}
|
|
711
|
-
|
|
712
|
-
if (item.getAttribute('aria-expanded') !== 'true') {
|
|
713
|
-
item.click();
|
|
714
|
-
}
|
|
715
|
-
|
|
716
|
-
const submenu = document.getElementById(submenuId);
|
|
717
|
-
|
|
718
|
-
// The submenu is revealed and positioned asynchronously, and an element that is still hidden
|
|
719
|
-
// or invisible cannot take focus, so keep trying for a few frames
|
|
720
|
-
for (let i = 0; i < 20; i += 1) {
|
|
721
|
-
const first = /** @type {HTMLElement | undefined} */ (
|
|
722
|
-
[...(submenu?.querySelectorAll(this.selector) ?? [])].find(
|
|
723
|
-
(element) => !element.matches(INACTIVE_MEMBER_SELECTOR),
|
|
724
|
-
)
|
|
725
|
-
);
|
|
726
|
-
|
|
727
|
-
first?.focus();
|
|
728
|
-
|
|
729
|
-
if (first && document.activeElement === first) {
|
|
730
|
-
return;
|
|
731
|
-
}
|
|
732
|
-
|
|
733
|
-
// eslint-disable-next-line no-await-in-loop
|
|
734
|
-
await sleep(20);
|
|
735
|
-
}
|
|
736
|
-
}
|
|
737
|
-
|
|
738
|
-
/**
|
|
739
|
-
* Close this submenu and move focus back onto the menu item that opens it.
|
|
740
|
-
* @param {HTMLElement} item Menu item with `aria-haspopup="menu"`.
|
|
741
|
-
*/
|
|
742
|
-
leaveSubmenu(item) {
|
|
743
|
-
if (item.getAttribute('aria-expanded') === 'true') {
|
|
744
|
-
item.click();
|
|
745
|
-
}
|
|
746
|
-
|
|
747
|
-
item.focus();
|
|
748
|
-
}
|
|
749
|
-
|
|
750
534
|
/**
|
|
751
535
|
* Get the currently selected member.
|
|
752
536
|
* @type {HTMLElement | undefined}
|
|
@@ -757,22 +541,6 @@ export class Group {
|
|
|
757
541
|
);
|
|
758
542
|
}
|
|
759
543
|
|
|
760
|
-
/**
|
|
761
|
-
* Whether the parent is disabled.
|
|
762
|
-
* @type {boolean}
|
|
763
|
-
*/
|
|
764
|
-
get isDisabled() {
|
|
765
|
-
return this.parent.matches('[aria-disabled="true"]');
|
|
766
|
-
}
|
|
767
|
-
|
|
768
|
-
/**
|
|
769
|
-
* Whether the parent is read-only.
|
|
770
|
-
* @type {boolean}
|
|
771
|
-
*/
|
|
772
|
-
get isReadOnly() {
|
|
773
|
-
return this.parent.matches('[aria-readonly="true"]');
|
|
774
|
-
}
|
|
775
|
-
|
|
776
544
|
/**
|
|
777
545
|
* Whether the widget is displayed in grid mode.
|
|
778
546
|
* @type {boolean}
|
|
@@ -874,14 +642,6 @@ export class Group {
|
|
|
874
642
|
#moveCursor(element, isTarget, scrollTargets) {
|
|
875
643
|
const controlTarget = this.#getControlTarget(element);
|
|
876
644
|
|
|
877
|
-
if (!this.focusChild) {
|
|
878
|
-
element.classList.toggle('focused', isTarget);
|
|
879
|
-
|
|
880
|
-
if (isTarget) {
|
|
881
|
-
element.dispatchEvent(new CustomEvent('Focus'));
|
|
882
|
-
}
|
|
883
|
-
}
|
|
884
|
-
|
|
885
645
|
if (controlTarget) {
|
|
886
646
|
this.#setPanelShown(controlTarget, isTarget);
|
|
887
647
|
|
|
@@ -890,10 +650,18 @@ export class Group {
|
|
|
890
650
|
}
|
|
891
651
|
}
|
|
892
652
|
|
|
893
|
-
if (isTarget) {
|
|
653
|
+
if (!isTarget) {
|
|
654
|
+
return;
|
|
655
|
+
}
|
|
656
|
+
|
|
657
|
+
if (this.focusChild) {
|
|
894
658
|
this.parent.setAttribute('aria-activedescendant', element.id);
|
|
895
|
-
|
|
659
|
+
} else {
|
|
660
|
+
setFocusedMember(this.parent, element);
|
|
661
|
+
element.dispatchEvent(new CustomEvent('Focus'));
|
|
896
662
|
}
|
|
663
|
+
|
|
664
|
+
scrollTargets.push(element);
|
|
897
665
|
}
|
|
898
666
|
|
|
899
667
|
/**
|
|
@@ -996,9 +764,7 @@ export class Group {
|
|
|
996
764
|
}
|
|
997
765
|
|
|
998
766
|
if (changed) {
|
|
999
|
-
this.
|
|
1000
|
-
new CustomEvent('Change', { detail: getSelectedItemDetail(newTarget) }),
|
|
1001
|
-
);
|
|
767
|
+
this.dispatchChange(newTarget);
|
|
1002
768
|
}
|
|
1003
769
|
}
|
|
1004
770
|
|
|
@@ -1053,26 +819,10 @@ export class Group {
|
|
|
1053
819
|
* @param {KeyboardEvent} event `keydown` event.
|
|
1054
820
|
*/
|
|
1055
821
|
onKeyDown(event) {
|
|
1056
|
-
const { key
|
|
1057
|
-
const hasModifier = shiftKey || altKey || ctrlKey || metaKey;
|
|
822
|
+
const { key } = event;
|
|
1058
823
|
const isMenu = this.childRoles.includes('menuitem');
|
|
1059
|
-
|
|
1060
|
-
// Tab leaves the menu entirely rather than stepping through it. Shift is allowed through here,
|
|
1061
|
-
// unlike the keys below, because Shift+Tab leaves the menu just the same.
|
|
1062
|
-
if (key === 'Tab' && isMenu && !ctrlKey && !metaKey && !altKey) {
|
|
1063
|
-
event.preventDefault();
|
|
1064
|
-
this.leaveMenu(shiftKey);
|
|
1065
|
-
|
|
1066
|
-
return;
|
|
1067
|
-
}
|
|
1068
|
-
|
|
1069
|
-
if (hasModifier) {
|
|
1070
|
-
return;
|
|
1071
|
-
}
|
|
1072
|
-
|
|
1073
824
|
// eslint-disable-next-line prefer-destructuring
|
|
1074
825
|
const target = /** @type {HTMLElement} */ (event.target);
|
|
1075
|
-
const { activeMembers } = this;
|
|
1076
826
|
|
|
1077
827
|
// A field the user is typing in keeps its keys: the caret moves, the text changes. Escape and
|
|
1078
828
|
// Tab still reach the group, so a menu holding a field can be left the usual ways.
|
|
@@ -1087,6 +837,16 @@ export class Group {
|
|
|
1087
837
|
|
|
1088
838
|
const currentTarget = this.#getCurrentTarget(target);
|
|
1089
839
|
|
|
840
|
+
if (isMenu && handleMenuKey(this, event, currentTarget)) {
|
|
841
|
+
return;
|
|
842
|
+
}
|
|
843
|
+
|
|
844
|
+
if (hasModifier(event)) {
|
|
845
|
+
return;
|
|
846
|
+
}
|
|
847
|
+
|
|
848
|
+
const { activeMembers } = this;
|
|
849
|
+
|
|
1090
850
|
if (['Enter', ' ', 'ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight'].includes(key)) {
|
|
1091
851
|
event.preventDefault();
|
|
1092
852
|
}
|
|
@@ -1116,7 +876,7 @@ export class Group {
|
|
|
1116
876
|
// been typed so far, as in a native `<select>` and per the Listbox and Menu patterns. This goes
|
|
1117
877
|
// by the visible label, not the search value, which may hold synonyms for filtering — and by
|
|
1118
878
|
// the label element rather than the whole text, which would take in icon ligature names.
|
|
1119
|
-
if (
|
|
879
|
+
if (isPrintableKey(event) && fromMember && (this.role === 'listbox' || isMenu)) {
|
|
1120
880
|
// Swallow the key whether or not it matches, as a native `<select>` does. Left to the
|
|
1121
881
|
// browser, a printable key on a non-editable element starts Firefox’s find-as-you-type.
|
|
1122
882
|
event.preventDefault();
|
|
@@ -1144,46 +904,7 @@ export class Group {
|
|
|
1144
904
|
return;
|
|
1145
905
|
}
|
|
1146
906
|
|
|
1147
|
-
|
|
1148
|
-
// own Escape handler sits on the `<dialog>` this submenu shares with its parent, doesn’t go on
|
|
1149
|
-
// to close the whole stack.
|
|
1150
|
-
if (key === 'Escape' && isMenu) {
|
|
1151
|
-
const { parentMenuItem } = this;
|
|
1152
|
-
|
|
1153
|
-
if (parentMenuItem) {
|
|
1154
|
-
event.preventDefault();
|
|
1155
|
-
event.stopPropagation();
|
|
1156
|
-
this.leaveSubmenu(parentMenuItem);
|
|
1157
|
-
|
|
1158
|
-
return;
|
|
1159
|
-
}
|
|
1160
|
-
}
|
|
1161
|
-
|
|
1162
|
-
const rtl = isRTL();
|
|
1163
|
-
|
|
1164
|
-
// Submenu traversal. In a vertical menu the inline arrows are free, so they step into a submenu
|
|
1165
|
-
// and back out again, as the Menu pattern expects. Mirrored for RTL.
|
|
1166
|
-
if (this.orientation === 'vertical' && isMenu) {
|
|
1167
|
-
const { prevKey: outOfSubmenuKey, nextKey: intoSubmenuKey } = getArrowKeys('horizontal', rtl);
|
|
1168
|
-
|
|
1169
|
-
if (key === intoSubmenuKey && currentTarget?.getAttribute('aria-haspopup') === 'menu') {
|
|
1170
|
-
this.enterSubmenu(currentTarget);
|
|
1171
|
-
|
|
1172
|
-
return;
|
|
1173
|
-
}
|
|
1174
|
-
|
|
1175
|
-
if (key === outOfSubmenuKey) {
|
|
1176
|
-
const { parentMenuItem } = this;
|
|
1177
|
-
|
|
1178
|
-
if (parentMenuItem) {
|
|
1179
|
-
this.leaveSubmenu(parentMenuItem);
|
|
1180
|
-
|
|
1181
|
-
return;
|
|
1182
|
-
}
|
|
1183
|
-
}
|
|
1184
|
-
}
|
|
1185
|
-
|
|
1186
|
-
const newTarget = this.#getArrowTarget(key, currentTarget, rtl);
|
|
907
|
+
const newTarget = this.#getArrowTarget(key, currentTarget, isRTL());
|
|
1187
908
|
|
|
1188
909
|
if (newTarget && newTarget !== currentTarget) {
|
|
1189
910
|
this.selectTarget(event, newTarget);
|
|
@@ -1218,18 +939,9 @@ export class Group {
|
|
|
1218
939
|
#getTypeAheadTarget(key, currentTarget) {
|
|
1219
940
|
const { activeMembers } = this;
|
|
1220
941
|
|
|
1221
|
-
const
|
|
1222
|
-
|
|
1223
|
-
|
|
1224
|
-
member.querySelector('.label')?.textContent ??
|
|
1225
|
-
member.textContent ??
|
|
1226
|
-
'',
|
|
1227
|
-
),
|
|
1228
|
-
);
|
|
1229
|
-
|
|
1230
|
-
const index = findTypeAheadMatch(
|
|
1231
|
-
labels,
|
|
1232
|
-
this.#typeAhead.push(key),
|
|
942
|
+
const index = this.typeAheadBuffer.match(
|
|
943
|
+
activeMembers.map((member) => getItemLabel(member)),
|
|
944
|
+
key,
|
|
1233
945
|
currentTarget ? activeMembers.indexOf(currentTarget) : -1,
|
|
1234
946
|
);
|
|
1235
947
|
|
|
@@ -1248,11 +960,29 @@ export class Group {
|
|
|
1248
960
|
|
|
1249
961
|
if (!this.grid) {
|
|
1250
962
|
const index = currentTarget ? activeMembers.indexOf(currentTarget) : -1;
|
|
963
|
+
const count = activeMembers.length;
|
|
964
|
+
|
|
965
|
+
// A radio group moves with all four arrows whatever its orientation, as native radio buttons
|
|
966
|
+
// do and as the Radio Group pattern expects: Down and Right go to the next radio, Up and Left
|
|
967
|
+
// to the previous one, with the inline arrows mirrored for RTL.
|
|
968
|
+
if (this.role === 'radiogroup') {
|
|
969
|
+
const inlineIndex = getLinearTargetIndex({
|
|
970
|
+
key,
|
|
971
|
+
index,
|
|
972
|
+
count,
|
|
973
|
+
...getArrowKeys('horizontal', rtl),
|
|
974
|
+
});
|
|
975
|
+
|
|
976
|
+
return activeMembers[
|
|
977
|
+
inlineIndex === -1
|
|
978
|
+
? getLinearTargetIndex({ key, index, count, ...getArrowKeys('vertical', rtl) })
|
|
979
|
+
: inlineIndex
|
|
980
|
+
];
|
|
981
|
+
}
|
|
982
|
+
|
|
1251
983
|
const keys = getArrowKeys(this.orientation, rtl);
|
|
1252
984
|
|
|
1253
|
-
return activeMembers[
|
|
1254
|
-
getLinearTargetIndex({ key, index, count: activeMembers.length, ...keys })
|
|
1255
|
-
];
|
|
985
|
+
return activeMembers[getLinearTargetIndex({ key, index, count, ...keys })];
|
|
1256
986
|
}
|
|
1257
987
|
|
|
1258
988
|
const { columnCount } = this;
|
|
@@ -1264,31 +994,58 @@ export class Group {
|
|
|
1264
994
|
// With nothing focused yet, the arrows start from either end of the active members
|
|
1265
995
|
const list = index === -1 ? activeMembers : members;
|
|
1266
996
|
const keys = getArrowKeys('horizontal', rtl);
|
|
997
|
+
let targetIndex = index;
|
|
998
|
+
/** @type {HTMLElement | undefined} */
|
|
999
|
+
let newTarget;
|
|
1000
|
+
|
|
1001
|
+
// Step over a disabled member in the same direction: the inline arrows on to the next member,
|
|
1002
|
+
// the vertical arrows on to the next row in the same column. Each step moves further along or
|
|
1003
|
+
// returns `-1`, so this ends at the edge of the grid at the latest.
|
|
1004
|
+
do {
|
|
1005
|
+
targetIndex = getGridTargetIndex({
|
|
1006
|
+
key,
|
|
1007
|
+
index: targetIndex,
|
|
1008
|
+
count: list.length,
|
|
1009
|
+
columnCount,
|
|
1010
|
+
...keys,
|
|
1011
|
+
});
|
|
1012
|
+
newTarget = list[targetIndex];
|
|
1013
|
+
} while (newTarget?.matches('[aria-disabled="true"]'));
|
|
1267
1014
|
|
|
1268
|
-
|
|
1269
|
-
list[getGridTargetIndex({ key, index, count: list.length, columnCount, ...keys })];
|
|
1270
|
-
|
|
1271
|
-
return newTarget?.matches('[aria-disabled="true"]') ? undefined : newTarget;
|
|
1015
|
+
return newTarget;
|
|
1272
1016
|
}
|
|
1273
1017
|
|
|
1274
1018
|
/**
|
|
1275
|
-
* Clean up event listeners.
|
|
1019
|
+
* Clean up event listeners and observers.
|
|
1020
|
+
* @override
|
|
1276
1021
|
*/
|
|
1277
1022
|
destroy() {
|
|
1278
|
-
|
|
1023
|
+
super.destroy();
|
|
1279
1024
|
globalThis.clearTimeout(this.#scrollTimer);
|
|
1280
|
-
this.#typeAhead.reset();
|
|
1281
1025
|
this.observer.disconnect();
|
|
1282
1026
|
this.selectionObserver?.disconnect();
|
|
1283
|
-
this.parent.removeEventListener('click', this._onClick);
|
|
1284
|
-
this.parent.removeEventListener('keydown', this._onKeyDown);
|
|
1285
1027
|
}
|
|
1286
1028
|
|
|
1287
1029
|
/**
|
|
1288
|
-
* Called whenever the params are updated.
|
|
1289
|
-
*
|
|
1030
|
+
* Called whenever the params are updated. Apply `clickToSelect` if given, and filter the items
|
|
1031
|
+
* based on the search terms if given.
|
|
1032
|
+
* @override
|
|
1033
|
+
* @param {object} params Updated params.
|
|
1034
|
+
* @param {string} [params.searchTerms] Search terms.
|
|
1035
|
+
* @param {boolean} [params.clickToSelect] Whether to select an item by clicking on it.
|
|
1290
1036
|
*/
|
|
1291
|
-
onUpdate(
|
|
1037
|
+
onUpdate(params) {
|
|
1038
|
+
const { searchTerms } = params;
|
|
1039
|
+
|
|
1040
|
+
if ('clickToSelect' in params) {
|
|
1041
|
+
this.clickToSelect = params.clickToSelect ?? true;
|
|
1042
|
+
}
|
|
1043
|
+
|
|
1044
|
+
// Only a filterable widget, such as a listbox, passes search terms
|
|
1045
|
+
if (typeof searchTerms !== 'string') {
|
|
1046
|
+
return;
|
|
1047
|
+
}
|
|
1048
|
+
|
|
1292
1049
|
const terms = normalize(searchTerms);
|
|
1293
1050
|
const _terms = terms ? terms.split(/\s+/) : [];
|
|
1294
1051
|
const { allMembers, parent } = this;
|
|
@@ -1316,27 +1073,7 @@ export class Group {
|
|
|
1316
1073
|
}
|
|
1317
1074
|
|
|
1318
1075
|
/**
|
|
1319
|
-
* Activate a new group.
|
|
1320
|
-
*
|
|
1321
|
-
* params.
|
|
1322
|
-
* @returns {Attachment} Attachment.
|
|
1076
|
+
* Activate a new group. Takes a params object, or a getter function for reactive params, and
|
|
1077
|
+
* returns an attachment.
|
|
1323
1078
|
*/
|
|
1324
|
-
export const activateGroup = (
|
|
1325
|
-
const isGetter = typeof paramsOrGetter === 'function';
|
|
1326
|
-
// Read the params without tracking them: attachments run in an effect, so a tracked read would
|
|
1327
|
-
// destroy and recreate the whole group whenever they change, e.g. on every search keystroke.
|
|
1328
|
-
// Changes are handled by `onUpdate()` below instead.
|
|
1329
|
-
const initialParams = isGetter ? untrack(() => paramsOrGetter()) : paramsOrGetter;
|
|
1330
|
-
const group = new Group(/** @type {HTMLElement} */ (parent), initialParams);
|
|
1331
|
-
|
|
1332
|
-
/* v8 ignore next 4 */
|
|
1333
|
-
if (isGetter) {
|
|
1334
|
-
$effect(() => {
|
|
1335
|
-
group.onUpdate(paramsOrGetter());
|
|
1336
|
-
});
|
|
1337
|
-
}
|
|
1338
|
-
|
|
1339
|
-
return () => {
|
|
1340
|
-
group.destroy();
|
|
1341
|
-
};
|
|
1342
|
-
};
|
|
1079
|
+
export const activateGroup = createWidgetAttachment(Group);
|