@svgrid/grid 2.6.21 → 2.6.22
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/CHANGELOG.md +62 -0
- package/README.md +22 -0
- package/dist/GridMenus.svelte +17 -12
- package/dist/SvGrid.controller.svelte.d.ts +13 -8
- package/dist/SvGrid.controller.svelte.js +150 -72
- package/dist/SvGrid.css +1 -1
- package/dist/SvGrid.svelte +110 -56
- package/dist/SvGrid.types.d.ts +41 -1
- package/dist/cdn/{GridMenus-BfTAKn84.js → GridMenus-BuoBPqxx.js} +137 -132
- package/dist/cdn/GridMenus-n4llxoOI.js +494 -0
- package/dist/cdn/column-resize-DsfNXMom.js +102 -0
- package/dist/cdn/row-resize-BRcimkUT.js +95 -0
- package/dist/cdn/{src-BYq-qyrp.js → src-C9Hihx1W.js} +3456 -3459
- package/dist/cdn/{src-DBel9wRZ.js → src-D1lXwq1l.js} +8283 -8286
- package/dist/cdn/svgrid.js +10 -8
- package/dist/cdn/svgrid.svelte-external.js +10 -8
- package/dist/column-groups.js +1 -1
- package/dist/column-resize.d.ts +46 -0
- package/dist/column-resize.js +205 -0
- package/dist/columns.d.ts +0 -3
- package/dist/columns.js +0 -57
- package/dist/core.d.ts +19 -4
- package/dist/core.js +460 -119
- package/dist/filtering/excel-filters.js +28 -0
- package/dist/group-display.d.ts +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +6 -0
- package/dist/menus.js +1 -1
- package/dist/row-resize.d.ts +11 -0
- package/dist/row-resize.js +7 -1
- package/dist/selection.js +9 -0
- package/dist/spreadsheet.d.ts +1 -1
- package/dist/spreadsheet.js +1 -1
- package/package.json +1 -1
- package/src/GridMenus.svelte +17 -12
- package/src/SvGrid.controller.svelte.ts +155 -74
- package/src/SvGrid.css +1 -1
- package/src/SvGrid.svelte +110 -56
- package/src/SvGrid.types.ts +41 -1
- package/src/column-groups.ts +1 -1
- package/src/column-resize.test.ts +381 -0
- package/src/column-resize.ts +227 -0
- package/src/columns.test.ts +0 -103
- package/src/columns.ts +0 -58
- package/src/core.aggregate.test.ts +134 -0
- package/src/core.filter.test.ts +156 -0
- package/src/core.grouping.test.ts +146 -0
- package/src/core.row-shape.test.ts +119 -0
- package/src/core.rowmodel-cache.test.ts +121 -0
- package/src/core.sort.test.ts +293 -0
- package/src/core.ts +516 -119
- package/src/filtering/excel-filters.ts +30 -0
- package/src/filtering/normalize-fast-path.test.ts +104 -0
- package/src/group-display.ts +1 -1
- package/src/index.ts +12 -1
- package/src/menus.ts +1 -1
- package/src/resize-props.test.ts +361 -0
- package/src/row-resize.test.ts +31 -0
- package/src/row-resize.ts +21 -3
- package/src/selection.ts +9 -0
- package/src/spreadsheet.ts +1 -1
- package/dist/cdn/GridMenus-C3bJd7w8.js +0 -489
|
@@ -49,12 +49,42 @@ export function normalizeForFilter(
|
|
|
49
49
|
locale?: string | ReadonlyArray<string>,
|
|
50
50
|
): string {
|
|
51
51
|
if (!s) return ''
|
|
52
|
+
|
|
53
|
+
// Fast path for pure-ASCII input, which is the overwhelming majority of what
|
|
54
|
+
// a grid filters. Both of the expensive steps are provably no-ops there:
|
|
55
|
+
// ASCII is already NFD-normalised, and the combining-marks block this strips
|
|
56
|
+
// (U+0300..U+036F) contains no ASCII. So lowercasing alone is the same
|
|
57
|
+
// answer, and `normalize-fast-path.test.ts` checks that exhaustively over
|
|
58
|
+
// every ASCII code point rather than taking the argument on trust.
|
|
59
|
+
//
|
|
60
|
+
// Worth the branch: this runs once per cell per filter - 100,000 times for a
|
|
61
|
+
// one-column filter over a 100k grid - and a CPU profile of a browser filter
|
|
62
|
+
// put more time in this function than in any other.
|
|
63
|
+
//
|
|
64
|
+
// Note the locale still routes through toLocaleLowerCase even on the fast
|
|
65
|
+
// path: 'I'.toLocaleLowerCase('tr') is 'ı', so ASCII does NOT imply the
|
|
66
|
+
// locale can be ignored.
|
|
67
|
+
if (isAsciiOnly(s)) {
|
|
68
|
+
return locale ? s.toLocaleLowerCase(locale as string | string[]) : s.toLowerCase()
|
|
69
|
+
}
|
|
70
|
+
|
|
52
71
|
const stripped = s.normalize('NFD').replace(DIACRITIC_RE, '')
|
|
53
72
|
return locale
|
|
54
73
|
? stripped.toLocaleLowerCase(locale as string | string[])
|
|
55
74
|
: stripped.toLowerCase()
|
|
56
75
|
}
|
|
57
76
|
|
|
77
|
+
/**
|
|
78
|
+
* True when every code unit is ASCII. A plain char-code scan, which is far
|
|
79
|
+
* cheaper than the `normalize()` + regex pass it lets us skip.
|
|
80
|
+
*/
|
|
81
|
+
function isAsciiOnly(s: string): boolean {
|
|
82
|
+
for (let i = 0; i < s.length; i++) {
|
|
83
|
+
if (s.charCodeAt(i) > 127) return false
|
|
84
|
+
}
|
|
85
|
+
return true
|
|
86
|
+
}
|
|
87
|
+
|
|
58
88
|
/**
|
|
59
89
|
* Delimiter used to serialise the `in` / `notIn` value list into the single
|
|
60
90
|
* `value` string that the filter model carries.
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Equivalence tests for `normalizeForFilter`'s ASCII fast path.
|
|
3
|
+
*
|
|
4
|
+
* The function NFD-decomposes, strips combining marks, then lowercases. It runs
|
|
5
|
+
* once per cell per filter - 100,000 times for a one-column filter on a 100k
|
|
6
|
+
* grid - and a CPU profile of a browser filter put 15.5% of the whole operation
|
|
7
|
+
* inside it, more than any other single function.
|
|
8
|
+
*
|
|
9
|
+
* For a pure-ASCII string the first two steps are provably no-ops: ASCII is
|
|
10
|
+
* already in NFD, and the combining-marks block (U+0300..U+036F) contains no
|
|
11
|
+
* ASCII. So the fast path returns `lowercase(s)` directly.
|
|
12
|
+
*
|
|
13
|
+
* "Provably" is doing a lot of work in that sentence, so the first test checks
|
|
14
|
+
* it exhaustively over every ASCII code point rather than trusting the argument.
|
|
15
|
+
*/
|
|
16
|
+
import { describe, expect, it } from 'vitest'
|
|
17
|
+
import { normalizeForFilter } from './excel-filters'
|
|
18
|
+
|
|
19
|
+
/** The original implementation, verbatim, as the oracle. */
|
|
20
|
+
const DIACRITIC_RE = /[̀-ͯ]/g
|
|
21
|
+
function reference(s: string, locale?: string | ReadonlyArray<string>): string {
|
|
22
|
+
if (!s) return ''
|
|
23
|
+
const stripped = s.normalize('NFD').replace(DIACRITIC_RE, '')
|
|
24
|
+
return locale
|
|
25
|
+
? stripped.toLocaleLowerCase(locale as string | string[])
|
|
26
|
+
: stripped.toLowerCase()
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
describe('normalizeForFilter - ASCII fast path equivalence', () => {
|
|
30
|
+
it('matches on every single ASCII code point', () => {
|
|
31
|
+
for (let code = 0; code < 128; code++) {
|
|
32
|
+
const ch = String.fromCharCode(code)
|
|
33
|
+
expect(normalizeForFilter(ch), `code point ${code}`).toBe(reference(ch))
|
|
34
|
+
}
|
|
35
|
+
})
|
|
36
|
+
|
|
37
|
+
it('matches on every ASCII code point under a Turkish locale', () => {
|
|
38
|
+
// Turkish is the locale that makes ASCII lowercasing locale-dependent:
|
|
39
|
+
// 'I'.toLocaleLowerCase('tr') is 'ı', not 'i'. The fast path must still
|
|
40
|
+
// route through toLocaleLowerCase rather than assuming ASCII is safe.
|
|
41
|
+
for (let code = 0; code < 128; code++) {
|
|
42
|
+
const ch = String.fromCharCode(code)
|
|
43
|
+
expect(normalizeForFilter(ch, 'tr'), `code point ${code}`).toBe(reference(ch, 'tr'))
|
|
44
|
+
}
|
|
45
|
+
})
|
|
46
|
+
|
|
47
|
+
const CASES: Array<[string, string]> = [
|
|
48
|
+
['empty', ''],
|
|
49
|
+
['plain ascii', 'Hello World'],
|
|
50
|
+
['ascii with digits and punctuation', 'ABC-123_x.y,z!'],
|
|
51
|
+
['precomposed accents', 'café CAFÉ Café'],
|
|
52
|
+
['decomposed accents', 'café'],
|
|
53
|
+
['mixed ascii and accents', 'naive naïve NAÏVE'],
|
|
54
|
+
['german sharp s', 'straße STRASSE'],
|
|
55
|
+
['greek', 'ΣΊΣΥΦΟΣ σίσυφος'],
|
|
56
|
+
['cyrillic', 'Привет МИР'],
|
|
57
|
+
['cjk', '日本語テキスト'],
|
|
58
|
+
['emoji', 'grid 🚀 test'],
|
|
59
|
+
['combining marks alone', '̀́̂'],
|
|
60
|
+
['ascii then combining mark', 'áb'],
|
|
61
|
+
['turkish dotted capital', 'İstanbul ISTANBUL'],
|
|
62
|
+
['ligature', 'file flow'],
|
|
63
|
+
['fullwidth', 'ABC'],
|
|
64
|
+
['nbsp and control chars', 'a b\tc\nd'],
|
|
65
|
+
['long ascii', 'x'.repeat(500)],
|
|
66
|
+
['long with one non-ascii at the end', 'x'.repeat(500) + 'é'],
|
|
67
|
+
]
|
|
68
|
+
|
|
69
|
+
for (const [name, input] of CASES) {
|
|
70
|
+
it(`matches: ${name}`, () => {
|
|
71
|
+
expect(normalizeForFilter(input)).toBe(reference(input))
|
|
72
|
+
})
|
|
73
|
+
it(`matches with locale: ${name}`, () => {
|
|
74
|
+
expect(normalizeForFilter(input, 'tr')).toBe(reference(input, 'tr'))
|
|
75
|
+
expect(normalizeForFilter(input, 'de')).toBe(reference(input, 'de'))
|
|
76
|
+
})
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
it('matches across randomised mixed-script strings', () => {
|
|
80
|
+
let seed = 7
|
|
81
|
+
const rand = () => {
|
|
82
|
+
seed = (seed * 1103515245 + 12345) & 0x7fffffff
|
|
83
|
+
return seed / 0x7fffffff
|
|
84
|
+
}
|
|
85
|
+
const pools = [
|
|
86
|
+
'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 -_.',
|
|
87
|
+
'áéíóúàèìòùâêîôûäëïöüñçÁÉÍÓÚÑÇ',
|
|
88
|
+
'̀́̂̃̈',
|
|
89
|
+
'ΑΒΓΔαβγδ',
|
|
90
|
+
'абвгдАБВГД',
|
|
91
|
+
'日本語中文한국어',
|
|
92
|
+
]
|
|
93
|
+
for (let trial = 0; trial < 300; trial++) {
|
|
94
|
+
let s = ''
|
|
95
|
+
const len = 1 + Math.floor(rand() * 20)
|
|
96
|
+
for (let i = 0; i < len; i++) {
|
|
97
|
+
const pool = pools[Math.floor(rand() * pools.length)]!
|
|
98
|
+
s += pool[Math.floor(rand() * pool.length)]
|
|
99
|
+
}
|
|
100
|
+
expect(normalizeForFilter(s), s).toBe(reference(s))
|
|
101
|
+
expect(normalizeForFilter(s, 'tr'), s).toBe(reference(s, 'tr'))
|
|
102
|
+
}
|
|
103
|
+
})
|
|
104
|
+
})
|
package/src/group-display.ts
CHANGED
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* they are trivially unit-testable and carry no dependency on the grid runtime.
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
|
-
/**
|
|
17
|
+
/** Grouping display variants. */
|
|
18
18
|
export type GroupDisplayType = 'groupRows' | 'singleColumn' | 'multipleColumns'
|
|
19
19
|
|
|
20
20
|
export type GroupFooterOptions<R> = {
|
package/src/index.ts
CHANGED
|
@@ -588,7 +588,13 @@ export {
|
|
|
588
588
|
type CellBorderSpec,
|
|
589
589
|
type BorderSpec,
|
|
590
590
|
} from './spreadsheet'
|
|
591
|
+
// The two resize actions, exported as a matched pair. `<SvGrid>` drives both
|
|
592
|
+
// through the `rowResize` / `columnResize` props - both default OFF, both are
|
|
593
|
+
// turned on by setting them true, and the grid `import()`s the module itself so
|
|
594
|
+
// a grid that leaves them off carries neither. Import them directly only for a
|
|
595
|
+
// headless table, which renders its own rows and headers.
|
|
591
596
|
export { rowResize, type RowResizeOptions } from './row-resize'
|
|
597
|
+
export { columnResize, type ColumnResizeOptions } from './column-resize'
|
|
592
598
|
export { rowDropZone, type RowDragEndEvent, type RowDropZoneOptions } from './row-drag'
|
|
593
599
|
export { resolveColumnTypes, inferCellDataType, type CellDataType } from './column-types'
|
|
594
600
|
export {
|
|
@@ -690,7 +696,12 @@ export { createVirtualizer } from './virtualization/virtualizer'
|
|
|
690
696
|
export { createSvelteVirtualizer } from './virtualization/svelte-virtualizer.svelte'
|
|
691
697
|
export { createColumnVirtualizer } from './virtualization/column-virtualizer'
|
|
692
698
|
export type { VirtualItem, VirtualizerOptions, VirtualizerState } from './virtualization/types'
|
|
693
|
-
export type {
|
|
699
|
+
export type {
|
|
700
|
+
SvGridApi,
|
|
701
|
+
SvGridFilterOperator,
|
|
702
|
+
SvGridViewState,
|
|
703
|
+
SvGridWrapperProps,
|
|
704
|
+
} from './svgrid-wrapper.types'
|
|
694
705
|
export {
|
|
695
706
|
parseEditorValue,
|
|
696
707
|
normalizeEditorOptions,
|
package/src/menus.ts
CHANGED
|
@@ -151,7 +151,7 @@ export function createMenus<
|
|
|
151
151
|
function openChooseColumns(event: MouseEvent) {
|
|
152
152
|
event.stopPropagation();
|
|
153
153
|
// Submenu behavior: keep the parent operations menu open and float the
|
|
154
|
-
// Choose Columns panel out to the right of it
|
|
154
|
+
// Choose Columns panel out to the right of it, submenu-style. Falls
|
|
155
155
|
// back to below the item if the popover would clip the viewport.
|
|
156
156
|
const trigger = event.currentTarget as HTMLElement;
|
|
157
157
|
const menuEl = trigger.closest(".sv-grid-menu") as HTMLElement | null;
|
|
@@ -0,0 +1,361 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The `columnResize` / `rowResize` props, against a REAL mounted `<SvGrid>`.
|
|
3
|
+
*
|
|
4
|
+
* Both default to OFF and both are opt-in, so they are tested together and the
|
|
5
|
+
* last block asserts they behave identically.
|
|
6
|
+
*
|
|
7
|
+
* Two things make "the prop is on" and "the affordance exists" separate claims
|
|
8
|
+
* here, and both are why these tests double-`settle()`:
|
|
9
|
+
*
|
|
10
|
+
* - Neither affordance is rendered by the component. Each is injected by an
|
|
11
|
+
* action through a MutationObserver.
|
|
12
|
+
* - Neither action is imported statically. Both arrive via `import()`, so the
|
|
13
|
+
* handles land a microtask after the first paint.
|
|
14
|
+
*
|
|
15
|
+
* `columnResize` off-by-default is a deliberate behaviour CHANGE - column
|
|
16
|
+
* resizing used to be unconditional - so the assertion pinning that is load
|
|
17
|
+
* bearing, not a restatement of the obvious.
|
|
18
|
+
*
|
|
19
|
+
* jsdom does no layout, so the drag arithmetic is only sanity-checked here; it
|
|
20
|
+
* is covered properly against synthetic DOM in row-resize.test.ts and
|
|
21
|
+
* column-resize.test.ts. What this file checks is the wiring.
|
|
22
|
+
*/
|
|
23
|
+
import { describe, expect, it, beforeEach } from 'vitest'
|
|
24
|
+
import { mount, unmount } from 'svelte'
|
|
25
|
+
import SvGrid from './SvGrid.svelte'
|
|
26
|
+
import { tableFeatures, createCoreRowModel } from './index'
|
|
27
|
+
import type { ColumnDef } from './index'
|
|
28
|
+
|
|
29
|
+
type Row = { id: string; name: string; team: string }
|
|
30
|
+
|
|
31
|
+
const features = tableFeatures({})
|
|
32
|
+
|
|
33
|
+
const rows: Row[] = [
|
|
34
|
+
{ id: 'r1', name: 'Ada Lovelace', team: 'Platform' },
|
|
35
|
+
{ id: 'r2', name: 'Grace Hopper', team: 'Compilers' },
|
|
36
|
+
{ id: 'r3', name: 'Barbara Liskov', team: 'Platform' },
|
|
37
|
+
]
|
|
38
|
+
|
|
39
|
+
const cols: ColumnDef<typeof features, Row>[] = [
|
|
40
|
+
{ field: 'name', header: 'Name', width: 200 },
|
|
41
|
+
{ field: 'team', header: 'Team', width: 140 },
|
|
42
|
+
]
|
|
43
|
+
|
|
44
|
+
const mounted: Array<() => void> = []
|
|
45
|
+
|
|
46
|
+
function mountGrid(extraProps: Record<string, unknown> = {}) {
|
|
47
|
+
const target = document.createElement('div')
|
|
48
|
+
document.body.appendChild(target)
|
|
49
|
+
const app = mount(SvGrid, {
|
|
50
|
+
target,
|
|
51
|
+
props: {
|
|
52
|
+
data: rows,
|
|
53
|
+
columns: cols,
|
|
54
|
+
features,
|
|
55
|
+
_rowModels: { coreRowModel: createCoreRowModel() },
|
|
56
|
+
containerHeight: 300,
|
|
57
|
+
// Virtualization off so every row is in the DOM to be counted.
|
|
58
|
+
virtualization: false,
|
|
59
|
+
columnVirtualization: false,
|
|
60
|
+
...extraProps,
|
|
61
|
+
} as never,
|
|
62
|
+
})
|
|
63
|
+
mounted.push(() => {
|
|
64
|
+
unmount(app)
|
|
65
|
+
target.remove()
|
|
66
|
+
})
|
|
67
|
+
return target
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
/** Let the row model + effects settle before reading the DOM. */
|
|
71
|
+
const settle = () => new Promise((r) => setTimeout(r, 0))
|
|
72
|
+
|
|
73
|
+
beforeEach(() => {
|
|
74
|
+
while (mounted.length) mounted.pop()!()
|
|
75
|
+
document.body.innerHTML = ''
|
|
76
|
+
if (!HTMLElement.prototype.setPointerCapture) {
|
|
77
|
+
HTMLElement.prototype.setPointerCapture = function () {}
|
|
78
|
+
}
|
|
79
|
+
if (!HTMLElement.prototype.releasePointerCapture) {
|
|
80
|
+
HTMLElement.prototype.releasePointerCapture = function () {}
|
|
81
|
+
}
|
|
82
|
+
})
|
|
83
|
+
|
|
84
|
+
const handles = (t: HTMLElement) => t.querySelectorAll('.sv-grid-resize-handle').length
|
|
85
|
+
const strips = (t: HTMLElement) => t.querySelectorAll('.sv-grid-row-resize-handle').length
|
|
86
|
+
|
|
87
|
+
describe('columnResize prop', () => {
|
|
88
|
+
it('injects no handles when the prop is absent', async () => {
|
|
89
|
+
const target = mountGrid()
|
|
90
|
+
await settle()
|
|
91
|
+
await settle()
|
|
92
|
+
// Off by default. Column resizing used to be unconditional, so this is the
|
|
93
|
+
// assertion that pins the deliberate behaviour change.
|
|
94
|
+
expect(handles(target)).toBe(0)
|
|
95
|
+
})
|
|
96
|
+
|
|
97
|
+
it('injects a handle per column when true', async () => {
|
|
98
|
+
const target = mountGrid({ columnResize: true })
|
|
99
|
+
await settle()
|
|
100
|
+
// The action is fetched through import(), so the handles land a tick later
|
|
101
|
+
// than the first paint - a second settle, not a rendering bug.
|
|
102
|
+
await settle()
|
|
103
|
+
expect(handles(target)).toBe(cols.length)
|
|
104
|
+
})
|
|
105
|
+
|
|
106
|
+
it('injects no handles when explicitly false', async () => {
|
|
107
|
+
const target = mountGrid({ columnResize: false })
|
|
108
|
+
await settle()
|
|
109
|
+
await settle()
|
|
110
|
+
expect(handles(target)).toBe(0)
|
|
111
|
+
})
|
|
112
|
+
|
|
113
|
+
it('leaves the headers themselves intact when off', async () => {
|
|
114
|
+
// Only the drag affordance is absent - the column still renders, still
|
|
115
|
+
// sorts, still has its accessible name.
|
|
116
|
+
const target = mountGrid({ columnResize: false })
|
|
117
|
+
await settle()
|
|
118
|
+
expect(target.querySelectorAll('.sv-grid-column').length).toBeGreaterThanOrEqual(cols.length)
|
|
119
|
+
expect(target.textContent).toContain('Name')
|
|
120
|
+
expect(target.textContent).toContain('Team')
|
|
121
|
+
})
|
|
122
|
+
|
|
123
|
+
it('applies a dragged width to the column', async () => {
|
|
124
|
+
const target = mountGrid({ columnResize: true })
|
|
125
|
+
await settle()
|
|
126
|
+
await settle()
|
|
127
|
+
|
|
128
|
+
const handle = target.querySelector<HTMLElement>('.sv-grid-resize-handle')!
|
|
129
|
+
const th = handle.closest<HTMLElement>('th.sv-grid-column')!
|
|
130
|
+
const opts = { bubbles: true, cancelable: true, pointerId: 1 }
|
|
131
|
+
handle.dispatchEvent(new PointerEvent('pointerdown', { ...opts, clientX: 0 } as PointerEventInit))
|
|
132
|
+
window.dispatchEvent(new PointerEvent('pointerup', { ...opts, clientX: 60 } as PointerEventInit))
|
|
133
|
+
await settle()
|
|
134
|
+
|
|
135
|
+
// Name starts at 200 (see `cols`), so a +60 drag lands at 260.
|
|
136
|
+
expect(th.style.width).toContain('260')
|
|
137
|
+
})
|
|
138
|
+
})
|
|
139
|
+
|
|
140
|
+
describe('rowResize prop', () => {
|
|
141
|
+
it('injects no strips when the prop is absent', async () => {
|
|
142
|
+
const target = mountGrid()
|
|
143
|
+
await settle()
|
|
144
|
+
expect(strips(target)).toBe(0)
|
|
145
|
+
})
|
|
146
|
+
|
|
147
|
+
it('injects a strip per body row when on', async () => {
|
|
148
|
+
const target = mountGrid({ rowResize: true })
|
|
149
|
+
await settle()
|
|
150
|
+
// The MutationObserver decorates asynchronously; give it a turn.
|
|
151
|
+
await settle()
|
|
152
|
+
expect(strips(target)).toBe(rows.length)
|
|
153
|
+
})
|
|
154
|
+
|
|
155
|
+
it('works without a gutter column, via the row anchor', async () => {
|
|
156
|
+
// No showRowNumbers, no `sv-row-gutter` cellClass. Before the anchor
|
|
157
|
+
// fallback this rendered zero strips and the prop did nothing at all.
|
|
158
|
+
const target = mountGrid({ rowResize: true })
|
|
159
|
+
await settle()
|
|
160
|
+
await settle()
|
|
161
|
+
const first = target.querySelector<HTMLElement>('.sv-grid-row-resize-handle')
|
|
162
|
+
expect(first).not.toBeNull()
|
|
163
|
+
expect(first!.closest('td')).not.toBeNull()
|
|
164
|
+
})
|
|
165
|
+
|
|
166
|
+
it('gives each strip a keyboard-reachable separator role', async () => {
|
|
167
|
+
const target = mountGrid({ rowResize: true })
|
|
168
|
+
await settle()
|
|
169
|
+
await settle()
|
|
170
|
+
const strip = target.querySelector<HTMLElement>('.sv-grid-row-resize-handle')!
|
|
171
|
+
expect(strip.getAttribute('role')).toBe('separator')
|
|
172
|
+
expect(strip.getAttribute('aria-orientation')).toBe('horizontal')
|
|
173
|
+
expect(strip.tabIndex).toBe(0)
|
|
174
|
+
})
|
|
175
|
+
|
|
176
|
+
it('is suppressed by autoRowHeight, which owns the height itself', async () => {
|
|
177
|
+
// Both want to set the row height. Letting them both run means the next
|
|
178
|
+
// measurement pass silently discards whatever the user dragged.
|
|
179
|
+
const target = mountGrid({ rowResize: true, autoRowHeight: true })
|
|
180
|
+
await settle()
|
|
181
|
+
await settle()
|
|
182
|
+
expect(strips(target)).toBe(0)
|
|
183
|
+
})
|
|
184
|
+
|
|
185
|
+
it('applies a dragged height to the row', async () => {
|
|
186
|
+
const target = mountGrid({ rowResize: true, rowHeight: 30 })
|
|
187
|
+
await settle()
|
|
188
|
+
await settle()
|
|
189
|
+
|
|
190
|
+
const strip = target.querySelector<HTMLElement>('.sv-grid-row-resize-handle')!
|
|
191
|
+
const tr = strip.closest<HTMLTableRowElement>('tr.sv-grid-row')!
|
|
192
|
+
// jsdom reports a zero rect, so the drag needs a real starting height.
|
|
193
|
+
tr.getBoundingClientRect = () =>
|
|
194
|
+
({ height: 30, width: 300, top: 0, left: 0, right: 300, bottom: 30, x: 0, y: 0, toJSON() {} }) as DOMRect
|
|
195
|
+
|
|
196
|
+
const opts = { bubbles: true, cancelable: true, pointerId: 1 }
|
|
197
|
+
strip.dispatchEvent(new PointerEvent('pointerdown', { ...opts, clientY: 0 } as PointerEventInit))
|
|
198
|
+
window.dispatchEvent(new PointerEvent('pointerup', { ...opts, clientY: 44 } as PointerEventInit))
|
|
199
|
+
await settle()
|
|
200
|
+
|
|
201
|
+
expect(tr.style.height).toBe('74px')
|
|
202
|
+
})
|
|
203
|
+
})
|
|
204
|
+
|
|
205
|
+
/**
|
|
206
|
+
* The two props are meant to be interchangeable in every way a consumer can
|
|
207
|
+
* touch them: same import, same shape, same opt-in, same runtime override.
|
|
208
|
+
* Asserted rather than assumed, because they were built at different times and
|
|
209
|
+
* `rowResize` reads through the controller while `columnResize` reads in the
|
|
210
|
+
* view - two paths that could easily drift apart.
|
|
211
|
+
*/
|
|
212
|
+
describe('rowResize / columnResize symmetry', () => {
|
|
213
|
+
it('are exported from the package the same way', async () => {
|
|
214
|
+
const pkg = (await import('./index')) as Record<string, unknown>
|
|
215
|
+
expect(typeof pkg.rowResize).toBe('function')
|
|
216
|
+
expect(typeof pkg.columnResize).toBe('function')
|
|
217
|
+
})
|
|
218
|
+
|
|
219
|
+
it('both default to off', async () => {
|
|
220
|
+
const target = mountGrid()
|
|
221
|
+
await settle()
|
|
222
|
+
await settle()
|
|
223
|
+
expect(handles(target)).toBe(0)
|
|
224
|
+
expect(strips(target)).toBe(0)
|
|
225
|
+
})
|
|
226
|
+
|
|
227
|
+
it('both turn on with an explicit true', async () => {
|
|
228
|
+
const target = mountGrid({ columnResize: true, rowResize: true })
|
|
229
|
+
await settle()
|
|
230
|
+
await settle()
|
|
231
|
+
expect(handles(target)).toBe(cols.length)
|
|
232
|
+
expect(strips(target)).toBe(rows.length)
|
|
233
|
+
})
|
|
234
|
+
|
|
235
|
+
it('both turn on at runtime through api.setOption', async () => {
|
|
236
|
+
// `columnResize` is read in the view and `rowResize` in the controller, but
|
|
237
|
+
// both go through the same override proxy - so both must react here.
|
|
238
|
+
let api: { setOption: (k: string, v: unknown) => void } | null = null
|
|
239
|
+
const target = mountGrid({ onApiReady: (next: unknown) => (api = next as never) })
|
|
240
|
+
await settle()
|
|
241
|
+
expect(handles(target)).toBe(0)
|
|
242
|
+
expect(strips(target)).toBe(0)
|
|
243
|
+
|
|
244
|
+
api!.setOption('columnResize', true)
|
|
245
|
+
api!.setOption('rowResize', true)
|
|
246
|
+
await settle()
|
|
247
|
+
await settle()
|
|
248
|
+
expect(handles(target)).toBe(cols.length)
|
|
249
|
+
expect(strips(target)).toBe(rows.length)
|
|
250
|
+
})
|
|
251
|
+
|
|
252
|
+
it('both turn back off through api.setOption', async () => {
|
|
253
|
+
let api: { setOption: (k: string, v: unknown) => void } | null = null
|
|
254
|
+
const target = mountGrid({
|
|
255
|
+
columnResize: true,
|
|
256
|
+
rowResize: true,
|
|
257
|
+
onApiReady: (next: unknown) => (api = next as never),
|
|
258
|
+
})
|
|
259
|
+
await settle()
|
|
260
|
+
await settle()
|
|
261
|
+
expect(handles(target)).toBe(cols.length)
|
|
262
|
+
expect(strips(target)).toBe(rows.length)
|
|
263
|
+
|
|
264
|
+
api!.setOption('columnResize', false)
|
|
265
|
+
api!.setOption('rowResize', false)
|
|
266
|
+
await settle()
|
|
267
|
+
await settle()
|
|
268
|
+
expect(handles(target)).toBe(0)
|
|
269
|
+
expect(strips(target)).toBe(0)
|
|
270
|
+
})
|
|
271
|
+
})
|
|
272
|
+
|
|
273
|
+
describe('ColumnDef.resizable', () => {
|
|
274
|
+
const mixed = [
|
|
275
|
+
{ field: 'name', header: 'Name', width: 200 },
|
|
276
|
+
{ field: 'team', header: 'Team', width: 140, resizable: false },
|
|
277
|
+
] as ColumnDef<typeof features, Row>[]
|
|
278
|
+
|
|
279
|
+
it('drops the handle for the column that opted out', async () => {
|
|
280
|
+
const target = mountGrid({ columnResize: true, columns: mixed })
|
|
281
|
+
await settle()
|
|
282
|
+
await settle()
|
|
283
|
+
expect(handles(target)).toBe(1)
|
|
284
|
+
const th = target
|
|
285
|
+
.querySelector<HTMLElement>('.sv-grid-resize-handle')!
|
|
286
|
+
.closest<HTMLElement>('th')!
|
|
287
|
+
expect(th.dataset.svgridHeaderCol).toBe('name')
|
|
288
|
+
})
|
|
289
|
+
|
|
290
|
+
it('narrows columnResize rather than enabling anything', async () => {
|
|
291
|
+
// With the grid-wide prop off, `resizable: true` must not bring a handle
|
|
292
|
+
// back - the column option only ever subtracts.
|
|
293
|
+
const target = mountGrid({
|
|
294
|
+
columns: [
|
|
295
|
+
{ field: 'name', header: 'Name', width: 200, resizable: true },
|
|
296
|
+
{ field: 'team', header: 'Team', width: 140 },
|
|
297
|
+
] as ColumnDef<typeof features, Row>[],
|
|
298
|
+
})
|
|
299
|
+
await settle()
|
|
300
|
+
await settle()
|
|
301
|
+
expect(handles(target)).toBe(0)
|
|
302
|
+
})
|
|
303
|
+
|
|
304
|
+
it('leaves every column resizable when none opts out', async () => {
|
|
305
|
+
const target = mountGrid({ columnResize: true })
|
|
306
|
+
await settle()
|
|
307
|
+
await settle()
|
|
308
|
+
expect(handles(target)).toBe(cols.length)
|
|
309
|
+
})
|
|
310
|
+
})
|
|
311
|
+
|
|
312
|
+
describe('rowResize brings in the row header column', () => {
|
|
313
|
+
const gutters = (t: HTMLElement) => t.querySelectorAll('.sv-grid-row-number-cell').length
|
|
314
|
+
|
|
315
|
+
it('shows the row-number gutter when rowResize is on', async () => {
|
|
316
|
+
// The strip lives in the row header, which is where a spreadsheet puts it.
|
|
317
|
+
// Without a gutter there is nothing that reads as a grab target.
|
|
318
|
+
const target = mountGrid({ rowResize: true })
|
|
319
|
+
await settle()
|
|
320
|
+
await settle()
|
|
321
|
+
expect(gutters(target)).toBe(rows.length)
|
|
322
|
+
const strip = target.querySelector<HTMLElement>('.sv-grid-row-resize-handle')!
|
|
323
|
+
expect(strip.closest('.sv-grid-row-number-cell')).not.toBeNull()
|
|
324
|
+
})
|
|
325
|
+
|
|
326
|
+
it('shows no gutter when rowResize is off', async () => {
|
|
327
|
+
const target = mountGrid()
|
|
328
|
+
await settle()
|
|
329
|
+
await settle()
|
|
330
|
+
expect(gutters(target)).toBe(0)
|
|
331
|
+
})
|
|
332
|
+
|
|
333
|
+
it('lets an explicit showRowNumbers={false} win', async () => {
|
|
334
|
+
// Turning the gutter on is a default, not a takeover. The strip falls back
|
|
335
|
+
// to the row's first cell so the prop still does something.
|
|
336
|
+
const target = mountGrid({ rowResize: true, showRowNumbers: false })
|
|
337
|
+
await settle()
|
|
338
|
+
await settle()
|
|
339
|
+
expect(gutters(target)).toBe(0)
|
|
340
|
+
expect(strips(target)).toBe(rows.length)
|
|
341
|
+
const strip = target.querySelector<HTMLElement>('.sv-grid-row-resize-handle')!
|
|
342
|
+
expect(strip.closest('td')).not.toBeNull()
|
|
343
|
+
})
|
|
344
|
+
|
|
345
|
+
it('does not disturb a grid that already asked for the gutter', async () => {
|
|
346
|
+
const target = mountGrid({ rowResize: true, showRowNumbers: true })
|
|
347
|
+
await settle()
|
|
348
|
+
await settle()
|
|
349
|
+
expect(gutters(target)).toBe(rows.length)
|
|
350
|
+
})
|
|
351
|
+
|
|
352
|
+
it('brings no gutter when autoRowHeight has suppressed rowResize', async () => {
|
|
353
|
+
// rowResizeOn is false there, so the gutter would be a column with no
|
|
354
|
+
// purpose - the gate has to follow the resolved state, not the raw prop.
|
|
355
|
+
const target = mountGrid({ rowResize: true, autoRowHeight: true })
|
|
356
|
+
await settle()
|
|
357
|
+
await settle()
|
|
358
|
+
expect(gutters(target)).toBe(0)
|
|
359
|
+
expect(strips(target)).toBe(0)
|
|
360
|
+
})
|
|
361
|
+
})
|
package/src/row-resize.test.ts
CHANGED
|
@@ -130,6 +130,37 @@ describe('rowResize - strip injection', () => {
|
|
|
130
130
|
action.destroy()
|
|
131
131
|
})
|
|
132
132
|
|
|
133
|
+
it("anchor 'row' falls back to the first body cell when there is no gutter", () => {
|
|
134
|
+
// What `<SvGrid rowResize>` relies on: most grids have no row-number
|
|
135
|
+
// column, and without the fallback the prop would be inert on them.
|
|
136
|
+
const { host, rows } = buildGrid([{ gutter: false }, { gutter: false }])
|
|
137
|
+
track(host)
|
|
138
|
+
const action = rowResize(host, { onResize: vi.fn(), anchor: 'row' })
|
|
139
|
+
expect(stripOf(rows[0]!)).not.toBeNull()
|
|
140
|
+
expect(stripOf(rows[1]!)).not.toBeNull()
|
|
141
|
+
// The strip hangs off the row's first cell, since that is all there is.
|
|
142
|
+
expect(stripOf(rows[0]!)!.parentElement).toBe(rows[0]!.querySelector('.sv-grid-cell'))
|
|
143
|
+
action.destroy()
|
|
144
|
+
})
|
|
145
|
+
|
|
146
|
+
it("anchor 'row' still prefers a real gutter when the row has one", () => {
|
|
147
|
+
const { host, rows } = buildGrid([{ gutter: true }])
|
|
148
|
+
track(host)
|
|
149
|
+
const action = rowResize(host, { onResize: vi.fn(), anchor: 'row' })
|
|
150
|
+
expect(stripOf(rows[0]!)!.parentElement).toBe(gutterOf(rows[0]!))
|
|
151
|
+
action.destroy()
|
|
152
|
+
})
|
|
153
|
+
|
|
154
|
+
it("defaults to anchor 'gutter', leaving gutterless rows alone", () => {
|
|
155
|
+
// The exported action's existing contract. Adding the fallback must not
|
|
156
|
+
// start decorating rows for consumers who never asked for it.
|
|
157
|
+
const { host, rows } = buildGrid([{ gutter: false }])
|
|
158
|
+
track(host)
|
|
159
|
+
const action = rowResize(host, { onResize: vi.fn() })
|
|
160
|
+
expect(stripOf(rows[0]!)).toBeNull()
|
|
161
|
+
action.destroy()
|
|
162
|
+
})
|
|
163
|
+
|
|
133
164
|
it('also injects a strip into the built-in row-number gutter (showRowNumbers)', () => {
|
|
134
165
|
// The native gutter cell is `.sv-grid-cell.sv-grid-row-number-cell`, NOT
|
|
135
166
|
// `.sv-row-gutter`; the action must recognise it so `showRowNumbers` grids
|
package/src/row-resize.ts
CHANGED
|
@@ -39,6 +39,17 @@ export type RowResizeOptions = {
|
|
|
39
39
|
max?: number
|
|
40
40
|
/** When true, the action removes its strips and ignores events. */
|
|
41
41
|
disabled?: boolean
|
|
42
|
+
/**
|
|
43
|
+
* Where the drag strip is anchored.
|
|
44
|
+
* - `'gutter'` (default) - only rows that have a row-header gutter cell get
|
|
45
|
+
* a strip: the built-in row-number column (`showRowNumbers`) or a column
|
|
46
|
+
* tagged `cellClass: 'sv-row-gutter'`. Rows without one are skipped, so on
|
|
47
|
+
* a plain grid the action does nothing.
|
|
48
|
+
* - `'row'` - use the gutter when there is one, otherwise fall back to the
|
|
49
|
+
* row's first body cell. This is what `<SvGrid rowResize>` passes, so the
|
|
50
|
+
* prop works without also asking for a gutter column.
|
|
51
|
+
*/
|
|
52
|
+
anchor?: 'gutter' | 'row'
|
|
42
53
|
}
|
|
43
54
|
|
|
44
55
|
type ActiveDrag = {
|
|
@@ -150,9 +161,16 @@ export function rowResize(node: HTMLElement, opts: RowResizeOptions) {
|
|
|
150
161
|
// A row-header gutter cell: either a user column tagged
|
|
151
162
|
// `sv-row-gutter`, or the grid's built-in row-number gutter
|
|
152
163
|
// (`showRowNumbers`), whose cell is `.sv-grid-row-number-cell`.
|
|
153
|
-
const gutter =
|
|
154
|
-
|
|
155
|
-
|
|
164
|
+
const gutter =
|
|
165
|
+
tr.querySelector<HTMLTableCellElement>(
|
|
166
|
+
'.sv-grid-cell.sv-row-gutter, .sv-grid-cell.sv-grid-row-number-cell',
|
|
167
|
+
) ??
|
|
168
|
+
// `anchor: 'row'` - no gutter on this grid, so hang the strip off the
|
|
169
|
+
// first body cell instead. Without this a grid with no row-number
|
|
170
|
+
// column would silently not resize.
|
|
171
|
+
(current.anchor === 'row'
|
|
172
|
+
? tr.querySelector<HTMLTableCellElement>('.sv-grid-cell')
|
|
173
|
+
: null)
|
|
156
174
|
if (!gutter) continue
|
|
157
175
|
if (gutter.querySelector(`:scope > .${STRIP_CLASS}`)) continue
|
|
158
176
|
// Anchor the strip to the gutter cell + allow it to overflow
|
package/src/selection.ts
CHANGED
|
@@ -243,6 +243,15 @@ export function createSelection<
|
|
|
243
243
|
* outline wins on overlap). Returns null when the cell is in no range.
|
|
244
244
|
*/
|
|
245
245
|
function getCellRangeEdges(rowIndex: number, colIndex: number) {
|
|
246
|
+
// Bail before `getSelectionRects()`, which allocates an array and resolves
|
|
247
|
+
// every range. This runs once per rendered CELL on every render - about 250
|
|
248
|
+
// times per frame on a default grid - and with nothing selected it did all
|
|
249
|
+
// that work to return null every time. An anchored active range or a
|
|
250
|
+
// committed one is the only way any rect can exist.
|
|
251
|
+
const active = ctx.selectionRange as SelectionRange | undefined;
|
|
252
|
+
const committed = ctx.selectionRanges as SelectionRange[] | undefined;
|
|
253
|
+
if (!committed?.length && !(active?.anchor && active?.focus)) return null;
|
|
254
|
+
|
|
246
255
|
for (const rect of getSelectionRects()) {
|
|
247
256
|
if (
|
|
248
257
|
rowIndex < rect.minRow ||
|
package/src/spreadsheet.ts
CHANGED
|
@@ -57,7 +57,7 @@ export type SpanColumn<TData = Record<string, unknown>> = {
|
|
|
57
57
|
/**
|
|
58
58
|
* Turn declarative per-column `colSpan` / `rowSpan` callbacks into a
|
|
59
59
|
* `MergeSpec[]` you can hand to `spreadsheetLayout` - so value-driven,
|
|
60
|
-
*
|
|
60
|
+
* Declarative spanning runs on the SAME real colspan/rowspan merge engine
|
|
61
61
|
* instead of a second code path. Recompute after sort/filter (indexes are
|
|
62
62
|
* display-row indexes). A common pattern is "merge runs of equal values":
|
|
63
63
|
*
|