@sectile/core 0.7.0 → 0.8.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/accordion.d.ts +0 -1
- package/dist/adapter-runtime.d.ts +53 -2
- package/dist/adapter-runtime.js +224 -25
- package/dist/adapter-runtime.js.map +1 -1
- package/dist/alert-dialog.d.ts +0 -1
- package/dist/carousel.d.ts +0 -1
- package/dist/cascade-list.d.ts +16 -0
- package/dist/cascade-list.js +33 -0
- package/dist/cascade-list.js.map +1 -0
- package/dist/cascade-select.d.ts +0 -1
- package/dist/cascade-select.js +47 -119
- package/dist/cascade-select.js.map +1 -1
- package/dist/checkbox-group.d.ts +0 -1
- package/dist/checkbox.d.ts +0 -1
- package/dist/collection-window.d.ts +0 -1
- package/dist/color-picker.d.ts +3 -8
- package/dist/color-picker.js +60 -305
- package/dist/color-picker.js.map +1 -1
- package/dist/combobox.d.ts +0 -1
- package/dist/dialog.d.ts +0 -1
- package/dist/disclosure.d.ts +0 -1
- package/dist/drawer.d.ts +0 -1
- package/dist/editable.d.ts +0 -1
- package/dist/editing/color-text.d.ts +7 -0
- package/dist/editing/color-text.js +199 -0
- package/dist/editing/color-text.js.map +1 -0
- package/dist/error-code.d.ts +1 -2
- package/dist/feed.d.ts +0 -1
- package/dist/grid-control.d.ts +3 -0
- package/dist/grid-control.js +2 -0
- package/dist/grid-control.js.map +1 -0
- package/dist/identity.d.ts +10 -0
- package/dist/identity.js +16 -0
- package/dist/identity.js.map +1 -0
- package/dist/index.d.ts +2 -2
- package/dist/interaction.d.ts +0 -1
- package/dist/internal/composites/cascade-choice.d.ts +54 -0
- package/dist/internal/composites/cascade-choice.js +154 -0
- package/dist/internal/composites/cascade-choice.js.map +1 -0
- package/dist/internal/composites/combobox.d.ts +0 -1
- package/dist/internal/composites/combobox.js +28 -11
- package/dist/internal/composites/combobox.js.map +1 -1
- package/dist/internal/composites/grid-control.d.ts +0 -1
- package/dist/internal/composites/grid-control.js +18 -23
- package/dist/internal/composites/grid-control.js.map +1 -1
- package/dist/internal/composites/linear-action.d.ts +0 -1
- package/dist/internal/composites/linear-action.js +20 -14
- package/dist/internal/composites/linear-action.js.map +1 -1
- package/dist/internal/composites/linear-choice.d.ts +0 -1
- package/dist/internal/composites/linear-choice.js +15 -8
- package/dist/internal/composites/linear-choice.js.map +1 -1
- package/dist/internal/composites/listbox.d.ts +0 -1
- package/dist/internal/composites/listbox.js +15 -13
- package/dist/internal/composites/listbox.js.map +1 -1
- package/dist/internal/composites/menu.d.ts +0 -1
- package/dist/internal/composites/menu.js +38 -17
- package/dist/internal/composites/menu.js.map +1 -1
- package/dist/internal/composites/popup.d.ts +0 -1
- package/dist/internal/composites/slider.d.ts +0 -1
- package/dist/internal/composites/tree-grid.d.ts +0 -1
- package/dist/internal/composites/tree-grid.js +70 -48
- package/dist/internal/composites/tree-grid.js.map +1 -1
- package/dist/internal/composites/tree-view.d.ts +0 -1
- package/dist/internal/composites/tree-view.js +32 -20
- package/dist/internal/composites/tree-view.js.map +1 -1
- package/dist/internal/editing/text.d.ts +0 -1
- package/dist/internal/editing/text.js +40 -27
- package/dist/internal/editing/text.js.map +1 -1
- package/dist/internal/kernel/bounded-scalar.d.ts +31 -0
- package/dist/internal/kernel/bounded-scalar.js +78 -0
- package/dist/internal/kernel/bounded-scalar.js.map +1 -0
- package/dist/internal/kernel/decimal.d.ts +0 -1
- package/dist/internal/kernel/exact-ratio.d.ts +5 -0
- package/dist/internal/kernel/exact-ratio.js +2 -0
- package/dist/internal/kernel/exact-ratio.js.map +1 -0
- package/dist/internal/kernel/foundation.d.ts +8 -6
- package/dist/internal/kernel/foundation.js +35 -16
- package/dist/internal/kernel/foundation.js.map +1 -1
- package/dist/internal/kernel/indexed-sequence.d.ts +28 -3
- package/dist/internal/kernel/indexed-sequence.js +162 -12
- package/dist/internal/kernel/indexed-sequence.js.map +1 -1
- package/dist/internal/kernel/machine.d.ts +1 -2
- package/dist/internal/kernel/machine.js +5 -2
- package/dist/internal/kernel/machine.js.map +1 -1
- package/dist/internal/runtime/revision.d.ts +0 -1
- package/dist/internal/state/checked.d.ts +0 -1
- package/dist/internal/state/cursor.d.ts +0 -1
- package/dist/internal/state/expansion.d.ts +0 -1
- package/dist/internal/state/open-state.d.ts +0 -1
- package/dist/internal/state/selection.d.ts +0 -1
- package/dist/internal/state/selection.js +99 -27
- package/dist/internal/state/selection.js.map +1 -1
- package/dist/layer-stack.d.ts +0 -1
- package/dist/listbox.d.ts +0 -1
- package/dist/menu-button.d.ts +0 -1
- package/dist/menu.d.ts +0 -1
- package/dist/menubar.d.ts +0 -1
- package/dist/meter-group.d.ts +38 -0
- package/dist/meter-group.js +103 -0
- package/dist/meter-group.js.map +1 -0
- package/dist/meter.d.ts +25 -0
- package/dist/meter.js +89 -0
- package/dist/meter.js.map +1 -0
- package/dist/multi-thumb-slider.d.ts +0 -1
- package/dist/navigation-menu.d.ts +0 -1
- package/dist/number-field.d.ts +0 -1
- package/dist/pagination.d.ts +0 -1
- package/dist/pin-input.d.ts +0 -1
- package/dist/popover.d.ts +0 -1
- package/dist/progress.d.ts +17 -0
- package/dist/progress.js +49 -0
- package/dist/progress.js.map +1 -0
- package/dist/quantity-field.d.ts +0 -1
- package/dist/radio-group.d.ts +0 -1
- package/dist/rating.d.ts +0 -1
- package/dist/reorder.d.ts +0 -1
- package/dist/reorder.js +92 -43
- package/dist/reorder.js.map +1 -1
- package/dist/result.d.ts +2 -1
- package/dist/result.js +14 -0
- package/dist/result.js.map +1 -1
- package/dist/revision.d.ts +1 -1
- package/dist/revision.js +1 -0
- package/dist/revision.js.map +1 -1
- package/dist/select.d.ts +0 -1
- package/dist/selection.d.ts +24 -0
- package/dist/selection.js +20 -0
- package/dist/selection.js.map +1 -0
- package/dist/shared.d.ts +0 -1
- package/dist/slider.d.ts +0 -1
- package/dist/spin-button.d.ts +0 -1
- package/dist/stepper.d.ts +0 -1
- package/dist/structures/anchored-layout.d.ts +33 -0
- package/dist/structures/anchored-layout.js +158 -0
- package/dist/structures/anchored-layout.js.map +1 -0
- package/dist/structures/color.d.ts +80 -0
- package/dist/structures/color.js +206 -0
- package/dist/structures/color.js.map +1 -0
- package/dist/structures/geometry.d.ts +53 -0
- package/dist/structures/geometry.js +165 -0
- package/dist/structures/geometry.js.map +1 -0
- package/dist/structures/grid.d.ts +20 -4
- package/dist/structures/grid.js +91 -50
- package/dist/structures/grid.js.map +1 -1
- package/dist/structures/index-span.d.ts +31 -0
- package/dist/structures/index-span.js +267 -0
- package/dist/structures/index-span.js.map +1 -0
- package/dist/structures/metric-index.d.ts +36 -0
- package/dist/structures/metric-index.js +390 -0
- package/dist/structures/metric-index.js.map +1 -0
- package/dist/structures/range.d.ts +21 -4
- package/dist/structures/range.js +156 -11
- package/dist/structures/range.js.map +1 -1
- package/dist/structures/selection-expression.d.ts +26 -0
- package/dist/structures/selection-expression.js +157 -0
- package/dist/structures/selection-expression.js.map +1 -0
- package/dist/structures/sequence.d.ts +0 -1
- package/dist/structures/sequence.js +69 -7
- package/dist/structures/sequence.js.map +1 -1
- package/dist/structures/tree.d.ts +5 -1
- package/dist/structures/tree.js +33 -5
- package/dist/structures/tree.js.map +1 -1
- package/dist/switch.d.ts +0 -1
- package/dist/tabs.d.ts +0 -1
- package/dist/tags-input.d.ts +0 -1
- package/dist/text.d.ts +0 -1
- package/dist/timer.d.ts +0 -1
- package/dist/toast.d.ts +2 -2
- package/dist/toast.js +3 -1
- package/dist/toast.js.map +1 -1
- package/dist/toggle-button.d.ts +0 -1
- package/dist/toggle-group.d.ts +0 -1
- package/dist/toolbar.d.ts +0 -1
- package/dist/tooltip.d.ts +0 -1
- package/dist/tree-grid.d.ts +0 -1
- package/dist/tree-view.d.ts +0 -1
- package/dist/units.d.ts +0 -1
- package/dist/window-splitter.d.ts +0 -1
- package/package.json +75 -12
- package/dist/accordion.d.ts.map +0 -1
- package/dist/adapter-runtime.d.ts.map +0 -1
- package/dist/alert-dialog.d.ts.map +0 -1
- package/dist/carousel.d.ts.map +0 -1
- package/dist/cascade-select.d.ts.map +0 -1
- package/dist/checkbox-group.d.ts.map +0 -1
- package/dist/checkbox.d.ts.map +0 -1
- package/dist/collection-window.d.ts.map +0 -1
- package/dist/color-picker.d.ts.map +0 -1
- package/dist/combobox.d.ts.map +0 -1
- package/dist/dialog.d.ts.map +0 -1
- package/dist/disclosure.d.ts.map +0 -1
- package/dist/drawer.d.ts.map +0 -1
- package/dist/editable.d.ts.map +0 -1
- package/dist/error-code.d.ts.map +0 -1
- package/dist/feed.d.ts.map +0 -1
- package/dist/form.d.ts +0 -135
- package/dist/form.d.ts.map +0 -1
- package/dist/form.js +0 -627
- package/dist/form.js.map +0 -1
- package/dist/index.d.ts.map +0 -1
- package/dist/interaction.d.ts.map +0 -1
- package/dist/internal/composites/combobox.d.ts.map +0 -1
- package/dist/internal/composites/grid-control.d.ts.map +0 -1
- package/dist/internal/composites/linear-action.d.ts.map +0 -1
- package/dist/internal/composites/linear-choice.d.ts.map +0 -1
- package/dist/internal/composites/listbox.d.ts.map +0 -1
- package/dist/internal/composites/menu.d.ts.map +0 -1
- package/dist/internal/composites/popup.d.ts.map +0 -1
- package/dist/internal/composites/slider.d.ts.map +0 -1
- package/dist/internal/composites/tree-grid.d.ts.map +0 -1
- package/dist/internal/composites/tree-view.d.ts.map +0 -1
- package/dist/internal/editing/text.d.ts.map +0 -1
- package/dist/internal/kernel/decimal.d.ts.map +0 -1
- package/dist/internal/kernel/foundation.d.ts.map +0 -1
- package/dist/internal/kernel/indexed-sequence.d.ts.map +0 -1
- package/dist/internal/kernel/machine.d.ts.map +0 -1
- package/dist/internal/runtime/revision.d.ts.map +0 -1
- package/dist/internal/state/checked.d.ts.map +0 -1
- package/dist/internal/state/cursor.d.ts.map +0 -1
- package/dist/internal/state/expansion.d.ts.map +0 -1
- package/dist/internal/state/open-state.d.ts.map +0 -1
- package/dist/internal/state/selection.d.ts.map +0 -1
- package/dist/layer-stack.d.ts.map +0 -1
- package/dist/listbox.d.ts.map +0 -1
- package/dist/menu-button.d.ts.map +0 -1
- package/dist/menu.d.ts.map +0 -1
- package/dist/menubar.d.ts.map +0 -1
- package/dist/multi-thumb-slider.d.ts.map +0 -1
- package/dist/navigation-menu.d.ts.map +0 -1
- package/dist/number-field.d.ts.map +0 -1
- package/dist/pagination.d.ts.map +0 -1
- package/dist/pin-input.d.ts.map +0 -1
- package/dist/popover.d.ts.map +0 -1
- package/dist/quantity-field.d.ts.map +0 -1
- package/dist/radio-group.d.ts.map +0 -1
- package/dist/rating.d.ts.map +0 -1
- package/dist/reorder.d.ts.map +0 -1
- package/dist/result.d.ts.map +0 -1
- package/dist/revision.d.ts.map +0 -1
- package/dist/select.d.ts.map +0 -1
- package/dist/shared.d.ts.map +0 -1
- package/dist/slider.d.ts.map +0 -1
- package/dist/spin-button.d.ts.map +0 -1
- package/dist/stepper.d.ts.map +0 -1
- package/dist/structures/grid.d.ts.map +0 -1
- package/dist/structures/range.d.ts.map +0 -1
- package/dist/structures/sequence.d.ts.map +0 -1
- package/dist/structures/tree.d.ts.map +0 -1
- package/dist/switch.d.ts.map +0 -1
- package/dist/tabs.d.ts.map +0 -1
- package/dist/tags-input.d.ts.map +0 -1
- package/dist/text.d.ts.map +0 -1
- package/dist/timer.d.ts.map +0 -1
- package/dist/toast.d.ts.map +0 -1
- package/dist/toggle-button.d.ts.map +0 -1
- package/dist/toggle-group.d.ts.map +0 -1
- package/dist/toolbar.d.ts.map +0 -1
- package/dist/tooltip.d.ts.map +0 -1
- package/dist/tree-grid.d.ts.map +0 -1
- package/dist/tree-view.d.ts.map +0 -1
- package/dist/units.d.ts.map +0 -1
- package/dist/window-splitter.d.ts.map +0 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { applyTextEvent, createTextEditingState, isWellFormedPlainText, normalizeTextEditingState, tryCreateTextEditingState, } from '../editing/text.js';
|
|
2
|
-
import { fail, ok } from '../kernel/foundation.js';
|
|
2
|
+
import { bindCanonicalState, fail, hasCanonicalState, ok } from '../kernel/foundation.js';
|
|
3
3
|
import { findEligibleFromEdge } from '../kernel/indexed-sequence.js';
|
|
4
4
|
import { createMachineUpdate } from '../kernel/machine.js';
|
|
5
5
|
import { unwrap } from '../../result.js';
|
|
@@ -23,12 +23,15 @@ export function tryCreateComboboxState(domain, text, input = {}) {
|
|
|
23
23
|
const selection = createSelectionState(domain, 'single', input);
|
|
24
24
|
if (!selection.ok)
|
|
25
25
|
return selection;
|
|
26
|
-
return ok(comboboxState(normalizedText.value, popupOpen, createCursorState(current), selection.value));
|
|
26
|
+
return ok(comboboxState(domain, normalizedText.value, popupOpen, createCursorState(current), selection.value));
|
|
27
27
|
}
|
|
28
28
|
export function applyComboboxEvent(domain, labels, state, event, policies = {}) {
|
|
29
29
|
const policyValidation = validatePolicies(policies);
|
|
30
30
|
if (!policyValidation.ok)
|
|
31
31
|
return policyValidation;
|
|
32
|
+
const stateValidation = validateComboboxState(domain, state);
|
|
33
|
+
if (stateValidation !== null)
|
|
34
|
+
return stateValidation;
|
|
32
35
|
const current = state;
|
|
33
36
|
if (isTextEvent(event)) {
|
|
34
37
|
return editComboboxText(domain, labels, current, event.event, policies);
|
|
@@ -40,7 +43,7 @@ export function applyComboboxEvent(domain, labels, state, event, policies = {})
|
|
|
40
43
|
if (!eligible.value.has(event.id)) {
|
|
41
44
|
return fail('transition-rejection', 'combobox-candidate-unavailable', 'Direct combobox acceptance requires a matching candidate.', { id: event.id });
|
|
42
45
|
}
|
|
43
|
-
return acceptComboboxCandidate(domain, labels, comboboxState(current.text, current.popupOpen, createCursorState(event.id), current.selection));
|
|
46
|
+
return acceptComboboxCandidate(domain, labels, comboboxState(domain, current.text, current.popupOpen, createCursorState(event.id), current.selection));
|
|
44
47
|
}
|
|
45
48
|
if (!isComboboxEvent(event)) {
|
|
46
49
|
return fail('transition-rejection', 'invalid-combobox-event', 'Combobox event must be text, navigation, popup, or acceptance.', { event });
|
|
@@ -51,12 +54,15 @@ export function applyComboboxEvent(domain, labels, state, event, policies = {})
|
|
|
51
54
|
case 'previous':
|
|
52
55
|
return moveCombobox(domain, labels, current, -1, policies);
|
|
53
56
|
case 'close':
|
|
54
|
-
return createMachineUpdate(comboboxState(current.text, false, current.cursor, current.selection));
|
|
57
|
+
return createMachineUpdate(comboboxState(domain, current.text, false, current.cursor, current.selection));
|
|
55
58
|
case 'accept':
|
|
56
59
|
return acceptComboboxCandidate(domain, labels, current);
|
|
57
60
|
}
|
|
58
61
|
}
|
|
59
62
|
export function acceptComboboxCandidate(domain, labels, state) {
|
|
63
|
+
const stateValidation = validateComboboxState(domain, state);
|
|
64
|
+
if (stateValidation !== null)
|
|
65
|
+
return stateValidation;
|
|
60
66
|
const current = state.cursor.current;
|
|
61
67
|
if (current === null || !domain.contains(current)) {
|
|
62
68
|
return fail('transition-rejection', 'no-candidate', 'Combobox acceptance requires a current candidate.');
|
|
@@ -78,7 +84,7 @@ export function acceptComboboxCandidate(domain, labels, state) {
|
|
|
78
84
|
if (!text.ok)
|
|
79
85
|
return text;
|
|
80
86
|
const selection = selectOne(state.selection, current, domain);
|
|
81
|
-
const next = comboboxState(text.value, false, state.cursor, selection);
|
|
87
|
+
const next = comboboxState(domain, text.value, false, state.cursor, selection);
|
|
82
88
|
return createMachineUpdate(next, [{ type: 'accept', id: current }]);
|
|
83
89
|
}
|
|
84
90
|
function editComboboxText(domain, labels, state, event, policies) {
|
|
@@ -99,7 +105,7 @@ function editComboboxText(domain, labels, state, event, policies) {
|
|
|
99
105
|
return first;
|
|
100
106
|
current = first.value;
|
|
101
107
|
}
|
|
102
|
-
const next = comboboxState(edited.value.state, true, createCursorState(current), state.selection);
|
|
108
|
+
const next = comboboxState(domain, edited.value.state, true, createCursorState(current), state.selection);
|
|
103
109
|
return createMachineUpdate(next, current !== null && current !== state.cursor.current
|
|
104
110
|
? [{ type: 'focus', id: current }]
|
|
105
111
|
: []);
|
|
@@ -126,10 +132,10 @@ function moveCombobox(domain, labels, state, direction, policies) {
|
|
|
126
132
|
return { ok: false, error: movement.error };
|
|
127
133
|
target = movement.kind === 'found' ? movement.id : state.cursor.current;
|
|
128
134
|
}
|
|
129
|
-
return updateCursor(state, target);
|
|
135
|
+
return updateCursor(domain, state, target);
|
|
130
136
|
}
|
|
131
|
-
function updateCursor(state, current) {
|
|
132
|
-
const next = comboboxState(state.text, true, current === state.cursor.current ? state.cursor : createCursorState(current), state.selection);
|
|
137
|
+
function updateCursor(domain, state, current) {
|
|
138
|
+
const next = comboboxState(domain, state.text, true, current === state.cursor.current ? state.cursor : createCursorState(current), state.selection);
|
|
133
139
|
return createMachineUpdate(next, current !== null && current !== state.cursor.current
|
|
134
140
|
? [{ type: 'focus', id: current }]
|
|
135
141
|
: []);
|
|
@@ -167,8 +173,19 @@ function validatePolicies(policies) {
|
|
|
167
173
|
function committedQuery(text) {
|
|
168
174
|
return text.composition === null ? text.snapshot.text : text.composition.baseline.text;
|
|
169
175
|
}
|
|
170
|
-
function comboboxState(text, popupOpen, cursor, selection) {
|
|
171
|
-
return Object.freeze({ text, popupOpen, cursor, selection });
|
|
176
|
+
function comboboxState(domain, text, popupOpen, cursor, selection) {
|
|
177
|
+
return bindCanonicalState(domain, Object.freeze({ text, popupOpen, cursor, selection }));
|
|
178
|
+
}
|
|
179
|
+
function validateComboboxState(domain, state) {
|
|
180
|
+
if (hasCanonicalState(domain, state))
|
|
181
|
+
return null;
|
|
182
|
+
const validation = tryCreateComboboxState(domain, state.text, {
|
|
183
|
+
current: state.cursor.current,
|
|
184
|
+
selected: state.selection.selected,
|
|
185
|
+
anchor: state.selection.anchor,
|
|
186
|
+
popupOpen: state.popupOpen,
|
|
187
|
+
});
|
|
188
|
+
return validation.ok ? null : { ok: false, error: { ...validation.error, class: 'transition-rejection' } };
|
|
172
189
|
}
|
|
173
190
|
function isTextEvent(event) {
|
|
174
191
|
return isObject(event) && event.type === 'text';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"combobox.js","sourceRoot":"","sources":["../../../src/internal/composites/combobox.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EACd,sBAAsB,EACtB,qBAAqB,EACrB,yBAAyB,EAGzB,yBAAyB,GAC1B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"combobox.js","sourceRoot":"","sources":["../../../src/internal/composites/combobox.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,4 +34,3 @@ export interface GridUpdate<ID extends StableID = StableID> {
|
|
|
34
34
|
export declare function createGridState<ID extends StableID>(grid: Grid<ID>, input?: GridStateInput<ID>): GridState<ID>;
|
|
35
35
|
export declare function tryCreateGridState<ID extends StableID>(grid: Grid<ID>, input?: GridStateInput<ID>): Result<GridState<ID>>;
|
|
36
36
|
export declare function applyGridEvent<ID extends StableID>(grid: Grid<ID>, state: GridState<ID>, event: GridEvent<ID>, policies?: GridPolicies<ID>): Result<GridUpdate<ID>>;
|
|
37
|
-
//# sourceMappingURL=grid-control.d.ts.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { unwrap } from '../../result.js';
|
|
2
|
-
import { fail, ok } from '../kernel/foundation.js';
|
|
3
|
-
import { findEligibleFromEdge
|
|
2
|
+
import { bindCanonicalState, fail, hasCanonicalState, ok } from '../kernel/foundation.js';
|
|
3
|
+
import { findEligibleFromEdge } from '../kernel/indexed-sequence.js';
|
|
4
4
|
import { createMachineUpdate } from '../kernel/machine.js';
|
|
5
5
|
import { createCursorState } from '../state/cursor.js';
|
|
6
6
|
import { createSelectionState, selectOne } from '../state/selection.js';
|
|
@@ -20,12 +20,14 @@ export function tryCreateGridState(grid, input = {}) {
|
|
|
20
20
|
return fail('construction', 'invalid-grid-edit-mode', 'Grid edit mode must be navigation or editing.');
|
|
21
21
|
if (editMode === 'editing' && current === null)
|
|
22
22
|
return fail('construction', 'grid-edit-without-cursor', 'Grid editing requires a cursor.');
|
|
23
|
-
return ok(gridState(current, selection.value, editMode));
|
|
23
|
+
return ok(gridState(grid, current, selection.value, editMode));
|
|
24
24
|
}
|
|
25
25
|
export function applyGridEvent(grid, state, event, policies = {}) {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
26
|
+
if (!hasCanonicalState(grid, state)) {
|
|
27
|
+
const validation = tryCreateGridState(grid, { current: state.cursor.current, selected: state.selection.selected, anchor: state.selection.anchor, editMode: state.editMode });
|
|
28
|
+
if (!validation.ok)
|
|
29
|
+
return { ok: false, error: { ...validation.error, class: 'transition-rejection' } };
|
|
30
|
+
}
|
|
29
31
|
const boundary = policies.boundary ?? 'stop';
|
|
30
32
|
if (boundary !== 'stop' && boundary !== 'wrap-axis')
|
|
31
33
|
return fail('transition-rejection', 'invalid-grid-boundary', 'Grid boundary must be stop or wrap-axis.');
|
|
@@ -34,29 +36,29 @@ export function applyGridEvent(grid, state, event, policies = {}) {
|
|
|
34
36
|
if (!domain.contains(event.id) || policies.eligible?.(event.id) === false)
|
|
35
37
|
return fail('transition-rejection', 'grid-target-unavailable', 'Direct grid events require an eligible cell.');
|
|
36
38
|
if (event.type === 'focus')
|
|
37
|
-
return createMachineUpdate(gridState(event.id, state.selection, 'navigation'), [{ type: 'focus', id: event.id }]);
|
|
39
|
+
return createMachineUpdate(gridState(grid, event.id, state.selection, 'navigation'), [{ type: 'focus', id: event.id }]);
|
|
38
40
|
const selection = selectOne(state.selection, event.id, domain);
|
|
39
41
|
if (event.type === 'select')
|
|
40
|
-
return createMachineUpdate(gridState(event.id, selection, 'navigation'), [{ type: 'focus', id: event.id }]);
|
|
41
|
-
return createMachineUpdate(gridState(event.id, selection, 'editing'), [{ type: 'focus', id: event.id }, { type: 'begin-edit', id: event.id }]);
|
|
42
|
+
return createMachineUpdate(gridState(grid, event.id, selection, 'navigation'), [{ type: 'focus', id: event.id }]);
|
|
43
|
+
return createMachineUpdate(gridState(grid, event.id, selection, 'editing'), [{ type: 'focus', id: event.id }, { type: 'begin-edit', id: event.id }]);
|
|
42
44
|
}
|
|
43
45
|
const current = state.cursor.current;
|
|
44
46
|
if (event === 'commit-edit' || event === 'cancel-edit') {
|
|
45
47
|
if (state.editMode !== 'editing' || current === null)
|
|
46
48
|
return fail('transition-rejection', 'grid-not-editing', 'Grid can only finish an active edit.');
|
|
47
|
-
return createMachineUpdate(gridState(current, state.selection, 'navigation'), [{ type: event, id: current }]);
|
|
49
|
+
return createMachineUpdate(gridState(grid, current, state.selection, 'navigation'), [{ type: event, id: current }]);
|
|
48
50
|
}
|
|
49
51
|
if (state.editMode === 'editing')
|
|
50
52
|
return event === 'start-edit' ? createMachineUpdate(state) : fail('transition-rejection', 'grid-edit-active', 'Grid navigation is suspended during editing.');
|
|
51
53
|
if (event === 'start-edit') {
|
|
52
54
|
if (current === null)
|
|
53
55
|
return fail('transition-rejection', 'no-cursor', 'Grid editing requires a cursor.');
|
|
54
|
-
return createMachineUpdate(gridState(current, state.selection, 'editing'), [{ type: 'begin-edit', id: current }]);
|
|
56
|
+
return createMachineUpdate(gridState(grid, current, state.selection, 'editing'), [{ type: 'begin-edit', id: current }]);
|
|
55
57
|
}
|
|
56
58
|
if (event === 'select') {
|
|
57
59
|
if (current === null)
|
|
58
60
|
return fail('transition-rejection', 'no-cursor', 'Grid selection requires a cursor.');
|
|
59
|
-
return createMachineUpdate(gridState(current, selectOne(state.selection, current, domain), 'navigation'));
|
|
61
|
+
return createMachineUpdate(gridState(grid, current, selectOne(state.selection, current, domain), 'navigation'));
|
|
60
62
|
}
|
|
61
63
|
const eligible = policies.eligible ?? (() => true);
|
|
62
64
|
let target = null;
|
|
@@ -72,19 +74,12 @@ export function applyGridEvent(grid, state, event, policies = {}) {
|
|
|
72
74
|
return { ok: false, error: movement.error };
|
|
73
75
|
target = movement.kind === 'found' ? movement.id : null;
|
|
74
76
|
}
|
|
75
|
-
return target === null ? createMachineUpdate(state) : createMachineUpdate(gridState(target, state.selection, 'navigation'), [{ type: 'focus', id: target }]);
|
|
77
|
+
return target === null ? createMachineUpdate(state) : createMachineUpdate(gridState(grid, target, state.selection, 'navigation'), [{ type: 'focus', id: target }]);
|
|
76
78
|
}
|
|
77
79
|
function gridCells(grid) {
|
|
78
|
-
|
|
79
|
-
for (let row = 0; row < grid.rowCount; row += 1)
|
|
80
|
-
for (let column = 0; column < grid.columnCount; column += 1) {
|
|
81
|
-
const id = grid.cellAt(row, column);
|
|
82
|
-
if (id !== null)
|
|
83
|
-
ids.push(id);
|
|
84
|
-
}
|
|
85
|
-
return new IndexedSequence(ids);
|
|
80
|
+
return grid.domain();
|
|
86
81
|
}
|
|
87
|
-
function gridState(current, selection, editMode) {
|
|
88
|
-
return Object.freeze({ cursor: createCursorState(current), selection, editMode });
|
|
82
|
+
function gridState(grid, current, selection, editMode) {
|
|
83
|
+
return bindCanonicalState(grid, Object.freeze({ cursor: createCursorState(current), selection, editMode }));
|
|
89
84
|
}
|
|
90
85
|
//# sourceMappingURL=grid-control.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid-control.js","sourceRoot":"","sources":["../../../src/internal/composites/grid-control.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAIzC,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"grid-control.js","sourceRoot":"","sources":["../../../src/internal/composites/grid-control.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,4 +33,3 @@ export interface LinearActionUpdate<ID extends StableID = StableID> {
|
|
|
33
33
|
export declare function createLinearActionState<ID extends StableID>(domain: Sequence<ID>, input?: LinearActionStateInput<ID>): LinearActionState<ID>;
|
|
34
34
|
export declare function tryCreateLinearActionState<ID extends StableID>(domain: Sequence<ID>, input?: LinearActionStateInput<ID>): Result<LinearActionState<ID>>;
|
|
35
35
|
export declare function applyLinearActionEvent<ID extends StableID>(domain: Sequence<ID>, state: LinearActionState<ID>, event: LinearActionEvent<ID>, policies?: LinearActionPolicies<ID>): Result<LinearActionUpdate<ID>>;
|
|
36
|
-
//# sourceMappingURL=linear-action.d.ts.map
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { unwrap } from '../../result.js';
|
|
2
|
-
import { fail, ok } from '../kernel/foundation.js';
|
|
2
|
+
import { bindCanonicalState, fail, hasCanonicalState, ok } from '../kernel/foundation.js';
|
|
3
3
|
import { findEligibleFromEdge } from '../kernel/indexed-sequence.js';
|
|
4
4
|
import { createMachineUpdate } from '../kernel/machine.js';
|
|
5
5
|
import { createCursorState } from '../state/cursor.js';
|
|
@@ -11,10 +11,12 @@ export function tryCreateLinearActionState(domain, input = {}) {
|
|
|
11
11
|
if (current !== null && !domain.contains(current)) {
|
|
12
12
|
return fail('construction', 'linear-action-cursor-outside-domain', 'Linear action cursor must exist in the sequence domain.', { current });
|
|
13
13
|
}
|
|
14
|
-
return ok(linearActionState(current));
|
|
14
|
+
return ok(linearActionState(domain, current));
|
|
15
15
|
}
|
|
16
16
|
export function applyLinearActionEvent(domain, state, event, policies = {}) {
|
|
17
|
-
const stateError =
|
|
17
|
+
const stateError = hasCanonicalState(domain, state)
|
|
18
|
+
? null
|
|
19
|
+
: validateState(domain, state);
|
|
18
20
|
if (stateError !== null)
|
|
19
21
|
return { ok: false, error: stateError };
|
|
20
22
|
if (!isLinearActionEvent(event)) {
|
|
@@ -32,13 +34,13 @@ export function applyLinearActionEvent(domain, state, event, policies = {}) {
|
|
|
32
34
|
return fail('transition-rejection', 'linear-action-target-unavailable', 'Direct linear action events require an eligible identity in the domain.', { id: event.id });
|
|
33
35
|
}
|
|
34
36
|
return event.type === 'focus'
|
|
35
|
-
? focus(event.id)
|
|
36
|
-
: invoke(state, event.id, true);
|
|
37
|
+
? focus(domain, event.id)
|
|
38
|
+
: invoke(domain, state, event.id, true);
|
|
37
39
|
}
|
|
38
40
|
if (event === 'invoke') {
|
|
39
41
|
return state.cursor.current === null
|
|
40
42
|
? fail('transition-rejection', 'no-cursor', 'Linear action invocation requires a cursor.')
|
|
41
|
-
: invoke(state, state.cursor.current, false);
|
|
43
|
+
: invoke(domain, state, state.cursor.current, false);
|
|
42
44
|
}
|
|
43
45
|
const direction = event === 'next' || event === 'first' ? 1 : -1;
|
|
44
46
|
const eligible = policies.eligible ?? (() => true);
|
|
@@ -61,20 +63,20 @@ export function applyLinearActionEvent(domain, state, event, policies = {}) {
|
|
|
61
63
|
return { ok: false, error: movement.error };
|
|
62
64
|
target = movement.kind === 'found' ? movement.id : null;
|
|
63
65
|
}
|
|
64
|
-
return target === null ? createMachineUpdate(state) : focus(target);
|
|
66
|
+
return target === null ? createMachineUpdate(state) : focus(domain, target);
|
|
65
67
|
}
|
|
66
|
-
function focus(id) {
|
|
67
|
-
return createMachineUpdate(linearActionState(id), [{ type: 'focus', id }]);
|
|
68
|
+
function focus(domain, id) {
|
|
69
|
+
return createMachineUpdate(linearActionState(domain, id), [{ type: 'focus', id }]);
|
|
68
70
|
}
|
|
69
|
-
function invoke(state, id, direct) {
|
|
71
|
+
function invoke(domain, state, id, direct) {
|
|
70
72
|
const commands = [];
|
|
71
73
|
if (direct && state.cursor.current !== id)
|
|
72
74
|
commands.push({ type: 'focus', id });
|
|
73
75
|
commands.push({ type: 'invoke', id });
|
|
74
|
-
return createMachineUpdate(linearActionState(id), commands);
|
|
76
|
+
return createMachineUpdate(linearActionState(domain, id), commands);
|
|
75
77
|
}
|
|
76
|
-
function linearActionState(current) {
|
|
77
|
-
return Object.freeze({ cursor: createCursorState(current) });
|
|
78
|
+
function linearActionState(domain, current) {
|
|
79
|
+
return bindCanonicalState(domain, Object.freeze({ cursor: createCursorState(current) }));
|
|
78
80
|
}
|
|
79
81
|
function validateState(domain, state) {
|
|
80
82
|
return state.cursor.current === null || domain.contains(state.cursor.current)
|
|
@@ -87,7 +89,11 @@ function validateState(domain, state) {
|
|
|
87
89
|
}
|
|
88
90
|
function isLinearActionEvent(value) {
|
|
89
91
|
if (typeof value === 'string') {
|
|
90
|
-
return
|
|
92
|
+
return value === 'next'
|
|
93
|
+
|| value === 'previous'
|
|
94
|
+
|| value === 'first'
|
|
95
|
+
|| value === 'last'
|
|
96
|
+
|| value === 'invoke';
|
|
91
97
|
}
|
|
92
98
|
return typeof value === 'object' && value !== null
|
|
93
99
|
&& 'type' in value && 'id' in value && typeof value.id === 'string'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linear-action.js","sourceRoot":"","sources":["../../../src/internal/composites/linear-action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAGzC,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"linear-action.js","sourceRoot":"","sources":["../../../src/internal/composites/linear-action.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,4 +38,3 @@ export interface LinearChoiceUpdate<ID extends StableID = StableID> {
|
|
|
38
38
|
}
|
|
39
39
|
export declare function createLinearChoiceState<ID extends StableID>(domain: Sequence<ID>, input?: LinearChoiceStateInput<ID>): Result<LinearChoiceState<ID>>;
|
|
40
40
|
export declare function applyLinearChoiceEvent<ID extends StableID>(domain: Sequence<ID>, state: LinearChoiceState<ID>, event: LinearChoiceEvent<ID>, policies?: LinearChoicePolicies<ID>): Result<LinearChoiceUpdate<ID>>;
|
|
41
|
-
//# sourceMappingURL=linear-choice.d.ts.map
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { fail, ok } from '../kernel/foundation.js';
|
|
1
|
+
import { bindCanonicalState, fail, hasCanonicalState, ok } from '../kernel/foundation.js';
|
|
2
2
|
import { findEligibleFromEdge } from '../kernel/indexed-sequence.js';
|
|
3
3
|
import { createMachineUpdate } from '../kernel/machine.js';
|
|
4
4
|
import { createCursorState } from '../state/cursor.js';
|
|
@@ -11,10 +11,12 @@ export function createLinearChoiceState(domain, input = {}) {
|
|
|
11
11
|
const selection = createSelectionState(domain, 'single', input);
|
|
12
12
|
if (!selection.ok)
|
|
13
13
|
return selection;
|
|
14
|
-
return ok(linearChoiceState(createCursorState(current), selection.value));
|
|
14
|
+
return ok(linearChoiceState(domain, createCursorState(current), selection.value));
|
|
15
15
|
}
|
|
16
16
|
export function applyLinearChoiceEvent(domain, state, event, policies = {}) {
|
|
17
|
-
const stateError =
|
|
17
|
+
const stateError = hasCanonicalState(domain, state)
|
|
18
|
+
? null
|
|
19
|
+
: validateLinearChoiceState(domain, state);
|
|
18
20
|
if (stateError !== null)
|
|
19
21
|
return { ok: false, error: stateError };
|
|
20
22
|
if (!isLinearChoiceEvent(event)) {
|
|
@@ -76,7 +78,7 @@ function moveLinearChoice(domain, state, event, boundary, follows, policies) {
|
|
|
76
78
|
}
|
|
77
79
|
function focusTarget(domain, state, id, follows) {
|
|
78
80
|
const selection = follows ? selectOne(state.selection, id, domain) : state.selection;
|
|
79
|
-
return createMachineUpdate(linearChoiceState(createCursorState(id), selection), [{ type: 'focus', id }]);
|
|
81
|
+
return createMachineUpdate(linearChoiceState(domain, createCursorState(id), selection), [{ type: 'focus', id }]);
|
|
80
82
|
}
|
|
81
83
|
function chooseTarget(domain, state, id, activate, focus = true) {
|
|
82
84
|
const commands = [];
|
|
@@ -84,7 +86,7 @@ function chooseTarget(domain, state, id, activate, focus = true) {
|
|
|
84
86
|
commands.push({ type: 'focus', id });
|
|
85
87
|
if (activate)
|
|
86
88
|
commands.push({ type: 'activate', id });
|
|
87
|
-
return createMachineUpdate(linearChoiceState(createCursorState(id), selectOne(state.selection, id, domain)), commands);
|
|
89
|
+
return createMachineUpdate(linearChoiceState(domain, createCursorState(id), selectOne(state.selection, id, domain)), commands);
|
|
88
90
|
}
|
|
89
91
|
function validateLinearChoiceState(domain, state) {
|
|
90
92
|
if (state.cursor.current !== null && !domain.contains(state.cursor.current)) {
|
|
@@ -119,8 +121,8 @@ function validateLinearChoiceState(domain, state) {
|
|
|
119
121
|
}
|
|
120
122
|
return null;
|
|
121
123
|
}
|
|
122
|
-
function linearChoiceState(cursor, selection) {
|
|
123
|
-
return Object.freeze({ cursor, selection });
|
|
124
|
+
function linearChoiceState(domain, cursor, selection) {
|
|
125
|
+
return bindCanonicalState(domain, Object.freeze({ cursor, selection }));
|
|
124
126
|
}
|
|
125
127
|
function isAvailable(domain, id, policies) {
|
|
126
128
|
return domain.contains(id) && policies.eligible?.(id) !== false;
|
|
@@ -130,7 +132,12 @@ function unavailable(id) {
|
|
|
130
132
|
}
|
|
131
133
|
function isLinearChoiceEvent(value) {
|
|
132
134
|
if (typeof value === 'string') {
|
|
133
|
-
return
|
|
135
|
+
return value === 'next'
|
|
136
|
+
|| value === 'previous'
|
|
137
|
+
|| value === 'first'
|
|
138
|
+
|| value === 'last'
|
|
139
|
+
|| value === 'select'
|
|
140
|
+
|| value === 'activate';
|
|
134
141
|
}
|
|
135
142
|
return typeof value === 'object' && value !== null
|
|
136
143
|
&& 'type' in value && 'id' in value && typeof value.id === 'string'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linear-choice.js","sourceRoot":"","sources":["../../../src/internal/composites/linear-choice.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"linear-choice.js","sourceRoot":"","sources":["../../../src/internal/composites/linear-choice.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,4 +50,3 @@ export interface ListboxTypeaheadOptions<ID extends StableID = StableID> {
|
|
|
50
50
|
readonly maxScan?: number;
|
|
51
51
|
}
|
|
52
52
|
export declare function findListboxTypeaheadMatch<ID extends StableID>(domain: Sequence<ID>, current: ID | null, query: string, options: ListboxTypeaheadOptions<ID>): Result<ID | null>;
|
|
53
|
-
//# sourceMappingURL=listbox.d.ts.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { unwrap } from '../../result.js';
|
|
2
2
|
import { createCursorState } from '../state/cursor.js';
|
|
3
|
-
import { fail, ok } from '../kernel/foundation.js';
|
|
3
|
+
import { bindCanonicalState, fail, hasCanonicalState, ok } from '../kernel/foundation.js';
|
|
4
4
|
import { findEligibleFromEdge } from '../kernel/indexed-sequence.js';
|
|
5
5
|
import { createMachineUpdate } from '../kernel/machine.js';
|
|
6
6
|
import { clearSelection, createSelectionState, selectOne, toggleMultipleSelection, } from '../state/selection.js';
|
|
@@ -16,10 +16,12 @@ export function tryCreateListboxState(domain, input = {}, selectionMode = DEFAUL
|
|
|
16
16
|
const selection = createSelectionState(domain, selectionMode, input);
|
|
17
17
|
if (!selection.ok)
|
|
18
18
|
return selection;
|
|
19
|
-
return ok(listboxState(createCursorState(current), selection.value));
|
|
19
|
+
return ok(listboxState(domain, createCursorState(current), selection.value));
|
|
20
20
|
}
|
|
21
21
|
export function applyListboxEvent(domain, state, event, policies = {}) {
|
|
22
|
-
const stateError =
|
|
22
|
+
const stateError = hasCanonicalState(domain, state)
|
|
23
|
+
? null
|
|
24
|
+
: validateListboxState(domain, state);
|
|
23
25
|
if (stateError !== null)
|
|
24
26
|
return { ok: false, error: stateError };
|
|
25
27
|
if (!isListboxEvent(event)) {
|
|
@@ -55,12 +57,12 @@ export function applyListboxEvent(domain, state, event, policies = {}) {
|
|
|
55
57
|
const selection = selectionFollowsFocus
|
|
56
58
|
? selectOne(state.selection, event.id, domain)
|
|
57
59
|
: state.selection;
|
|
58
|
-
return createMachineUpdate(listboxState(createCursorState(event.id), selection), [{ type: 'focus', id: event.id }]);
|
|
60
|
+
return createMachineUpdate(listboxState(domain, createCursorState(event.id), selection), [{ type: 'focus', id: event.id }]);
|
|
59
61
|
}
|
|
60
62
|
if (event.type === 'toggle') {
|
|
61
|
-
return createMachineUpdate(listboxState(createCursorState(event.id), selectForMode(state.selection, event.id, domain, selectionMode, deselectable)), [{ type: 'focus', id: event.id }]);
|
|
63
|
+
return createMachineUpdate(listboxState(domain, createCursorState(event.id), selectForMode(state.selection, event.id, domain, selectionMode, deselectable)), [{ type: 'focus', id: event.id }]);
|
|
62
64
|
}
|
|
63
|
-
return createMachineUpdate(listboxState(createCursorState(event.id), selectOne(state.selection, event.id, domain)), [{ type: 'focus', id: event.id }, { type: 'activate', id: event.id }]);
|
|
65
|
+
return createMachineUpdate(listboxState(domain, createCursorState(event.id), selectOne(state.selection, event.id, domain)), [{ type: 'focus', id: event.id }, { type: 'activate', id: event.id }]);
|
|
64
66
|
}
|
|
65
67
|
switch (event) {
|
|
66
68
|
case 'next':
|
|
@@ -75,17 +77,17 @@ export function applyListboxEvent(domain, state, event, policies = {}) {
|
|
|
75
77
|
const current = state.cursor.current;
|
|
76
78
|
if (current === null)
|
|
77
79
|
return noCursor();
|
|
78
|
-
return createMachineUpdate(listboxState(state.cursor, selectForMode(state.selection, current, domain, selectionMode, deselectable)));
|
|
80
|
+
return createMachineUpdate(listboxState(domain, state.cursor, selectForMode(state.selection, current, domain, selectionMode, deselectable)));
|
|
79
81
|
}
|
|
80
82
|
case 'activate': {
|
|
81
83
|
const current = state.cursor.current;
|
|
82
84
|
if (current === null)
|
|
83
85
|
return noCursor();
|
|
84
|
-
return createMachineUpdate(listboxState(state.cursor, selectOne(state.selection, current, domain)), [{ type: 'activate', id: current }]);
|
|
86
|
+
return createMachineUpdate(listboxState(domain, state.cursor, selectOne(state.selection, current, domain)), [{ type: 'activate', id: current }]);
|
|
85
87
|
}
|
|
86
88
|
case 'clear': {
|
|
87
89
|
const selection = clearSelection(state.selection);
|
|
88
|
-
return createMachineUpdate(selection === state.selection ? state : listboxState(state.cursor, selection));
|
|
90
|
+
return createMachineUpdate(selection === state.selection ? state : listboxState(domain, state.cursor, selection));
|
|
89
91
|
}
|
|
90
92
|
}
|
|
91
93
|
}
|
|
@@ -156,7 +158,7 @@ function moveListbox(domain, state, direction, boundary, selectionFollowsFocus,
|
|
|
156
158
|
const selection = selectionFollowsFocus
|
|
157
159
|
? selectOne(state.selection, target, domain)
|
|
158
160
|
: state.selection;
|
|
159
|
-
return createMachineUpdate(listboxState(cursor, selection), [{ type: 'focus', id: target }]);
|
|
161
|
+
return createMachineUpdate(listboxState(domain, cursor, selection), [{ type: 'focus', id: target }]);
|
|
160
162
|
}
|
|
161
163
|
function moveListboxToEdge(domain, state, direction, selectionFollowsFocus, policies) {
|
|
162
164
|
const target = findEligibleFromEdge(domain, direction, {
|
|
@@ -168,7 +170,7 @@ function moveListboxToEdge(domain, state, direction, selectionFollowsFocus, poli
|
|
|
168
170
|
if (target.value === null || target.value === state.cursor.current) {
|
|
169
171
|
return createMachineUpdate(state);
|
|
170
172
|
}
|
|
171
|
-
return createMachineUpdate(listboxState(createCursorState(target.value), selectionFollowsFocus ? selectOne(state.selection, target.value, domain) : state.selection), [{ type: 'focus', id: target.value }]);
|
|
173
|
+
return createMachineUpdate(listboxState(domain, createCursorState(target.value), selectionFollowsFocus ? selectOne(state.selection, target.value, domain) : state.selection), [{ type: 'focus', id: target.value }]);
|
|
172
174
|
}
|
|
173
175
|
function selectForMode(state, id, domain, selectionMode, deselectable) {
|
|
174
176
|
return selectionMode === 'single'
|
|
@@ -231,8 +233,8 @@ function validateListboxState(domain, state) {
|
|
|
231
233
|
}
|
|
232
234
|
return null;
|
|
233
235
|
}
|
|
234
|
-
function listboxState(cursor, selection) {
|
|
235
|
-
return Object.freeze({ cursor, selection });
|
|
236
|
+
function listboxState(domain, cursor, selection) {
|
|
237
|
+
return bindCanonicalState(domain, Object.freeze({ cursor, selection }));
|
|
236
238
|
}
|
|
237
239
|
function noCursor() {
|
|
238
240
|
return fail('transition-rejection', 'no-cursor', 'Listbox toggle and activate require a current cursor.');
|