@dxos/lit-grid 0.6.10-main.bbdfaa4 → 0.6.10-staging.014d6d3
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/lib/browser/index.mjs +303 -134
- package/dist/lib/browser/index.mjs.map +4 -4
- package/dist/lib/browser/meta.json +1 -1
- package/dist/types/src/dx-grid.d.ts +42 -10
- package/dist/types/src/dx-grid.d.ts.map +1 -1
- package/dist/types/src/dx-grid.lit-stories.d.ts +6 -4
- package/dist/types/src/dx-grid.lit-stories.d.ts.map +1 -1
- package/dist/types/src/index.d.ts +1 -1
- package/dist/types/src/index.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/dx-grid.lit-stories.ts +30 -7
- package/src/dx-grid.pcss +50 -10
- package/src/dx-grid.ts +353 -126
- package/src/index.ts +1 -1
- package/dist/types/src/position.d.ts +0 -18
- package/dist/types/src/position.d.ts.map +0 -1
- package/src/position.ts +0 -80
package/src/dx-grid.ts
CHANGED
|
@@ -2,23 +2,56 @@
|
|
|
2
2
|
// Copyright 2024 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { LitElement, html
|
|
5
|
+
import { LitElement, html } from 'lit';
|
|
6
6
|
import { customElement, state, property } from 'lit/decorators.js';
|
|
7
7
|
import { ref, createRef, type Ref } from 'lit/directives/ref.js';
|
|
8
8
|
|
|
9
|
-
|
|
9
|
+
/**
|
|
10
|
+
* The size in pixels of the gap between cells
|
|
11
|
+
*/
|
|
12
|
+
const gap = 1;
|
|
10
13
|
|
|
11
|
-
|
|
14
|
+
/**
|
|
15
|
+
* This should be about the width of the `1` numeral so resize is triggered as the row header column’s intrinsic size
|
|
16
|
+
* changes when scrolling vertically.
|
|
17
|
+
*/
|
|
18
|
+
const resizeTolerance = 8;
|
|
12
19
|
|
|
13
|
-
|
|
20
|
+
//
|
|
21
|
+
// `overscan` is the number of columns or rows to render outside of the viewport
|
|
22
|
+
//
|
|
23
|
+
const overscanCol = 1;
|
|
24
|
+
const overscanRow = 1;
|
|
14
25
|
|
|
15
|
-
|
|
26
|
+
//
|
|
27
|
+
// `size`, when suffixed with ‘row’ or ‘col’, are limits on size applied when resizing
|
|
28
|
+
//
|
|
29
|
+
const sizeColMin = 32;
|
|
30
|
+
const sizeColMax = 1024;
|
|
31
|
+
const sizeRowMin = 16;
|
|
32
|
+
const sizeRowMax = 1024;
|
|
33
|
+
|
|
34
|
+
/**
|
|
35
|
+
* Separator for serializing cell position vectors
|
|
36
|
+
*/
|
|
37
|
+
const separator = ',';
|
|
38
|
+
|
|
39
|
+
//
|
|
40
|
+
// A1 notation is the fallback for numbering columns and rows.
|
|
41
|
+
//
|
|
42
|
+
|
|
43
|
+
const colToA1Notation = (col: number): string => {
|
|
44
|
+
return (
|
|
45
|
+
(col >= 26 ? String.fromCharCode('A'.charCodeAt(0) + Math.floor(col / 26) - 1) : '') +
|
|
46
|
+
String.fromCharCode('A'.charCodeAt(0) + (col % 26))
|
|
47
|
+
);
|
|
48
|
+
};
|
|
49
|
+
|
|
50
|
+
const rowToA1Notation = (row: number): string => {
|
|
51
|
+
return `${row + 1}`;
|
|
52
|
+
};
|
|
16
53
|
|
|
17
54
|
export type CellValue = {
|
|
18
|
-
/**
|
|
19
|
-
* The position (or topleft-most of the range) in numeric notation
|
|
20
|
-
*/
|
|
21
|
-
pos: string;
|
|
22
55
|
/**
|
|
23
56
|
* The content value
|
|
24
57
|
*/
|
|
@@ -33,10 +66,39 @@ export type CellValue = {
|
|
|
33
66
|
style?: string;
|
|
34
67
|
};
|
|
35
68
|
|
|
69
|
+
type AxisMeta = {
|
|
70
|
+
size: number;
|
|
71
|
+
description?: string;
|
|
72
|
+
resizeable?: boolean;
|
|
73
|
+
};
|
|
74
|
+
|
|
75
|
+
export type DxGridProps = Pick<DxGrid, 'cells' | 'rows' | 'columns' | 'rowDefault' | 'columnDefault'>;
|
|
76
|
+
|
|
77
|
+
const localChId = (c0: number) => `ch--${c0}`;
|
|
78
|
+
const localRhId = (r0: number) => `rh--${r0}`;
|
|
79
|
+
|
|
80
|
+
const getPage = (axis: string, event: PointerEvent) => (axis === 'col' ? event.pageX : event.pageY);
|
|
81
|
+
|
|
36
82
|
@customElement('dx-grid')
|
|
37
83
|
export class DxGrid extends LitElement {
|
|
38
84
|
@property({ type: Object })
|
|
39
|
-
|
|
85
|
+
rowDefault: AxisMeta = { size: 32 };
|
|
86
|
+
|
|
87
|
+
@property({ type: Object })
|
|
88
|
+
columnDefault: AxisMeta = { size: 180 };
|
|
89
|
+
|
|
90
|
+
@property({ type: Object })
|
|
91
|
+
rows: Record<string, AxisMeta> = {};
|
|
92
|
+
|
|
93
|
+
@property({ type: Object })
|
|
94
|
+
columns: Record<string, AxisMeta> = {};
|
|
95
|
+
|
|
96
|
+
@property({ type: Object })
|
|
97
|
+
cells: Record<string, CellValue> = {};
|
|
98
|
+
|
|
99
|
+
//
|
|
100
|
+
// `pos`, short for ‘position’, is the position in pixels of the viewport from the origin.
|
|
101
|
+
//
|
|
40
102
|
|
|
41
103
|
@state()
|
|
42
104
|
posInline = 0;
|
|
@@ -44,14 +106,136 @@ export class DxGrid extends LitElement {
|
|
|
44
106
|
@state()
|
|
45
107
|
posBlock = 0;
|
|
46
108
|
|
|
109
|
+
//
|
|
110
|
+
// `size` (when not suffixed with ‘row’ or ‘col’, see above) is the size in pixels of the viewport.
|
|
111
|
+
//
|
|
112
|
+
|
|
47
113
|
@state()
|
|
48
114
|
sizeInline = 0;
|
|
49
115
|
|
|
50
116
|
@state()
|
|
51
117
|
sizeBlock = 0;
|
|
52
118
|
|
|
119
|
+
//
|
|
120
|
+
// `overscan` is the amount in pixels to offset the grid content due to the number of overscanned columns or rows.
|
|
121
|
+
//
|
|
122
|
+
|
|
123
|
+
@state()
|
|
124
|
+
overscanInline = 0;
|
|
125
|
+
|
|
126
|
+
@state()
|
|
127
|
+
overscanBlock = 0;
|
|
128
|
+
|
|
129
|
+
//
|
|
130
|
+
// `bin`, not short for anything, is the range in pixels within which virtualization does not need to reassess.
|
|
131
|
+
//
|
|
132
|
+
|
|
133
|
+
@state()
|
|
134
|
+
binInlineMin = 0;
|
|
135
|
+
|
|
136
|
+
@state()
|
|
137
|
+
binInlineMax = this.colSize(0);
|
|
138
|
+
|
|
139
|
+
@state()
|
|
140
|
+
binBlockMin = 0;
|
|
141
|
+
|
|
142
|
+
@state()
|
|
143
|
+
binBlockMax = this.rowSize(0);
|
|
144
|
+
|
|
145
|
+
//
|
|
146
|
+
// `vis`, short for ‘visible’, is the range in numeric index of the columns or rows which should be rendered within
|
|
147
|
+
// the viewport. These start with naïve values that are updated before first contentful render.
|
|
148
|
+
//
|
|
149
|
+
|
|
150
|
+
@state()
|
|
151
|
+
visColMin = 0;
|
|
152
|
+
|
|
153
|
+
@state()
|
|
154
|
+
visColMax = 1;
|
|
155
|
+
|
|
156
|
+
@state()
|
|
157
|
+
visRowMin = 0;
|
|
158
|
+
|
|
159
|
+
@state()
|
|
160
|
+
visRowMax = 1;
|
|
161
|
+
|
|
162
|
+
//
|
|
163
|
+
// `template` is the rendered value of `grid-{axis}-template`.
|
|
164
|
+
//
|
|
53
165
|
@state()
|
|
54
|
-
|
|
166
|
+
templateColumns = `${this.colSize(0)}px`;
|
|
167
|
+
|
|
168
|
+
@state()
|
|
169
|
+
templateRows = `${this.rowSize(0)}px`;
|
|
170
|
+
|
|
171
|
+
//
|
|
172
|
+
// Resize state and handlers
|
|
173
|
+
//
|
|
174
|
+
|
|
175
|
+
@state()
|
|
176
|
+
colSizes: Record<string, number> = {};
|
|
177
|
+
|
|
178
|
+
@state()
|
|
179
|
+
rowSizes: Record<string, number> = {};
|
|
180
|
+
|
|
181
|
+
@state()
|
|
182
|
+
resizing: null | { axis: 'col' | 'row'; page: number; size: number; index: string } = null;
|
|
183
|
+
|
|
184
|
+
handlePointerDown = (event: PointerEvent) => {
|
|
185
|
+
const actionEl = (event.target as HTMLElement)?.closest('[data-dx-grid-action]');
|
|
186
|
+
const action = actionEl?.getAttribute('data-dx-grid-action');
|
|
187
|
+
if (action) {
|
|
188
|
+
if (action.startsWith('resize')) {
|
|
189
|
+
const [resize, index] = action.split(',');
|
|
190
|
+
const [_, axis] = resize.split('-');
|
|
191
|
+
this.resizing = {
|
|
192
|
+
axis: axis as 'col' | 'row',
|
|
193
|
+
size: axis === 'col' ? this.colSize(index) : this.rowSize(index),
|
|
194
|
+
page: getPage(axis, event),
|
|
195
|
+
index,
|
|
196
|
+
};
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
};
|
|
200
|
+
|
|
201
|
+
handlePointerUp = (_event: PointerEvent) => {
|
|
202
|
+
this.resizing = null;
|
|
203
|
+
};
|
|
204
|
+
|
|
205
|
+
handlePointerMove = (event: PointerEvent) => {
|
|
206
|
+
if (this.resizing) {
|
|
207
|
+
const delta = getPage(this.resizing.axis, event) - this.resizing.page;
|
|
208
|
+
if (this.resizing.axis === 'col') {
|
|
209
|
+
const nextSize = Math.max(sizeColMin, Math.min(sizeColMax, this.resizing.size + delta));
|
|
210
|
+
this.colSizes = { ...this.colSizes, [this.resizing.index]: nextSize };
|
|
211
|
+
this.updateVisInline();
|
|
212
|
+
} else {
|
|
213
|
+
const nextSize = Math.max(sizeRowMin, Math.min(sizeRowMax, this.resizing.size + delta));
|
|
214
|
+
this.rowSizes = { ...this.rowSizes, [this.resizing.index]: nextSize };
|
|
215
|
+
this.updateVisBlock();
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
};
|
|
219
|
+
|
|
220
|
+
//
|
|
221
|
+
// Accessors
|
|
222
|
+
//
|
|
223
|
+
|
|
224
|
+
private colSize(c: number | string) {
|
|
225
|
+
return this.colSizes?.[c] ?? this.columnDefault.size;
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
private rowSize(r: number | string) {
|
|
229
|
+
return this.rowSizes?.[r] ?? this.rowDefault.size;
|
|
230
|
+
}
|
|
231
|
+
|
|
232
|
+
private getCell(c: number | string, r: number | string) {
|
|
233
|
+
return this.cells[`${c}${separator}${r}`];
|
|
234
|
+
}
|
|
235
|
+
|
|
236
|
+
//
|
|
237
|
+
// Resize & reposition handlers, observer, ref
|
|
238
|
+
//
|
|
55
239
|
|
|
56
240
|
@state()
|
|
57
241
|
observer = new ResizeObserver((entries) => {
|
|
@@ -59,8 +243,15 @@ export class DxGrid extends LitElement {
|
|
|
59
243
|
inlineSize: 0,
|
|
60
244
|
blockSize: 0,
|
|
61
245
|
};
|
|
62
|
-
|
|
63
|
-
|
|
246
|
+
if (
|
|
247
|
+
Math.abs(inlineSize - this.sizeInline) > resizeTolerance ||
|
|
248
|
+
Math.abs(blockSize - this.sizeBlock) > resizeTolerance
|
|
249
|
+
) {
|
|
250
|
+
// console.info('[updating bounds]', 'resize', [inlineSize - this.sizeInline, blockSize - this.sizeBlock]);
|
|
251
|
+
this.sizeInline = inlineSize;
|
|
252
|
+
this.sizeBlock = blockSize;
|
|
253
|
+
this.updateVis();
|
|
254
|
+
}
|
|
64
255
|
});
|
|
65
256
|
|
|
66
257
|
viewportRef: Ref<HTMLDivElement> = createRef();
|
|
@@ -68,111 +259,135 @@ export class DxGrid extends LitElement {
|
|
|
68
259
|
handleWheel = ({ deltaX, deltaY }: WheelEvent) => {
|
|
69
260
|
this.posInline = Math.max(0, this.posInline + deltaX);
|
|
70
261
|
this.posBlock = Math.max(0, this.posBlock + deltaY);
|
|
262
|
+
if (
|
|
263
|
+
this.posInline >= this.binInlineMin &&
|
|
264
|
+
this.posInline < this.binInlineMax &&
|
|
265
|
+
this.posBlock >= this.binBlockMin &&
|
|
266
|
+
this.posBlock < this.binBlockMax
|
|
267
|
+
) {
|
|
268
|
+
// do nothing
|
|
269
|
+
} else {
|
|
270
|
+
// console.info(
|
|
271
|
+
// '[updating bounds]',
|
|
272
|
+
// 'wheel',
|
|
273
|
+
// [this.binInlineMin, this.posInline, this.binInlineMax],
|
|
274
|
+
// [this.binBlockMin, this.posBlock, this.binBlockMax],
|
|
275
|
+
// );
|
|
276
|
+
this.updateVis();
|
|
277
|
+
}
|
|
71
278
|
};
|
|
72
279
|
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
280
|
+
private updateVisInline() {
|
|
281
|
+
// todo: avoid starting from zero
|
|
282
|
+
let colIndex = 0;
|
|
283
|
+
let pxInline = this.colSize(colIndex);
|
|
284
|
+
|
|
285
|
+
while (pxInline < this.posInline) {
|
|
286
|
+
colIndex += 1;
|
|
287
|
+
pxInline += this.colSize(colIndex) + gap;
|
|
288
|
+
}
|
|
289
|
+
|
|
290
|
+
this.visColMin = colIndex - overscanCol;
|
|
291
|
+
|
|
292
|
+
this.binInlineMin = pxInline - this.colSize(colIndex) - gap;
|
|
293
|
+
this.binInlineMax = pxInline + gap;
|
|
294
|
+
|
|
295
|
+
this.overscanInline =
|
|
296
|
+
[...Array(overscanCol)].reduce((acc, _, c0) => {
|
|
297
|
+
acc += this.colSize(this.visColMin + c0);
|
|
88
298
|
return acc;
|
|
89
|
-
},
|
|
299
|
+
}, 0) +
|
|
300
|
+
gap * (overscanCol - 1);
|
|
301
|
+
|
|
302
|
+
while (pxInline < this.binInlineMax + this.sizeInline) {
|
|
303
|
+
colIndex += 1;
|
|
304
|
+
pxInline += this.colSize(colIndex) + gap;
|
|
90
305
|
}
|
|
91
|
-
}
|
|
92
306
|
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
307
|
+
this.visColMax = colIndex + overscanCol + 1;
|
|
308
|
+
|
|
309
|
+
this.templateColumns = [...Array(this.visColMax - this.visColMin)]
|
|
310
|
+
.map((_, c0) => `${this.colSize(this.visColMin + c0)}px`)
|
|
311
|
+
.join(' ');
|
|
97
312
|
}
|
|
98
313
|
|
|
99
|
-
private
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
}
|
|
118
|
-
return acc;
|
|
119
|
-
},
|
|
120
|
-
{ colExtMin: colVisMin, colExtMax: colVisMax },
|
|
121
|
-
);
|
|
122
|
-
|
|
123
|
-
const { rowExtMin, rowExtMax } = [...Array(colVisMax - colVisMin)].reduce(
|
|
124
|
-
(acc, _, i) => {
|
|
125
|
-
const rowVisMinCell = this.getCell(i + colVisMin, rowVisMin);
|
|
126
|
-
if (rowVisMinCell?.end) {
|
|
127
|
-
const { j: jStart } = posFromNumericNotation(rowVisMinCell.pos);
|
|
128
|
-
acc.rowExtMin = Math.min(acc.rowExtMin, jStart);
|
|
129
|
-
}
|
|
130
|
-
const rowVisMaxCell = this.getCell(i + colVisMin, rowVisMax);
|
|
131
|
-
if (rowVisMaxCell?.end) {
|
|
132
|
-
const { j: jEnd } = posFromNumericNotation(rowVisMaxCell.end);
|
|
133
|
-
acc.rowExtMax = Math.max(acc.rowExtMax, jEnd);
|
|
134
|
-
}
|
|
314
|
+
private updateVisBlock() {
|
|
315
|
+
// todo: avoid starting from zero
|
|
316
|
+
let rowIndex = 0;
|
|
317
|
+
let pxBlock = this.rowSize(rowIndex);
|
|
318
|
+
|
|
319
|
+
while (pxBlock < this.posBlock) {
|
|
320
|
+
rowIndex += 1;
|
|
321
|
+
pxBlock += this.rowSize(rowIndex) + gap;
|
|
322
|
+
}
|
|
323
|
+
|
|
324
|
+
this.visRowMin = rowIndex - overscanRow;
|
|
325
|
+
|
|
326
|
+
this.binBlockMin = pxBlock - this.rowSize(rowIndex) - gap;
|
|
327
|
+
this.binBlockMax = pxBlock + gap;
|
|
328
|
+
|
|
329
|
+
this.overscanBlock =
|
|
330
|
+
[...Array(overscanRow)].reduce((acc, _, r0) => {
|
|
331
|
+
acc += this.rowSize(this.visRowMin + r0);
|
|
135
332
|
return acc;
|
|
136
|
-
},
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
};
|
|
333
|
+
}, 0) +
|
|
334
|
+
gap * (overscanRow - 1);
|
|
335
|
+
|
|
336
|
+
while (pxBlock < this.binBlockMax + this.sizeBlock) {
|
|
337
|
+
rowIndex += 1;
|
|
338
|
+
pxBlock += this.rowSize(rowIndex) + gap;
|
|
339
|
+
}
|
|
340
|
+
|
|
341
|
+
this.visRowMax = rowIndex + overscanRow + 1;
|
|
342
|
+
|
|
343
|
+
this.templateRows = [...Array(this.visRowMax - this.visRowMin)]
|
|
344
|
+
.map((_, r0) => `${this.rowSize(this.visRowMin + r0)}px`)
|
|
345
|
+
.join(' ');
|
|
150
346
|
}
|
|
151
347
|
|
|
152
|
-
|
|
153
|
-
|
|
348
|
+
private updateVis() {
|
|
349
|
+
this.updateVisInline();
|
|
350
|
+
this.updateVisBlock();
|
|
351
|
+
}
|
|
154
352
|
|
|
155
|
-
|
|
156
|
-
|
|
353
|
+
//
|
|
354
|
+
// Render and other lifecycle methods
|
|
355
|
+
//
|
|
157
356
|
|
|
158
|
-
|
|
159
|
-
const
|
|
160
|
-
const
|
|
357
|
+
override render() {
|
|
358
|
+
const visibleCols = this.visColMax - this.visColMin;
|
|
359
|
+
const visibleRows = this.visRowMax - this.visRowMin;
|
|
360
|
+
// TODO NEXT -> ensure offset is using the right components
|
|
361
|
+
const offsetInline = this.binInlineMin - this.posInline - this.overscanInline;
|
|
362
|
+
const offsetBlock = this.binBlockMin - this.posBlock - this.overscanBlock;
|
|
161
363
|
|
|
162
|
-
return html`<div
|
|
364
|
+
return html`<div
|
|
365
|
+
role="none"
|
|
366
|
+
class="dx-grid"
|
|
367
|
+
@pointerdown=${this.handlePointerDown}
|
|
368
|
+
@pointerup=${this.handlePointerUp}
|
|
369
|
+
@pointermove=${this.handlePointerMove}
|
|
370
|
+
>
|
|
163
371
|
<div role="none" class="dx-grid__corner"></div>
|
|
164
372
|
<div role="none" class="dx-grid__columnheader">
|
|
165
373
|
<div
|
|
166
374
|
role="none"
|
|
167
375
|
class="dx-grid__columnheader__content"
|
|
168
|
-
style="transform:translate3d(${offsetInline}px,0,0);grid-template-columns
|
|
376
|
+
style="transform:translate3d(${offsetInline}px,0,0);grid-template-columns:${this.templateColumns};"
|
|
169
377
|
>
|
|
170
|
-
${[...Array(visibleCols)].map((_,
|
|
378
|
+
${[...Array(visibleCols)].map((_, c0) => {
|
|
379
|
+
const c = this.visColMin + c0;
|
|
171
380
|
return html`<div
|
|
172
|
-
role="
|
|
173
|
-
|
|
381
|
+
role="columnheader"
|
|
382
|
+
?inert=${c < 0}
|
|
383
|
+
style="inline-size:${this.colSize(c)}px;block-size:${this.rowDefault.size}px;grid-column:${c0 + 1}/${c0 +
|
|
384
|
+
2};"
|
|
174
385
|
>
|
|
175
|
-
|
|
386
|
+
<span id=${localChId(c0)}>${colToA1Notation(c)}</span>
|
|
387
|
+
${(this.columns[c]?.resizeable ?? this.columnDefault.resizeable) &&
|
|
388
|
+
html`<button class="dx-grid__resize-handle" data-dx-grid-action=${`resize-col,${c}`}>
|
|
389
|
+
<span class="sr-only">Resize</span>
|
|
390
|
+
</button>`}
|
|
176
391
|
</div>`;
|
|
177
392
|
})}
|
|
178
393
|
</div>
|
|
@@ -180,9 +395,18 @@ export class DxGrid extends LitElement {
|
|
|
180
395
|
<div role="none" class="dx-grid__corner"></div>
|
|
181
396
|
<div role="none" class="dx-grid__rowheader">
|
|
182
397
|
<div role="none" class="dx-grid__rowheader__content" style="transform:translate3d(0,${offsetBlock}px,0);">
|
|
183
|
-
${[...Array(visibleRows)].map((_,
|
|
184
|
-
|
|
185
|
-
|
|
398
|
+
${[...Array(visibleRows)].map((_, r0) => {
|
|
399
|
+
const r = this.visRowMin + r0;
|
|
400
|
+
return html`<div
|
|
401
|
+
role="rowheader"
|
|
402
|
+
?inert=${r < 0}
|
|
403
|
+
style="block-size:${this.rowSize(r)}px;grid-row:${r0 + 1}/${r0 + 2}"
|
|
404
|
+
>
|
|
405
|
+
<span id=${localRhId(r0)}>${rowToA1Notation(r)}</span>
|
|
406
|
+
${(this.rows[r]?.resizeable ?? this.rowDefault.resizeable) &&
|
|
407
|
+
html`<button class="dx-grid__resize-handle" data-dx-grid-action=${`resize-row,${r}`}>
|
|
408
|
+
<span class="sr-only">Resize</span>
|
|
409
|
+
</button>`}
|
|
186
410
|
</div>`;
|
|
187
411
|
})}
|
|
188
412
|
</div>
|
|
@@ -191,33 +415,24 @@ export class DxGrid extends LitElement {
|
|
|
191
415
|
<div
|
|
192
416
|
role="grid"
|
|
193
417
|
class="dx-grid__content"
|
|
194
|
-
style="transform:translate3d(${offsetInline}px,${offsetBlock}px,0);grid-template-columns
|
|
418
|
+
style="transform:translate3d(${offsetInline}px,${offsetBlock}px,0);grid-template-columns:${this
|
|
419
|
+
.templateColumns};grid-template-rows:${this.templateRows};"
|
|
195
420
|
>
|
|
196
|
-
${[...Array(visibleCols)].map((_,
|
|
197
|
-
return [...Array(visibleRows)].map((_,
|
|
198
|
-
const
|
|
199
|
-
const
|
|
200
|
-
const cell =
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
style="grid-column:${i + 1} / ${iEndAbs - colVisMin + 2};grid-row:${j + 1} / ${jEndAbs -
|
|
212
|
-
rowVisMin +
|
|
213
|
-
2}"
|
|
214
|
-
>
|
|
215
|
-
${cell?.value}
|
|
216
|
-
</div>`;
|
|
217
|
-
}
|
|
218
|
-
} else {
|
|
219
|
-
return html`<div role="gridcell" style="grid-column:${i + 1};grid-row:${j + 1}">${cell?.value}</div>`;
|
|
220
|
-
}
|
|
421
|
+
${[...Array(visibleCols)].map((_, c0) => {
|
|
422
|
+
return [...Array(visibleRows)].map((_, r0) => {
|
|
423
|
+
const c = c0 + this.visColMin;
|
|
424
|
+
const r = r0 + this.visRowMin;
|
|
425
|
+
const cell = this.getCell(c, r);
|
|
426
|
+
return html`<div
|
|
427
|
+
role="gridcell"
|
|
428
|
+
?inert=${c < 0 || r < 0}
|
|
429
|
+
aria-rowindex=${r}
|
|
430
|
+
aria-colindex=${c}
|
|
431
|
+
data-dx-grid-action="cell"
|
|
432
|
+
style="grid-column:${c0 + 1};grid-row:${r0 + 1}"
|
|
433
|
+
>
|
|
434
|
+
${cell?.value}
|
|
435
|
+
</div>`;
|
|
221
436
|
});
|
|
222
437
|
})}
|
|
223
438
|
</div>
|
|
@@ -235,6 +450,18 @@ export class DxGrid extends LitElement {
|
|
|
235
450
|
|
|
236
451
|
override firstUpdated() {
|
|
237
452
|
this.observer.observe(this.viewportRef.value!);
|
|
453
|
+
this.colSizes = Object.entries(this.columns).reduce((acc: Record<string, number>, [colId, colMeta]) => {
|
|
454
|
+
if (colMeta?.size) {
|
|
455
|
+
acc[colId] = colMeta.size;
|
|
456
|
+
}
|
|
457
|
+
return acc;
|
|
458
|
+
}, {});
|
|
459
|
+
this.rowSizes = Object.entries(this.rows).reduce((acc: Record<string, number>, [rowId, rowMeta]) => {
|
|
460
|
+
if (rowMeta?.size) {
|
|
461
|
+
acc[rowId] = rowMeta.size;
|
|
462
|
+
}
|
|
463
|
+
return acc;
|
|
464
|
+
}, {});
|
|
238
465
|
}
|
|
239
466
|
|
|
240
467
|
override disconnectedCallback() {
|
package/src/index.ts
CHANGED
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
export type CellPosition = {
|
|
2
|
-
i: number;
|
|
3
|
-
j: number;
|
|
4
|
-
};
|
|
5
|
-
export type CellRange = {
|
|
6
|
-
from: CellPosition;
|
|
7
|
-
to?: CellPosition;
|
|
8
|
-
};
|
|
9
|
-
export declare const posEquals: (a: CellPosition | undefined, b: CellPosition | undefined) => boolean;
|
|
10
|
-
export declare const colToA1Notation: (column: number) => string;
|
|
11
|
-
export declare const rowToA1Notation: (row: number) => string;
|
|
12
|
-
export declare const posToA1Notation: (column: number, row: number) => string;
|
|
13
|
-
export declare const posFromA1Notation: (notation: string) => CellPosition;
|
|
14
|
-
export declare const posFromNumericNotation: (notation: string) => CellPosition;
|
|
15
|
-
export declare const rangeToA1Notation: (range: CellRange) => string;
|
|
16
|
-
export declare const rangeFromA1Notation: (notation: string) => CellRange;
|
|
17
|
-
export declare const inRange: (range: CellRange | undefined, pos: CellPosition) => boolean;
|
|
18
|
-
//# sourceMappingURL=position.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"position.d.ts","sourceRoot":"","sources":["../../../src/position.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,YAAY,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEpD,MAAM,MAAM,SAAS,GAAG;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,EAAE,CAAC,EAAE,YAAY,CAAA;CAAE,CAAC;AAElE,eAAO,MAAM,SAAS,MAAO,YAAY,GAAG,SAAS,KAAK,YAAY,GAAG,SAAS,YAAmC,CAAC;AAEtH,eAAO,MAAM,eAAe,WAAY,MAAM,KAAG,MAKhD,CAAC;AAEF,eAAO,MAAM,eAAe,QAAS,MAAM,KAAG,MAE7C,CAAC;AAEF,eAAO,MAAM,eAAe,WAAY,MAAM,OAAO,MAAM,KAAG,MAI7D,CAAC;AAEF,eAAO,MAAM,iBAAiB,aAAc,MAAM,KAAG,YAQpD,CAAC;AAEF,eAAO,MAAM,sBAAsB,aAAc,MAAM,KAAG,YAMzD,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAAW,SAAS,WAGpC,CAAC;AAEf,eAAO,MAAM,mBAAmB,aAAc,MAAM,KAAG,SAGtD,CAAC;AAEF,eAAO,MAAM,OAAO,UAAW,SAAS,GAAG,SAAS,OAAO,YAAY,KAAG,OAwBzE,CAAC"}
|
package/src/position.ts
DELETED
|
@@ -1,80 +0,0 @@
|
|
|
1
|
-
//
|
|
2
|
-
// Copyright 2024 DXOS.org
|
|
3
|
-
//
|
|
4
|
-
|
|
5
|
-
export type CellPosition = { i: number; j: number };
|
|
6
|
-
|
|
7
|
-
export type CellRange = { from: CellPosition; to?: CellPosition };
|
|
8
|
-
|
|
9
|
-
export const posEquals = (a: CellPosition | undefined, b: CellPosition | undefined) => a?.i === b?.i && a?.j === b?.j;
|
|
10
|
-
|
|
11
|
-
export const colToA1Notation = (column: number): string => {
|
|
12
|
-
return (
|
|
13
|
-
(column >= 26 ? String.fromCharCode('A'.charCodeAt(0) + Math.floor(column / 26) - 1) : '') +
|
|
14
|
-
String.fromCharCode('A'.charCodeAt(0) + (column % 26))
|
|
15
|
-
);
|
|
16
|
-
};
|
|
17
|
-
|
|
18
|
-
export const rowToA1Notation = (row: number): string => {
|
|
19
|
-
return `${row + 1}`;
|
|
20
|
-
};
|
|
21
|
-
|
|
22
|
-
export const posToA1Notation = (column: number, row: number): string => {
|
|
23
|
-
const columnA1 = colToA1Notation(column);
|
|
24
|
-
const rowA1 = rowToA1Notation(row);
|
|
25
|
-
return `${columnA1}${rowA1}`;
|
|
26
|
-
};
|
|
27
|
-
|
|
28
|
-
export const posFromA1Notation = (notation: string): CellPosition => {
|
|
29
|
-
const match = notation.match(/([A-Z]+)(\d+)/);
|
|
30
|
-
if (!match) {
|
|
31
|
-
throw Error('[posFromA1Notation] No match.');
|
|
32
|
-
}
|
|
33
|
-
const column = match[1].split('').reduce((acc, c) => acc * 26 + c.charCodeAt(0) - 'A'.charCodeAt(0) + 1, 0) - 1;
|
|
34
|
-
const row = parseInt(match[2], 10) - 1;
|
|
35
|
-
return { i: column, j: row };
|
|
36
|
-
};
|
|
37
|
-
|
|
38
|
-
export const posFromNumericNotation = (notation: string): CellPosition => {
|
|
39
|
-
const [iStr, jStr] = notation.split(',');
|
|
40
|
-
if (!iStr || !jStr) {
|
|
41
|
-
throw Error('[posFromNumericNotation] Bad input');
|
|
42
|
-
}
|
|
43
|
-
return { i: parseInt(iStr), j: parseInt(jStr) };
|
|
44
|
-
};
|
|
45
|
-
|
|
46
|
-
export const rangeToA1Notation = (range: CellRange) =>
|
|
47
|
-
[range?.from && posToA1Notation(range?.from.i, range?.from.j), range?.to && posToA1Notation(range?.to.i, range.to.j)]
|
|
48
|
-
.filter(Boolean)
|
|
49
|
-
.join(':');
|
|
50
|
-
|
|
51
|
-
export const rangeFromA1Notation = (notation: string): CellRange => {
|
|
52
|
-
const [from, to] = notation.split(':').map(posFromA1Notation);
|
|
53
|
-
return { from, to };
|
|
54
|
-
};
|
|
55
|
-
|
|
56
|
-
export const inRange = (range: CellRange | undefined, pos: CellPosition): boolean => {
|
|
57
|
-
if (!range) {
|
|
58
|
-
return false;
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
const { from, to } = range;
|
|
62
|
-
if ((from && posEquals(from, pos)) || (to && posEquals(to, pos))) {
|
|
63
|
-
return true;
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
if (!from || !to) {
|
|
67
|
-
return false;
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
const { i, j } = pos;
|
|
71
|
-
|
|
72
|
-
const { i: c1, j: r1 } = from;
|
|
73
|
-
const { i: c2, j: r2 } = to;
|
|
74
|
-
const cMin = Math.min(c1, c2);
|
|
75
|
-
const cMax = Math.max(c1, c2);
|
|
76
|
-
const rMin = Math.min(r1, r2);
|
|
77
|
-
const rMax = Math.max(r1, r2);
|
|
78
|
-
|
|
79
|
-
return i >= cMin && i <= cMax && j >= rMin && j <= rMax;
|
|
80
|
-
};
|