@kaizen/components 1.67.1 → 1.67.3
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/cjs/Filter/FilterBar/context/FilterBarContext.cjs +17 -2
- package/dist/cjs/Filter/FilterBar/context/reducer/filterBarStateReducer.cjs +4 -0
- package/dist/cjs/Filter/FilterBar/context/reducer/setupFilterBarState.cjs +2 -1
- package/dist/cjs/Filter/FilterBar/subcomponents/AddFiltersMenu/AddFiltersMenu.cjs +12 -1
- package/dist/cjs/Filter/FilterBar/subcomponents/FilterBarButton/FilterBarButton.cjs +12 -1
- package/dist/cjs/Filter/FilterBar/subcomponents/FilterBarMultiSelect/FilterBarMultiSelect.cjs +13 -2
- package/dist/cjs/Filter/FilterMultiSelect/FilterMultiSelect.cjs +4 -2
- package/dist/cjs/Filter/FilterMultiSelect/context/MenuTriggerProvider/MenuTriggerProvider.cjs +4 -2
- package/dist/cjs/TextField/TextField.cjs +2 -2
- package/dist/cjs/TextField/TextField.module.scss.cjs +4 -6
- package/dist/esm/Filter/FilterBar/context/FilterBarContext.mjs +17 -2
- package/dist/esm/Filter/FilterBar/context/reducer/filterBarStateReducer.mjs +4 -0
- package/dist/esm/Filter/FilterBar/context/reducer/setupFilterBarState.mjs +2 -1
- package/dist/esm/Filter/FilterBar/subcomponents/AddFiltersMenu/AddFiltersMenu.mjs +13 -2
- package/dist/esm/Filter/FilterBar/subcomponents/FilterBarButton/FilterBarButton.mjs +13 -2
- package/dist/esm/Filter/FilterBar/subcomponents/FilterBarMultiSelect/FilterBarMultiSelect.mjs +14 -3
- package/dist/esm/Filter/FilterMultiSelect/FilterMultiSelect.mjs +4 -2
- package/dist/esm/Filter/FilterMultiSelect/context/MenuTriggerProvider/MenuTriggerProvider.mjs +4 -2
- package/dist/esm/TextField/TextField.mjs +2 -2
- package/dist/esm/TextField/TextField.module.scss.mjs +4 -6
- package/dist/styles.css +252 -465
- package/dist/types/Filter/FilterBar/context/FilterBarContext.d.ts +2 -0
- package/dist/types/Filter/FilterBar/context/reducer/filterBarStateReducer.d.ts +3 -0
- package/dist/types/Filter/FilterBar/context/types.d.ts +1 -0
- package/dist/types/Filter/FilterMultiSelect/FilterMultiSelect.d.ts +2 -1
- package/dist/types/Filter/FilterMultiSelect/context/MenuTriggerProvider/MenuTriggerProvider.d.ts +2 -1
- package/package.json +3 -3
- package/src/Avatar/Avatar.module.scss +4 -4
- package/src/Checkbox/Checkbox/Checkbox.module.scss +2 -2
- package/src/Filter/FilterBar/FilterBar.spec.tsx +87 -0
- package/src/Filter/FilterBar/context/FilterBarContext.tsx +11 -2
- package/src/Filter/FilterBar/context/reducer/filterBarStateReducer.ts +7 -0
- package/src/Filter/FilterBar/context/reducer/setupFilterBarState.ts +1 -0
- package/src/Filter/FilterBar/context/types.ts +1 -0
- package/src/Filter/FilterBar/subcomponents/AddFiltersMenu/AddFiltersMenu.tsx +12 -2
- package/src/Filter/FilterBar/subcomponents/FilterBarButton/FilterBarButton.tsx +10 -2
- package/src/Filter/FilterBar/subcomponents/FilterBarMultiSelect/FilterBarMultiSelect.tsx +18 -3
- package/src/Filter/FilterMultiSelect/FilterMultiSelect.tsx +3 -1
- package/src/Filter/FilterMultiSelect/context/MenuTriggerProvider/MenuTriggerProvider.tsx +4 -1
- package/src/Filter/FilterMultiSelect/subcomponents/SelectionControlButton/SelectionControlButton.module.scss +9 -10
- package/src/GuidanceBlock/GuidanceBlock.module.scss +4 -5
- package/src/Input/InputRange/InputRange.module.scss +4 -4
- package/src/Input/InputSearch/InputSearch.module.scss +21 -21
- package/src/LikertScaleLegacy/LikertScaleLegacy.module.scss +7 -8
- package/src/Modal/ContextModal/ContextModal.module.scss +4 -4
- package/src/Modal/GenericModal/GenericModal.module.scss +8 -8
- package/src/Modal/GenericModal/subcomponents/ModalHeader/ModalHeader.module.scss +2 -2
- package/src/Modal/InputEditModal/InputEditModal.module.scss +4 -4
- package/src/Notification/subcomponents/GenericNotification/_mixins.scss +7 -8
- package/src/RichTextEditor/RichTextEditor/RichTextEditor.module.scss +2 -2
- package/src/Select/Select.module.scss +7 -7
- package/src/Table/Table.module.scss +11 -7
- package/src/TextArea/TextArea.module.scss +4 -4
- package/src/TextField/TextField.module.scss +10 -36
- package/src/TextField/TextField.tsx +2 -4
- package/src/TextField/_docs/TextField.stickersheet.stories.tsx +9 -1
- package/src/Tile/subcomponents/GenericTile/GenericTile.module.scss +7 -8
- package/src/TitleBlockZen/TitleBlockZen.module.scss +14 -21
- package/src/TitleBlockZen/subcomponents/MobileActions.module.scss +2 -2
- package/src/__future__/Tag/RemovableTag/subcomponents/RemoveButton.module.scss +1 -2
|
@@ -14,6 +14,8 @@ export type FilterBarContextValue<Value, ValuesMap extends FiltersValues = Recor
|
|
|
14
14
|
hideFilter: <Id extends keyof ValuesMap>(id: Id) => void;
|
|
15
15
|
getInactiveFilters: () => Array<FilterAttributes<ValuesMap>>;
|
|
16
16
|
clearAllFilters: () => void;
|
|
17
|
+
setFocus: <Id extends keyof ValuesMap>(id: Id | undefined) => void;
|
|
18
|
+
focusId?: keyof ValuesMap;
|
|
17
19
|
};
|
|
18
20
|
export declare const useFilterBarContext: <Value, Values extends FiltersValues = Record<string, Value>>() => FilterBarContextValue<Value, Values>;
|
|
19
21
|
export type FilterBarProviderProps<ValuesMap extends FiltersValues> = {
|
|
@@ -18,6 +18,9 @@ type Actions<ValuesMap extends FiltersValues> = {
|
|
|
18
18
|
} | {
|
|
19
19
|
type: "update_filter_labels";
|
|
20
20
|
data: Filters<ValuesMap>;
|
|
21
|
+
} | {
|
|
22
|
+
type: "set_focus";
|
|
23
|
+
id: keyof ValuesMap | undefined;
|
|
21
24
|
};
|
|
22
25
|
export declare const filterBarStateReducer: <ValuesMap extends FiltersValues>(state: FilterBarState<ValuesMap>, action: Actions<ValuesMap>) => FilterBarState<ValuesMap>;
|
|
23
26
|
export {};
|
|
@@ -24,5 +24,6 @@ export type FilterBarState<ValuesMap extends FiltersValues> = {
|
|
|
24
24
|
activeFilterIds: Set<keyof ValuesMap>;
|
|
25
25
|
values: Partial<ValuesMap>;
|
|
26
26
|
dependentFilterIds: Set<keyof ValuesMap>;
|
|
27
|
+
focusId?: keyof ValuesMap;
|
|
27
28
|
};
|
|
28
29
|
export type ActiveFiltersArray<ValuesMap extends FiltersValues> = Array<FilterAttributes<ValuesMap>>;
|
|
@@ -15,9 +15,10 @@ type SelectionProps = {
|
|
|
15
15
|
export type FilterMultiSelectProps = {
|
|
16
16
|
trigger: (value?: MenuTriggerProviderContextType) => React.ReactNode;
|
|
17
17
|
children: (value?: SelectionProviderContextType) => React.ReactNode;
|
|
18
|
+
triggerRef?: React.RefObject<HTMLButtonElement>;
|
|
18
19
|
} & Omit<MenuPopupProps, "children"> & Omit<MenuTriggerProviderProps, "children"> & SelectionProps;
|
|
19
20
|
export declare const FilterMultiSelect: {
|
|
20
|
-
({ trigger, children, isOpen, defaultOpen, onOpenChange, isLoading, loadingSkeleton, label, items, selectedKeys, defaultSelectedKeys, onSelectionChange, selectionMode, onSearchInputChange, }: FilterMultiSelectProps): JSX.Element;
|
|
21
|
+
({ trigger, children, isOpen, defaultOpen, onOpenChange, isLoading, loadingSkeleton, label, items, selectedKeys, defaultSelectedKeys, onSelectionChange, selectionMode, onSearchInputChange, triggerRef, }: FilterMultiSelectProps): JSX.Element;
|
|
21
22
|
displayName: string;
|
|
22
23
|
TriggerButton: {
|
|
23
24
|
({ selectedOptionLabels, label, classNameOverride, labelCharacterLimitBeforeTruncate, }: import("./subcomponents/Trigger").FilterTriggerButtonProps): JSX.Element;
|
package/dist/types/Filter/FilterMultiSelect/context/MenuTriggerProvider/MenuTriggerProvider.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ export type MenuTriggerProviderProps = {
|
|
|
7
7
|
defaultOpen?: boolean;
|
|
8
8
|
onOpenChange?: (isOpen: boolean) => void;
|
|
9
9
|
children: React.ReactNode;
|
|
10
|
+
triggerRef?: React.RefObject<HTMLButtonElement>;
|
|
10
11
|
};
|
|
11
12
|
export type MenuTriggerProviderContextType = {
|
|
12
13
|
menuTriggerProps: HTMLAttributes<HTMLElement>;
|
|
@@ -15,6 +16,6 @@ export type MenuTriggerProviderContextType = {
|
|
|
15
16
|
menuTriggerState: MenuTriggerState;
|
|
16
17
|
buttonRef: React.RefObject<HTMLButtonElement>;
|
|
17
18
|
};
|
|
18
|
-
export declare function MenuTriggerProvider({ isOpen, defaultOpen, onOpenChange, children, }: MenuTriggerProviderProps): JSX.Element;
|
|
19
|
+
export declare function MenuTriggerProvider({ isOpen, defaultOpen, onOpenChange, children, triggerRef, }: MenuTriggerProviderProps): JSX.Element;
|
|
19
20
|
export declare const useMenuTriggerContext: () => MenuTriggerProviderContextType;
|
|
20
21
|
export declare const MenuTriggerConsumer: ({ children, }: React.ConsumerProps<MenuTriggerProviderContextType>) => JSX.Element;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kaizen/components",
|
|
3
|
-
"version": "1.67.
|
|
3
|
+
"version": "1.67.3",
|
|
4
4
|
"description": "Kaizen component library",
|
|
5
5
|
"author": "Geoffrey Chong <geoff.chong@cultureamp.com>",
|
|
6
6
|
"homepage": "https://cultureamp.design",
|
|
@@ -119,8 +119,8 @@
|
|
|
119
119
|
"svgo": "^3.3.2",
|
|
120
120
|
"tslib": "^2.7.0",
|
|
121
121
|
"tsx": "^4.19.1",
|
|
122
|
-
"@kaizen/
|
|
123
|
-
"@kaizen/
|
|
122
|
+
"@kaizen/design-tokens": "10.8.0",
|
|
123
|
+
"@kaizen/package-bundler": "1.1.7"
|
|
124
124
|
},
|
|
125
125
|
"peerDependencies": {
|
|
126
126
|
"@cultureamp/i18n-react-intl": "^2.5.9",
|
|
@@ -10,11 +10,11 @@ $dt-color-checkbox-background-color-checked: $color-gray-500;
|
|
|
10
10
|
|
|
11
11
|
// override bootstrap styles
|
|
12
12
|
.checkbox.checkbox {
|
|
13
|
-
@include form-input-visually-hidden;
|
|
14
|
-
|
|
15
13
|
width: $checkbox-size;
|
|
16
14
|
height: $checkbox-size;
|
|
17
15
|
margin: 0;
|
|
16
|
+
|
|
17
|
+
@include form-input-visually-hidden;
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
.checkbox:disabled {
|
|
@@ -65,6 +65,7 @@ const simpleFilters = [
|
|
|
65
65
|
type ValuesRemovable = {
|
|
66
66
|
flavour: string
|
|
67
67
|
topping: string
|
|
68
|
+
others: string
|
|
68
69
|
}
|
|
69
70
|
|
|
70
71
|
const filtersRemovable = [
|
|
@@ -86,6 +87,37 @@ const filtersRemovable = [
|
|
|
86
87
|
),
|
|
87
88
|
isRemovable: true,
|
|
88
89
|
},
|
|
90
|
+
{
|
|
91
|
+
id: "others",
|
|
92
|
+
name: "Others",
|
|
93
|
+
Component: (
|
|
94
|
+
<FilterBar.MultiSelect
|
|
95
|
+
items={[
|
|
96
|
+
{ value: "gluten-free", label: "Gluten Free" },
|
|
97
|
+
{ value: "no-sugar", label: "No Sugar" },
|
|
98
|
+
{ value: "dairy-free", label: "Dairy Free" },
|
|
99
|
+
]}
|
|
100
|
+
>
|
|
101
|
+
{(): JSX.Element => (
|
|
102
|
+
<>
|
|
103
|
+
<FilterMultiSelect.SearchInput />
|
|
104
|
+
<FilterMultiSelect.ListBox>
|
|
105
|
+
{({ allItems }): JSX.Element | JSX.Element[] =>
|
|
106
|
+
allItems.map(item => (
|
|
107
|
+
<FilterMultiSelect.Option key={item.key} item={item} />
|
|
108
|
+
))
|
|
109
|
+
}
|
|
110
|
+
</FilterMultiSelect.ListBox>
|
|
111
|
+
<FilterMultiSelect.MenuFooter>
|
|
112
|
+
<FilterMultiSelect.SelectAllButton />
|
|
113
|
+
<FilterMultiSelect.ClearButton />
|
|
114
|
+
</FilterMultiSelect.MenuFooter>
|
|
115
|
+
</>
|
|
116
|
+
)}
|
|
117
|
+
</FilterBar.MultiSelect>
|
|
118
|
+
),
|
|
119
|
+
isRemovable: true,
|
|
120
|
+
},
|
|
89
121
|
] satisfies Filters<ValuesRemovable>
|
|
90
122
|
|
|
91
123
|
type ValuesDependent = {
|
|
@@ -288,6 +320,61 @@ describe("<FilterBar />", () => {
|
|
|
288
320
|
expect(filters[1]).toHaveTextContent("Flavour")
|
|
289
321
|
expect(filters[2]).toHaveTextContent("Sugar Level")
|
|
290
322
|
})
|
|
323
|
+
|
|
324
|
+
it("moves focus to recently added filter button", async () => {
|
|
325
|
+
const { getByRole } = render(
|
|
326
|
+
<FilterBarWrapper<ValuesSimple>
|
|
327
|
+
filters={simpleFilters.map(filter => ({
|
|
328
|
+
...filter,
|
|
329
|
+
isRemovable: true,
|
|
330
|
+
}))}
|
|
331
|
+
/>
|
|
332
|
+
)
|
|
333
|
+
await waitForI18nContent()
|
|
334
|
+
|
|
335
|
+
const addFiltersButton = getByRole("button", { name: "Add Filters" })
|
|
336
|
+
await user.click(addFiltersButton)
|
|
337
|
+
|
|
338
|
+
const menuOptionIceLevel = getByRole("button", { name: "Ice Level" })
|
|
339
|
+
await user.click(menuOptionIceLevel)
|
|
340
|
+
|
|
341
|
+
expect(getByRole("button", { name: "Ice Level" })).toHaveFocus()
|
|
342
|
+
})
|
|
343
|
+
|
|
344
|
+
it("moves focus to recently added filter button in the FilterMultiSelect case", async () => {
|
|
345
|
+
const { getByRole } = render(
|
|
346
|
+
<FilterBarWrapper<ValuesRemovable> filters={filtersRemovable} />
|
|
347
|
+
)
|
|
348
|
+
await waitForI18nContent()
|
|
349
|
+
|
|
350
|
+
const addFiltersButton = getByRole("button", { name: "Add Filters" })
|
|
351
|
+
await user.click(addFiltersButton)
|
|
352
|
+
|
|
353
|
+
const menuOptionOthers = getByRole("button", { name: "Others" })
|
|
354
|
+
await user.click(menuOptionOthers)
|
|
355
|
+
|
|
356
|
+
expect(getByRole("button", { name: "Others" })).toHaveFocus()
|
|
357
|
+
})
|
|
358
|
+
|
|
359
|
+
it("restores focus to the add filter button after remove", async () => {
|
|
360
|
+
const { getByRole } = render(
|
|
361
|
+
<FilterBarWrapper<ValuesRemovable>
|
|
362
|
+
filters={filtersRemovable}
|
|
363
|
+
defaultValues={{ topping: "pearls" }}
|
|
364
|
+
/>
|
|
365
|
+
)
|
|
366
|
+
await waitForI18nContent()
|
|
367
|
+
|
|
368
|
+
const filterButton = getByRole("button", { name: "Topping : Pearls" })
|
|
369
|
+
expect(filterButton).toBeVisible()
|
|
370
|
+
|
|
371
|
+
await user.click(getByRole("button", { name: "Remove filter - Topping" }))
|
|
372
|
+
await waitFor(() => {
|
|
373
|
+
expect(filterButton).not.toBeInTheDocument()
|
|
374
|
+
})
|
|
375
|
+
|
|
376
|
+
expect(getByRole("button", { name: "Add Filters" })).toHaveFocus()
|
|
377
|
+
})
|
|
291
378
|
})
|
|
292
379
|
|
|
293
380
|
describe("Dependent filters", () => {
|
|
@@ -43,6 +43,8 @@ export type FilterBarContextValue<
|
|
|
43
43
|
hideFilter: <Id extends keyof ValuesMap>(id: Id) => void
|
|
44
44
|
getInactiveFilters: () => Array<FilterAttributes<ValuesMap>>
|
|
45
45
|
clearAllFilters: () => void
|
|
46
|
+
setFocus: <Id extends keyof ValuesMap>(id: Id | undefined) => void
|
|
47
|
+
focusId?: keyof ValuesMap
|
|
46
48
|
}
|
|
47
49
|
|
|
48
50
|
const FilterBarContext = React.createContext<FilterBarContextValue<any> | null>(
|
|
@@ -119,10 +121,13 @@ export const FilterBarProvider = <ValuesMap extends FiltersValues>({
|
|
|
119
121
|
values: { ...values, [id]: getValidValue(newValue) },
|
|
120
122
|
})
|
|
121
123
|
},
|
|
122
|
-
showFilter: <Id extends keyof ValuesMap>(id: Id): void =>
|
|
123
|
-
dispatch({ type: "activate_filter", id })
|
|
124
|
+
showFilter: <Id extends keyof ValuesMap>(id: Id): void => {
|
|
125
|
+
dispatch({ type: "activate_filter", id })
|
|
126
|
+
dispatch({ type: "set_focus", id })
|
|
127
|
+
},
|
|
124
128
|
hideFilter: <Id extends keyof ValuesMap>(id: Id): void => {
|
|
125
129
|
dispatch({ type: "deactivate_filter", id })
|
|
130
|
+
dispatch({ type: "set_focus", id: "add_filter" })
|
|
126
131
|
},
|
|
127
132
|
getInactiveFilters: () => getInactiveFilters<ValuesMap>(state),
|
|
128
133
|
clearAllFilters: () => {
|
|
@@ -132,6 +137,10 @@ export const FilterBarProvider = <ValuesMap extends FiltersValues>({
|
|
|
132
137
|
})
|
|
133
138
|
dispatch({ type: "update_values", values: {} })
|
|
134
139
|
},
|
|
140
|
+
setFocus: <Id extends keyof ValuesMap>(id: Id | undefined) => {
|
|
141
|
+
dispatch({ type: "set_focus", id })
|
|
142
|
+
},
|
|
143
|
+
focusId: state.focusId,
|
|
135
144
|
} satisfies FilterBarContextValue<any, ValuesMap>
|
|
136
145
|
|
|
137
146
|
useEffect(() => {
|
|
@@ -15,12 +15,19 @@ type Actions<ValuesMap extends FiltersValues> =
|
|
|
15
15
|
| { type: "activate_filter"; id: keyof ValuesMap }
|
|
16
16
|
| { type: "deactivate_filter"; id: keyof ValuesMap }
|
|
17
17
|
| { type: "update_filter_labels"; data: Filters<ValuesMap> }
|
|
18
|
+
| { type: "set_focus"; id: keyof ValuesMap | undefined }
|
|
18
19
|
|
|
19
20
|
export const filterBarStateReducer = <ValuesMap extends FiltersValues>(
|
|
20
21
|
state: FilterBarState<ValuesMap>,
|
|
21
22
|
action: Actions<ValuesMap>
|
|
22
23
|
): FilterBarState<ValuesMap> => {
|
|
23
24
|
switch (action.type) {
|
|
25
|
+
case "set_focus":
|
|
26
|
+
return {
|
|
27
|
+
...state,
|
|
28
|
+
focusId: action.id,
|
|
29
|
+
}
|
|
30
|
+
|
|
24
31
|
case "update_values":
|
|
25
32
|
return { ...updateValues(state, action.values) }
|
|
26
33
|
|
|
@@ -32,6 +32,7 @@ export type FilterBarState<ValuesMap extends FiltersValues> = {
|
|
|
32
32
|
activeFilterIds: Set<keyof ValuesMap>
|
|
33
33
|
values: Partial<ValuesMap>
|
|
34
34
|
dependentFilterIds: Set<keyof ValuesMap>
|
|
35
|
+
focusId?: keyof ValuesMap
|
|
35
36
|
}
|
|
36
37
|
|
|
37
38
|
export type ActiveFiltersArray<ValuesMap extends FiltersValues> = Array<
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React from "react"
|
|
1
|
+
import React, { useEffect, useRef } from "react"
|
|
2
2
|
import { useIntl } from "@cultureamp/i18n-react-intl"
|
|
3
3
|
import { Menu, MenuList, MenuItem, Button } from "~components/__actions__/v2"
|
|
4
4
|
import { Icon } from "~components/__future__/Icon"
|
|
@@ -6,6 +6,7 @@ import { useFilterBarContext } from "../../context/FilterBarContext"
|
|
|
6
6
|
|
|
7
7
|
export const AddFiltersMenu = (): JSX.Element => {
|
|
8
8
|
const { formatMessage } = useIntl()
|
|
9
|
+
const buttonRef = useRef<HTMLButtonElement>(null)
|
|
9
10
|
|
|
10
11
|
const menuButtonLabel = formatMessage({
|
|
11
12
|
id: "filterBar.addFiltersMenu.buttonLabel",
|
|
@@ -14,13 +15,22 @@ export const AddFiltersMenu = (): JSX.Element => {
|
|
|
14
15
|
"Menu button label to show additional available filter options",
|
|
15
16
|
})
|
|
16
17
|
|
|
17
|
-
const { getInactiveFilters, showFilter } =
|
|
18
|
+
const { getInactiveFilters, showFilter, focusId, setFocus } =
|
|
19
|
+
useFilterBarContext()
|
|
18
20
|
const inactiveFilters = getInactiveFilters()
|
|
19
21
|
|
|
22
|
+
useEffect(() => {
|
|
23
|
+
if (focusId === "add_filter") {
|
|
24
|
+
buttonRef.current?.focus()
|
|
25
|
+
setFocus(undefined)
|
|
26
|
+
}
|
|
27
|
+
}, [focusId])
|
|
28
|
+
|
|
20
29
|
return (
|
|
21
30
|
<Menu
|
|
22
31
|
button={
|
|
23
32
|
<Button
|
|
33
|
+
ref={buttonRef}
|
|
24
34
|
label={menuButtonLabel}
|
|
25
35
|
secondary
|
|
26
36
|
disabled={inactiveFilters.length === 0}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, { forwardRef } from "react"
|
|
1
|
+
import React, { forwardRef, useEffect } from "react"
|
|
2
2
|
import { FilterTriggerRef } from "~components/Filter/Filter"
|
|
3
3
|
import { useFilterBarContext } from "~components/Filter/FilterBar/context/FilterBarContext"
|
|
4
4
|
import {
|
|
@@ -6,6 +6,7 @@ import {
|
|
|
6
6
|
FilterButtonProps,
|
|
7
7
|
FilterButtonRemovable,
|
|
8
8
|
} from "~components/Filter/FilterButton"
|
|
9
|
+
import { isRefObject } from "~components/utils/isRefObject"
|
|
9
10
|
|
|
10
11
|
export type FilterBarButtonProps = FilterButtonProps & {
|
|
11
12
|
filterId: string
|
|
@@ -16,7 +17,14 @@ export const FilterBarButton = forwardRef<
|
|
|
16
17
|
FilterTriggerRef,
|
|
17
18
|
FilterBarButtonProps
|
|
18
19
|
>(({ filterId, isRemovable = false, ...props }, ref): JSX.Element => {
|
|
19
|
-
const { hideFilter } = useFilterBarContext()
|
|
20
|
+
const { hideFilter, focusId, setFocus } = useFilterBarContext()
|
|
21
|
+
|
|
22
|
+
useEffect(() => {
|
|
23
|
+
if (focusId === filterId && isRefObject(ref)) {
|
|
24
|
+
ref?.current?.triggerRef?.current?.focus()
|
|
25
|
+
setFocus(undefined)
|
|
26
|
+
}
|
|
27
|
+
}, [focusId])
|
|
20
28
|
|
|
21
29
|
return isRemovable ? (
|
|
22
30
|
<FilterButtonRemovable
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, { useEffect, useState } from "react"
|
|
1
|
+
import React, { useEffect, useRef, useState } from "react"
|
|
2
2
|
import { Selection, Key } from "@react-types/shared"
|
|
3
3
|
import {
|
|
4
4
|
FilterMultiSelect,
|
|
@@ -43,9 +43,16 @@ export const FilterBarMultiSelect = ({
|
|
|
43
43
|
onSelectionChange,
|
|
44
44
|
...props
|
|
45
45
|
}: FilterBarMultiSelectProps): JSX.Element | null => {
|
|
46
|
-
const {
|
|
47
|
-
|
|
46
|
+
const {
|
|
47
|
+
getFilterState,
|
|
48
|
+
setFilterOpenState,
|
|
49
|
+
updateValue,
|
|
50
|
+
hideFilter,
|
|
51
|
+
focusId,
|
|
52
|
+
setFocus,
|
|
53
|
+
} = useFilterBarContext<ConsumableSelection>()
|
|
48
54
|
const [items, setItems] = useState<ItemType[]>(propsItems)
|
|
55
|
+
const buttonRef = useRef<HTMLButtonElement>(null)
|
|
49
56
|
|
|
50
57
|
if (!id) throw Error("Missing `id` prop in FilterBarMultiSelect")
|
|
51
58
|
|
|
@@ -70,6 +77,13 @@ export const FilterBarMultiSelect = ({
|
|
|
70
77
|
}
|
|
71
78
|
}, [items])
|
|
72
79
|
|
|
80
|
+
useEffect(() => {
|
|
81
|
+
if (focusId === id) {
|
|
82
|
+
buttonRef.current?.focus()
|
|
83
|
+
setFocus(undefined)
|
|
84
|
+
}
|
|
85
|
+
}, [focusId])
|
|
86
|
+
|
|
73
87
|
return (
|
|
74
88
|
<FilterMultiSelect
|
|
75
89
|
label={filterState.name}
|
|
@@ -103,6 +117,7 @@ export const FilterBarMultiSelect = ({
|
|
|
103
117
|
<FilterMultiSelect.TriggerButton {...triggerProps} />
|
|
104
118
|
)
|
|
105
119
|
}}
|
|
120
|
+
triggerRef={buttonRef}
|
|
106
121
|
{...props}
|
|
107
122
|
>
|
|
108
123
|
{children}
|
|
@@ -41,6 +41,7 @@ type SelectionProps = {
|
|
|
41
41
|
export type FilterMultiSelectProps = {
|
|
42
42
|
trigger: (value?: MenuTriggerProviderContextType) => React.ReactNode
|
|
43
43
|
children: (value?: SelectionProviderContextType) => React.ReactNode // the content of the menu
|
|
44
|
+
triggerRef?: React.RefObject<HTMLButtonElement>
|
|
44
45
|
} & Omit<MenuPopupProps, "children"> &
|
|
45
46
|
Omit<MenuTriggerProviderProps, "children"> &
|
|
46
47
|
SelectionProps
|
|
@@ -60,8 +61,9 @@ export const FilterMultiSelect = ({
|
|
|
60
61
|
onSelectionChange,
|
|
61
62
|
selectionMode = "multiple",
|
|
62
63
|
onSearchInputChange,
|
|
64
|
+
triggerRef,
|
|
63
65
|
}: FilterMultiSelectProps): JSX.Element => {
|
|
64
|
-
const menuTriggerProps = { isOpen, defaultOpen, onOpenChange }
|
|
66
|
+
const menuTriggerProps = { isOpen, defaultOpen, onOpenChange, triggerRef }
|
|
65
67
|
const menuPopupProps = { isLoading, loadingSkeleton }
|
|
66
68
|
const disabledKeys: Selection = new Set(
|
|
67
69
|
items
|
|
@@ -14,6 +14,7 @@ export type MenuTriggerProviderProps = {
|
|
|
14
14
|
defaultOpen?: boolean
|
|
15
15
|
onOpenChange?: (isOpen: boolean) => void
|
|
16
16
|
children: React.ReactNode
|
|
17
|
+
triggerRef?: React.RefObject<HTMLButtonElement>
|
|
17
18
|
}
|
|
18
19
|
|
|
19
20
|
export type MenuTriggerProviderContextType = {
|
|
@@ -32,12 +33,14 @@ export function MenuTriggerProvider({
|
|
|
32
33
|
defaultOpen,
|
|
33
34
|
onOpenChange,
|
|
34
35
|
children,
|
|
36
|
+
triggerRef,
|
|
35
37
|
}: MenuTriggerProviderProps): JSX.Element {
|
|
36
38
|
// Create state based on the incoming props to manage the open/close
|
|
37
39
|
const state = useMenuTriggerState({ isOpen, defaultOpen, onOpenChange })
|
|
38
40
|
|
|
39
41
|
// Get A11y attributes and events for the menu trigger and menu elements
|
|
40
|
-
const
|
|
42
|
+
const fallbackRef = useRef<HTMLButtonElement>(null)
|
|
43
|
+
const ref = triggerRef || fallbackRef
|
|
41
44
|
const { menuTriggerProps, menuProps } = useMenuTrigger<ItemType>(
|
|
42
45
|
{},
|
|
43
46
|
state,
|
|
@@ -11,17 +11,20 @@ $focus-ring-offset: 1px;
|
|
|
11
11
|
|
|
12
12
|
-webkit-font-smoothing: antialiased;
|
|
13
13
|
-moz-osx-font-smoothing: grayscale;
|
|
14
|
-
font-family: $typography-button-secondary-font-family;
|
|
15
|
-
font-weight: $typography-button-secondary-font-weight;
|
|
16
|
-
font-size: $typography-button-secondary-font-size;
|
|
17
|
-
line-height: $typography-button-secondary-line-height;
|
|
18
|
-
letter-spacing: $typography-button-secondary-letter-spacing;
|
|
19
14
|
position: relative;
|
|
20
|
-
|
|
15
|
+
display: inline-flex;
|
|
16
|
+
align-items: center;
|
|
17
|
+
gap: $spacing-xs;
|
|
21
18
|
border: $border-solid-border-width $border-solid-border-style;
|
|
22
19
|
border-color: $border-borderless-border-color;
|
|
23
20
|
border-radius: $border-solid-border-radius;
|
|
24
21
|
padding: $spacing-4 $spacing-8;
|
|
22
|
+
font-weight: $typography-button-secondary-font-weight;
|
|
23
|
+
font-family: $typography-button-secondary-font-family;
|
|
24
|
+
font-size: $typography-button-secondary-font-size;
|
|
25
|
+
line-height: $typography-button-secondary-line-height;
|
|
26
|
+
letter-spacing: $typography-button-secondary-letter-spacing;
|
|
27
|
+
color: $color-blue-500;
|
|
25
28
|
|
|
26
29
|
&:focus {
|
|
27
30
|
outline: none;
|
|
@@ -48,10 +51,6 @@ $focus-ring-offset: 1px;
|
|
|
48
51
|
inset: calc(-1 * #{$focus-ring-offset});
|
|
49
52
|
}
|
|
50
53
|
|
|
51
|
-
display: inline-flex;
|
|
52
|
-
gap: $spacing-xs;
|
|
53
|
-
align-items: center;
|
|
54
|
-
|
|
55
54
|
// TODO: copied from Calendar button since the design is not settled
|
|
56
55
|
&.isDisabled {
|
|
57
56
|
pointer-events: none;
|
|
@@ -178,6 +178,10 @@ $scene-illustration-size: 300px;
|
|
|
178
178
|
@include button-reset;
|
|
179
179
|
|
|
180
180
|
cursor: pointer;
|
|
181
|
+
position: absolute;
|
|
182
|
+
top: $spacing-sm;
|
|
183
|
+
right: $spacing-sm;
|
|
184
|
+
color: $color-purple-800;
|
|
181
185
|
|
|
182
186
|
.icon {
|
|
183
187
|
opacity: 70%;
|
|
@@ -207,11 +211,6 @@ $scene-illustration-size: 300px;
|
|
|
207
211
|
}
|
|
208
212
|
}
|
|
209
213
|
}
|
|
210
|
-
|
|
211
|
-
position: absolute;
|
|
212
|
-
top: $spacing-sm;
|
|
213
|
-
right: $spacing-sm;
|
|
214
|
-
color: $color-purple-800;
|
|
215
214
|
}
|
|
216
215
|
|
|
217
216
|
.default {
|
|
@@ -74,9 +74,9 @@ input[type="range"].ratingScaleRange {
|
|
|
74
74
|
}
|
|
75
75
|
|
|
76
76
|
&::-webkit-slider-runnable-track {
|
|
77
|
-
@include track;
|
|
78
|
-
|
|
79
77
|
margin: $spacing-sm 0;
|
|
78
|
+
|
|
79
|
+
@include track;
|
|
80
80
|
}
|
|
81
81
|
|
|
82
82
|
&::-moz-range-track {
|
|
@@ -84,10 +84,10 @@ input[type="range"].ratingScaleRange {
|
|
|
84
84
|
}
|
|
85
85
|
|
|
86
86
|
&::-webkit-slider-thumb {
|
|
87
|
-
@include thumb;
|
|
88
|
-
|
|
89
87
|
-webkit-appearance: none;
|
|
90
88
|
margin-top: calc((#{$thumb-height-with-border}/ 2) * -1);
|
|
89
|
+
|
|
90
|
+
@include thumb;
|
|
91
91
|
}
|
|
92
92
|
|
|
93
93
|
&::-moz-range-thumb {
|
|
@@ -29,10 +29,6 @@ $classname--input: '.input[type="search"]';
|
|
|
29
29
|
#{$classname--input} {
|
|
30
30
|
@include form-input-reset;
|
|
31
31
|
|
|
32
|
-
@include form-input-placeholder {
|
|
33
|
-
opacity: 100%;
|
|
34
|
-
}
|
|
35
|
-
|
|
36
32
|
display: flex;
|
|
37
33
|
align-items: center;
|
|
38
34
|
height: $input-height;
|
|
@@ -44,6 +40,10 @@ $classname--input: '.input[type="search"]';
|
|
|
44
40
|
font-size: 1rem;
|
|
45
41
|
line-height: 1.5;
|
|
46
42
|
|
|
43
|
+
@include form-input-placeholder {
|
|
44
|
+
opacity: 100%;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
47
|
&::-webkit-search-cancel-button {
|
|
48
48
|
-webkit-appearance: none;
|
|
49
49
|
}
|
|
@@ -113,14 +113,14 @@ $classname--input: '.input[type="search"]';
|
|
|
113
113
|
// Default
|
|
114
114
|
.default {
|
|
115
115
|
#{$classname--input} {
|
|
116
|
+
border-color: $color-gray-500;
|
|
117
|
+
background-color: $color-white;
|
|
118
|
+
color: $color-purple-800;
|
|
119
|
+
|
|
116
120
|
@include form-input-placeholder {
|
|
117
121
|
color: $color-purple-800;
|
|
118
122
|
opacity: $input-placeholder-opacity--default;
|
|
119
123
|
}
|
|
120
|
-
|
|
121
|
-
border-color: $color-gray-500;
|
|
122
|
-
background-color: $color-white;
|
|
123
|
-
color: $color-purple-800;
|
|
124
124
|
}
|
|
125
125
|
|
|
126
126
|
.focusRing {
|
|
@@ -135,12 +135,12 @@ $classname--input: '.input[type="search"]';
|
|
|
135
135
|
&:hover,
|
|
136
136
|
&:focus-within {
|
|
137
137
|
#{$classname--input} {
|
|
138
|
+
border-color: $color-gray-600;
|
|
139
|
+
background-color: $color-gray-200;
|
|
140
|
+
|
|
138
141
|
@include form-input-placeholder {
|
|
139
142
|
opacity: 100%;
|
|
140
143
|
}
|
|
141
|
-
|
|
142
|
-
border-color: $color-gray-600;
|
|
143
|
-
background-color: $color-gray-200;
|
|
144
144
|
}
|
|
145
145
|
|
|
146
146
|
.startIconAdornment {
|
|
@@ -152,14 +152,14 @@ $classname--input: '.input[type="search"]';
|
|
|
152
152
|
// Secondary
|
|
153
153
|
.secondary {
|
|
154
154
|
#{$classname--input} {
|
|
155
|
+
border-color: transparent;
|
|
156
|
+
background-color: $color-gray-200;
|
|
157
|
+
color: $color-purple-800;
|
|
158
|
+
|
|
155
159
|
@include form-input-placeholder {
|
|
156
160
|
color: $color-purple-800;
|
|
157
161
|
opacity: $input-placeholder-opacity--default;
|
|
158
162
|
}
|
|
159
|
-
|
|
160
|
-
border-color: transparent;
|
|
161
|
-
background-color: $color-gray-200;
|
|
162
|
-
color: $color-purple-800;
|
|
163
163
|
}
|
|
164
164
|
|
|
165
165
|
.focusRing {
|
|
@@ -174,12 +174,12 @@ $classname--input: '.input[type="search"]';
|
|
|
174
174
|
&:hover,
|
|
175
175
|
&:focus-within {
|
|
176
176
|
#{$classname--input} {
|
|
177
|
+
border-color: transparent;
|
|
178
|
+
background-color: $color-gray-300;
|
|
179
|
+
|
|
177
180
|
@include form-input-placeholder {
|
|
178
181
|
opacity: 100%;
|
|
179
182
|
}
|
|
180
|
-
|
|
181
|
-
border-color: transparent;
|
|
182
|
-
background-color: $color-gray-300;
|
|
183
183
|
}
|
|
184
184
|
|
|
185
185
|
.startIconAdornment {
|
|
@@ -191,13 +191,13 @@ $classname--input: '.input[type="search"]';
|
|
|
191
191
|
// Reversed
|
|
192
192
|
.reversed {
|
|
193
193
|
#{$classname--input} {
|
|
194
|
+
background: rgba($color-white-rgb, 0.1);
|
|
195
|
+
color: $color-white;
|
|
196
|
+
|
|
194
197
|
@include form-input-placeholder {
|
|
195
198
|
color: $color-white;
|
|
196
199
|
opacity: $input-placeholder-opacity--reversed;
|
|
197
200
|
}
|
|
198
|
-
|
|
199
|
-
background: rgba($color-white-rgb, 0.1);
|
|
200
|
-
color: $color-white;
|
|
201
201
|
}
|
|
202
202
|
|
|
203
203
|
.focusRing {
|
|
@@ -170,6 +170,13 @@ $blue-fifth: $color-blue-500;
|
|
|
170
170
|
.likertItem {
|
|
171
171
|
margin-right: 2px;
|
|
172
172
|
margin-left: 2px;
|
|
173
|
+
font-size: 1px;
|
|
174
|
+
line-height: 1;
|
|
175
|
+
padding: 0;
|
|
176
|
+
overflow-x: visible;
|
|
177
|
+
display: inline-block;
|
|
178
|
+
width: 18.5%; // 5 columns
|
|
179
|
+
position: relative;
|
|
173
180
|
|
|
174
181
|
&[dir="rtl"],
|
|
175
182
|
[dir="rtl"] & {
|
|
@@ -184,14 +191,6 @@ $blue-fifth: $color-blue-500;
|
|
|
184
191
|
|
|
185
192
|
@include fill($block-height);
|
|
186
193
|
|
|
187
|
-
font-size: 1px;
|
|
188
|
-
line-height: 1;
|
|
189
|
-
padding: 0;
|
|
190
|
-
overflow-x: visible;
|
|
191
|
-
display: inline-block;
|
|
192
|
-
width: 18.5%; // 5 columns
|
|
193
|
-
position: relative;
|
|
194
|
-
|
|
195
194
|
&:first-child {
|
|
196
195
|
margin-right: 2px;
|
|
197
196
|
margin-left: 0;
|