@launchpad-ui/dropdown 0.6.42 → 0.6.44

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.
@@ -1 +1 @@
1
- {"version":3,"file":"Dropdown.d.ts","sourceRoot":"","sources":["../src/Dropdown.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAO1D,KAAK,aAAa,GAAG;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,KAAK,aAAa,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,IAAI,YAAY,GAAG;IACtE,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,YAAY,EAAE,aAAa,KAAK,IAAI,CAAC;IAC1D,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CAChD,CAAC;AAEF,QAAA,MAAM,QAAQ,8EAsGb,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,CAAC;AACpB,YAAY,EAAE,aAAa,EAAE,CAAC"}
1
+ {"version":3,"file":"Dropdown.d.ts","sourceRoot":"","sources":["../src/Dropdown.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAQ1D,KAAK,aAAa,GAAG;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,KAAK,aAAa,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,IAAI,YAAY,GAAG;IACtE,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,YAAY,EAAE,aAAa,KAAK,IAAI,CAAC;IAC1D,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CAChD,CAAC;AAEF,QAAA,MAAM,QAAQ,8EAyGb,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,CAAC;AACpB,YAAY,EAAE,aAAa,EAAE,CAAC"}
package/dist/index.es.js CHANGED
@@ -1,4 +1,5 @@
1
1
  import { Popover } from "@launchpad-ui/popover";
2
+ import { mergeRefs } from "@react-aria/utils";
2
3
  import { cx } from "classix";
3
4
  import { useRef, useState, useEffect, cloneElement, Children, forwardRef } from "react";
4
5
  import { jsxs, jsx } from "react/jsx-runtime";
@@ -18,7 +19,7 @@ const Dropdown = (props) => {
18
19
  "data-test-id": testId = "dropdown",
19
20
  ...rest
20
21
  } = props;
21
- const triggerRef = useRef(null);
22
+ const triggerRef = useRef();
22
23
  const [isOpen, setIsOpen] = useState(isOpenProp != null ? isOpenProp : false);
23
24
  const [hasOpened, setHasOpened] = useState(isOpen);
24
25
  useEffect(() => {
@@ -46,10 +47,13 @@ const Dropdown = (props) => {
46
47
  });
47
48
  }, [isOpen]);
48
49
  const renderTrigger = () => {
49
- return cloneElement(parseChildren().target, {
50
+ const {
51
+ target
52
+ } = parseChildren();
53
+ return cloneElement(target, {
50
54
  "aria-haspopup": true,
51
55
  "aria-expanded": isOpen ? true : false,
52
- ref: triggerRef,
56
+ ref: target.ref ? mergeRefs(target.ref, triggerRef) : triggerRef,
53
57
  isopen: isOpen == null ? void 0 : isOpen.toString()
54
58
  });
55
59
  };
@@ -1 +1 @@
1
- {"version":3,"file":"index.es.js","sources":["../src/Dropdown.tsx","../src/DropdownButton.tsx"],"sourcesContent":["import type { PopoverProps } from '@launchpad-ui/popover';\nimport type { ReactElement } from 'react';\n\nimport { Popover } from '@launchpad-ui/popover';\nimport { cx } from 'classix';\nimport { Children, cloneElement, useEffect, useRef, useState } from 'react';\n\ntype DropdownState = {\n isOpen?: boolean;\n};\n\ntype DropdownProps<T extends string | object | number> = PopoverProps & {\n onSelect?: (item: T, stateChanges: DropdownState) => void;\n onStateChange?: (state: DropdownState) => void;\n};\n\nconst Dropdown = <T extends string | object | number>(props: DropdownProps<T>) => {\n const {\n placement,\n disabled,\n targetClassName,\n popoverClassName,\n isOpen: isOpenProp,\n onInteraction,\n onSelect,\n onStateChange,\n children,\n 'data-test-id': testId = 'dropdown',\n ...rest\n } = props;\n\n const triggerRef = useRef<HTMLElement>(null);\n const [isOpen, setIsOpen] = useState(isOpenProp ?? false);\n const [hasOpened, setHasOpened] = useState(isOpen);\n\n useEffect(() => {\n if (isOpenProp !== undefined) {\n setIsOpen(isOpenProp);\n }\n }, [isOpenProp]);\n\n useEffect(() => {\n // Focus the button upon closing for convenient tabbing\n if (hasOpened && isOpen === false) {\n setTimeout(() => {\n const current = triggerRef.current;\n if (!current) {\n return;\n }\n\n // If a dropdown menu item triggers a modal, we do not want to focus the trigger. Instead\n // we let the modal components control their own focus.\n // Note that this is not ideal since closing the modal will not cause the dropdown trigger\n // to regain focus.\n const hasModal = current.closest?.('.has-overlay');\n\n !hasModal && current.focus?.();\n });\n }\n }, [isOpen, hasOpened]);\n\n useEffect(() => {\n setHasOpened(isOpen);\n onStateChange?.({ isOpen });\n // eslint-disable-next-line react-hooks/exhaustive-deps\n }, [isOpen]);\n\n const renderTrigger = () => {\n return cloneElement(parseChildren().target, {\n 'aria-haspopup': true,\n 'aria-expanded': isOpen ? true : false,\n ref: triggerRef,\n isopen: isOpen?.toString(),\n });\n };\n\n const renderContent = () => {\n return cloneElement(parseChildren().content, {\n onSelect: handleSelect,\n });\n };\n\n const handleSelect = (item: T) => {\n setIsOpen(false);\n onSelect?.(item, { isOpen: false });\n };\n\n const handlePopoverInteraction = (nextIsOpen: boolean) => {\n setIsOpen(nextIsOpen);\n };\n\n const parseChildren = () => {\n const [targetChild, contentChild] = Children.toArray(children);\n return {\n target: targetChild as ReactElement,\n content: contentChild as ReactElement,\n };\n };\n\n const popoverTargetClasses = cx('Dropdown-target', targetClassName);\n const popoverClasses = cx('Dropdown', popoverClassName);\n\n return (\n <Popover\n isOpen={isOpen}\n placement={placement}\n onInteraction={onInteraction || handlePopoverInteraction}\n restrictHeight={false}\n disabled={disabled}\n targetClassName={popoverTargetClasses}\n popoverClassName={popoverClasses}\n data-test-id={testId}\n {...rest}\n >\n {renderTrigger()}\n {renderContent()}\n </Popover>\n );\n};\n\nexport { Dropdown };\nexport type { DropdownProps };\n","import type { ButtonProps } from '@launchpad-ui/button';\n\nimport { Button } from '@launchpad-ui/button';\nimport { ExpandMore } from '@launchpad-ui/icons';\nimport { forwardRef } from 'react';\n\ntype DropdownButtonProps = ButtonProps & {\n hideCaret?: boolean;\n};\n\nconst DropdownButton = forwardRef<HTMLButtonElement, DropdownButtonProps>((props, ref) => {\n const { children, hideCaret, 'data-test-id': testId = 'dropdown-button', ...rest } = props;\n\n return (\n <Button {...rest} data-test-id={testId} ref={ref}>\n {children} {!hideCaret && <ExpandMore size=\"small\" />}\n </Button>\n );\n});\n\nDropdownButton.displayName = 'DropdownButton';\n\nexport { DropdownButton };\nexport type { DropdownButtonProps };\n"],"names":["Dropdown","props","placement","disabled","targetClassName","popoverClassName","isOpen","isOpenProp","onInteraction","onSelect","onStateChange","children","testId","rest","triggerRef","useRef","setIsOpen","useState","hasOpened","setHasOpened","useEffect","undefined","setTimeout","current","hasModal","closest","focus","renderTrigger","cloneElement","parseChildren","target","ref","isopen","toString","renderContent","content","handleSelect","item","handlePopoverInteraction","nextIsOpen","targetChild","contentChild","Children","toArray","popoverTargetClasses","cx","popoverClasses","Popover","restrictHeight","DropdownButton","forwardRef","hideCaret","Button","ExpandMore","size","displayName"],"mappings":"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"}
1
+ {"version":3,"file":"index.es.js","sources":["../src/Dropdown.tsx","../src/DropdownButton.tsx"],"sourcesContent":["import type { PopoverProps } from '@launchpad-ui/popover';\nimport type { AriaAttributes, ForwardedRef, FunctionComponentElement, ReactElement } from 'react';\n\nimport { Popover } from '@launchpad-ui/popover';\nimport { mergeRefs } from '@react-aria/utils';\nimport { cx } from 'classix';\nimport { Children, cloneElement, useEffect, useRef, useState } from 'react';\n\ntype DropdownState = {\n isOpen?: boolean;\n};\n\ntype DropdownProps<T extends string | object | number> = PopoverProps & {\n onSelect?: (item: T, stateChanges: DropdownState) => void;\n onStateChange?: (state: DropdownState) => void;\n};\n\nconst Dropdown = <T extends string | object | number>(props: DropdownProps<T>) => {\n const {\n placement,\n disabled,\n targetClassName,\n popoverClassName,\n isOpen: isOpenProp,\n onInteraction,\n onSelect,\n onStateChange,\n children,\n 'data-test-id': testId = 'dropdown',\n ...rest\n } = props;\n\n const triggerRef = useRef<HTMLElement>();\n const [isOpen, setIsOpen] = useState(isOpenProp ?? false);\n const [hasOpened, setHasOpened] = useState(isOpen);\n\n useEffect(() => {\n if (isOpenProp !== undefined) {\n setIsOpen(isOpenProp);\n }\n }, [isOpenProp]);\n\n useEffect(() => {\n // Focus the button upon closing for convenient tabbing\n if (hasOpened && isOpen === false) {\n setTimeout(() => {\n const current = triggerRef.current;\n if (!current) {\n return;\n }\n\n // If a dropdown menu item triggers a modal, we do not want to focus the trigger. Instead\n // we let the modal components control their own focus.\n // Note that this is not ideal since closing the modal will not cause the dropdown trigger\n // to regain focus.\n const hasModal = current.closest?.('.has-overlay');\n\n !hasModal && current.focus?.();\n });\n }\n }, [isOpen, hasOpened]);\n\n useEffect(() => {\n setHasOpened(isOpen);\n onStateChange?.({ isOpen });\n // eslint-disable-next-line react-hooks/exhaustive-deps\n }, [isOpen]);\n\n const renderTrigger = () => {\n const { target } = parseChildren();\n return cloneElement(target, {\n 'aria-haspopup': true,\n 'aria-expanded': isOpen ? true : false,\n ref: target.ref ? mergeRefs(target.ref, triggerRef) : triggerRef,\n isopen: isOpen?.toString(),\n });\n };\n\n const renderContent = () => {\n return cloneElement(parseChildren().content, {\n onSelect: handleSelect,\n });\n };\n\n const handleSelect = (item: T) => {\n setIsOpen(false);\n onSelect?.(item, { isOpen: false });\n };\n\n const handlePopoverInteraction = (nextIsOpen: boolean) => {\n setIsOpen(nextIsOpen);\n };\n\n const parseChildren = () => {\n const [targetChild, contentChild] = Children.toArray(children);\n return {\n target: targetChild as FunctionComponentElement<\n AriaAttributes & { ref: ForwardedRef<HTMLElement | undefined>; isopen: string }\n >,\n content: contentChild as ReactElement,\n };\n };\n\n const popoverTargetClasses = cx('Dropdown-target', targetClassName);\n const popoverClasses = cx('Dropdown', popoverClassName);\n\n return (\n <Popover\n isOpen={isOpen}\n placement={placement}\n onInteraction={onInteraction || handlePopoverInteraction}\n restrictHeight={false}\n disabled={disabled}\n targetClassName={popoverTargetClasses}\n popoverClassName={popoverClasses}\n data-test-id={testId}\n {...rest}\n >\n {renderTrigger()}\n {renderContent()}\n </Popover>\n );\n};\n\nexport { Dropdown };\nexport type { DropdownProps };\n","import type { ButtonProps } from '@launchpad-ui/button';\n\nimport { Button } from '@launchpad-ui/button';\nimport { ExpandMore } from '@launchpad-ui/icons';\nimport { forwardRef } from 'react';\n\ntype DropdownButtonProps = ButtonProps & {\n hideCaret?: boolean;\n};\n\nconst DropdownButton = forwardRef<HTMLButtonElement, DropdownButtonProps>((props, ref) => {\n const { children, hideCaret, 'data-test-id': testId = 'dropdown-button', ...rest } = props;\n\n return (\n <Button {...rest} data-test-id={testId} ref={ref}>\n {children} {!hideCaret && <ExpandMore size=\"small\" />}\n </Button>\n );\n});\n\nDropdownButton.displayName = 'DropdownButton';\n\nexport { DropdownButton };\nexport type { DropdownButtonProps };\n"],"names":["Dropdown","props","placement","disabled","targetClassName","popoverClassName","isOpen","isOpenProp","onInteraction","onSelect","onStateChange","children","testId","rest","triggerRef","useRef","setIsOpen","useState","hasOpened","setHasOpened","useEffect","undefined","setTimeout","current","hasModal","closest","focus","renderTrigger","target","parseChildren","cloneElement","ref","mergeRefs","isopen","toString","renderContent","content","handleSelect","item","handlePopoverInteraction","nextIsOpen","targetChild","contentChild","Children","toArray","popoverTargetClasses","cx","popoverClasses","Popover","restrictHeight","DropdownButton","forwardRef","hideCaret","Button","ExpandMore","size","displayName"],"mappings":"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"}
package/dist/index.js CHANGED
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
3
3
  const popover = require("@launchpad-ui/popover");
4
+ const utils = require("@react-aria/utils");
4
5
  const classix = require("classix");
5
6
  const react = require("react");
6
7
  const jsxRuntime = require("react/jsx-runtime");
@@ -20,7 +21,7 @@ const Dropdown = (props) => {
20
21
  "data-test-id": testId = "dropdown",
21
22
  ...rest
22
23
  } = props;
23
- const triggerRef = react.useRef(null);
24
+ const triggerRef = react.useRef();
24
25
  const [isOpen, setIsOpen] = react.useState(isOpenProp != null ? isOpenProp : false);
25
26
  const [hasOpened, setHasOpened] = react.useState(isOpen);
26
27
  react.useEffect(() => {
@@ -48,10 +49,13 @@ const Dropdown = (props) => {
48
49
  });
49
50
  }, [isOpen]);
50
51
  const renderTrigger = () => {
51
- return react.cloneElement(parseChildren().target, {
52
+ const {
53
+ target
54
+ } = parseChildren();
55
+ return react.cloneElement(target, {
52
56
  "aria-haspopup": true,
53
57
  "aria-expanded": isOpen ? true : false,
54
- ref: triggerRef,
58
+ ref: target.ref ? utils.mergeRefs(target.ref, triggerRef) : triggerRef,
55
59
  isopen: isOpen == null ? void 0 : isOpen.toString()
56
60
  });
57
61
  };
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sources":["../src/Dropdown.tsx","../src/DropdownButton.tsx"],"sourcesContent":["import type { PopoverProps } from '@launchpad-ui/popover';\nimport type { ReactElement } from 'react';\n\nimport { Popover } from '@launchpad-ui/popover';\nimport { cx } from 'classix';\nimport { Children, cloneElement, useEffect, useRef, useState } from 'react';\n\ntype DropdownState = {\n isOpen?: boolean;\n};\n\ntype DropdownProps<T extends string | object | number> = PopoverProps & {\n onSelect?: (item: T, stateChanges: DropdownState) => void;\n onStateChange?: (state: DropdownState) => void;\n};\n\nconst Dropdown = <T extends string | object | number>(props: DropdownProps<T>) => {\n const {\n placement,\n disabled,\n targetClassName,\n popoverClassName,\n isOpen: isOpenProp,\n onInteraction,\n onSelect,\n onStateChange,\n children,\n 'data-test-id': testId = 'dropdown',\n ...rest\n } = props;\n\n const triggerRef = useRef<HTMLElement>(null);\n const [isOpen, setIsOpen] = useState(isOpenProp ?? false);\n const [hasOpened, setHasOpened] = useState(isOpen);\n\n useEffect(() => {\n if (isOpenProp !== undefined) {\n setIsOpen(isOpenProp);\n }\n }, [isOpenProp]);\n\n useEffect(() => {\n // Focus the button upon closing for convenient tabbing\n if (hasOpened && isOpen === false) {\n setTimeout(() => {\n const current = triggerRef.current;\n if (!current) {\n return;\n }\n\n // If a dropdown menu item triggers a modal, we do not want to focus the trigger. Instead\n // we let the modal components control their own focus.\n // Note that this is not ideal since closing the modal will not cause the dropdown trigger\n // to regain focus.\n const hasModal = current.closest?.('.has-overlay');\n\n !hasModal && current.focus?.();\n });\n }\n }, [isOpen, hasOpened]);\n\n useEffect(() => {\n setHasOpened(isOpen);\n onStateChange?.({ isOpen });\n // eslint-disable-next-line react-hooks/exhaustive-deps\n }, [isOpen]);\n\n const renderTrigger = () => {\n return cloneElement(parseChildren().target, {\n 'aria-haspopup': true,\n 'aria-expanded': isOpen ? true : false,\n ref: triggerRef,\n isopen: isOpen?.toString(),\n });\n };\n\n const renderContent = () => {\n return cloneElement(parseChildren().content, {\n onSelect: handleSelect,\n });\n };\n\n const handleSelect = (item: T) => {\n setIsOpen(false);\n onSelect?.(item, { isOpen: false });\n };\n\n const handlePopoverInteraction = (nextIsOpen: boolean) => {\n setIsOpen(nextIsOpen);\n };\n\n const parseChildren = () => {\n const [targetChild, contentChild] = Children.toArray(children);\n return {\n target: targetChild as ReactElement,\n content: contentChild as ReactElement,\n };\n };\n\n const popoverTargetClasses = cx('Dropdown-target', targetClassName);\n const popoverClasses = cx('Dropdown', popoverClassName);\n\n return (\n <Popover\n isOpen={isOpen}\n placement={placement}\n onInteraction={onInteraction || handlePopoverInteraction}\n restrictHeight={false}\n disabled={disabled}\n targetClassName={popoverTargetClasses}\n popoverClassName={popoverClasses}\n data-test-id={testId}\n {...rest}\n >\n {renderTrigger()}\n {renderContent()}\n </Popover>\n );\n};\n\nexport { Dropdown };\nexport type { DropdownProps };\n","import type { ButtonProps } from '@launchpad-ui/button';\n\nimport { Button } from '@launchpad-ui/button';\nimport { ExpandMore } from '@launchpad-ui/icons';\nimport { forwardRef } from 'react';\n\ntype DropdownButtonProps = ButtonProps & {\n hideCaret?: boolean;\n};\n\nconst DropdownButton = forwardRef<HTMLButtonElement, DropdownButtonProps>((props, ref) => {\n const { children, hideCaret, 'data-test-id': testId = 'dropdown-button', ...rest } = props;\n\n return (\n <Button {...rest} data-test-id={testId} ref={ref}>\n {children} {!hideCaret && <ExpandMore size=\"small\" />}\n </Button>\n );\n});\n\nDropdownButton.displayName = 'DropdownButton';\n\nexport { DropdownButton };\nexport type { DropdownButtonProps };\n"],"names":["Dropdown","props","placement","disabled","targetClassName","popoverClassName","isOpen","isOpenProp","onInteraction","onSelect","onStateChange","children","testId","rest","triggerRef","useRef","setIsOpen","useState","hasOpened","setHasOpened","useEffect","undefined","setTimeout","current","hasModal","closest","focus","renderTrigger","cloneElement","parseChildren","target","ref","isopen","toString","renderContent","content","handleSelect","item","handlePopoverInteraction","nextIsOpen","targetChild","contentChild","Children","toArray","popoverTargetClasses","cx","popoverClasses","Popover","restrictHeight","DropdownButton","forwardRef","hideCaret","Button","ExpandMore","size","displayName"],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sources":["../src/Dropdown.tsx","../src/DropdownButton.tsx"],"sourcesContent":["import type { PopoverProps } from '@launchpad-ui/popover';\nimport type { AriaAttributes, ForwardedRef, FunctionComponentElement, ReactElement } from 'react';\n\nimport { Popover } from '@launchpad-ui/popover';\nimport { mergeRefs } from '@react-aria/utils';\nimport { cx } from 'classix';\nimport { Children, cloneElement, useEffect, useRef, useState } from 'react';\n\ntype DropdownState = {\n isOpen?: boolean;\n};\n\ntype DropdownProps<T extends string | object | number> = PopoverProps & {\n onSelect?: (item: T, stateChanges: DropdownState) => void;\n onStateChange?: (state: DropdownState) => void;\n};\n\nconst Dropdown = <T extends string | object | number>(props: DropdownProps<T>) => {\n const {\n placement,\n disabled,\n targetClassName,\n popoverClassName,\n isOpen: isOpenProp,\n onInteraction,\n onSelect,\n onStateChange,\n children,\n 'data-test-id': testId = 'dropdown',\n ...rest\n } = props;\n\n const triggerRef = useRef<HTMLElement>();\n const [isOpen, setIsOpen] = useState(isOpenProp ?? false);\n const [hasOpened, setHasOpened] = useState(isOpen);\n\n useEffect(() => {\n if (isOpenProp !== undefined) {\n setIsOpen(isOpenProp);\n }\n }, [isOpenProp]);\n\n useEffect(() => {\n // Focus the button upon closing for convenient tabbing\n if (hasOpened && isOpen === false) {\n setTimeout(() => {\n const current = triggerRef.current;\n if (!current) {\n return;\n }\n\n // If a dropdown menu item triggers a modal, we do not want to focus the trigger. Instead\n // we let the modal components control their own focus.\n // Note that this is not ideal since closing the modal will not cause the dropdown trigger\n // to regain focus.\n const hasModal = current.closest?.('.has-overlay');\n\n !hasModal && current.focus?.();\n });\n }\n }, [isOpen, hasOpened]);\n\n useEffect(() => {\n setHasOpened(isOpen);\n onStateChange?.({ isOpen });\n // eslint-disable-next-line react-hooks/exhaustive-deps\n }, [isOpen]);\n\n const renderTrigger = () => {\n const { target } = parseChildren();\n return cloneElement(target, {\n 'aria-haspopup': true,\n 'aria-expanded': isOpen ? true : false,\n ref: target.ref ? mergeRefs(target.ref, triggerRef) : triggerRef,\n isopen: isOpen?.toString(),\n });\n };\n\n const renderContent = () => {\n return cloneElement(parseChildren().content, {\n onSelect: handleSelect,\n });\n };\n\n const handleSelect = (item: T) => {\n setIsOpen(false);\n onSelect?.(item, { isOpen: false });\n };\n\n const handlePopoverInteraction = (nextIsOpen: boolean) => {\n setIsOpen(nextIsOpen);\n };\n\n const parseChildren = () => {\n const [targetChild, contentChild] = Children.toArray(children);\n return {\n target: targetChild as FunctionComponentElement<\n AriaAttributes & { ref: ForwardedRef<HTMLElement | undefined>; isopen: string }\n >,\n content: contentChild as ReactElement,\n };\n };\n\n const popoverTargetClasses = cx('Dropdown-target', targetClassName);\n const popoverClasses = cx('Dropdown', popoverClassName);\n\n return (\n <Popover\n isOpen={isOpen}\n placement={placement}\n onInteraction={onInteraction || handlePopoverInteraction}\n restrictHeight={false}\n disabled={disabled}\n targetClassName={popoverTargetClasses}\n popoverClassName={popoverClasses}\n data-test-id={testId}\n {...rest}\n >\n {renderTrigger()}\n {renderContent()}\n </Popover>\n );\n};\n\nexport { Dropdown };\nexport type { DropdownProps };\n","import type { ButtonProps } from '@launchpad-ui/button';\n\nimport { Button } from '@launchpad-ui/button';\nimport { ExpandMore } from '@launchpad-ui/icons';\nimport { forwardRef } from 'react';\n\ntype DropdownButtonProps = ButtonProps & {\n hideCaret?: boolean;\n};\n\nconst DropdownButton = forwardRef<HTMLButtonElement, DropdownButtonProps>((props, ref) => {\n const { children, hideCaret, 'data-test-id': testId = 'dropdown-button', ...rest } = props;\n\n return (\n <Button {...rest} data-test-id={testId} ref={ref}>\n {children} {!hideCaret && <ExpandMore size=\"small\" />}\n </Button>\n );\n});\n\nDropdownButton.displayName = 'DropdownButton';\n\nexport { DropdownButton };\nexport type { DropdownButtonProps };\n"],"names":["Dropdown","props","placement","disabled","targetClassName","popoverClassName","isOpen","isOpenProp","onInteraction","onSelect","onStateChange","children","testId","rest","triggerRef","useRef","setIsOpen","useState","hasOpened","setHasOpened","useEffect","undefined","setTimeout","current","hasModal","closest","focus","renderTrigger","target","parseChildren","cloneElement","ref","mergeRefs","isopen","toString","renderContent","content","handleSelect","item","handlePopoverInteraction","nextIsOpen","targetChild","contentChild","Children","toArray","popoverTargetClasses","cx","popoverClasses","Popover","restrictHeight","DropdownButton","forwardRef","hideCaret","Button","ExpandMore","size","displayName"],"mappings":";;;;;;;;;AAiBMA,MAAAA,WAAW,CAAqCC,UAA4B;AAC1E,QAAA;AAAA,IACJC;AAAAA,IACAC;AAAAA,IACAC;AAAAA,IACAC;AAAAA,IACAC,QAAQC;AAAAA,IACRC;AAAAA,IACAC;AAAAA,IACAC;AAAAA,IACAC;AAAAA,IACA,gBAAgBC,SAAS;AAAA,OACtBC;AAAAA,EACDZ,IAAAA;AAEJ,QAAMa,aAAaC,MAAAA;AACnB,QAAM,CAACT,QAAQU,SAAS,IAAIC,MAAAA,SAASV,kCAAc,KAAK;AACxD,QAAM,CAACW,WAAWC,YAAY,IAAIF,eAASX,MAAM;AAEjDc,QAAAA,UAAU,MAAM;AACd,QAAIb,eAAec,QAAW;AAC5BL,gBAAUT,UAAU;AAAA,IACtB;AAAA,EAAA,GACC,CAACA,UAAU,CAAC;AAEfa,QAAAA,UAAU,MAAM;AAEVF,QAAAA,aAAaZ,WAAW,OAAO;AACjCgB,iBAAW,MAAM;;AACf,cAAMC,UAAUT,WAAWS;AAC3B,YAAI,CAACA,SAAS;AACZ;AAAA,QACF;AAMMC,cAAAA,YAAWD,aAAQE,YAARF,iCAAkB;AAElCC,SAAAA,cAAYD,aAAQG,UAARH;AAAAA,MAAiB,CAC/B;AAAA,IACH;AAAA,EAAA,GACC,CAACjB,QAAQY,SAAS,CAAC;AAEtBE,QAAAA,UAAU,MAAM;AACdD,iBAAab,MAAM;AACH,mDAAA;AAAA,MAAEA;AAAAA,IAAAA;AAAAA,EAAQ,GAEzB,CAACA,MAAM,CAAC;AAEX,QAAMqB,gBAAgBA,MAAM;AACpB,UAAA;AAAA,MAAEC;AAAAA,QAAWC,cAAe;AAClC,WAAOC,MAAAA,aAAaF,QAAQ;AAAA,MAC1B,iBAAiB;AAAA,MACjB,iBAAiBtB,SAAS,OAAO;AAAA,MACjCyB,KAAKH,OAAOG,MAAMC,MAAAA,UAAUJ,OAAOG,KAAKjB,UAAU,IAAIA;AAAAA,MACtDmB,QAAQ3B,iCAAQ4B;AAAAA,IAAQ,CACzB;AAAA,EAAA;AAGH,QAAMC,gBAAgBA,MAAM;AACnBL,WAAAA,MAAAA,aAAaD,cAAe,EAACO,SAAS;AAAA,MAC3C3B,UAAU4B;AAAAA,IAAAA,CACX;AAAA,EAAA;AAGGA,QAAAA,eAAeA,CAACC,SAAY;AAChCtB,cAAU,KAAK;AACfP,yCAAW6B,MAAM;AAAA,MAAEhC,QAAQ;AAAA,IAAA;AAAA,EAAO;AAG9BiC,QAAAA,2BAA2BA,CAACC,eAAwB;AACxDxB,cAAUwB,UAAU;AAAA,EAAA;AAGtB,QAAMX,gBAAgBA,MAAM;AAC1B,UAAM,CAACY,aAAaC,YAAY,IAAIC,MAAAA,SAASC,QAAQjC,QAAQ;AACtD,WAAA;AAAA,MACLiB,QAAQa;AAAAA,MAGRL,SAASM;AAAAA,IAAAA;AAAAA,EACX;AAGIG,QAAAA,uBAAuBC,QAAAA,GAAG,mBAAmB1C,eAAe;AAC5D2C,QAAAA,iBAAiBD,QAAAA,GAAG,YAAYzC,gBAAgB;AAEtD,yCACG2C,QAAAA,SAAO;AAAA,IACN1C;AAAAA,IACAJ;AAAAA,IACAM,eAAeA,iBAAiB+B;AAAAA,IAChCU,gBAAgB;AAAA,IAChB9C;AAAAA,IACAC,iBAAiByC;AAAAA,IACjBxC,kBAAkB0C;AAAAA,IAClB,gBAAcnC;AAAAA,IAAO,GACjBC;AAAAA,IAAIF,UAEPgB,CAAAA,iBACAQ,eAAe;AAAA,EAAA,CACR;AAEd;AChHA,MAAMe,iBAAiBC,MAAAA,WAAmD,CAAClD,OAAO8B,QAAQ;AAClF,QAAA;AAAA,IAAEpB;AAAAA,IAAUyC;AAAAA,IAAW,gBAAgBxC,SAAS;AAAA,OAAsBC;AAAAA,EAASZ,IAAAA;AAErF,yCACGoD,OAAAA,QAAM;AAAA,IAAA,GAAKxC;AAAAA,IAAM,gBAAcD;AAAAA,IAAQmB;AAAAA,IAASpB,UAAA,CAC9CA,UAAS,KAAE,CAACyC,4CAAcE,kBAAU;AAAA,MAACC,MAAK;AAAA,IAAA,CAAU,CAAA;AAAA,EAAA,CAC9C;AAEb,CAAC;AAEDL,eAAeM,cAAc;;;"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@launchpad-ui/dropdown",
3
- "version": "0.6.42",
3
+ "version": "0.6.44",
4
4
  "status": "beta",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -25,11 +25,12 @@
25
25
  },
26
26
  "source": "src/index.ts",
27
27
  "dependencies": {
28
+ "@react-aria/utils": "3.15.0",
28
29
  "classix": "2.1.17",
29
- "@launchpad-ui/button": "~0.8.8",
30
- "@launchpad-ui/icons": "~0.8.2",
31
- "@launchpad-ui/popover": "~0.9.7",
32
- "@launchpad-ui/tokens": "~0.5.4"
30
+ "@launchpad-ui/button": "~0.8.10",
31
+ "@launchpad-ui/icons": "~0.8.4",
32
+ "@launchpad-ui/popover": "~0.10.0",
33
+ "@launchpad-ui/tokens": "~0.5.6"
33
34
  },
34
35
  "peerDependencies": {
35
36
  "react": "18.2.0",