@svgrid/grid 2.2.27 → 2.2.29
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/README.md +199 -199
- package/dist/FlexRender.svelte +96 -96
- package/dist/GridFooter.svelte +179 -179
- package/dist/GridMenus.svelte +782 -734
- package/dist/SvAutoComplete.svelte +165 -165
- package/dist/SvCalendar.svelte +503 -503
- package/dist/SvCarousel.svelte +141 -141
- package/dist/SvCheckBox.svelte +101 -101
- package/dist/SvColorInput.svelte +181 -181
- package/dist/SvComboBox.svelte +275 -275
- package/dist/SvContextMenu.svelte +116 -116
- package/dist/SvCountryInput.svelte +160 -160
- package/dist/SvDrawer.svelte +254 -250
- package/dist/SvDropDownList.svelte +374 -374
- package/dist/SvDurationInput.svelte +126 -126
- package/dist/SvField.svelte +293 -293
- package/dist/SvForm.svelte +437 -437
- package/dist/SvGrid.controller.svelte.d.ts +14 -1
- package/dist/SvGrid.controller.svelte.js +112 -28
- package/dist/SvGrid.css +2704 -2723
- package/dist/SvGrid.svelte +3361 -3333
- package/dist/SvGrid.types.d.ts +20 -5
- package/dist/SvGridChart.svelte +1724 -1724
- package/dist/SvGridChartPanel.svelte +485 -485
- package/dist/SvGridChartView.svelte +70 -70
- package/dist/SvGridDropdown.svelte +696 -696
- package/dist/SvGridSelect.svelte +259 -259
- package/dist/SvGroupCell.svelte +109 -109
- package/dist/SvListBox.svelte +326 -287
- package/dist/SvListBox.svelte.d.ts +10 -1
- package/dist/SvMaskedInput.svelte +122 -122
- package/dist/SvMenu.svelte +124 -124
- package/dist/SvMenuList.svelte +146 -146
- package/dist/SvMultiSelect.svelte +281 -281
- package/dist/SvNumberInput.svelte +168 -168
- package/dist/SvOtpInput.svelte +158 -158
- package/dist/SvPasswordInput.svelte +151 -151
- package/dist/SvPhoneInput.svelte +133 -131
- package/dist/SvPopover.svelte +197 -197
- package/dist/SvRadioGroup.svelte +107 -107
- package/dist/SvRowGroupPanel.svelte +170 -170
- package/dist/SvScrollArea.svelte +61 -61
- package/dist/SvSlider.svelte +200 -200
- package/dist/SvSwitchButton.svelte +107 -107
- package/dist/SvTagsInput.svelte +112 -112
- package/dist/SvTextInput.svelte +147 -147
- package/dist/SvTimePicker.svelte +245 -245
- package/dist/SvToaster.svelte +159 -159
- package/dist/SvToggleButton.svelte +85 -85
- package/dist/SvTooltip.svelte +161 -161
- package/dist/SvTour.svelte +204 -204
- package/dist/SvTree.svelte +437 -437
- package/dist/SvTreeSelect.svelte +233 -233
- package/dist/cdn/GridMenus-Da_p7SKS.js +486 -0
- package/dist/cdn/GridMenus-Ds3OpzZT.js +490 -0
- package/dist/cdn/{SvDateTimePicker-B1sDc9Pz.js → SvDateTimePicker-B8GopjhC.js} +2 -2
- package/dist/cdn/{SvDateTimePicker-Bh0FTs1E.js → SvDateTimePicker-DB0aIEk8.js} +2 -2
- package/dist/cdn/{SvGridChart-Bgk4hDs8.js → SvGridChart-BcLCYvw9.js} +1 -1
- package/dist/cdn/{SvGridChart-BKQsO5fZ.js → SvGridChart-BhnFdLd0.js} +1 -1
- package/dist/cdn/{SvGridChartPanel-DkCc2Z7b.js → SvGridChartPanel-Cmx9DHAS.js} +1 -1
- package/dist/cdn/{SvGridChartPanel-DSkHIQDd.js → SvGridChartPanel-DvjwxLvK.js} +1 -1
- package/dist/cdn/{SvGridChartView-BrbVaELm.js → SvGridChartView-B40DTJSX.js} +1 -1
- package/dist/cdn/{SvGridChartView-i9rWvSKg.js → SvGridChartView-PwqI4s02.js} +1 -1
- package/dist/cdn/{SvGridDropdown-D08sVmAy.js → SvGridDropdown-DjALc_4f.js} +1 -1
- package/dist/cdn/{SvGridDropdown-CGxxopQ4.js → SvGridDropdown-hpnHvOGt.js} +1 -1
- package/dist/cdn/{src-cgs1wcUS.js → src-BLJfdyL0.js} +4034 -3889
- package/dist/cdn/{src-Cw8d9U8j.js → src-DYDCiC0D.js} +7053 -6908
- package/dist/cdn/svgrid.js +9 -9
- package/dist/cdn/svgrid.svelte-external.js +9 -9
- package/dist/chart-export.js +8 -8
- package/dist/column-groups.js +8 -10
- package/dist/column-id.d.ts +9 -0
- package/dist/column-id.js +25 -0
- package/dist/core.js +2 -1
- package/dist/createListbox.svelte.d.ts +15 -2
- package/dist/createListbox.svelte.js +27 -6
- package/dist/editing.d.ts +1 -0
- package/dist/editing.js +45 -10
- package/dist/filtering/excel-filters.d.ts +30 -10
- package/dist/filtering/excel-filters.js +96 -15
- package/dist/index.d.ts +2 -2
- package/dist/index.js +2 -2
- package/dist/menus.d.ts +2 -0
- package/dist/menus.js +25 -0
- package/dist/row-resize.js +40 -0
- package/dist/selection.js +1 -1
- package/package.json +10 -10
- package/src/FlexRender.svelte +96 -96
- package/src/GridFooter.svelte +179 -179
- package/src/GridMenus.svelte +782 -734
- package/src/SvAutoComplete.svelte +165 -165
- package/src/SvCalendar.svelte +503 -503
- package/src/SvCalendar.test.ts +226 -226
- package/src/SvCarousel.svelte +141 -141
- package/src/SvCheckBox.svelte +101 -101
- package/src/SvColorInput.svelte +181 -181
- package/src/SvComboBox.svelte +275 -275
- package/src/SvContextMenu.svelte +116 -116
- package/src/SvCountryInput.svelte +160 -160
- package/src/SvDrawer.svelte +254 -250
- package/src/SvDrawer.test.ts +18 -1
- package/src/SvDropDownList.svelte +374 -374
- package/src/SvDurationInput.svelte +126 -126
- package/src/SvField.svelte +293 -293
- package/src/SvForm.svelte +437 -437
- package/src/SvForm.test.ts +411 -411
- package/src/SvGrid.controller.svelte.ts +3335 -3239
- package/src/SvGrid.css +2704 -2723
- package/src/SvGrid.svelte +3361 -3333
- package/src/SvGrid.types.ts +1628 -1613
- package/src/SvGridChart.svelte +1724 -1724
- package/src/SvGridChartPanel.svelte +485 -485
- package/src/SvGridChartView.svelte +70 -70
- package/src/SvGridDropdown.svelte +696 -696
- package/src/SvGridSelect.svelte +259 -259
- package/src/SvGroupCell.svelte +109 -109
- package/src/SvListBox.svelte +326 -287
- package/src/SvMaskedInput.svelte +122 -122
- package/src/SvMenu.svelte +124 -124
- package/src/SvMenu.test.ts +97 -97
- package/src/SvMenuList.svelte +146 -146
- package/src/SvMultiSelect.svelte +281 -281
- package/src/SvNavPane.test.ts +15 -4
- package/src/SvNumberInput.svelte +168 -168
- package/src/SvOtpInput.svelte +158 -158
- package/src/SvPasswordInput.svelte +151 -151
- package/src/SvPhoneInput.svelte +133 -131
- package/src/SvPopover.svelte +197 -197
- package/src/SvRadioGroup.svelte +107 -107
- package/src/SvRowGroupPanel.svelte +170 -170
- package/src/SvScrollArea.svelte +61 -61
- package/src/SvSlider.svelte +200 -200
- package/src/SvSwitchButton.svelte +107 -107
- package/src/SvTagsInput.svelte +112 -112
- package/src/SvTextInput.svelte +147 -147
- package/src/SvTimePicker.svelte +245 -245
- package/src/SvToaster.svelte +159 -159
- package/src/SvToaster.test.ts +95 -95
- package/src/SvToggleButton.svelte +85 -85
- package/src/SvTooltip.svelte +161 -161
- package/src/SvTour.svelte +204 -204
- package/src/SvTree.svelte +437 -437
- package/src/SvTreeSelect.svelte +233 -233
- package/src/a11y/dismissable.test.ts +119 -119
- package/src/a11y/dismissable.ts +114 -114
- package/src/a11y.contract.test.ts +49 -49
- package/src/a11y.test.ts +59 -59
- package/src/a11y.ts +61 -61
- package/src/ai.test.ts +502 -502
- package/src/ai.ts +1391 -1391
- package/src/build-api.coverage.test.ts +633 -633
- package/src/build-api.ts +895 -895
- package/src/builtin-editors.grid.test.ts +85 -85
- package/src/cell-formatting.ts +169 -169
- package/src/cell-render.ts +469 -469
- package/src/chart-export.ts +201 -201
- package/src/chart-view.svelte.ts +36 -36
- package/src/chart.ts +2296 -2296
- package/src/collaboration.test.ts +104 -104
- package/src/collaboration.ts +167 -167
- package/src/column-groups.test.ts +48 -0
- package/src/column-groups.ts +8 -10
- package/src/column-id.ts +30 -0
- package/src/core.performance.test.ts +30 -30
- package/src/core.ts +1112 -1111
- package/src/createAutocomplete.svelte.ts +132 -132
- package/src/createCombobox.svelte.ts +191 -191
- package/src/createCountryInput.svelte.ts +157 -157
- package/src/createDropdownList.svelte.ts +168 -168
- package/src/createForm.svelte.ts +386 -386
- package/src/createGrid.svelte.ts +42 -42
- package/src/createGrid.test.ts +10 -10
- package/src/createGridState.svelte.ts +17 -17
- package/src/createListbox.svelte.ts +39 -7
- package/src/createMenu.svelte.ts +225 -225
- package/src/createPopoverSelect.svelte.ts +213 -213
- package/src/createSlider.svelte.ts +191 -191
- package/src/createTooltip.svelte.ts +144 -144
- package/src/createTree.svelte.ts +319 -319
- package/src/editing.test.ts +949 -859
- package/src/editing.ts +709 -675
- package/src/editor-contract.ts +157 -157
- package/src/export-data-api.test.ts +126 -126
- package/src/export-format.test.ts +107 -107
- package/src/export-format.ts +598 -598
- package/src/filter-operators.ts +157 -157
- package/src/filtering/excel-filters.test.ts +44 -1
- package/src/filtering/excel-filters.ts +91 -14
- package/src/flex-render.ts +3 -3
- package/src/form-field.ts +127 -127
- package/src/index.ts +715 -713
- package/src/js-scroller.svelte.ts +173 -173
- package/src/keyboard.test.ts +59 -59
- package/src/keyboard.ts +97 -97
- package/src/list-nav.test.ts +49 -49
- package/src/list-nav.ts +29 -29
- package/src/list-option.test.ts +56 -56
- package/src/list-option.ts +172 -172
- package/src/menus.test.ts +736 -700
- package/src/menus.ts +679 -652
- package/src/merge-objects.ts +48 -48
- package/src/overlays.test.ts +90 -90
- package/src/render-component.ts +28 -28
- package/src/row-resize.test.ts +100 -0
- package/src/row-resize.ts +36 -0
- package/src/scheduler-model.test.ts +562 -562
- package/src/scheduler-model.ts +872 -872
- package/src/selection.test.ts +754 -754
- package/src/selection.ts +600 -600
- package/src/server-data-source.test.ts +289 -289
- package/src/server-data-source.ts +413 -413
- package/src/sparkline.test.ts +68 -68
- package/src/sparkline.ts +169 -169
- package/src/spreadsheet.test.ts +489 -489
- package/src/spreadsheet.ts +312 -312
- package/src/static-functions.ts +11 -11
- package/src/subscribe.ts +38 -38
- package/src/svgrid-wrapper.types.ts +524 -524
- package/src/svgrid.api-extensions.test.ts +8 -3
- package/src/svgrid.behavior.test.ts +706 -706
- package/src/svgrid.cell-dom-ids.test.ts +96 -0
- package/src/svgrid.charting.test.ts +534 -534
- package/src/svgrid.conditional-stat-scope.test.ts +111 -0
- package/src/svgrid.features.test.ts +157 -157
- package/src/svgrid.filter-menu-listbox.svelte.test.ts +308 -0
- package/src/svgrid.filter-menu-scroll.test.ts +3 -1
- package/src/svgrid.group-header-ids.test.ts +121 -0
- package/src/svgrid.new-features.wrapper.test.ts +251 -251
- package/src/svgrid.wrapper.test.ts +40 -40
- package/src/test-setup.ts +62 -62
- package/src/themes/index.ts +215 -215
- package/src/toast-store.svelte.ts +246 -246
- package/src/toast-store.test.ts +147 -147
- package/src/ui-buttons.test.ts +144 -144
- package/src/ui-inputs.test.ts +118 -118
- package/src/ui-range.test.ts +70 -70
- package/src/ui-selection.test.ts +155 -155
- package/src/ui-tier1.test.ts +142 -142
- package/src/virtual.test.ts +88 -88
- package/src/virtualization/column-virtualizer.test.ts +27 -27
- package/src/virtualization/column-virtualizer.ts +30 -30
- package/src/virtualization/svelte-virtualizer.svelte.ts +26 -26
- package/src/virtualization/types.ts +30 -30
- package/src/virtualization/virtualizer.test.ts +47 -47
- package/src/virtualization/virtualizer.ts +296 -296
- package/themes/ember.css +71 -71
- package/dist/cdn/GridMenus-BzxEYNtW.js +0 -421
- package/dist/cdn/GridMenus-Dr-nGEXn.js +0 -417
package/src/editor-contract.ts
CHANGED
|
@@ -1,157 +1,157 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* The shared "editor contract" for the SvGrid UI kit.
|
|
3
|
-
*
|
|
4
|
-
* Every value-bearing editor (inputs, selects, pickers) accepts this common set
|
|
5
|
-
* of props so forms, validation, accessibility, direction (RTL) and localization
|
|
6
|
-
* behave IDENTICALLY across the kit - the same spirit as the grid's headless
|
|
7
|
-
* core, applied to the editors. Components spread their own `value` / options /
|
|
8
|
-
* behavior on top of this base.
|
|
9
|
-
*
|
|
10
|
-
* Framework-free (no Svelte, no DOM) so it can be unit-tested and reused.
|
|
11
|
-
*/
|
|
12
|
-
|
|
13
|
-
export type EditorSize = 'sm' | 'md' | 'lg'
|
|
14
|
-
|
|
15
|
-
/**
|
|
16
|
-
* A small action button rendered inside a framed field (via `SvField`'s
|
|
17
|
-
* `actions`) - the generalized form of the clear / reveal buttons, for a lookup,
|
|
18
|
-
* a generate, a copy, etc. `icon` is a Svelte snippet; when absent the `label`
|
|
19
|
-
* text is shown. (Type-only Svelte import, so this module stays runtime-free.)
|
|
20
|
-
*/
|
|
21
|
-
export type EditorAction = {
|
|
22
|
-
/** Accessible name + tooltip for the button. */
|
|
23
|
-
label: string
|
|
24
|
-
/** Invoked when the button is pressed. */
|
|
25
|
-
onClick: () => void
|
|
26
|
-
/** Optional icon snippet; falls back to the `label` text. */
|
|
27
|
-
icon?: import('svelte').Snippet
|
|
28
|
-
disabled?: boolean
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
/** Text direction. `'auto'` defers to the surrounding document/CSS. */
|
|
32
|
-
export type EditorDir = 'ltr' | 'rtl' | 'auto'
|
|
33
|
-
|
|
34
|
-
/** Props shared by every value-bearing editor in the kit. */
|
|
35
|
-
export type SvEditorProps = {
|
|
36
|
-
/** Disable interaction + form submission. */
|
|
37
|
-
disabled?: boolean
|
|
38
|
-
/** Read-only: the value is shown but not editable. */
|
|
39
|
-
readonly?: boolean
|
|
40
|
-
/** Required for validation (adds `aria-required` + participates in validity). */
|
|
41
|
-
required?: boolean
|
|
42
|
-
/** Marks the control invalid (`aria-invalid` + error styling). */
|
|
43
|
-
invalid?: boolean
|
|
44
|
-
/** Error message; when set it is announced via `aria-describedby` and shown. */
|
|
45
|
-
error?: string
|
|
46
|
-
/** Visible field label, rendered above the control and wired via `for`/`id`. */
|
|
47
|
-
label?: string
|
|
48
|
-
/** Helper text shown under the control and announced via `aria-describedby`. */
|
|
49
|
-
hint?: string
|
|
50
|
-
/** Control size / density. */
|
|
51
|
-
size?: EditorSize
|
|
52
|
-
/**
|
|
53
|
-
* Text direction. `'rtl'` mirrors layout for Arabic/Hebrew/etc.; `'auto'` (the
|
|
54
|
-
* default) inherits from the surrounding document so a page-level `dir` wins.
|
|
55
|
-
*/
|
|
56
|
-
dir?: EditorDir
|
|
57
|
-
/** Form field name; the editor emits a hidden input carrying its value. */
|
|
58
|
-
name?: string
|
|
59
|
-
/** Root/control element id (the label/hint/error ids derive from it). */
|
|
60
|
-
id?: string
|
|
61
|
-
/** Accessible name when there is no visible `label`. */
|
|
62
|
-
ariaLabel?: string
|
|
63
|
-
/** Busy state - shows a spinner (e.g. while an async value/validation resolves). */
|
|
64
|
-
loading?: boolean
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
/**
|
|
68
|
-
* The interaction surface an editor exposes when embedded as a grid cell editor.
|
|
69
|
-
* Standalone usage ignores these; the grid supplies them so every editor shares
|
|
70
|
-
* one commit / cancel / move contract (Enter commits, Escape cancels, Tab moves)
|
|
71
|
-
* instead of each cell-editor re-implementing key handling. Consumed in Phase 2
|
|
72
|
-
* (the editor registry).
|
|
73
|
-
*/
|
|
74
|
-
export type EditorInteraction<V = unknown> = {
|
|
75
|
-
/** Commit the current value and stop editing (Enter, option pick, blur-commit). */
|
|
76
|
-
onCommit?: (value: V) => void
|
|
77
|
-
/** Abandon the edit and restore the previous value (Escape). */
|
|
78
|
-
onCancel?: () => void
|
|
79
|
-
/** Commit, then move to the adjacent cell (Tab = 1, Shift+Tab = -1). */
|
|
80
|
-
onCommitAndMove?: (value: V, direction: 1 | -1) => void
|
|
81
|
-
/** Ask the surrounding popover/panel to close without committing. */
|
|
82
|
-
onRequestClose?: () => void
|
|
83
|
-
/** True while mounted inside a grid cell (lets an editor tune autofocus etc.). */
|
|
84
|
-
inCell?: boolean
|
|
85
|
-
}
|
|
86
|
-
|
|
87
|
-
/** Stable DOM id for an editor's error text, for `aria-describedby` wiring. */
|
|
88
|
-
export const editorErrorId = (id?: string): string | undefined => (id ? `${id}__error` : undefined)
|
|
89
|
-
|
|
90
|
-
/** Stable DOM id for an editor's hint text, for `aria-describedby` wiring. */
|
|
91
|
-
export const editorHintId = (id?: string): string | undefined => (id ? `${id}__hint` : undefined)
|
|
92
|
-
|
|
93
|
-
let _autoId = 0
|
|
94
|
-
/**
|
|
95
|
-
* Generate a stable-per-instance element id. Call ONCE per component instance
|
|
96
|
-
* (e.g. `const uid = provided ?? nextEditorId()`) so label/hint/error wiring
|
|
97
|
-
* always has an anchor even when the consumer passes no `id`.
|
|
98
|
-
*/
|
|
99
|
-
export const nextEditorId = (prefix = 'sv-ed'): string => `${prefix}-${_autoId++}`
|
|
100
|
-
|
|
101
|
-
/** A subset of {@link SvEditorProps} that drives ARIA on the focusable control. */
|
|
102
|
-
export type EditorAriaState = Pick<
|
|
103
|
-
SvEditorProps,
|
|
104
|
-
'id' | 'invalid' | 'required' | 'error' | 'hint' | 'ariaLabel'
|
|
105
|
-
>
|
|
106
|
-
|
|
107
|
-
/**
|
|
108
|
-
* ARIA attributes for the focusable control of an editor, derived from its state.
|
|
109
|
-
* Spread onto the input/button/combobox:
|
|
110
|
-
* `<input {...editorAria({ id, invalid, required, error, hint, ariaLabel })} />`
|
|
111
|
-
*
|
|
112
|
-
* `aria-describedby` points at the error text (when invalid) and/or the hint
|
|
113
|
-
* text - both ids derive from `id`, so pass a stable `id` (see {@link nextEditorId}).
|
|
114
|
-
* Undefined values are omitted by Svelte, so unset props add no attributes.
|
|
115
|
-
*/
|
|
116
|
-
export function editorAria(state: EditorAriaState): {
|
|
117
|
-
'aria-invalid': 'true' | undefined
|
|
118
|
-
'aria-required': 'true' | undefined
|
|
119
|
-
'aria-describedby': string | undefined
|
|
120
|
-
'aria-label': string | undefined
|
|
121
|
-
} {
|
|
122
|
-
const described = [
|
|
123
|
-
state.error ? editorErrorId(state.id) : undefined,
|
|
124
|
-
state.hint ? editorHintId(state.id) : undefined,
|
|
125
|
-
].filter(Boolean)
|
|
126
|
-
return {
|
|
127
|
-
'aria-invalid': state.invalid ? 'true' : undefined,
|
|
128
|
-
'aria-required': state.required ? 'true' : undefined,
|
|
129
|
-
'aria-describedby': described.length ? described.join(' ') : undefined,
|
|
130
|
-
'aria-label': state.ariaLabel,
|
|
131
|
-
}
|
|
132
|
-
}
|
|
133
|
-
|
|
134
|
-
/**
|
|
135
|
-
* Merge a component's default message strings with a consumer's `messages`
|
|
136
|
-
* override, so every editor can be fully localized from the outside.
|
|
137
|
-
*
|
|
138
|
-
* ```ts
|
|
139
|
-
* const M = { clear: 'Clear', noResults: 'No results' }
|
|
140
|
-
* const messages = resolveMessages(M, props.messages) // Partial override
|
|
141
|
-
* ```
|
|
142
|
-
*
|
|
143
|
-
* Undefined/empty overrides fall back to the default, so a partial `messages`
|
|
144
|
-
* object only replaces the keys it sets.
|
|
145
|
-
*/
|
|
146
|
-
export function resolveMessages<T extends Record<string, string>>(
|
|
147
|
-
defaults: T,
|
|
148
|
-
overrides?: Partial<T> | null,
|
|
149
|
-
): T {
|
|
150
|
-
if (!overrides) return defaults
|
|
151
|
-
const out = { ...defaults }
|
|
152
|
-
for (const k in overrides) {
|
|
153
|
-
const v = overrides[k]
|
|
154
|
-
if (v != null && v !== '') out[k] = v as T[Extract<keyof T, string>]
|
|
155
|
-
}
|
|
156
|
-
return out
|
|
157
|
-
}
|
|
1
|
+
/**
|
|
2
|
+
* The shared "editor contract" for the SvGrid UI kit.
|
|
3
|
+
*
|
|
4
|
+
* Every value-bearing editor (inputs, selects, pickers) accepts this common set
|
|
5
|
+
* of props so forms, validation, accessibility, direction (RTL) and localization
|
|
6
|
+
* behave IDENTICALLY across the kit - the same spirit as the grid's headless
|
|
7
|
+
* core, applied to the editors. Components spread their own `value` / options /
|
|
8
|
+
* behavior on top of this base.
|
|
9
|
+
*
|
|
10
|
+
* Framework-free (no Svelte, no DOM) so it can be unit-tested and reused.
|
|
11
|
+
*/
|
|
12
|
+
|
|
13
|
+
export type EditorSize = 'sm' | 'md' | 'lg'
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* A small action button rendered inside a framed field (via `SvField`'s
|
|
17
|
+
* `actions`) - the generalized form of the clear / reveal buttons, for a lookup,
|
|
18
|
+
* a generate, a copy, etc. `icon` is a Svelte snippet; when absent the `label`
|
|
19
|
+
* text is shown. (Type-only Svelte import, so this module stays runtime-free.)
|
|
20
|
+
*/
|
|
21
|
+
export type EditorAction = {
|
|
22
|
+
/** Accessible name + tooltip for the button. */
|
|
23
|
+
label: string
|
|
24
|
+
/** Invoked when the button is pressed. */
|
|
25
|
+
onClick: () => void
|
|
26
|
+
/** Optional icon snippet; falls back to the `label` text. */
|
|
27
|
+
icon?: import('svelte').Snippet
|
|
28
|
+
disabled?: boolean
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/** Text direction. `'auto'` defers to the surrounding document/CSS. */
|
|
32
|
+
export type EditorDir = 'ltr' | 'rtl' | 'auto'
|
|
33
|
+
|
|
34
|
+
/** Props shared by every value-bearing editor in the kit. */
|
|
35
|
+
export type SvEditorProps = {
|
|
36
|
+
/** Disable interaction + form submission. */
|
|
37
|
+
disabled?: boolean
|
|
38
|
+
/** Read-only: the value is shown but not editable. */
|
|
39
|
+
readonly?: boolean
|
|
40
|
+
/** Required for validation (adds `aria-required` + participates in validity). */
|
|
41
|
+
required?: boolean
|
|
42
|
+
/** Marks the control invalid (`aria-invalid` + error styling). */
|
|
43
|
+
invalid?: boolean
|
|
44
|
+
/** Error message; when set it is announced via `aria-describedby` and shown. */
|
|
45
|
+
error?: string
|
|
46
|
+
/** Visible field label, rendered above the control and wired via `for`/`id`. */
|
|
47
|
+
label?: string
|
|
48
|
+
/** Helper text shown under the control and announced via `aria-describedby`. */
|
|
49
|
+
hint?: string
|
|
50
|
+
/** Control size / density. */
|
|
51
|
+
size?: EditorSize
|
|
52
|
+
/**
|
|
53
|
+
* Text direction. `'rtl'` mirrors layout for Arabic/Hebrew/etc.; `'auto'` (the
|
|
54
|
+
* default) inherits from the surrounding document so a page-level `dir` wins.
|
|
55
|
+
*/
|
|
56
|
+
dir?: EditorDir
|
|
57
|
+
/** Form field name; the editor emits a hidden input carrying its value. */
|
|
58
|
+
name?: string
|
|
59
|
+
/** Root/control element id (the label/hint/error ids derive from it). */
|
|
60
|
+
id?: string
|
|
61
|
+
/** Accessible name when there is no visible `label`. */
|
|
62
|
+
ariaLabel?: string
|
|
63
|
+
/** Busy state - shows a spinner (e.g. while an async value/validation resolves). */
|
|
64
|
+
loading?: boolean
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* The interaction surface an editor exposes when embedded as a grid cell editor.
|
|
69
|
+
* Standalone usage ignores these; the grid supplies them so every editor shares
|
|
70
|
+
* one commit / cancel / move contract (Enter commits, Escape cancels, Tab moves)
|
|
71
|
+
* instead of each cell-editor re-implementing key handling. Consumed in Phase 2
|
|
72
|
+
* (the editor registry).
|
|
73
|
+
*/
|
|
74
|
+
export type EditorInteraction<V = unknown> = {
|
|
75
|
+
/** Commit the current value and stop editing (Enter, option pick, blur-commit). */
|
|
76
|
+
onCommit?: (value: V) => void
|
|
77
|
+
/** Abandon the edit and restore the previous value (Escape). */
|
|
78
|
+
onCancel?: () => void
|
|
79
|
+
/** Commit, then move to the adjacent cell (Tab = 1, Shift+Tab = -1). */
|
|
80
|
+
onCommitAndMove?: (value: V, direction: 1 | -1) => void
|
|
81
|
+
/** Ask the surrounding popover/panel to close without committing. */
|
|
82
|
+
onRequestClose?: () => void
|
|
83
|
+
/** True while mounted inside a grid cell (lets an editor tune autofocus etc.). */
|
|
84
|
+
inCell?: boolean
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
/** Stable DOM id for an editor's error text, for `aria-describedby` wiring. */
|
|
88
|
+
export const editorErrorId = (id?: string): string | undefined => (id ? `${id}__error` : undefined)
|
|
89
|
+
|
|
90
|
+
/** Stable DOM id for an editor's hint text, for `aria-describedby` wiring. */
|
|
91
|
+
export const editorHintId = (id?: string): string | undefined => (id ? `${id}__hint` : undefined)
|
|
92
|
+
|
|
93
|
+
let _autoId = 0
|
|
94
|
+
/**
|
|
95
|
+
* Generate a stable-per-instance element id. Call ONCE per component instance
|
|
96
|
+
* (e.g. `const uid = provided ?? nextEditorId()`) so label/hint/error wiring
|
|
97
|
+
* always has an anchor even when the consumer passes no `id`.
|
|
98
|
+
*/
|
|
99
|
+
export const nextEditorId = (prefix = 'sv-ed'): string => `${prefix}-${_autoId++}`
|
|
100
|
+
|
|
101
|
+
/** A subset of {@link SvEditorProps} that drives ARIA on the focusable control. */
|
|
102
|
+
export type EditorAriaState = Pick<
|
|
103
|
+
SvEditorProps,
|
|
104
|
+
'id' | 'invalid' | 'required' | 'error' | 'hint' | 'ariaLabel'
|
|
105
|
+
>
|
|
106
|
+
|
|
107
|
+
/**
|
|
108
|
+
* ARIA attributes for the focusable control of an editor, derived from its state.
|
|
109
|
+
* Spread onto the input/button/combobox:
|
|
110
|
+
* `<input {...editorAria({ id, invalid, required, error, hint, ariaLabel })} />`
|
|
111
|
+
*
|
|
112
|
+
* `aria-describedby` points at the error text (when invalid) and/or the hint
|
|
113
|
+
* text - both ids derive from `id`, so pass a stable `id` (see {@link nextEditorId}).
|
|
114
|
+
* Undefined values are omitted by Svelte, so unset props add no attributes.
|
|
115
|
+
*/
|
|
116
|
+
export function editorAria(state: EditorAriaState): {
|
|
117
|
+
'aria-invalid': 'true' | undefined
|
|
118
|
+
'aria-required': 'true' | undefined
|
|
119
|
+
'aria-describedby': string | undefined
|
|
120
|
+
'aria-label': string | undefined
|
|
121
|
+
} {
|
|
122
|
+
const described = [
|
|
123
|
+
state.error ? editorErrorId(state.id) : undefined,
|
|
124
|
+
state.hint ? editorHintId(state.id) : undefined,
|
|
125
|
+
].filter(Boolean)
|
|
126
|
+
return {
|
|
127
|
+
'aria-invalid': state.invalid ? 'true' : undefined,
|
|
128
|
+
'aria-required': state.required ? 'true' : undefined,
|
|
129
|
+
'aria-describedby': described.length ? described.join(' ') : undefined,
|
|
130
|
+
'aria-label': state.ariaLabel,
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
/**
|
|
135
|
+
* Merge a component's default message strings with a consumer's `messages`
|
|
136
|
+
* override, so every editor can be fully localized from the outside.
|
|
137
|
+
*
|
|
138
|
+
* ```ts
|
|
139
|
+
* const M = { clear: 'Clear', noResults: 'No results' }
|
|
140
|
+
* const messages = resolveMessages(M, props.messages) // Partial override
|
|
141
|
+
* ```
|
|
142
|
+
*
|
|
143
|
+
* Undefined/empty overrides fall back to the default, so a partial `messages`
|
|
144
|
+
* object only replaces the keys it sets.
|
|
145
|
+
*/
|
|
146
|
+
export function resolveMessages<T extends Record<string, string>>(
|
|
147
|
+
defaults: T,
|
|
148
|
+
overrides?: Partial<T> | null,
|
|
149
|
+
): T {
|
|
150
|
+
if (!overrides) return defaults
|
|
151
|
+
const out = { ...defaults }
|
|
152
|
+
for (const k in overrides) {
|
|
153
|
+
const v = overrides[k]
|
|
154
|
+
if (v != null && v !== '') out[k] = v as T[Extract<keyof T, string>]
|
|
155
|
+
}
|
|
156
|
+
return out
|
|
157
|
+
}
|
|
@@ -1,126 +1,126 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* The free CSV / TSV / JSON export + copy-to-clipboard now on the grid API.
|
|
3
|
-
* Mounts a real <SvGrid /> and drives api.exportCsv/exportTsv/exportJson/
|
|
4
|
-
* copyToClipboard with download:false so nothing hits the DOM download path.
|
|
5
|
-
*/
|
|
6
|
-
import { afterEach, describe, expect, it, vi } from 'vitest'
|
|
7
|
-
import { mount, unmount } from 'svelte'
|
|
8
|
-
import SvGrid from './SvGrid.svelte'
|
|
9
|
-
import {
|
|
10
|
-
columnFilteringFeature,
|
|
11
|
-
rowSelectionFeature,
|
|
12
|
-
rowSortingFeature,
|
|
13
|
-
tableFeatures,
|
|
14
|
-
} from './index'
|
|
15
|
-
import type { ColumnDef, SvGridApi } from './index'
|
|
16
|
-
|
|
17
|
-
type Row = { id: number; name: string; price: number; when: string }
|
|
18
|
-
const rows: Row[] = [
|
|
19
|
-
{ id: 1, name: 'ACME, Inc', price: 1234.5, when: '2026-03-04' },
|
|
20
|
-
{ id: 2, name: 'Globex', price: 20, when: '2026-06-01' },
|
|
21
|
-
]
|
|
22
|
-
const columns: ColumnDef<any, Row>[] = [
|
|
23
|
-
{ field: 'name', header: 'Company', width: 180 },
|
|
24
|
-
{ field: 'price', header: 'Price', width: 120, align: 'right', format: { type: 'currency', currency: 'USD' } },
|
|
25
|
-
{ field: 'when', header: 'Date', width: 120 }, // plain string, no format (deterministic)
|
|
26
|
-
]
|
|
27
|
-
|
|
28
|
-
const features = tableFeatures({ columnFilteringFeature, rowSortingFeature, rowSelectionFeature })
|
|
29
|
-
|
|
30
|
-
function mountGrid(): Promise<{ api: SvGridApi<any, Row>; destroy: () => void }> {
|
|
31
|
-
return new Promise((resolve, reject) => {
|
|
32
|
-
const target = document.createElement('div')
|
|
33
|
-
document.body.appendChild(target)
|
|
34
|
-
let done = false
|
|
35
|
-
const app = mount(SvGrid, {
|
|
36
|
-
target,
|
|
37
|
-
props: {
|
|
38
|
-
data: rows.map((r) => ({ ...r })),
|
|
39
|
-
columns: columns.map((c) => ({ ...c })),
|
|
40
|
-
features,
|
|
41
|
-
getRowId: (r: Row) => String(r.id),
|
|
42
|
-
rowHeight: 34,
|
|
43
|
-
containerHeight: 400,
|
|
44
|
-
virtualization: false,
|
|
45
|
-
onApiReady(api: SvGridApi<any, Row>) {
|
|
46
|
-
done = true
|
|
47
|
-
resolve({ api, destroy: () => { unmount(app); target.remove() } })
|
|
48
|
-
},
|
|
49
|
-
} as any,
|
|
50
|
-
})
|
|
51
|
-
queueMicrotask(() => { if (!done) reject(new Error('onApiReady never fired')) })
|
|
52
|
-
})
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
let cleanup: (() => void) | null = null
|
|
56
|
-
afterEach(() => { cleanup?.(); cleanup = null; vi.restoreAllMocks() })
|
|
57
|
-
|
|
58
|
-
describe('free grid export: exportCsv', () => {
|
|
59
|
-
it('serializes visible rows with faithful formatted values + a BOM header', async () => {
|
|
60
|
-
const { api, destroy } = await mountGrid()
|
|
61
|
-
cleanup = destroy
|
|
62
|
-
const csv = await api.exportCsv({ download: false })
|
|
63
|
-
const lines = csv.replace(/^/, '').split('\r\n')
|
|
64
|
-
expect(lines[0]).toBe('Company,Price,Date')
|
|
65
|
-
// Formatted as on screen; the comma in "ACME, Inc" AND in "$1,234.50" both
|
|
66
|
-
// force RFC-4180 quoting.
|
|
67
|
-
expect(lines[1]).toBe('"ACME, Inc","$1,234.50",2026-03-04')
|
|
68
|
-
expect(csv.startsWith('')).toBe(true)
|
|
69
|
-
})
|
|
70
|
-
|
|
71
|
-
it('rawValues:true writes the underlying numbers/strings', async () => {
|
|
72
|
-
const { api, destroy } = await mountGrid()
|
|
73
|
-
cleanup = destroy
|
|
74
|
-
const csv = await api.exportCsv({ download: false, rawValues: true, bom: false })
|
|
75
|
-
const lines = csv.split('\r\n')
|
|
76
|
-
expect(lines[1]).toBe('"ACME, Inc",1234.5,2026-03-04')
|
|
77
|
-
})
|
|
78
|
-
|
|
79
|
-
it('honors a column subset in the given order', async () => {
|
|
80
|
-
const { api, destroy } = await mountGrid()
|
|
81
|
-
cleanup = destroy
|
|
82
|
-
const csv = await api.exportCsv({ download: false, bom: false, columns: ['when', 'name'] })
|
|
83
|
-
expect(csv.split('\r\n')[0]).toBe('Date,Company')
|
|
84
|
-
})
|
|
85
|
-
})
|
|
86
|
-
|
|
87
|
-
describe('free grid export: exportTsv / exportJson', () => {
|
|
88
|
-
it('exportTsv is tab-delimited', async () => {
|
|
89
|
-
const { api, destroy } = await mountGrid()
|
|
90
|
-
cleanup = destroy
|
|
91
|
-
const tsv = await api.exportTsv({ download: false, bom: false })
|
|
92
|
-
expect(tsv.split('\r\n')[0]).toBe('Company\tPrice\tDate')
|
|
93
|
-
})
|
|
94
|
-
|
|
95
|
-
it('exportJson emits an array of formatted records', async () => {
|
|
96
|
-
const { api, destroy } = await mountGrid()
|
|
97
|
-
cleanup = destroy
|
|
98
|
-
const json = JSON.parse(await api.exportJson({ download: false }))
|
|
99
|
-
expect(json).toHaveLength(2)
|
|
100
|
-
expect(json[0]).toEqual({ name: 'ACME, Inc', price: '$1,234.50', when: '2026-03-04' })
|
|
101
|
-
})
|
|
102
|
-
})
|
|
103
|
-
|
|
104
|
-
describe('free grid export: copyToClipboard', () => {
|
|
105
|
-
it('writes TSV to the clipboard by default', async () => {
|
|
106
|
-
const writeText = vi.fn().mockResolvedValue(undefined)
|
|
107
|
-
vi.stubGlobal('navigator', { clipboard: { writeText } })
|
|
108
|
-
const { api, destroy } = await mountGrid()
|
|
109
|
-
cleanup = destroy
|
|
110
|
-
const text = await api.copyToClipboard()
|
|
111
|
-
expect(writeText).toHaveBeenCalledOnce()
|
|
112
|
-
expect(text.split('\r\n')[0]).toBe('Company\tPrice\tDate')
|
|
113
|
-
expect(text.startsWith('')).toBe(false) // no BOM on clipboard
|
|
114
|
-
})
|
|
115
|
-
|
|
116
|
-
it('can copy a Markdown table', async () => {
|
|
117
|
-
const writeText = vi.fn().mockResolvedValue(undefined)
|
|
118
|
-
vi.stubGlobal('navigator', { clipboard: { writeText } })
|
|
119
|
-
const { api, destroy } = await mountGrid()
|
|
120
|
-
cleanup = destroy
|
|
121
|
-
const md = await api.copyToClipboard({ format: 'markdown' })
|
|
122
|
-
const lines = md.split('\n')
|
|
123
|
-
expect(lines[0]).toBe('| Company | Price | Date |')
|
|
124
|
-
expect(lines[1]).toBe('| --- | ---: | --- |') // Price is right-aligned
|
|
125
|
-
})
|
|
126
|
-
})
|
|
1
|
+
/**
|
|
2
|
+
* The free CSV / TSV / JSON export + copy-to-clipboard now on the grid API.
|
|
3
|
+
* Mounts a real <SvGrid /> and drives api.exportCsv/exportTsv/exportJson/
|
|
4
|
+
* copyToClipboard with download:false so nothing hits the DOM download path.
|
|
5
|
+
*/
|
|
6
|
+
import { afterEach, describe, expect, it, vi } from 'vitest'
|
|
7
|
+
import { mount, unmount } from 'svelte'
|
|
8
|
+
import SvGrid from './SvGrid.svelte'
|
|
9
|
+
import {
|
|
10
|
+
columnFilteringFeature,
|
|
11
|
+
rowSelectionFeature,
|
|
12
|
+
rowSortingFeature,
|
|
13
|
+
tableFeatures,
|
|
14
|
+
} from './index'
|
|
15
|
+
import type { ColumnDef, SvGridApi } from './index'
|
|
16
|
+
|
|
17
|
+
type Row = { id: number; name: string; price: number; when: string }
|
|
18
|
+
const rows: Row[] = [
|
|
19
|
+
{ id: 1, name: 'ACME, Inc', price: 1234.5, when: '2026-03-04' },
|
|
20
|
+
{ id: 2, name: 'Globex', price: 20, when: '2026-06-01' },
|
|
21
|
+
]
|
|
22
|
+
const columns: ColumnDef<any, Row>[] = [
|
|
23
|
+
{ field: 'name', header: 'Company', width: 180 },
|
|
24
|
+
{ field: 'price', header: 'Price', width: 120, align: 'right', format: { type: 'currency', currency: 'USD' } },
|
|
25
|
+
{ field: 'when', header: 'Date', width: 120 }, // plain string, no format (deterministic)
|
|
26
|
+
]
|
|
27
|
+
|
|
28
|
+
const features = tableFeatures({ columnFilteringFeature, rowSortingFeature, rowSelectionFeature })
|
|
29
|
+
|
|
30
|
+
function mountGrid(): Promise<{ api: SvGridApi<any, Row>; destroy: () => void }> {
|
|
31
|
+
return new Promise((resolve, reject) => {
|
|
32
|
+
const target = document.createElement('div')
|
|
33
|
+
document.body.appendChild(target)
|
|
34
|
+
let done = false
|
|
35
|
+
const app = mount(SvGrid, {
|
|
36
|
+
target,
|
|
37
|
+
props: {
|
|
38
|
+
data: rows.map((r) => ({ ...r })),
|
|
39
|
+
columns: columns.map((c) => ({ ...c })),
|
|
40
|
+
features,
|
|
41
|
+
getRowId: (r: Row) => String(r.id),
|
|
42
|
+
rowHeight: 34,
|
|
43
|
+
containerHeight: 400,
|
|
44
|
+
virtualization: false,
|
|
45
|
+
onApiReady(api: SvGridApi<any, Row>) {
|
|
46
|
+
done = true
|
|
47
|
+
resolve({ api, destroy: () => { unmount(app); target.remove() } })
|
|
48
|
+
},
|
|
49
|
+
} as any,
|
|
50
|
+
})
|
|
51
|
+
queueMicrotask(() => { if (!done) reject(new Error('onApiReady never fired')) })
|
|
52
|
+
})
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
let cleanup: (() => void) | null = null
|
|
56
|
+
afterEach(() => { cleanup?.(); cleanup = null; vi.restoreAllMocks() })
|
|
57
|
+
|
|
58
|
+
describe('free grid export: exportCsv', () => {
|
|
59
|
+
it('serializes visible rows with faithful formatted values + a BOM header', async () => {
|
|
60
|
+
const { api, destroy } = await mountGrid()
|
|
61
|
+
cleanup = destroy
|
|
62
|
+
const csv = await api.exportCsv({ download: false })
|
|
63
|
+
const lines = csv.replace(/^/, '').split('\r\n')
|
|
64
|
+
expect(lines[0]).toBe('Company,Price,Date')
|
|
65
|
+
// Formatted as on screen; the comma in "ACME, Inc" AND in "$1,234.50" both
|
|
66
|
+
// force RFC-4180 quoting.
|
|
67
|
+
expect(lines[1]).toBe('"ACME, Inc","$1,234.50",2026-03-04')
|
|
68
|
+
expect(csv.startsWith('')).toBe(true)
|
|
69
|
+
})
|
|
70
|
+
|
|
71
|
+
it('rawValues:true writes the underlying numbers/strings', async () => {
|
|
72
|
+
const { api, destroy } = await mountGrid()
|
|
73
|
+
cleanup = destroy
|
|
74
|
+
const csv = await api.exportCsv({ download: false, rawValues: true, bom: false })
|
|
75
|
+
const lines = csv.split('\r\n')
|
|
76
|
+
expect(lines[1]).toBe('"ACME, Inc",1234.5,2026-03-04')
|
|
77
|
+
})
|
|
78
|
+
|
|
79
|
+
it('honors a column subset in the given order', async () => {
|
|
80
|
+
const { api, destroy } = await mountGrid()
|
|
81
|
+
cleanup = destroy
|
|
82
|
+
const csv = await api.exportCsv({ download: false, bom: false, columns: ['when', 'name'] })
|
|
83
|
+
expect(csv.split('\r\n')[0]).toBe('Date,Company')
|
|
84
|
+
})
|
|
85
|
+
})
|
|
86
|
+
|
|
87
|
+
describe('free grid export: exportTsv / exportJson', () => {
|
|
88
|
+
it('exportTsv is tab-delimited', async () => {
|
|
89
|
+
const { api, destroy } = await mountGrid()
|
|
90
|
+
cleanup = destroy
|
|
91
|
+
const tsv = await api.exportTsv({ download: false, bom: false })
|
|
92
|
+
expect(tsv.split('\r\n')[0]).toBe('Company\tPrice\tDate')
|
|
93
|
+
})
|
|
94
|
+
|
|
95
|
+
it('exportJson emits an array of formatted records', async () => {
|
|
96
|
+
const { api, destroy } = await mountGrid()
|
|
97
|
+
cleanup = destroy
|
|
98
|
+
const json = JSON.parse(await api.exportJson({ download: false }))
|
|
99
|
+
expect(json).toHaveLength(2)
|
|
100
|
+
expect(json[0]).toEqual({ name: 'ACME, Inc', price: '$1,234.50', when: '2026-03-04' })
|
|
101
|
+
})
|
|
102
|
+
})
|
|
103
|
+
|
|
104
|
+
describe('free grid export: copyToClipboard', () => {
|
|
105
|
+
it('writes TSV to the clipboard by default', async () => {
|
|
106
|
+
const writeText = vi.fn().mockResolvedValue(undefined)
|
|
107
|
+
vi.stubGlobal('navigator', { clipboard: { writeText } })
|
|
108
|
+
const { api, destroy } = await mountGrid()
|
|
109
|
+
cleanup = destroy
|
|
110
|
+
const text = await api.copyToClipboard()
|
|
111
|
+
expect(writeText).toHaveBeenCalledOnce()
|
|
112
|
+
expect(text.split('\r\n')[0]).toBe('Company\tPrice\tDate')
|
|
113
|
+
expect(text.startsWith('')).toBe(false) // no BOM on clipboard
|
|
114
|
+
})
|
|
115
|
+
|
|
116
|
+
it('can copy a Markdown table', async () => {
|
|
117
|
+
const writeText = vi.fn().mockResolvedValue(undefined)
|
|
118
|
+
vi.stubGlobal('navigator', { clipboard: { writeText } })
|
|
119
|
+
const { api, destroy } = await mountGrid()
|
|
120
|
+
cleanup = destroy
|
|
121
|
+
const md = await api.copyToClipboard({ format: 'markdown' })
|
|
122
|
+
const lines = md.split('\n')
|
|
123
|
+
expect(lines[0]).toBe('| Company | Price | Date |')
|
|
124
|
+
expect(lines[1]).toBe('| --- | ---: | --- |') // Price is right-aligned
|
|
125
|
+
})
|
|
126
|
+
})
|