@conveyorhq/arrow-ds 1.142.0 → 1.143.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/package.json +1 -1
- package/public/components/Accordion/Accordion.js +9 -6
- package/public/components/Menu/MenuItem.js +2 -2
- package/public/components/MenuRenderer/MenuRenderer.d.ts +2 -1
- package/public/components/MenuRenderer/MenuRenderer.js +2 -1
- package/public/components/MenuRenderer/context.d.ts +1 -0
- package/public/components/MenuRenderer/context.js +1 -0
- package/src/components/Accordion/Accordion.tsx +11 -7
- package/src/components/Menu/MenuItem.tsx +2 -2
- package/src/components/MenuRenderer/MenuRenderer.tsx +6 -0
- package/src/components/MenuRenderer/context.ts +2 -0
package/package.json
CHANGED
|
@@ -147,6 +147,7 @@ const AccordionIcon = ({ className, direction = "down", color, disabled = false,
|
|
|
147
147
|
};
|
|
148
148
|
exports.AccordionIcon = AccordionIcon;
|
|
149
149
|
const AccordionContent = ({ children, maxHeight, style, className, scrollClassName, ...rest }) => {
|
|
150
|
+
const { disableAnimation } = (0, context_1.useAccordionGroupContext)();
|
|
150
151
|
const { buttonId, contentId, defaultIsOpen, isOpen, } = (0, context_1.useAccordionItemContext)();
|
|
151
152
|
const [childrenRef, setChildrenRef] = react_1.default.useState({ current: null });
|
|
152
153
|
const onRefChange = react_1.default.useCallback((node) => {
|
|
@@ -155,18 +156,20 @@ const AccordionContent = ({ children, maxHeight, style, className, scrollClassNa
|
|
|
155
156
|
}
|
|
156
157
|
}, []);
|
|
157
158
|
const [enableTransition, setEnableTransition] = react_1.default.useState(!defaultIsOpen);
|
|
158
|
-
const { height
|
|
159
|
-
const
|
|
160
|
-
height: isOpen ?
|
|
161
|
-
|
|
159
|
+
const { height } = (0, component_size_1.default)(childrenRef);
|
|
160
|
+
const props = (0, web_1.useSpring)({
|
|
161
|
+
height: isOpen ? height : 0,
|
|
162
|
+
opacity: isOpen ? 1 : 0,
|
|
163
|
+
config: { mass: 2, tension: 400, friction: 50 },
|
|
162
164
|
onRest: () => {
|
|
163
165
|
if (defaultIsOpen && isOpen) {
|
|
164
166
|
setEnableTransition(true);
|
|
165
167
|
}
|
|
166
168
|
},
|
|
169
|
+
immediate: disableAnimation || !enableTransition,
|
|
167
170
|
});
|
|
168
|
-
return (react_1.default.createElement(web_1.animated.div, { className: (0, classnames_1.default)("overflow-hidden box-content", className), style: { ...style,
|
|
169
|
-
react_1.default.createElement(Box_1.Box, { ref: onRefChange, className: (0, classnames_1.default)(maxHeight && "overflow-y-auto"), style: maxHeight ? { maxHeight } : undefined }, children)));
|
|
171
|
+
return (react_1.default.createElement(web_1.animated.div, { className: (0, classnames_1.default)("overflow-hidden box-content", className), style: { ...style, ...props }, "aria-labelledby": buttonId, id: contentId, role: "region", ...rest },
|
|
172
|
+
react_1.default.createElement(Box_1.Box, { ref: onRefChange, className: (0, classnames_1.default)(maxHeight && "overflow-y-auto", scrollClassName), style: maxHeight ? { maxHeight } : undefined }, children)));
|
|
170
173
|
};
|
|
171
174
|
exports.AccordionContent = AccordionContent;
|
|
172
175
|
const Accordion = (props) => {
|
|
@@ -33,12 +33,12 @@ const bem_1 = require("../../utilities/bem");
|
|
|
33
33
|
const MenuRenderer_1 = require("../MenuRenderer");
|
|
34
34
|
const cn = "Menu";
|
|
35
35
|
exports.MenuItem = (0, react_1.forwardRef)(({ children, className, isSelected = false, isHighlighted = false, disabled = false, as: Component = "button", onClick, ...rest }, ref) => {
|
|
36
|
-
const { onClose, itemProps } = (0, MenuRenderer_1.useMenuContext)();
|
|
36
|
+
const { onClose, itemProps, closeOnSelect } = (0, MenuRenderer_1.useMenuContext)();
|
|
37
37
|
const clickHandler = (event) => {
|
|
38
38
|
if (typeof onClick === "function") {
|
|
39
39
|
onClick(event);
|
|
40
40
|
}
|
|
41
|
-
if (typeof onClose === "function") {
|
|
41
|
+
if (typeof onClose === "function" && closeOnSelect) {
|
|
42
42
|
onClose();
|
|
43
43
|
}
|
|
44
44
|
};
|
|
@@ -31,6 +31,7 @@ export interface MenuProps extends Omit<BoxProps, "children"> {
|
|
|
31
31
|
openMenu?: (open: boolean) => void;
|
|
32
32
|
menuDisplay?: "inline-block" | "block";
|
|
33
33
|
disableFocusLock?: boolean;
|
|
34
|
+
closeOnSelect?: boolean;
|
|
34
35
|
}
|
|
35
|
-
export declare const MenuRenderer: ({ children, className, placement, position, trigger, popperModifiers, autoFocus, hasPortal, isOpen: isOpenInitial, isMenuOpen: isOpenControlled, onClose: onCloseProp, openMenu: setOpenControlled, menuDisplay, disableFocusLock, ...rest }: MenuProps) => React.JSX.Element;
|
|
36
|
+
export declare const MenuRenderer: ({ children, className, placement, position, trigger, popperModifiers, autoFocus, hasPortal, isOpen: isOpenInitial, isMenuOpen: isOpenControlled, onClose: onCloseProp, openMenu: setOpenControlled, menuDisplay, disableFocusLock, closeOnSelect, ...rest }: MenuProps) => React.JSX.Element;
|
|
36
37
|
export {};
|
|
@@ -43,7 +43,7 @@ const TRANSITION_START = {
|
|
|
43
43
|
opacity: 0,
|
|
44
44
|
};
|
|
45
45
|
const TRANSITION_END = { transform: "translateY(0)", opacity: 1 };
|
|
46
|
-
const MenuRenderer = ({ children, className, placement = "bottom-start", position = "absolute", trigger, popperModifiers = [], autoFocus = false, hasPortal = false, isOpen: isOpenInitial = false, isMenuOpen: isOpenControlled, onClose: onCloseProp, openMenu: setOpenControlled, menuDisplay = "inline-block", disableFocusLock = false, ...rest }) => {
|
|
46
|
+
const MenuRenderer = ({ children, className, placement = "bottom-start", position = "absolute", trigger, popperModifiers = [], autoFocus = false, hasPortal = false, isOpen: isOpenInitial = false, isMenuOpen: isOpenControlled, onClose: onCloseProp, openMenu: setOpenControlled, menuDisplay = "inline-block", disableFocusLock = false, closeOnSelect = true, ...rest }) => {
|
|
47
47
|
const [isOpenUncontrolled, setOpenUncontrolled] = (0, react_1.useState)(isOpenInitial);
|
|
48
48
|
const open = isOpenControlled !== null && isOpenControlled !== void 0 ? isOpenControlled : isOpenUncontrolled;
|
|
49
49
|
const setOpen = setOpenControlled !== null && setOpenControlled !== void 0 ? setOpenControlled : setOpenUncontrolled;
|
|
@@ -121,6 +121,7 @@ const MenuRenderer = ({ children, className, placement = "bottom-start", positio
|
|
|
121
121
|
menuId,
|
|
122
122
|
buttonId,
|
|
123
123
|
placement,
|
|
124
|
+
closeOnSelect,
|
|
124
125
|
...renderProps,
|
|
125
126
|
};
|
|
126
127
|
(0, hooks_1.useOutsideClick)([menuElement, menuListElement], () => {
|
|
@@ -20,6 +20,7 @@ export type MenuContextProps = RenderProps & {
|
|
|
20
20
|
onToggle?: (event: Event | React.MouseEvent<HTMLButtonElement>) => void;
|
|
21
21
|
onOpen?: () => void;
|
|
22
22
|
placement?: PopperPlacement;
|
|
23
|
+
closeOnSelect?: boolean;
|
|
23
24
|
};
|
|
24
25
|
export declare const defaultContext: MenuContextProps;
|
|
25
26
|
export declare const MenuContext: Context<typeof defaultContext>;
|
|
@@ -308,7 +308,7 @@ export const AccordionContent = ({
|
|
|
308
308
|
scrollClassName,
|
|
309
309
|
...rest
|
|
310
310
|
}: AccordionContentProps) => {
|
|
311
|
-
|
|
311
|
+
const { disableAnimation } = useAccordionGroupContext();
|
|
312
312
|
const {
|
|
313
313
|
buttonId,
|
|
314
314
|
contentId,
|
|
@@ -328,20 +328,24 @@ export const AccordionContent = ({
|
|
|
328
328
|
const [enableTransition, setEnableTransition] = React.useState(
|
|
329
329
|
!defaultIsOpen,
|
|
330
330
|
);
|
|
331
|
-
|
|
332
|
-
const { height } =
|
|
333
|
-
|
|
334
|
-
|
|
331
|
+
|
|
332
|
+
const { height } = useComponentSize(childrenRef);
|
|
333
|
+
const props = useSpring({
|
|
334
|
+
height: isOpen ? height : 0,
|
|
335
|
+
opacity: isOpen ? 1 : 0,
|
|
336
|
+
config: { mass: 2, tension: 400, friction: 50 },
|
|
335
337
|
onRest: () => {
|
|
336
338
|
if (defaultIsOpen && isOpen) {
|
|
337
339
|
setEnableTransition(true);
|
|
338
340
|
}
|
|
339
341
|
},
|
|
342
|
+
immediate: disableAnimation || !enableTransition,
|
|
340
343
|
});
|
|
344
|
+
|
|
341
345
|
return (
|
|
342
346
|
<animated.div
|
|
343
347
|
className={classNames("overflow-hidden box-content", className)}
|
|
344
|
-
style={{ ...style,
|
|
348
|
+
style={{ ...style, ...props }}
|
|
345
349
|
aria-labelledby={buttonId}
|
|
346
350
|
id={contentId}
|
|
347
351
|
role="region"
|
|
@@ -349,7 +353,7 @@ export const AccordionContent = ({
|
|
|
349
353
|
>
|
|
350
354
|
<Box
|
|
351
355
|
ref={onRefChange}
|
|
352
|
-
className={classNames(maxHeight && "overflow-y-auto")}
|
|
356
|
+
className={classNames(maxHeight && "overflow-y-auto", scrollClassName)}
|
|
353
357
|
style={maxHeight ? { maxHeight } : undefined}
|
|
354
358
|
>
|
|
355
359
|
{children}
|
|
@@ -28,12 +28,12 @@ export const MenuItem = forwardRef<MenuItemProps, any>(
|
|
|
28
28
|
},
|
|
29
29
|
ref,
|
|
30
30
|
) => {
|
|
31
|
-
const { onClose, itemProps } = useMenuContext();
|
|
31
|
+
const { onClose, itemProps, closeOnSelect } = useMenuContext();
|
|
32
32
|
const clickHandler = (event: MouseEvent) => {
|
|
33
33
|
if (typeof onClick === "function") {
|
|
34
34
|
onClick(event);
|
|
35
35
|
}
|
|
36
|
-
if (typeof onClose === "function") {
|
|
36
|
+
if (typeof onClose === "function" && closeOnSelect) {
|
|
37
37
|
onClose();
|
|
38
38
|
}
|
|
39
39
|
};
|
|
@@ -90,6 +90,10 @@ export interface MenuProps extends Omit<BoxProps, "children"> {
|
|
|
90
90
|
* Should focus lock be disabled
|
|
91
91
|
*/
|
|
92
92
|
disableFocusLock?: boolean;
|
|
93
|
+
/**
|
|
94
|
+
* If true, the menu will close when a menu item is clicked.
|
|
95
|
+
*/
|
|
96
|
+
closeOnSelect?: boolean;
|
|
93
97
|
}
|
|
94
98
|
|
|
95
99
|
const MENU_OFFSET = 8;
|
|
@@ -114,6 +118,7 @@ export const MenuRenderer = ({
|
|
|
114
118
|
openMenu: setOpenControlled,
|
|
115
119
|
menuDisplay = "inline-block",
|
|
116
120
|
disableFocusLock = false,
|
|
121
|
+
closeOnSelect = true,
|
|
117
122
|
...rest
|
|
118
123
|
}: MenuProps) => {
|
|
119
124
|
const [isOpenUncontrolled, setOpenUncontrolled] = useState(isOpenInitial);
|
|
@@ -207,6 +212,7 @@ export const MenuRenderer = ({
|
|
|
207
212
|
menuId,
|
|
208
213
|
buttonId,
|
|
209
214
|
placement,
|
|
215
|
+
closeOnSelect,
|
|
210
216
|
...renderProps,
|
|
211
217
|
};
|
|
212
218
|
|
|
@@ -22,6 +22,7 @@ export type MenuContextProps = RenderProps & {
|
|
|
22
22
|
onToggle?: (event: Event | React.MouseEvent<HTMLButtonElement>) => void;
|
|
23
23
|
onOpen?: () => void;
|
|
24
24
|
placement?: PopperPlacement;
|
|
25
|
+
closeOnSelect?: boolean;
|
|
25
26
|
};
|
|
26
27
|
|
|
27
28
|
export const defaultContext: MenuContextProps = {
|
|
@@ -42,6 +43,7 @@ export const defaultContext: MenuContextProps = {
|
|
|
42
43
|
buttonId: "",
|
|
43
44
|
menuId: "",
|
|
44
45
|
placement: "bottom-start",
|
|
46
|
+
closeOnSelect: true,
|
|
45
47
|
};
|
|
46
48
|
|
|
47
49
|
export const MenuContext: Context<typeof defaultContext> = createContext<
|