@arbor-education/design-system.components 4.7.0 → 4.7.1
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 +6 -0
- package/dist/components/filterBar/FilterBar.d.ts +1 -0
- package/dist/components/filterBar/FilterBar.d.ts.map +1 -1
- package/dist/components/filterBar/FilterBar.js +7 -1
- package/dist/components/filterBar/FilterBar.js.map +1 -1
- package/dist/components/filterBar/FilterBar.test.js +25 -1
- package/dist/components/filterBar/FilterBar.test.js.map +1 -1
- package/package.json +1 -1
- package/src/components/filterBar/FilterBar.test.tsx +50 -0
- package/src/components/filterBar/FilterBar.tsx +10 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 4.7.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#301](https://github.com/arbor-education/design-system.components/pull/301) [`d369b57`](https://github.com/arbor-education/design-system.components/commit/d369b57e6a075737842a4c998309ee8496f02c8d) Thanks [@Alex-DN-SP](https://github.com/Alex-DN-SP)! - MIS-74732 Stop FilterBar tag accessible name reading [object Object] for non-text values
|
|
8
|
+
|
|
3
9
|
## 4.7.0
|
|
4
10
|
|
|
5
11
|
### Minor Changes
|
|
@@ -10,6 +10,7 @@ export type FilterBarTagItem = {
|
|
|
10
10
|
icon?: IconName;
|
|
11
11
|
ariaControls?: string;
|
|
12
12
|
ariaExpanded?: boolean;
|
|
13
|
+
/** Accessible name for the tag button. Takes precedence over the label derived from `label` and `value`; provide it when `value` is not a string or number. */
|
|
13
14
|
actionLabel?: string;
|
|
14
15
|
removeLabel?: string;
|
|
15
16
|
disabled?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterBar.d.ts","sourceRoot":"","sources":["../../../src/components/filterBar/FilterBar.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAI7D,OAAO,EAAwB,KAAK,oBAAoB,EAAE,KAAK,cAAc,EAAE,KAAK,iBAAiB,EAAE,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAErI,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,CAAC;AAEhE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,aAAa,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;IACvF,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAK,IAAI,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,cAAc,CAAC,cAAc,CAAC,CAAC;AAE5D,MAAM,MAAM,qBAAqB,GAAG,cAAc,CAAC,cAAc,CAAC,CAAC;AAEnE,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC,GAAG;IACtG,IAAI,EAAE,aAAa,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,QAAQ,CAAC,EAAE,oBAAoB,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;CAC5D,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,CAAC,EAAE,SAAS,gBAAgB,EAAE,CAAC;IACpC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC7B,cAAc,CAAC,EAAE,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IAC/C,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,eAAe,CAAC,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACvD,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,EAAE,IAAI,GAAG,SAAS,GAAG,UAAU,CAAC,GAAG;IACtF,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;IACvF,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAK,IAAI,CAAC;CAC7C,CAAC;
|
|
1
|
+
{"version":3,"file":"FilterBar.d.ts","sourceRoot":"","sources":["../../../src/components/filterBar/FilterBar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,13 @@ const getButtonA11yLabel = (type, label, count) => {
|
|
|
30
30
|
}
|
|
31
31
|
return `Open ${label.toLowerCase()}. ${count} ${type} item${count === 1 ? '' : 's'} applied`;
|
|
32
32
|
};
|
|
33
|
-
const getTagActionLabel = (
|
|
33
|
+
const getTagActionLabel = ({ type, label, value }) => {
|
|
34
|
+
const textValue = typeof value === 'string' || typeof value === 'number' ? value : null;
|
|
35
|
+
if (label) {
|
|
36
|
+
return textValue === null ? `Open ${type} ${label}` : `Open ${type} ${label}: ${textValue}`;
|
|
37
|
+
}
|
|
38
|
+
return textValue === null ? `Open ${type}` : `Open ${type} ${textValue}`;
|
|
39
|
+
};
|
|
34
40
|
const FilterBarTagContent = ({ label, value }) => {
|
|
35
41
|
return (_jsxs("span", { className: "ds-filter-bar__tag-content", children: [label && (_jsxs("span", { className: "ds-filter-bar__tag-label", children: [label, ":"] })), _jsx("span", { className: "ds-filter-bar__tag-value", children: value })] }));
|
|
36
42
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterBar.js","sourceRoot":"","sources":["../../../src/components/filterBar/FilterBar.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AACrD,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAA0F,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"FilterBar.js","sourceRoot":"","sources":["../../../src/components/filterBar/FilterBar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
2
|
import '@testing-library/jest-dom/vitest';
|
|
3
3
|
import { render, screen } from '@testing-library/react';
|
|
4
4
|
import userEvent from '@testing-library/user-event';
|
|
@@ -193,5 +193,29 @@ describe('FilterBar', () => {
|
|
|
193
193
|
await user.click(screen.getByRole('button', { name: 'Remove date range filter' }));
|
|
194
194
|
expect(screen.getByRole('button', { name: 'Open filter' })).toHaveFocus();
|
|
195
195
|
});
|
|
196
|
+
test('does not stringify a non-text tag value into the accessible name', () => {
|
|
197
|
+
render(_jsx(FilterBar.ActiveList, { items: [
|
|
198
|
+
{ id: 'with-label', type: 'group', label: 'Year group', value: _jsx("span", { children: "Year 10" }), onClick: vi.fn() },
|
|
199
|
+
{ id: 'without-label', type: 'sort', value: _jsx("span", { children: "Name" }), onClick: vi.fn() },
|
|
200
|
+
] }));
|
|
201
|
+
expect(screen.getByRole('button', { name: 'Open group Year group' })).toBeInTheDocument();
|
|
202
|
+
expect(screen.getByRole('button', { name: 'Open sort' })).toBeInTheDocument();
|
|
203
|
+
expect(screen.queryByRole('button', { name: /\[object Object\]/ })).not.toBeInTheDocument();
|
|
204
|
+
});
|
|
205
|
+
test('uses an explicit actionLabel over the derived label for a non-text tag value', () => {
|
|
206
|
+
render(_jsxs(_Fragment, { children: [_jsx(FilterBar.ActiveList, { items: [
|
|
207
|
+
{ id: 'item', type: 'group', label: 'Year group', value: _jsx("span", { children: "Year 10" }), actionLabel: 'Open year group: Year 10', onClick: vi.fn() },
|
|
208
|
+
] }), _jsx(FilterBar.Tag, { type: "sort", value: _jsx("span", { children: "Name" }), actionLabel: "Open sort: Name", onClick: vi.fn() })] }));
|
|
209
|
+
expect(screen.getByRole('button', { name: 'Open year group: Year 10' })).toBeInTheDocument();
|
|
210
|
+
expect(screen.getByRole('button', { name: 'Open sort: Name' })).toBeInTheDocument();
|
|
211
|
+
});
|
|
212
|
+
test('keeps the value in the accessible name for string and number values', () => {
|
|
213
|
+
render(_jsx(FilterBar.ActiveList, { items: [
|
|
214
|
+
{ id: 'text', type: 'filter', label: 'Year group', value: 'Year 10', onClick: vi.fn() },
|
|
215
|
+
{ id: 'number', type: 'filter', value: 10, onClick: vi.fn() },
|
|
216
|
+
] }));
|
|
217
|
+
expect(screen.getByRole('button', { name: 'Open filter Year group: Year 10' })).toBeInTheDocument();
|
|
218
|
+
expect(screen.getByRole('button', { name: 'Open filter 10' })).toBeInTheDocument();
|
|
219
|
+
});
|
|
196
220
|
});
|
|
197
221
|
//# sourceMappingURL=FilterBar.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterBar.test.js","sourceRoot":"","sources":["../../../src/components/filterBar/FilterBar.test.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"FilterBar.test.js","sourceRoot":"","sources":["../../../src/components/filterBar/FilterBar.test.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -302,4 +302,54 @@ describe('FilterBar', () => {
|
|
|
302
302
|
await user.click(screen.getByRole('button', { name: 'Remove date range filter' }));
|
|
303
303
|
expect(screen.getByRole('button', { name: 'Open filter' })).toHaveFocus();
|
|
304
304
|
});
|
|
305
|
+
|
|
306
|
+
test('does not stringify a non-text tag value into the accessible name', () => {
|
|
307
|
+
render(
|
|
308
|
+
<FilterBar.ActiveList
|
|
309
|
+
items={[
|
|
310
|
+
{ id: 'with-label', type: 'group', label: 'Year group', value: <span>Year 10</span>, onClick: vi.fn() },
|
|
311
|
+
{ id: 'without-label', type: 'sort', value: <span>Name</span>, onClick: vi.fn() },
|
|
312
|
+
]}
|
|
313
|
+
/>,
|
|
314
|
+
);
|
|
315
|
+
|
|
316
|
+
expect(screen.getByRole('button', { name: 'Open group Year group' })).toBeInTheDocument();
|
|
317
|
+
expect(screen.getByRole('button', { name: 'Open sort' })).toBeInTheDocument();
|
|
318
|
+
expect(screen.queryByRole('button', { name: /\[object Object\]/ })).not.toBeInTheDocument();
|
|
319
|
+
});
|
|
320
|
+
|
|
321
|
+
test('uses an explicit actionLabel over the derived label for a non-text tag value', () => {
|
|
322
|
+
render(
|
|
323
|
+
<>
|
|
324
|
+
<FilterBar.ActiveList
|
|
325
|
+
items={[
|
|
326
|
+
{ id: 'item', type: 'group', label: 'Year group', value: <span>Year 10</span>, actionLabel: 'Open year group: Year 10', onClick: vi.fn() },
|
|
327
|
+
]}
|
|
328
|
+
/>
|
|
329
|
+
<FilterBar.Tag
|
|
330
|
+
type="sort"
|
|
331
|
+
value={<span>Name</span>}
|
|
332
|
+
actionLabel="Open sort: Name"
|
|
333
|
+
onClick={vi.fn()}
|
|
334
|
+
/>
|
|
335
|
+
</>,
|
|
336
|
+
);
|
|
337
|
+
|
|
338
|
+
expect(screen.getByRole('button', { name: 'Open year group: Year 10' })).toBeInTheDocument();
|
|
339
|
+
expect(screen.getByRole('button', { name: 'Open sort: Name' })).toBeInTheDocument();
|
|
340
|
+
});
|
|
341
|
+
|
|
342
|
+
test('keeps the value in the accessible name for string and number values', () => {
|
|
343
|
+
render(
|
|
344
|
+
<FilterBar.ActiveList
|
|
345
|
+
items={[
|
|
346
|
+
{ id: 'text', type: 'filter', label: 'Year group', value: 'Year 10', onClick: vi.fn() },
|
|
347
|
+
{ id: 'number', type: 'filter', value: 10, onClick: vi.fn() },
|
|
348
|
+
]}
|
|
349
|
+
/>,
|
|
350
|
+
);
|
|
351
|
+
|
|
352
|
+
expect(screen.getByRole('button', { name: 'Open filter Year group: Year 10' })).toBeInTheDocument();
|
|
353
|
+
expect(screen.getByRole('button', { name: 'Open filter 10' })).toBeInTheDocument();
|
|
354
|
+
});
|
|
305
355
|
});
|
|
@@ -18,6 +18,7 @@ export type FilterBarTagItem = {
|
|
|
18
18
|
icon?: IconName;
|
|
19
19
|
ariaControls?: string;
|
|
20
20
|
ariaExpanded?: boolean;
|
|
21
|
+
/** Accessible name for the tag button. Takes precedence over the label derived from `label` and `value`; provide it when `value` is not a string or number. */
|
|
21
22
|
actionLabel?: string;
|
|
22
23
|
removeLabel?: string;
|
|
23
24
|
disabled?: boolean;
|
|
@@ -89,7 +90,15 @@ const getButtonA11yLabel = (type: FilterBarType, label: string, count?: number |
|
|
|
89
90
|
return `Open ${label.toLowerCase()}. ${count} ${type} item${count === 1 ? '' : 's'} applied`;
|
|
90
91
|
};
|
|
91
92
|
|
|
92
|
-
const getTagActionLabel = (
|
|
93
|
+
const getTagActionLabel = ({ type, label, value }: FilterBarTagItem): string => {
|
|
94
|
+
const textValue = typeof value === 'string' || typeof value === 'number' ? value : null;
|
|
95
|
+
|
|
96
|
+
if (label) {
|
|
97
|
+
return textValue === null ? `Open ${type} ${label}` : `Open ${type} ${label}: ${textValue}`;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
return textValue === null ? `Open ${type}` : `Open ${type} ${textValue}`;
|
|
101
|
+
};
|
|
93
102
|
|
|
94
103
|
const FilterBarTagContent = ({ label, value }: Pick<FilterBarTagProps, 'label' | 'value'>) => {
|
|
95
104
|
return (
|