@mndw/ui 0.1.5 → 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/aria/key-manager.d.ts +35 -0
- package/dist/aria/key-manager.d.ts.map +1 -0
- package/dist/aria/key-manager.js +156 -0
- package/dist/aria/key-manager.js.map +1 -0
- package/dist/button/button.d.ts +12 -0
- package/dist/button/button.d.ts.map +1 -1
- package/dist/button/button.js +47 -0
- package/dist/button/button.js.map +1 -1
- package/dist/charts/bar-chart.d.ts +7 -1
- package/dist/charts/bar-chart.d.ts.map +1 -1
- package/dist/charts/bar-chart.js +91 -23
- package/dist/charts/bar-chart.js.map +1 -1
- package/dist/charts/chart-frame.d.ts +5 -0
- package/dist/charts/chart-frame.d.ts.map +1 -1
- package/dist/charts/chart-frame.js +4 -0
- package/dist/charts/chart-frame.js.map +1 -1
- package/dist/charts/chart-types.d.ts +21 -0
- package/dist/charts/chart-types.d.ts.map +1 -1
- package/dist/charts/chart-utils.d.ts +2 -0
- package/dist/charts/chart-utils.d.ts.map +1 -1
- package/dist/charts/chart-utils.js +16 -2
- package/dist/charts/chart-utils.js.map +1 -1
- package/dist/charts/line-chart.d.ts +6 -5
- package/dist/charts/line-chart.d.ts.map +1 -1
- package/dist/charts/line-chart.js +90 -25
- package/dist/charts/line-chart.js.map +1 -1
- package/dist/checkbox/checkbox.js +1 -1
- package/dist/checkbox/checkbox.js.map +1 -1
- package/dist/focus.d.ts +2 -0
- package/dist/focus.d.ts.map +1 -1
- package/dist/focus.js +38 -0
- package/dist/focus.js.map +1 -1
- package/dist/forms/form-associated.d.ts +1 -1
- package/dist/forms/form-associated.d.ts.map +1 -1
- package/dist/forms/form-associated.js +2 -2
- package/dist/forms/form-associated.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/overlay.d.ts.map +1 -1
- package/dist/overlay.js +4 -2
- package/dist/overlay.js.map +1 -1
- package/dist/segmented/segmented.d.ts.map +1 -1
- package/dist/segmented/segmented.js +7 -8
- package/dist/segmented/segmented.js.map +1 -1
- package/dist/select/select-panel.d.ts +6 -5
- package/dist/select/select-panel.d.ts.map +1 -1
- package/dist/select/select-panel.js +29 -79
- package/dist/select/select-panel.js.map +1 -1
- package/dist/select/select.d.ts +21 -3
- package/dist/select/select.d.ts.map +1 -1
- package/dist/select/select.js +246 -86
- package/dist/select/select.js.map +1 -1
- package/dist/slider/slider.d.ts +2 -1
- package/dist/slider/slider.d.ts.map +1 -1
- package/dist/slider/slider.js +14 -10
- package/dist/slider/slider.js.map +1 -1
- package/dist/table/column-menu.d.ts +6 -0
- package/dist/table/column-menu.d.ts.map +1 -1
- package/dist/table/column-menu.js +57 -32
- package/dist/table/column-menu.js.map +1 -1
- package/dist/table/table.d.ts +7 -0
- package/dist/table/table.d.ts.map +1 -1
- package/dist/table/table.js +86 -12
- package/dist/table/table.js.map +1 -1
- package/dist/tabs/tabs.d.ts.map +1 -1
- package/dist/tabs/tabs.js +2 -6
- package/dist/tabs/tabs.js.map +1 -1
- package/dist/tooltip/tooltip.d.ts +36 -1
- package/dist/tooltip/tooltip.d.ts.map +1 -1
- package/dist/tooltip/tooltip.js +143 -14
- package/dist/tooltip/tooltip.js.map +1 -1
- package/package.json +4 -4
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
export type KeyManagerMode = 'active-descendant' | 'roving-focus';
|
|
2
|
+
export interface KeyManagerList<Item> {
|
|
3
|
+
readonly items: readonly Item[];
|
|
4
|
+
readonly wrap: boolean;
|
|
5
|
+
readonly mode: KeyManagerMode;
|
|
6
|
+
activeIndex: number;
|
|
7
|
+
setActiveIndex(index: number): void;
|
|
8
|
+
focusItem?(index: number): void;
|
|
9
|
+
}
|
|
10
|
+
export interface AriaKeyManagerOptions<Item> {
|
|
11
|
+
readonly getLabel: (item: Item) => string;
|
|
12
|
+
readonly isDisabled: (item: Item) => boolean;
|
|
13
|
+
readonly pageSize?: number;
|
|
14
|
+
readonly typeaheadTimeout?: number;
|
|
15
|
+
readonly now?: () => number;
|
|
16
|
+
}
|
|
17
|
+
/** Framework-free keyboard navigation for listbox, menu, and other composite widget options. */
|
|
18
|
+
export declare class AriaKeyManager<Item> {
|
|
19
|
+
private readonly getLabel;
|
|
20
|
+
private readonly isDisabled;
|
|
21
|
+
private readonly pageSize;
|
|
22
|
+
private readonly typeaheadTimeout;
|
|
23
|
+
private readonly now;
|
|
24
|
+
private typeaheadBuffer;
|
|
25
|
+
private lastTypeaheadAt;
|
|
26
|
+
constructor(options: AriaKeyManagerOptions<Item>);
|
|
27
|
+
handleKeydown(event: KeyboardEvent, list: KeyManagerList<Item>): boolean;
|
|
28
|
+
private isPrintable;
|
|
29
|
+
private move;
|
|
30
|
+
private edge;
|
|
31
|
+
private page;
|
|
32
|
+
private typeahead;
|
|
33
|
+
private normalize;
|
|
34
|
+
}
|
|
35
|
+
//# sourceMappingURL=key-manager.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"key-manager.d.ts","sourceRoot":"","sources":["../../src/aria/key-manager.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GAAG,mBAAmB,GAAG,cAAc,CAAC;AAElE,MAAM,WAAW,cAAc,CAAC,IAAI;IAClC,QAAQ,CAAC,KAAK,EAAE,SAAS,IAAI,EAAE,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,SAAS,CAAC,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,qBAAqB,CAAC,IAAI;IACzC,QAAQ,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC;IAC1C,QAAQ,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC;IAC7C,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CAC7B;AAED,gGAAgG;AAChG,qBAAa,cAAc,CAAC,IAAI;IAC9B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAyB;IAClD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA0B;IACrD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,eAAe,CAAM;IAC7B,OAAO,CAAC,eAAe,CAA4B;gBAEvC,OAAO,EAAE,qBAAqB,CAAC,IAAI,CAAC;IAQzC,aAAa,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,GAAG,OAAO;IA2C/E,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,IAAI;IA8BZ,OAAO,CAAC,IAAI;IAaZ,OAAO,CAAC,IAAI;IAmCZ,OAAO,CAAC,SAAS;IAuCjB,OAAO,CAAC,SAAS;CAGlB"}
|
|
@@ -0,0 +1,156 @@
|
|
|
1
|
+
/** Framework-free keyboard navigation for listbox, menu, and other composite widget options. */
|
|
2
|
+
export class AriaKeyManager {
|
|
3
|
+
getLabel;
|
|
4
|
+
isDisabled;
|
|
5
|
+
pageSize;
|
|
6
|
+
typeaheadTimeout;
|
|
7
|
+
now;
|
|
8
|
+
typeaheadBuffer = '';
|
|
9
|
+
lastTypeaheadAt = Number.NEGATIVE_INFINITY;
|
|
10
|
+
constructor(options) {
|
|
11
|
+
this.getLabel = options.getLabel;
|
|
12
|
+
this.isDisabled = options.isDisabled;
|
|
13
|
+
this.pageSize = options.pageSize ?? 10;
|
|
14
|
+
this.typeaheadTimeout = options.typeaheadTimeout ?? 500;
|
|
15
|
+
this.now = options.now ?? Date.now;
|
|
16
|
+
}
|
|
17
|
+
handleKeydown(event, list) {
|
|
18
|
+
let nextIndex = null;
|
|
19
|
+
switch (event.key) {
|
|
20
|
+
case 'ArrowDown':
|
|
21
|
+
nextIndex = this.move(list, 1);
|
|
22
|
+
break;
|
|
23
|
+
case 'ArrowUp':
|
|
24
|
+
nextIndex = this.move(list, -1);
|
|
25
|
+
break;
|
|
26
|
+
case 'Home':
|
|
27
|
+
nextIndex = this.edge(list, 1);
|
|
28
|
+
break;
|
|
29
|
+
case 'End':
|
|
30
|
+
nextIndex = this.edge(list, -1);
|
|
31
|
+
break;
|
|
32
|
+
case 'PageDown':
|
|
33
|
+
nextIndex = this.page(list, 1);
|
|
34
|
+
break;
|
|
35
|
+
case 'PageUp':
|
|
36
|
+
nextIndex = this.page(list, -1);
|
|
37
|
+
break;
|
|
38
|
+
default:
|
|
39
|
+
if (this.isPrintable(event)) {
|
|
40
|
+
nextIndex = this.typeahead(event.key, list);
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
return false;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
event.preventDefault();
|
|
47
|
+
if (nextIndex !== null && nextIndex !== list.activeIndex) {
|
|
48
|
+
list.setActiveIndex(nextIndex);
|
|
49
|
+
if (list.mode === 'roving-focus') {
|
|
50
|
+
list.focusItem?.(nextIndex);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
return true;
|
|
54
|
+
}
|
|
55
|
+
isPrintable(event) {
|
|
56
|
+
return !event.ctrlKey
|
|
57
|
+
&& !event.altKey
|
|
58
|
+
&& !event.metaKey
|
|
59
|
+
&& !event.isComposing
|
|
60
|
+
&& event.key !== ' '
|
|
61
|
+
&& [...event.key].length === 1;
|
|
62
|
+
}
|
|
63
|
+
move(list, direction) {
|
|
64
|
+
const count = list.items.length;
|
|
65
|
+
if (count === 0) {
|
|
66
|
+
return null;
|
|
67
|
+
}
|
|
68
|
+
let index = list.activeIndex;
|
|
69
|
+
if (index < 0) {
|
|
70
|
+
return this.edge(list, direction);
|
|
71
|
+
}
|
|
72
|
+
for (let step = 0; step < count; step += 1) {
|
|
73
|
+
index += direction;
|
|
74
|
+
if (list.wrap) {
|
|
75
|
+
index = (index + count) % count;
|
|
76
|
+
}
|
|
77
|
+
else if (index < 0 || index >= count) {
|
|
78
|
+
return null;
|
|
79
|
+
}
|
|
80
|
+
if (!this.isDisabled(list.items[index])) {
|
|
81
|
+
return index;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
return null;
|
|
85
|
+
}
|
|
86
|
+
edge(list, direction) {
|
|
87
|
+
const start = direction > 0 ? 0 : list.items.length - 1;
|
|
88
|
+
const end = direction > 0 ? list.items.length : -1;
|
|
89
|
+
for (let index = start; index !== end; index += direction) {
|
|
90
|
+
if (!this.isDisabled(list.items[index])) {
|
|
91
|
+
return index;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
return null;
|
|
95
|
+
}
|
|
96
|
+
page(list, direction) {
|
|
97
|
+
if (list.items.length === 0) {
|
|
98
|
+
return null;
|
|
99
|
+
}
|
|
100
|
+
if (list.activeIndex < 0) {
|
|
101
|
+
return this.edge(list, direction);
|
|
102
|
+
}
|
|
103
|
+
const target = list.activeIndex + direction * this.pageSize;
|
|
104
|
+
let index = list.wrap
|
|
105
|
+
? (target % list.items.length + list.items.length) % list.items.length
|
|
106
|
+
: Math.max(0, Math.min(list.items.length - 1, target));
|
|
107
|
+
let step = 0;
|
|
108
|
+
while (step < list.items.length) {
|
|
109
|
+
if (!this.isDisabled(list.items[index])) {
|
|
110
|
+
return index;
|
|
111
|
+
}
|
|
112
|
+
index += direction;
|
|
113
|
+
if (list.wrap) {
|
|
114
|
+
index = (index + list.items.length) % list.items.length;
|
|
115
|
+
}
|
|
116
|
+
else if (index < 0 || index >= list.items.length) {
|
|
117
|
+
return null;
|
|
118
|
+
}
|
|
119
|
+
step += 1;
|
|
120
|
+
}
|
|
121
|
+
return null;
|
|
122
|
+
}
|
|
123
|
+
typeahead(key, list) {
|
|
124
|
+
const now = this.now();
|
|
125
|
+
const withinTimeout = now - this.lastTypeaheadAt <= this.typeaheadTimeout;
|
|
126
|
+
const prior = withinTimeout ? this.typeaheadBuffer : '';
|
|
127
|
+
const repeated = prior !== '' && [...prior].every((character) => character === key.toLocaleLowerCase());
|
|
128
|
+
const next = repeated ? key.toLocaleLowerCase() : `${prior}${key}`.toLocaleLowerCase();
|
|
129
|
+
this.typeaheadBuffer = next;
|
|
130
|
+
this.lastTypeaheadAt = now;
|
|
131
|
+
const current = list.items[list.activeIndex];
|
|
132
|
+
// Keep the current match as a multi-character buffer grows (for example B then I on Birch).
|
|
133
|
+
if (prior !== ''
|
|
134
|
+
&& !repeated
|
|
135
|
+
&& current
|
|
136
|
+
&& !this.isDisabled(current)
|
|
137
|
+
&& this.normalize(this.getLabel(current)).startsWith(next)) {
|
|
138
|
+
return list.activeIndex;
|
|
139
|
+
}
|
|
140
|
+
const count = list.items.length;
|
|
141
|
+
for (let step = 1; step <= count; step += 1) {
|
|
142
|
+
const index = list.activeIndex < 0
|
|
143
|
+
? step - 1
|
|
144
|
+
: (list.activeIndex + step) % count;
|
|
145
|
+
const item = list.items[index];
|
|
146
|
+
if (!this.isDisabled(item) && this.normalize(this.getLabel(item)).startsWith(next)) {
|
|
147
|
+
return index;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
return null;
|
|
151
|
+
}
|
|
152
|
+
normalize(value) {
|
|
153
|
+
return value.trimStart().toLocaleLowerCase();
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
//# sourceMappingURL=key-manager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"key-manager.js","sourceRoot":"","sources":["../../src/aria/key-manager.ts"],"names":[],"mappings":"AAmBA,gGAAgG;AAChG,MAAM,OAAO,cAAc;IACR,QAAQ,CAAyB;IACjC,UAAU,CAA0B;IACpC,QAAQ,CAAS;IACjB,gBAAgB,CAAS;IACzB,GAAG,CAAe;IAC3B,eAAe,GAAG,EAAE,CAAC;IACrB,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC;IAEnD,YAAY,OAAoC;QAC9C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QACrC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;QACvC,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,IAAI,GAAG,CAAC;QACxD,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;IACrC,CAAC;IAEM,aAAa,CAAC,KAAoB,EAAE,IAA0B;QACnE,IAAI,SAAS,GAAkB,IAAI,CAAC;QAEpC,QAAQ,KAAK,CAAC,GAAG,EAAE,CAAC;YAClB,KAAK,WAAW;gBACd,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAC/B,MAAM;YACR,KAAK,SAAS;gBACZ,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBAChC,MAAM;YACR,KAAK,MAAM;gBACT,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAC/B,MAAM;YACR,KAAK,KAAK;gBACR,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBAChC,MAAM;YACR,KAAK,UAAU;gBACb,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAC/B,MAAM;YACR,KAAK,QAAQ;gBACX,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBAChC,MAAM;YACR;gBACE,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC5B,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBAC9C,CAAC;qBAAM,CAAC;oBACN,OAAO,KAAK,CAAC;gBACf,CAAC;QACL,CAAC;QAED,KAAK,CAAC,cAAc,EAAE,CAAC;QAEvB,IAAI,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;YACzD,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;YAE/B,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;gBACjC,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,WAAW,CAAC,KAAoB;QACtC,OAAO,CAAC,KAAK,CAAC,OAAO;eAChB,CAAC,KAAK,CAAC,MAAM;eACb,CAAC,KAAK,CAAC,OAAO;eACd,CAAC,KAAK,CAAC,WAAW;eAClB,KAAK,CAAC,GAAG,KAAK,GAAG;eACjB,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;IACnC,CAAC;IAEO,IAAI,CAAC,IAA0B,EAAE,SAAiB;QACxD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QAEhC,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC;QAE7B,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YACd,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACpC,CAAC;QAED,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,KAAK,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC;YAC3C,KAAK,IAAI,SAAS,CAAC;YAEnB,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACd,KAAK,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,KAAK,CAAC;YAClC,CAAC;iBAAM,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,IAAI,KAAK,EAAE,CAAC;gBACvC,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBACxC,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,IAAI,CAAC,IAA0B,EAAE,SAAiB;QACxD,MAAM,KAAK,GAAG,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QACxD,MAAM,GAAG,GAAG,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAEnD,KAAK,IAAI,KAAK,GAAG,KAAK,EAAE,KAAK,KAAK,GAAG,EAAE,KAAK,IAAI,SAAS,EAAE,CAAC;YAC1D,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBACxC,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,IAAI,CAAC,IAA0B,EAAE,SAAiB;QACxD,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,IAAI,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,GAAG,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC5D,IAAI,KAAK,GAAG,IAAI,CAAC,IAAI;YACnB,CAAC,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM;YACtE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;QAEzD,IAAI,IAAI,GAAG,CAAC,CAAC;QAEb,OAAO,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAChC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBACxC,OAAO,KAAK,CAAC;YACf,CAAC;YAED,KAAK,IAAI,SAAS,CAAC;YAEnB,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACd,KAAK,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;YAC1D,CAAC;iBAAM,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;gBACnD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,IAAI,CAAC,CAAC;QACZ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,SAAS,CAAC,GAAW,EAAE,IAA0B;QACvD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,aAAa,GAAG,GAAG,GAAG,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,gBAAgB,CAAC;QAC1E,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,MAAM,QAAQ,GAAG,KAAK,KAAK,EAAE,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,KAAK,GAAG,CAAC,iBAAiB,EAAE,CAAC,CAAC;QACxG,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,GAAG,EAAE,CAAC,iBAAiB,EAAE,CAAC;QAEvF,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC;QAE3B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAE7C,4FAA4F;QAC5F,IACE,KAAK,KAAK,EAAE;eACT,CAAC,QAAQ;eACT,OAAO;eACP,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;eACzB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAC1D,CAAC;YACD,OAAO,IAAI,CAAC,WAAW,CAAC;QAC1B,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QAEhC,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,IAAI,KAAK,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC;YAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,GAAG,CAAC;gBAChC,CAAC,CAAC,IAAI,GAAG,CAAC;gBACV,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC;YACtC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAE/B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnF,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,SAAS,CAAC,KAAa;QAC7B,OAAO,KAAK,CAAC,SAAS,EAAE,CAAC,iBAAiB,EAAE,CAAC;IAC/C,CAAC;CACF"}
|
package/dist/button/button.d.ts
CHANGED
|
@@ -10,6 +10,10 @@ export declare class MndwButton extends LitElement {
|
|
|
10
10
|
disabled: boolean;
|
|
11
11
|
type: 'button' | 'submit' | 'reset';
|
|
12
12
|
ariaLabel: string;
|
|
13
|
+
ariaExpanded: string;
|
|
14
|
+
ariaPressed: string;
|
|
15
|
+
ariaHaspopup: string;
|
|
16
|
+
ariaControls: string;
|
|
13
17
|
private readonly formState;
|
|
14
18
|
constructor();
|
|
15
19
|
formDisabledCallback(disabled: boolean): void;
|
|
@@ -17,6 +21,14 @@ export declare class MndwButton extends LitElement {
|
|
|
17
21
|
formStateRestoreCallback(state: string | File | FormData | null, mode: 'autocomplete' | 'restore'): void;
|
|
18
22
|
protected render(): TemplateResult;
|
|
19
23
|
protected updated(): void;
|
|
24
|
+
/**
|
|
25
|
+
* `aria-controls` is an IDREF list, so it cannot cross the shadow boundary as a plain
|
|
26
|
+
* attribute: the inner button lives in the shadow root while the controlled element is in
|
|
27
|
+
* the light DOM. Where the platform supports `ariaControlsElements` the references are
|
|
28
|
+
* resolved in the document and exposed on the inner button directly. Browsers without it
|
|
29
|
+
* get the string attribute copied over; it may not reach assistive technology there.
|
|
30
|
+
*/
|
|
31
|
+
private syncAriaControls;
|
|
20
32
|
private readonly onClick;
|
|
21
33
|
}
|
|
22
34
|
declare global {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"button.d.ts","sourceRoot":"","sources":["../../src/button/button.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,KAAK,oBAAoB,EAAE,KAAK,cAAc,EAAqB,MAAM,KAAK,CAAC;AAYnG,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAE7C,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG,WAAW,GAAG,OAAO,GAAG,QAAQ,CAAC;AAE7E,qBAAa,UAAW,SAAQ,UAAU;IACxC,gBAAuB,cAAc,QAAQ;IAE7C,gBAAgC,iBAAiB,EAAE,cAAc,CAG/D;IAEF,OAAc,UAAU,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"button.d.ts","sourceRoot":"","sources":["../../src/button/button.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,KAAK,oBAAoB,EAAE,KAAK,cAAc,EAAqB,MAAM,KAAK,CAAC;AAYnG,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAE7C,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG,WAAW,GAAG,OAAO,GAAG,QAAQ,CAAC;AAE7E,qBAAa,UAAW,SAAQ,UAAU;IACxC,gBAAuB,cAAc,QAAQ;IAE7C,gBAAgC,iBAAiB,EAAE,cAAc,CAG/D;IAEF,OAAc,UAAU,EAAE,oBAAoB,CAS5C;IAEF,OAAc,MAAM,0BAwElB;IAEa,OAAO,EAAE,iBAAiB,CAAC;IAC3B,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IAEpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAOvB;;IAgBI,oBAAoB,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI;IAI7C,iBAAiB,IAAI,IAAI;IAIzB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,QAAQ,GAAG,IAAI,EAAE,IAAI,EAAE,cAAc,GAAG,SAAS,GAAG,IAAI;IAI/G,SAAS,CAAC,MAAM,IAAI,cAAc;cAgBf,OAAO,IAAI,IAAI;IAWlC;;;;;;OAMG;IACH,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAkBtB;CACH;AAED,OAAO,CAAC,MAAM,CAAC;IAEb,UAAU,qBAAqB;QAC7B,aAAa,EAAE,UAAU,CAAC;KAC3B;CACF"}
|
package/dist/button/button.js
CHANGED
|
@@ -13,6 +13,10 @@ export class MndwButton extends LitElement {
|
|
|
13
13
|
disabled: { type: Boolean, reflect: true },
|
|
14
14
|
type: { type: String },
|
|
15
15
|
ariaLabel: { type: String, attribute: 'aria-label' },
|
|
16
|
+
ariaExpanded: { type: String, attribute: 'aria-expanded' },
|
|
17
|
+
ariaPressed: { type: String, attribute: 'aria-pressed' },
|
|
18
|
+
ariaHaspopup: { type: String, attribute: 'aria-haspopup' },
|
|
19
|
+
ariaControls: { type: String, attribute: 'aria-controls' },
|
|
16
20
|
};
|
|
17
21
|
static styles = css `
|
|
18
22
|
:host {
|
|
@@ -101,6 +105,10 @@ export class MndwButton extends LitElement {
|
|
|
101
105
|
this.disabled = false;
|
|
102
106
|
this.type = 'button';
|
|
103
107
|
this.ariaLabel = '';
|
|
108
|
+
this.ariaExpanded = '';
|
|
109
|
+
this.ariaPressed = '';
|
|
110
|
+
this.ariaHaspopup = '';
|
|
111
|
+
this.ariaControls = '';
|
|
104
112
|
this.addEventListener('click', this.onClick);
|
|
105
113
|
}
|
|
106
114
|
formDisabledCallback(disabled) {
|
|
@@ -118,6 +126,9 @@ export class MndwButton extends LitElement {
|
|
|
118
126
|
part="button"
|
|
119
127
|
type="button"
|
|
120
128
|
aria-label=${this.ariaLabel || nothing}
|
|
129
|
+
aria-expanded=${this.ariaExpanded || nothing}
|
|
130
|
+
aria-pressed=${this.ariaPressed || nothing}
|
|
131
|
+
aria-haspopup=${this.ariaHaspopup || nothing}
|
|
121
132
|
?disabled=${this.formState.effectiveDisabled}
|
|
122
133
|
>
|
|
123
134
|
<slot></slot>
|
|
@@ -130,6 +141,42 @@ export class MndwButton extends LitElement {
|
|
|
130
141
|
return;
|
|
131
142
|
}
|
|
132
143
|
inner.disabled = this.formState.effectiveDisabled;
|
|
144
|
+
this.syncAriaControls(inner);
|
|
145
|
+
}
|
|
146
|
+
/**
|
|
147
|
+
* `aria-controls` is an IDREF list, so it cannot cross the shadow boundary as a plain
|
|
148
|
+
* attribute: the inner button lives in the shadow root while the controlled element is in
|
|
149
|
+
* the light DOM. Where the platform supports `ariaControlsElements` the references are
|
|
150
|
+
* resolved in the document and exposed on the inner button directly. Browsers without it
|
|
151
|
+
* get the string attribute copied over; it may not reach assistive technology there.
|
|
152
|
+
*/
|
|
153
|
+
syncAriaControls(inner) {
|
|
154
|
+
const ids = this.ariaControls
|
|
155
|
+
?.trim()
|
|
156
|
+
.split(/\s+/)
|
|
157
|
+
.filter((id) => id !== '')
|
|
158
|
+
?? [];
|
|
159
|
+
// The cast is only for feature detection: with the property present in the DOM lib typings,
|
|
160
|
+
// a plain `in` check would narrow the else branch to `never`.
|
|
161
|
+
const supportsAriaControlsElements = 'ariaControlsElements' in inner;
|
|
162
|
+
if (supportsAriaControlsElements) {
|
|
163
|
+
const elements = ids
|
|
164
|
+
.map((id) => this.ownerDocument.getElementById(id))
|
|
165
|
+
.filter((element) => element !== null);
|
|
166
|
+
// The setter manages the content attribute itself: per the HTML spec, any change or
|
|
167
|
+
// removal of the attribute afterwards would null the explicitly set elements, so the
|
|
168
|
+
// attribute must not be touched here. Clearing the relation means assigning null.
|
|
169
|
+
inner.ariaControlsElements = elements.length > 0 ? elements : null;
|
|
170
|
+
}
|
|
171
|
+
else {
|
|
172
|
+
const value = ids.join(' ');
|
|
173
|
+
if (value === '') {
|
|
174
|
+
inner.removeAttribute('aria-controls');
|
|
175
|
+
}
|
|
176
|
+
else {
|
|
177
|
+
inner.setAttribute('aria-controls', value);
|
|
178
|
+
}
|
|
179
|
+
}
|
|
133
180
|
}
|
|
134
181
|
onClick = (event) => {
|
|
135
182
|
if (this.formState.effectiveDisabled) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"button.js","sourceRoot":"","sources":["../../src/button/button.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAkD,GAAG,EAAE,IAAI,EAAE,OAAO,EAAC,MAAM,KAAK,CAAC;AACnG,OAAO,EAAC,wBAAwB,EAAC,MAAM,6BAA6B,CAAC;AACrE,OAAO,EACL,WAAW,EACX,WAAW,EACX,YAAY,EACZ,SAAS,EACT,cAAc,EACd,YAAY,EACZ,SAAS,GACV,MAAM,mBAAmB,CAAC;AAE3B,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAC;AAI7C,MAAM,OAAO,UAAW,SAAQ,UAAU;IACjC,MAAM,CAAU,cAAc,GAAG,IAAI,CAAC;IAEtC,MAAM,CAAmB,iBAAiB,GAAmB;QAClE,IAAI,EAAE,MAAM;QACZ,cAAc,EAAE,IAAI;KACrB,CAAC;IAEK,MAAM,CAAC,UAAU,GAAyB;QAC/C,OAAO,EAAE,EAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAC;QACtC,QAAQ,EAAE,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAC;QACxC,IAAI,EAAE,EAAC,IAAI,EAAE,MAAM,EAAC;QACpB,SAAS,EAAE,EAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAC;
|
|
1
|
+
{"version":3,"file":"button.js","sourceRoot":"","sources":["../../src/button/button.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,20 @@
|
|
|
1
1
|
import { LitElement, type PropertyDeclarations, type TemplateResult } from 'lit';
|
|
2
|
-
import type { MndwChartColor, MndwChartPoint, MndwChartTimeFormatter, MndwChartValueFormatter } from './chart-types.js';
|
|
2
|
+
import type { MndwChartColor, MndwChartPoint, MndwChartTimeFormatter, MndwChartTooltipFormatter, MndwChartValueDomain, MndwChartValueFormatter } from './chart-types.js';
|
|
3
3
|
export declare const MNDW_BAR_CHART_TAG = "mndw-bar-chart";
|
|
4
4
|
export declare class MndwBarChart extends LitElement {
|
|
5
5
|
static readonly shadowRootOptions: ShadowRootInit;
|
|
6
6
|
static properties: PropertyDeclarations;
|
|
7
7
|
static styles: import("lit").CSSResult[];
|
|
8
8
|
points: readonly MndwChartPoint[];
|
|
9
|
+
valueDomain: MndwChartValueDomain | undefined;
|
|
9
10
|
emptyLabel: string | undefined;
|
|
10
11
|
valueLabel: string | undefined;
|
|
11
12
|
valueFormatter: MndwChartValueFormatter;
|
|
12
13
|
timeFormatter: MndwChartTimeFormatter;
|
|
14
|
+
tooltipFormatter: MndwChartTooltipFormatter | undefined;
|
|
13
15
|
color: MndwChartColor;
|
|
14
16
|
private tooltipState;
|
|
17
|
+
private formatterErrorLogged;
|
|
15
18
|
private readonly emptyLabelState;
|
|
16
19
|
private readonly valueLabelState;
|
|
17
20
|
private readonly ariaLabelState;
|
|
@@ -21,9 +24,12 @@ export declare class MndwBarChart extends LitElement {
|
|
|
21
24
|
protected render(): TemplateResult;
|
|
22
25
|
protected willUpdate(changedProperties: Map<PropertyKey, unknown>): void;
|
|
23
26
|
protected updated(changedProperties: Map<PropertyKey, unknown>): void;
|
|
27
|
+
disconnectedCallback(): void;
|
|
24
28
|
private updateAccessibilityLabel;
|
|
25
29
|
private applyLocale;
|
|
26
30
|
private drawChart;
|
|
31
|
+
private updateTooltipPosition;
|
|
32
|
+
private formatTooltip;
|
|
27
33
|
}
|
|
28
34
|
declare global {
|
|
29
35
|
interface HTMLElementTagNameMap {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bar-chart.d.ts","sourceRoot":"","sources":["../../src/charts/bar-chart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,KAAK,oBAAoB,EAAE,KAAK,cAAc,EAAY,MAAM,KAAK,CAAC;AAW1F,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"bar-chart.d.ts","sourceRoot":"","sources":["../../src/charts/bar-chart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,KAAK,oBAAoB,EAAE,KAAK,cAAc,EAAY,MAAM,KAAK,CAAC;AAW1F,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EACd,sBAAsB,EAGtB,yBAAyB,EACzB,oBAAoB,EACpB,uBAAuB,EACxB,MAAM,kBAAkB,CAAC;AAY1B,eAAO,MAAM,kBAAkB,mBAAmB,CAAC;AAoBnD,qBAAa,YAAa,SAAQ,UAAU;IAC1C,gBAAgC,iBAAiB,EAAE,cAAc,CAAkB;IAEnF,OAAc,UAAU,EAAE,oBAAoB,CAS5C;IAEF,OAAc,MAAM,4BAiBlB;IAEa,MAAM,EAAE,SAAS,cAAc,EAAE,CAAC;IAClC,WAAW,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAC9C,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,cAAc,EAAE,uBAAuB,CAAC;IACxC,aAAa,EAAE,sBAAsB,CAAC;IACtC,gBAAgB,EAAE,yBAAyB,GAAG,SAAS,CAAC;IACxD,KAAK,EAAE,cAAc,CAAC;IAErC,OAAO,CAAC,YAAY,CAA6B;IACjD,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6C;IAC7E,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6C;IAC7E,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA0B;IACzD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAI9B;IACH,OAAO,CAAC,QAAQ,CAAC,KAAK,CAEnB;;cAegB,MAAM,IAAI,cAAc;cAsBxB,UAAU,CAAC,iBAAiB,EAAE,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,IAAI;cAe9D,OAAO,CAAC,iBAAiB,EAAE,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,IAAI;IAmB9D,oBAAoB,IAAI,IAAI;IAK5C,OAAO,CAAC,wBAAwB;IAShC,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,SAAS;IAqNjB,OAAO,CAAC,qBAAqB;IA4B7B,OAAO,CAAC,aAAa;CAsBtB;AAED,OAAO,CAAC,MAAM,CAAC;IAEb,UAAU,qBAAqB;QAC7B,gBAAgB,EAAE,YAAY,CAAC;KAChC;CACF"}
|
package/dist/charts/bar-chart.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { LitElement, css, html } from 'lit';
|
|
2
2
|
import * as d3 from 'd3';
|
|
3
|
-
import { buildBarAriaLabel, filterFinitePoints, formatClockTime,
|
|
3
|
+
import { buildBarAriaLabel, filterFinitePoints, formatClockTime, formatNumber, getNiceUpperLimit, resolveChartColor, } from './chart-utils.js';
|
|
4
4
|
import { ChartFrameController } from './chart-frame-controller.js';
|
|
5
|
-
import { chartFrameStyles, renderChartFrame } from './chart-frame.js';
|
|
5
|
+
import { chartFrameStyles, measureChartTooltip, renderChartFrame } from './chart-frame.js';
|
|
6
6
|
import { getMndwUiText } from '../i18n.js';
|
|
7
7
|
import { LocaleController } from '../locale-controller.js';
|
|
8
8
|
import { createGeneratedAttribute, createLocalizedProperty, } from '../localized-property.js';
|
|
@@ -11,10 +11,12 @@ export class MndwBarChart extends LitElement {
|
|
|
11
11
|
static shadowRootOptions = { mode: 'open' };
|
|
12
12
|
static properties = {
|
|
13
13
|
points: { attribute: false },
|
|
14
|
+
valueDomain: { attribute: false },
|
|
14
15
|
emptyLabel: { type: String, attribute: 'empty-label' },
|
|
15
16
|
valueLabel: { type: String, attribute: 'value-label' },
|
|
16
17
|
valueFormatter: { attribute: false },
|
|
17
18
|
timeFormatter: { attribute: false },
|
|
19
|
+
tooltipFormatter: { attribute: false },
|
|
18
20
|
color: { type: String, reflect: true },
|
|
19
21
|
};
|
|
20
22
|
static styles = [
|
|
@@ -36,6 +38,7 @@ export class MndwBarChart extends LitElement {
|
|
|
36
38
|
`,
|
|
37
39
|
];
|
|
38
40
|
tooltipState = null;
|
|
41
|
+
formatterErrorLogged = false;
|
|
39
42
|
emptyLabelState;
|
|
40
43
|
valueLabelState;
|
|
41
44
|
ariaLabelState;
|
|
@@ -50,7 +53,8 @@ export class MndwBarChart extends LitElement {
|
|
|
50
53
|
constructor() {
|
|
51
54
|
super();
|
|
52
55
|
this.points = [];
|
|
53
|
-
this.
|
|
56
|
+
this.valueDomain = undefined;
|
|
57
|
+
this.valueFormatter = formatNumber;
|
|
54
58
|
this.timeFormatter = formatClockTime;
|
|
55
59
|
this.color = 'accent';
|
|
56
60
|
this.emptyLabelState = createLocalizedProperty(this, 'emptyLabel', 'empty-label');
|
|
@@ -59,37 +63,54 @@ export class MndwBarChart extends LitElement {
|
|
|
59
63
|
}
|
|
60
64
|
render() {
|
|
61
65
|
const hasValidPoints = filterFinitePoints(this.points).length > 0;
|
|
66
|
+
const tooltip = this.tooltipState;
|
|
62
67
|
return renderChartFrame({
|
|
63
68
|
hasContent: hasValidPoints,
|
|
64
69
|
emptyLabel: this.emptyLabel ?? getMndwUiText('chart.empty'),
|
|
65
|
-
tooltip
|
|
66
|
-
tooltipBody:
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
+
tooltip,
|
|
71
|
+
tooltipBody: tooltip === null
|
|
72
|
+
? ''
|
|
73
|
+
: tooltip.content === undefined
|
|
74
|
+
? html `
|
|
75
|
+
<div>${tooltip.time}</div>
|
|
76
|
+
<div>${this.valueLabel ?? getMndwUiText('chart.values')}: <strong>${tooltip.value}</strong></div>
|
|
77
|
+
`
|
|
78
|
+
: html `
|
|
79
|
+
<div>${tooltip.content.title ?? tooltip.time}</div>
|
|
80
|
+
${tooltip.content.rows.map((item) => html `<div>${item.label}: <strong>${item.value}</strong></div>`)}
|
|
81
|
+
`,
|
|
70
82
|
});
|
|
71
83
|
}
|
|
72
84
|
willUpdate(changedProperties) {
|
|
73
85
|
if (changedProperties.has('points')
|
|
86
|
+
|| changedProperties.has('valueDomain')
|
|
74
87
|
|| changedProperties.has('emptyLabel')
|
|
75
88
|
|| changedProperties.has('valueLabel')
|
|
76
89
|
|| changedProperties.has('valueFormatter')
|
|
77
90
|
|| changedProperties.has('timeFormatter')
|
|
91
|
+
|| changedProperties.has('tooltipFormatter')
|
|
78
92
|
|| changedProperties.has('color')) {
|
|
79
93
|
this.tooltipState = null;
|
|
80
94
|
}
|
|
81
95
|
}
|
|
82
96
|
updated(changedProperties) {
|
|
83
97
|
if (changedProperties.has('points')
|
|
98
|
+
|| changedProperties.has('valueDomain')
|
|
84
99
|
|| changedProperties.has('emptyLabel')
|
|
85
100
|
|| changedProperties.has('valueLabel')
|
|
86
101
|
|| changedProperties.has('valueFormatter')
|
|
87
102
|
|| changedProperties.has('timeFormatter')
|
|
103
|
+
|| changedProperties.has('tooltipFormatter')
|
|
88
104
|
|| changedProperties.has('color')
|
|
89
105
|
|| this.frame.plotElement === null) {
|
|
90
106
|
this.updateAccessibilityLabel();
|
|
91
107
|
this.drawChart();
|
|
92
108
|
}
|
|
109
|
+
this.updateTooltipPosition();
|
|
110
|
+
}
|
|
111
|
+
disconnectedCallback() {
|
|
112
|
+
this.formatterErrorLogged = false;
|
|
113
|
+
super.disconnectedCallback();
|
|
93
114
|
}
|
|
94
115
|
updateAccessibilityLabel() {
|
|
95
116
|
this.ariaLabelState.setGenerated(buildBarAriaLabel(this.points, this.valueLabel ?? getMndwUiText('chart.values'), this.emptyLabel ?? getMndwUiText('chart.empty'), this.valueFormatter));
|
|
@@ -126,13 +147,14 @@ export class MndwBarChart extends LitElement {
|
|
|
126
147
|
const innerWidth = Math.max(width - margin.left - margin.right, 50);
|
|
127
148
|
const innerHeight = Math.max(height - margin.top - margin.bottom, 50);
|
|
128
149
|
const maxValue = Math.max(...validPoints.map((point) => point.value), 1);
|
|
129
|
-
const
|
|
150
|
+
const lowerLimit = this.valueDomain?.min ?? 0;
|
|
151
|
+
const upperLimit = this.valueDomain?.max ?? getNiceUpperLimit(maxValue);
|
|
130
152
|
const xScale = d3.scaleBand()
|
|
131
153
|
.domain(validPoints.map((_point, index) => String(index)))
|
|
132
154
|
.range([0, innerWidth])
|
|
133
155
|
.padding(0.15);
|
|
134
156
|
const yScale = d3.scaleLinear()
|
|
135
|
-
.domain([
|
|
157
|
+
.domain([lowerLimit, upperLimit])
|
|
136
158
|
.range([innerHeight, 0]);
|
|
137
159
|
const svg = d3.select(svgElement)
|
|
138
160
|
.attr('width', width)
|
|
@@ -168,7 +190,7 @@ export class MndwBarChart extends LitElement {
|
|
|
168
190
|
.attr('x', barX)
|
|
169
191
|
.attr('y', yScale(point.value))
|
|
170
192
|
.attr('width', xScale.bandwidth())
|
|
171
|
-
.attr('height', yScale(
|
|
193
|
+
.attr('height', yScale(lowerLimit) - yScale(point.value))
|
|
172
194
|
.style('fill', `var(--mndw-${resolvedColor})`);
|
|
173
195
|
}
|
|
174
196
|
const tickCount = Math.min(validPoints.length, 5);
|
|
@@ -209,6 +231,7 @@ export class MndwBarChart extends LitElement {
|
|
|
209
231
|
const [mouseX, mouseY] = d3.pointer(event, groupNode);
|
|
210
232
|
if (mouseX < 0 || mouseX > innerWidth || mouseY < 0 || mouseY > innerHeight) {
|
|
211
233
|
hoverBand.attr('data-active', null);
|
|
234
|
+
this.formatterErrorLogged = false;
|
|
212
235
|
this.tooltipState = null;
|
|
213
236
|
this.requestUpdate();
|
|
214
237
|
return;
|
|
@@ -228,28 +251,35 @@ export class MndwBarChart extends LitElement {
|
|
|
228
251
|
.attr('x', bandX)
|
|
229
252
|
.attr('width', Math.min(bandWidth, innerWidth - bandX))
|
|
230
253
|
.attr('data-active', '');
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
}
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
254
|
+
const label = this.valueLabel ?? getMndwUiText('chart.values');
|
|
255
|
+
const context = {
|
|
256
|
+
time: point.time,
|
|
257
|
+
samples: [{ seriesId: 'value', label, value: point.value, time: point.time }],
|
|
258
|
+
};
|
|
259
|
+
const content = this.formatTooltip(context);
|
|
260
|
+
if (content === null) {
|
|
261
|
+
this.tooltipState = null;
|
|
262
|
+
this.requestUpdate();
|
|
263
|
+
return;
|
|
241
264
|
}
|
|
242
265
|
this.tooltipState = {
|
|
243
|
-
left,
|
|
244
|
-
top,
|
|
266
|
+
left: mouseX + margin.left + 8,
|
|
267
|
+
top: mouseY - 30,
|
|
268
|
+
anchorX: mouseX + margin.left,
|
|
269
|
+
anchorY: mouseY,
|
|
270
|
+
chartWidth: width,
|
|
271
|
+
bottomLimit: height,
|
|
272
|
+
horizontalOffset: 8,
|
|
245
273
|
time: this.timeFormatter(point.time),
|
|
246
274
|
value: this.valueFormatter(point.value),
|
|
275
|
+
...(content === undefined ? {} : { content }),
|
|
247
276
|
};
|
|
248
277
|
this.requestUpdate();
|
|
249
278
|
};
|
|
250
279
|
overlay.on('mousemove.chart', updateTooltip);
|
|
251
280
|
overlay.on('mouseleave.chart', () => {
|
|
252
281
|
hoverBand.attr('data-active', null);
|
|
282
|
+
this.formatterErrorLogged = false;
|
|
253
283
|
this.tooltipState = null;
|
|
254
284
|
this.requestUpdate();
|
|
255
285
|
});
|
|
@@ -257,5 +287,43 @@ export class MndwBarChart extends LitElement {
|
|
|
257
287
|
overlay.on('.chart', null);
|
|
258
288
|
});
|
|
259
289
|
}
|
|
290
|
+
updateTooltipPosition() {
|
|
291
|
+
const tooltip = this.renderRoot.querySelector('[part="tooltip"][data-visible]');
|
|
292
|
+
const state = this.tooltipState;
|
|
293
|
+
if (tooltip === null || state === null) {
|
|
294
|
+
return;
|
|
295
|
+
}
|
|
296
|
+
const { width, height } = measureChartTooltip(tooltip);
|
|
297
|
+
let left = state.anchorX + state.horizontalOffset;
|
|
298
|
+
if (left + width > state.chartWidth) {
|
|
299
|
+
left = state.anchorX - width - state.horizontalOffset;
|
|
300
|
+
}
|
|
301
|
+
left = Math.max(0, Math.min(left, state.chartWidth - width));
|
|
302
|
+
const top = Math.min(Math.max(state.anchorY - 30, 0), Math.max(0, state.bottomLimit - height));
|
|
303
|
+
if (left === state.left && top === state.top) {
|
|
304
|
+
return;
|
|
305
|
+
}
|
|
306
|
+
this.tooltipState = { ...state, left, top };
|
|
307
|
+
tooltip.style.left = `${left}px`;
|
|
308
|
+
tooltip.style.top = `${top}px`;
|
|
309
|
+
}
|
|
310
|
+
formatTooltip(context) {
|
|
311
|
+
const formatter = this.tooltipFormatter;
|
|
312
|
+
if (formatter === undefined) {
|
|
313
|
+
return undefined;
|
|
314
|
+
}
|
|
315
|
+
try {
|
|
316
|
+
const content = formatter(context);
|
|
317
|
+
this.formatterErrorLogged = false;
|
|
318
|
+
return content;
|
|
319
|
+
}
|
|
320
|
+
catch (error) {
|
|
321
|
+
if (!this.formatterErrorLogged) {
|
|
322
|
+
console.error('Chart tooltip formatter failed', error);
|
|
323
|
+
this.formatterErrorLogged = true;
|
|
324
|
+
}
|
|
325
|
+
return undefined;
|
|
326
|
+
}
|
|
327
|
+
}
|
|
260
328
|
}
|
|
261
329
|
//# sourceMappingURL=bar-chart.js.map
|