@basic-ui/core 0.0.37 → 0.0.40
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/build/cjs/index.js +85 -84
- package/build/cjs/index.js.map +1 -1
- package/build/esm/Accordion/Accordion.d.ts +1 -1
- package/build/esm/Accordion/Accordion.js +23 -17
- package/build/esm/Accordion/Accordion.js.map +1 -1
- package/build/esm/Accordion/AccordionBody.d.ts +1 -1
- package/build/esm/Accordion/AccordionBody.js +24 -15
- package/build/esm/Accordion/AccordionBody.js.map +1 -1
- package/build/esm/Accordion/AccordionHeader.d.ts +1 -1
- package/build/esm/Accordion/AccordionHeader.js +46 -31
- package/build/esm/Accordion/AccordionHeader.js.map +1 -1
- package/build/esm/Accordion/AccordionItem.d.ts +1 -1
- package/build/esm/Accordion/AccordionItem.js +18 -18
- package/build/esm/Accordion/AccordionItem.js.map +1 -1
- package/build/esm/Accordion/context.d.ts +1 -1
- package/build/esm/Accordion/context.js +12 -10
- package/build/esm/Accordion/context.js.map +1 -1
- package/build/esm/Accordion/index.d.ts +0 -0
- package/build/esm/Accordion/index.js.map +0 -0
- package/build/esm/Accordion/scopeQuery.d.ts +0 -0
- package/build/esm/Accordion/scopeQuery.js.map +0 -0
- package/build/esm/CheckBox/CheckBox.d.ts +1 -1
- package/build/esm/CheckBox/CheckBox.js +20 -12
- package/build/esm/CheckBox/CheckBox.js.map +1 -1
- package/build/esm/CheckBox/index.d.ts +0 -0
- package/build/esm/CheckBox/index.js.map +0 -0
- package/build/esm/ComboBox/Combobox.d.ts +1 -1
- package/build/esm/ComboBox/Combobox.js +55 -48
- package/build/esm/ComboBox/Combobox.js.map +1 -1
- package/build/esm/ComboBox/ComboboxButton.d.ts +1 -1
- package/build/esm/ComboBox/ComboboxButton.js +20 -20
- package/build/esm/ComboBox/ComboboxButton.js.map +1 -1
- package/build/esm/ComboBox/ComboboxInput.d.ts +1 -1
- package/build/esm/ComboBox/ComboboxInput.js +53 -50
- package/build/esm/ComboBox/ComboboxInput.js.map +1 -1
- package/build/esm/ComboBox/ComboboxLabel.d.ts +1 -1
- package/build/esm/ComboBox/ComboboxLabel.js +12 -12
- package/build/esm/ComboBox/ComboboxLabel.js.map +1 -1
- package/build/esm/ComboBox/ComboboxList.d.ts +1 -1
- package/build/esm/ComboBox/ComboboxList.js +16 -17
- package/build/esm/ComboBox/ComboboxList.js.map +1 -1
- package/build/esm/ComboBox/ComboboxOption.d.ts +1 -1
- package/build/esm/ComboBox/ComboboxOption.js +32 -34
- package/build/esm/ComboBox/ComboboxOption.js.map +1 -1
- package/build/esm/ComboBox/ComboboxPopover.d.ts +1 -1
- package/build/esm/ComboBox/ComboboxPopover.js +16 -17
- package/build/esm/ComboBox/ComboboxPopover.js.map +1 -1
- package/build/esm/ComboBox/cities.d.ts +0 -0
- package/build/esm/ComboBox/cities.js.map +0 -0
- package/build/esm/ComboBox/context.d.ts +3 -3
- package/build/esm/ComboBox/context.js +6 -5
- package/build/esm/ComboBox/context.js.map +1 -1
- package/build/esm/ComboBox/hooks.d.ts +1 -1
- package/build/esm/ComboBox/hooks.js +82 -115
- package/build/esm/ComboBox/hooks.js.map +1 -1
- package/build/esm/ComboBox/index.d.ts +0 -0
- package/build/esm/ComboBox/index.js.map +0 -0
- package/build/esm/ComboBox/makeHash.d.ts +0 -0
- package/build/esm/ComboBox/makeHash.js +3 -3
- package/build/esm/ComboBox/makeHash.js.map +1 -1
- package/build/esm/ComboBox/scopeQuery.d.ts +0 -0
- package/build/esm/ComboBox/scopeQuery.js.map +0 -0
- package/build/esm/FocusLock/FocusLock.d.ts +1 -1
- package/build/esm/FocusLock/FocusLock.js +18 -16
- package/build/esm/FocusLock/FocusLock.js.map +1 -1
- package/build/esm/FocusLock/index.d.ts +0 -0
- package/build/esm/FocusLock/index.js.map +0 -0
- package/build/esm/FocusLock/tabUtils.d.ts +1 -0
- package/build/esm/FocusLock/tabUtils.js +14 -2
- package/build/esm/FocusLock/tabUtils.js.map +1 -1
- package/build/esm/FocusLock/useFocusLock.d.ts +0 -0
- package/build/esm/FocusLock/useFocusLock.js +14 -22
- package/build/esm/FocusLock/useFocusLock.js.map +1 -1
- package/build/esm/List/List.d.ts +1 -1
- package/build/esm/List/List.js +6 -6
- package/build/esm/List/List.js.map +1 -1
- package/build/esm/List/ListItem.d.ts +1 -1
- package/build/esm/List/ListItem.js +6 -6
- package/build/esm/List/ListItem.js.map +1 -1
- package/build/esm/List/context.d.ts +0 -0
- package/build/esm/List/context.js +3 -3
- package/build/esm/List/context.js.map +1 -1
- package/build/esm/List/index.d.ts +0 -0
- package/build/esm/List/index.js.map +0 -0
- package/build/esm/Menu/Menu.d.ts +1 -1
- package/build/esm/Menu/Menu.js +31 -23
- package/build/esm/Menu/Menu.js.map +1 -1
- package/build/esm/Menu/MenuButton.d.ts +1 -1
- package/build/esm/Menu/MenuButton.js +29 -25
- package/build/esm/Menu/MenuButton.js.map +1 -1
- package/build/esm/Menu/MenuItem.d.ts +1 -1
- package/build/esm/Menu/MenuItem.js +26 -27
- package/build/esm/Menu/MenuItem.js.map +1 -1
- package/build/esm/Menu/MenuList.d.ts +1 -1
- package/build/esm/Menu/MenuList.js +62 -45
- package/build/esm/Menu/MenuList.js.map +1 -1
- package/build/esm/Menu/MenuPopover.d.ts +2 -2
- package/build/esm/Menu/MenuPopover.js +9 -10
- package/build/esm/Menu/MenuPopover.js.map +1 -1
- package/build/esm/Menu/context.d.ts +1 -1
- package/build/esm/Menu/context.js +11 -8
- package/build/esm/Menu/context.js.map +1 -1
- package/build/esm/Menu/index.d.ts +0 -0
- package/build/esm/Menu/index.js.map +0 -0
- package/build/esm/Menu/scope.d.ts +0 -0
- package/build/esm/Menu/scope.js.map +0 -0
- package/build/esm/Modal/Modal.d.ts +2 -2
- package/build/esm/Modal/Modal.js +14 -12
- package/build/esm/Modal/Modal.js.map +1 -1
- package/build/esm/Modal/ModalBackdrop.d.ts +1 -1
- package/build/esm/Modal/ModalBackdrop.js +21 -19
- package/build/esm/Modal/ModalBackdrop.js.map +1 -1
- package/build/esm/Modal/index.d.ts +0 -0
- package/build/esm/Modal/index.js.map +0 -0
- package/build/esm/Popper/Popper.d.ts +2 -2
- package/build/esm/Popper/Popper.js +51 -36
- package/build/esm/Popper/Popper.js.map +1 -1
- package/build/esm/Popper/PopperArrow.d.ts +1 -1
- package/build/esm/Popper/PopperArrow.js +9 -9
- package/build/esm/Popper/PopperArrow.js.map +1 -1
- package/build/esm/Popper/context.d.ts +1 -1
- package/build/esm/Popper/context.js +5 -3
- package/build/esm/Popper/context.js.map +1 -1
- package/build/esm/Popper/index.d.ts +0 -0
- package/build/esm/Popper/index.js.map +0 -0
- package/build/esm/Portal/Portal.d.ts +1 -1
- package/build/esm/Portal/Portal.js +6 -5
- package/build/esm/Portal/Portal.js.map +1 -1
- package/build/esm/Portal/index.d.ts +0 -0
- package/build/esm/Portal/index.js.map +0 -0
- package/build/esm/RadioButton/RadioButton.d.ts +2 -2
- package/build/esm/RadioButton/RadioButton.js +13 -13
- package/build/esm/RadioButton/RadioButton.js.map +1 -1
- package/build/esm/RadioButton/RadioGroup.d.ts +2 -2
- package/build/esm/RadioButton/RadioGroup.js +25 -18
- package/build/esm/RadioButton/RadioGroup.js.map +1 -1
- package/build/esm/RadioButton/context.d.ts +0 -0
- package/build/esm/RadioButton/context.js +6 -5
- package/build/esm/RadioButton/context.js.map +1 -1
- package/build/esm/RadioButton/index.d.ts +0 -0
- package/build/esm/RadioButton/index.js.map +0 -0
- package/build/esm/SkipNav/SkipNav.d.ts +1 -1
- package/build/esm/SkipNav/SkipNav.js +6 -6
- package/build/esm/SkipNav/SkipNav.js.map +1 -1
- package/build/esm/SkipNav/index.d.ts +0 -0
- package/build/esm/SkipNav/index.js.map +0 -0
- package/build/esm/Spinner/Spinner.d.ts +1 -1
- package/build/esm/Spinner/Spinner.js +42 -31
- package/build/esm/Spinner/Spinner.js.map +1 -1
- package/build/esm/Spinner/SpinnerButton.d.ts +1 -1
- package/build/esm/Spinner/SpinnerButton.js +12 -12
- package/build/esm/Spinner/SpinnerButton.js.map +1 -1
- package/build/esm/Spinner/context.d.ts +0 -0
- package/build/esm/Spinner/context.js +6 -5
- package/build/esm/Spinner/context.js.map +1 -1
- package/build/esm/Spinner/index.d.ts +0 -0
- package/build/esm/Spinner/index.js.map +0 -0
- package/build/esm/Tabs/Tab.d.ts +1 -1
- package/build/esm/Tabs/Tab.js +30 -29
- package/build/esm/Tabs/Tab.js.map +1 -1
- package/build/esm/Tabs/TabList.d.ts +1 -1
- package/build/esm/Tabs/TabList.js +27 -23
- package/build/esm/Tabs/TabList.js.map +1 -1
- package/build/esm/Tabs/TabPanel.d.ts +1 -1
- package/build/esm/Tabs/TabPanel.js +13 -12
- package/build/esm/Tabs/TabPanel.js.map +1 -1
- package/build/esm/Tabs/TabPanels.d.ts +1 -1
- package/build/esm/Tabs/TabPanels.js +14 -12
- package/build/esm/Tabs/TabPanels.js.map +1 -1
- package/build/esm/Tabs/Tabs.d.ts +1 -1
- package/build/esm/Tabs/Tabs.js +28 -14
- package/build/esm/Tabs/Tabs.js.map +1 -1
- package/build/esm/Tabs/context.d.ts +1 -1
- package/build/esm/Tabs/context.js +12 -10
- package/build/esm/Tabs/context.js.map +1 -1
- package/build/esm/Tabs/index.d.ts +0 -0
- package/build/esm/Tabs/index.js.map +0 -0
- package/build/esm/Tabs/scopeQuery.d.ts +0 -0
- package/build/esm/Tabs/scopeQuery.js.map +0 -0
- package/build/esm/Tooltip/Tooltip.d.ts +2 -1
- package/build/esm/Tooltip/Tooltip.js +17 -15
- package/build/esm/Tooltip/Tooltip.js.map +1 -1
- package/build/esm/Tooltip/index.d.ts +0 -0
- package/build/esm/Tooltip/index.js.map +0 -0
- package/build/esm/Tooltip/stateMachine.d.ts +0 -0
- package/build/esm/Tooltip/stateMachine.js +56 -80
- package/build/esm/Tooltip/stateMachine.js.map +1 -1
- package/build/esm/Tooltip/useTooltip.d.ts +1 -1
- package/build/esm/Tooltip/useTooltip.js +33 -32
- package/build/esm/Tooltip/useTooltip.js.map +1 -1
- package/build/esm/hooks/index.d.ts +0 -1
- package/build/esm/hooks/index.js +0 -1
- package/build/esm/hooks/index.js.map +1 -1
- package/build/esm/hooks/useAutoFocus.d.ts +0 -0
- package/build/esm/hooks/useAutoFocus.js +6 -2
- package/build/esm/hooks/useAutoFocus.js.map +1 -1
- package/build/esm/hooks/useChildrenCounter.d.ts +1 -1
- package/build/esm/hooks/useChildrenCounter.js +6 -4
- package/build/esm/hooks/useChildrenCounter.js.map +1 -1
- package/build/esm/hooks/useControlledState.d.ts +1 -1
- package/build/esm/hooks/useControlledState.js +7 -2
- package/build/esm/hooks/useControlledState.js.map +1 -1
- package/build/esm/hooks/useFocusReturn.d.ts +2 -1
- package/build/esm/hooks/useFocusReturn.js +25 -14
- package/build/esm/hooks/useFocusReturn.js.map +1 -1
- package/build/esm/hooks/useFocusState.d.ts +0 -0
- package/build/esm/hooks/useFocusState.js +13 -9
- package/build/esm/hooks/useFocusState.js.map +1 -1
- package/build/esm/hooks/useGestureHandlers.d.ts +0 -0
- package/build/esm/hooks/useGestureHandlers.js +59 -63
- package/build/esm/hooks/useGestureHandlers.js.map +1 -1
- package/build/esm/hooks/useId.d.ts +0 -0
- package/build/esm/hooks/useId.js +0 -0
- package/build/esm/hooks/useId.js.map +0 -0
- package/build/esm/hooks/useMeasure.d.ts +0 -0
- package/build/esm/hooks/useMeasure.js +13 -7
- package/build/esm/hooks/useMeasure.js.map +1 -1
- package/build/esm/hooks/useOnClickOutside.d.ts +0 -0
- package/build/esm/hooks/useOnClickOutside.js +5 -4
- package/build/esm/hooks/useOnClickOutside.js.map +1 -1
- package/build/esm/hooks/useOnKeyDown.d.ts +0 -0
- package/build/esm/hooks/useOnKeyDown.js +4 -3
- package/build/esm/hooks/useOnKeyDown.js.map +1 -1
- package/build/esm/hooks/useReducerMachine.d.ts +1 -1
- package/build/esm/hooks/useReducerMachine.js +13 -10
- package/build/esm/hooks/useReducerMachine.js.map +1 -1
- package/build/esm/hooks/useRemoveBodyScroll.d.ts +0 -0
- package/build/esm/hooks/useRemoveBodyScroll.js +14 -21
- package/build/esm/hooks/useRemoveBodyScroll.js.map +1 -1
- package/build/esm/hooks/useScope.d.ts +1 -1
- package/build/esm/hooks/useScope.js +10 -12
- package/build/esm/hooks/useScope.js.map +1 -1
- package/build/esm/hooks/useThrottle.d.ts +0 -0
- package/build/esm/hooks/useThrottle.js +10 -5
- package/build/esm/hooks/useThrottle.js.map +1 -1
- package/build/esm/index.d.ts +0 -0
- package/build/esm/index.js.map +0 -0
- package/build/esm/utils/assignRef.d.ts +1 -1
- package/build/esm/utils/assignRef.js +7 -3
- package/build/esm/utils/assignRef.js.map +1 -1
- package/build/esm/utils/clamp.d.ts +0 -0
- package/build/esm/utils/clamp.js.map +0 -0
- package/build/esm/utils/createSubscription.d.ts +0 -0
- package/build/esm/utils/createSubscription.js +7 -5
- package/build/esm/utils/createSubscription.js.map +1 -1
- package/build/esm/utils/getCircularIndex.d.ts +0 -0
- package/build/esm/utils/getCircularIndex.js.map +0 -0
- package/build/esm/utils/index.d.ts +0 -0
- package/build/esm/utils/index.js.map +0 -0
- package/build/esm/utils/rubberBandClamp.d.ts +0 -0
- package/build/esm/utils/rubberBandClamp.js +5 -2
- package/build/esm/utils/rubberBandClamp.js.map +1 -1
- package/build/esm/utils/wrapEvent.d.ts +0 -0
- package/build/esm/utils/wrapEvent.js +7 -3
- package/build/esm/utils/wrapEvent.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -7069
- package/package.json +13 -13
- package/src/Accordion/Accordion.story.tsx +1 -0
- package/src/Accordion/Accordion.tsx +4 -2
- package/src/Accordion/AccordionBody.tsx +4 -4
- package/src/Accordion/AccordionHeader.tsx +7 -8
- package/src/Accordion/AccordionItem.tsx +5 -4
- package/src/Accordion/context.ts +2 -1
- package/src/CheckBox/CheckBox.tsx +2 -1
- package/src/ComboBox/ComboBox.story.tsx +2 -1
- package/src/ComboBox/Combobox.tsx +9 -11
- package/src/ComboBox/ComboboxButton.tsx +4 -9
- package/src/ComboBox/ComboboxInput.tsx +2 -1
- package/src/ComboBox/ComboboxLabel.tsx +2 -1
- package/src/ComboBox/ComboboxList.tsx +2 -1
- package/src/ComboBox/ComboboxOption.tsx +1 -1
- package/src/ComboBox/ComboboxPopover.tsx +2 -1
- package/src/ComboBox/context.ts +4 -3
- package/src/ComboBox/hooks.tsx +6 -9
- package/src/FocusLock/FocusLock.tsx +2 -1
- package/src/FocusLock/tabUtils.ts +12 -0
- package/src/FocusLock/useFocusLock.ts +5 -11
- package/src/List/List.tsx +1 -1
- package/src/List/ListItem.tsx +1 -1
- package/src/Menu/Menu.story.tsx +6 -5
- package/src/Menu/Menu.tsx +5 -4
- package/src/Menu/MenuButton.tsx +7 -11
- package/src/Menu/MenuItem.tsx +6 -7
- package/src/Menu/MenuList.tsx +4 -8
- package/src/Menu/MenuPopover.tsx +4 -2
- package/src/Menu/context.ts +2 -1
- package/src/Modal/Modal.story.tsx +20 -5
- package/src/Modal/Modal.tsx +6 -4
- package/src/Modal/ModalBackdrop.tsx +2 -1
- package/src/Modal/NavDrawer.story.tsx +3 -3
- package/src/Popper/Popper.story.tsx +3 -4
- package/src/Popper/Popper.tsx +12 -7
- package/src/Popper/PopperArrow.tsx +2 -1
- package/src/Popper/context.ts +2 -1
- package/src/Portal/Portal.tsx +1 -1
- package/src/RadioButton/RadioButton.story.tsx +1 -0
- package/src/RadioButton/RadioButton.tsx +4 -2
- package/src/RadioButton/RadioGroup.tsx +6 -4
- package/src/SkipNav/SkipNav.tsx +1 -1
- package/src/Spinner/Spinner.story.tsx +1 -0
- package/src/Spinner/Spinner.tsx +2 -1
- package/src/Spinner/SpinnerButton.tsx +2 -1
- package/src/Tabs/Tab.story.tsx +1 -0
- package/src/Tabs/Tab.tsx +4 -4
- package/src/Tabs/TabList.tsx +11 -3
- package/src/Tabs/TabPanel.tsx +2 -1
- package/src/Tabs/TabPanels.tsx +1 -1
- package/src/Tabs/Tabs.tsx +2 -1
- package/src/Tabs/context.ts +2 -1
- package/src/Tooltip/Tooltip.story.tsx +2 -1
- package/src/Tooltip/Tooltip.tsx +3 -7
- package/src/Tooltip/stateMachine.ts +1 -1
- package/src/Tooltip/useTooltip.ts +6 -4
- package/src/hooks/index.ts +0 -1
- package/src/hooks/useAutoFocus.ts +9 -1
- package/src/hooks/useChildrenCounter.ts +2 -1
- package/src/hooks/useControlledState.ts +3 -1
- package/src/hooks/useFocusReturn.ts +33 -13
- package/src/hooks/useFocusState.ts +1 -0
- package/src/hooks/useReducerMachine.ts +2 -1
- package/src/hooks/useRemoveBodyScroll.ts +10 -18
- package/src/hooks/useScope.ts +2 -1
- package/src/utils/assignRef.ts +1 -1
- package/src/hooks/useId.ts +0 -18
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@basic-ui/core",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.40",
|
|
4
4
|
"description": "Accessible React Components used as building blocks for UI patterns",
|
|
5
5
|
"author": "Lucas Terra <lucasterra7@gmail.com>",
|
|
6
6
|
"license": "MIT",
|
|
@@ -15,20 +15,20 @@
|
|
|
15
15
|
"sideEffects": false,
|
|
16
16
|
"scripts": {
|
|
17
17
|
"build": "run -T concurrently \"yarn:build:*\"",
|
|
18
|
-
"build:dts": "tsc -p ./tsconfig.json --isolatedModules false --declaration --emitDeclarationOnly",
|
|
19
|
-
"build:cjs": "rollup -c ../../rollup.config.js",
|
|
20
|
-
"build:esm": "cross-env NODE_ENV=production BABEL_ENV=esm babel --config-file ../../babel.config.js ./src --extensions \".ts,.tsx,.js,.jsx\" --source-maps --out-dir ./build/esm --ignore \"**/*.story.tsx,**/*.story.ts,**/*.test.tsx,**/*.test.ts\"",
|
|
21
|
-
"build-storybook": "build-storybook -c ../../scripts/storybook -o .out",
|
|
22
|
-
"storybook": "
|
|
23
|
-
"start": "
|
|
24
|
-
"serve": "http-server .out",
|
|
25
|
-
"lint": "eslint 'src/**/*.{js,jsx,ts,tsx}' --fix",
|
|
26
|
-
"typecheck": "tsc --noEmit -p ./tsconfig.json",
|
|
27
|
-
"test": "jest --config ../../jest.config.js",
|
|
18
|
+
"build:dts": "run -T tsc -p ./tsconfig.json --isolatedModules false --declaration --emitDeclarationOnly",
|
|
19
|
+
"build:cjs": "run -T rollup -c ../../rollup.config.js",
|
|
20
|
+
"build:esm": "run -T cross-env NODE_ENV=production BABEL_ENV=esm babel --config-file ../../babel.config.js ./src --extensions \".ts,.tsx,.js,.jsx\" --source-maps --out-dir ./build/esm --ignore \"**/*.story.tsx,**/*.story.ts,**/*.test.tsx,**/*.test.ts\"",
|
|
21
|
+
"build-storybook": "run -T build-storybook -c ../../scripts/storybook -o .out",
|
|
22
|
+
"storybook": "run -T start-storybook -p 9001 -c ../../scripts/storybook",
|
|
23
|
+
"start": "run storybook",
|
|
24
|
+
"serve": "run -T http-server .out",
|
|
25
|
+
"lint": "run -T eslint 'src/**/*.{js,jsx,ts,tsx}' --fix",
|
|
26
|
+
"typecheck": "run -T tsc --noEmit -p ./tsconfig.json",
|
|
27
|
+
"test": "run -T jest --config ../../jest.config.js",
|
|
28
28
|
"test:watch": "yarn test --watch"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@popperjs/core": "^2.
|
|
31
|
+
"@popperjs/core": "^2.11.5",
|
|
32
32
|
"resize-observer-polyfill": "^1.5.1"
|
|
33
33
|
},
|
|
34
34
|
"peerDependencies": {
|
|
@@ -36,5 +36,5 @@
|
|
|
36
36
|
"react": "^16.14.0 || ^17.0.0 || ^18.0.0",
|
|
37
37
|
"react-dom": "^16.14.0 || ^17.0.0 || ^18.0.0"
|
|
38
38
|
},
|
|
39
|
-
"gitHead": "
|
|
39
|
+
"gitHead": "b1023e3a84f2f7d55b59cd2b30326c782393c1de"
|
|
40
40
|
}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { forwardRef, useRef, useState } from 'react';
|
|
2
|
-
import
|
|
3
|
-
|
|
2
|
+
import * as React from 'react';
|
|
3
|
+
|
|
4
|
+
import type { AccordionContextProps } from './context';
|
|
5
|
+
import { AccordionProvider } from './context';
|
|
4
6
|
import { useScope } from '../hooks';
|
|
5
7
|
import { assignMultipleRefs } from '../utils';
|
|
6
8
|
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { forwardRef, useState, useEffect, useRef } from 'react';
|
|
2
|
-
import
|
|
2
|
+
import * as React from 'react';
|
|
3
|
+
|
|
3
4
|
import { useAccordionItemContext, useAccordionContext } from './context';
|
|
4
5
|
import { bodyScopeQuery as scopeQuery } from './scopeQuery';
|
|
5
6
|
import { assignMultipleRefs } from '../utils';
|
|
@@ -24,9 +25,8 @@ export const AccordionBody = forwardRef<HTMLDivElement, AccordionBodyProps>(
|
|
|
24
25
|
|
|
25
26
|
useEffect(() => {
|
|
26
27
|
if (accordionContext) {
|
|
27
|
-
const allHeaders =
|
|
28
|
-
scopeQuery
|
|
29
|
-
);
|
|
28
|
+
const allHeaders =
|
|
29
|
+
accordionContext.scope.current.queryAllNodes(scopeQuery);
|
|
30
30
|
|
|
31
31
|
const index = allHeaders.findIndex((e) => e === ref.current);
|
|
32
32
|
setIndex(index);
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { forwardRef, useRef, useState, useEffect } from 'react';
|
|
2
|
-
import
|
|
2
|
+
import * as React from 'react';
|
|
3
|
+
|
|
3
4
|
import { wrapEvent, assignMultipleRefs, getCircularIndex } from '../utils';
|
|
4
5
|
import { useAccordionContext, useAccordionItemContext } from './context';
|
|
5
6
|
import { headerScopeQuery as scopeQuery } from './scopeQuery';
|
|
@@ -66,7 +67,7 @@ export const AccordionHeader = forwardRef<HTMLDivElement, AccordionHeaderProps>(
|
|
|
66
67
|
switch (e.key) {
|
|
67
68
|
case 'Enter':
|
|
68
69
|
case ' ': {
|
|
69
|
-
onClick(
|
|
70
|
+
onClick(e as unknown as React.MouseEvent<HTMLDivElement>);
|
|
70
71
|
e.preventDefault();
|
|
71
72
|
break;
|
|
72
73
|
}
|
|
@@ -77,9 +78,8 @@ export const AccordionHeader = forwardRef<HTMLDivElement, AccordionHeaderProps>(
|
|
|
77
78
|
if (!accordionContext) {
|
|
78
79
|
return;
|
|
79
80
|
}
|
|
80
|
-
const allHeaders =
|
|
81
|
-
scopeQuery
|
|
82
|
-
);
|
|
81
|
+
const allHeaders =
|
|
82
|
+
accordionContext.scope.current.queryAllNodes(scopeQuery);
|
|
83
83
|
|
|
84
84
|
e.preventDefault();
|
|
85
85
|
|
|
@@ -126,9 +126,8 @@ export const AccordionHeader = forwardRef<HTMLDivElement, AccordionHeaderProps>(
|
|
|
126
126
|
|
|
127
127
|
const handleBlur = (e: React.FocusEvent<HTMLDivElement>) => {
|
|
128
128
|
if (accordionContext) {
|
|
129
|
-
const allHeaders =
|
|
130
|
-
scopeQuery
|
|
131
|
-
);
|
|
129
|
+
const allHeaders =
|
|
130
|
+
accordionContext.scope.current.queryAllNodes(scopeQuery);
|
|
132
131
|
const newFocusIsHeader =
|
|
133
132
|
allHeaders.findIndex((header) => header === e.relatedTarget) >= 0;
|
|
134
133
|
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { Fragment, forwardRef } from 'react';
|
|
2
|
-
import
|
|
3
|
-
|
|
4
|
-
import {
|
|
1
|
+
import { Fragment, forwardRef, useId } from 'react';
|
|
2
|
+
import * as React from 'react';
|
|
3
|
+
|
|
4
|
+
import type { AccordionItemContextProps } from './context';
|
|
5
|
+
import { AccordionItemProvider } from './context';
|
|
5
6
|
|
|
6
7
|
export interface AccordionItemProps
|
|
7
8
|
extends Omit<React.HTMLAttributes<HTMLDivElement>, 'onChange'> {
|
package/src/Accordion/context.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { useMemo, useState } from 'react';
|
|
2
|
-
import
|
|
2
|
+
import * as React from 'react';
|
|
3
|
+
|
|
3
4
|
import { ComboboxOption } from './ComboboxOption';
|
|
4
5
|
import { ComboboxList } from './ComboboxList';
|
|
5
6
|
import { ComboboxPopover } from './ComboboxPopover';
|
|
@@ -1,15 +1,13 @@
|
|
|
1
|
-
import { forwardRef, useRef, useMemo } from 'react';
|
|
2
|
-
import
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
ActionTypes,
|
|
9
|
-
} from './hooks';
|
|
10
|
-
import { ComboBoxProvider, ComboBoxContextProps } from './context';
|
|
1
|
+
import { forwardRef, useRef, useMemo, useId } from 'react';
|
|
2
|
+
import * as React from 'react';
|
|
3
|
+
|
|
4
|
+
import type { ActionTypes } from './hooks';
|
|
5
|
+
import { stateChart, comboboxReducer, isVisible, INIT } from './hooks';
|
|
6
|
+
import type { ComboBoxContextProps } from './context';
|
|
7
|
+
import { ComboBoxProvider } from './context';
|
|
11
8
|
import { useReducerMachine } from '../hooks/useReducerMachine';
|
|
12
|
-
import {
|
|
9
|
+
import type { Scope } from '../hooks';
|
|
10
|
+
import { getScope } from '../hooks';
|
|
13
11
|
|
|
14
12
|
export type SelectEventHandler = (
|
|
15
13
|
text: string,
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { forwardRef } from 'react';
|
|
2
|
-
import
|
|
2
|
+
import * as React from 'react';
|
|
3
|
+
|
|
3
4
|
import { useComboBoxContext } from './context';
|
|
4
5
|
import { useKeyDown, IDLE, OPEN_WITH_BUTTON, CLOSE_WITH_BUTTON } from './hooks';
|
|
5
6
|
import { wrapEvent } from '../utils/wrapEvent';
|
|
@@ -21,14 +22,8 @@ export const ComboboxButton = forwardRef<
|
|
|
21
22
|
{ as: Comp = 'button', innerAs, onClick, onKeyDown, ...props },
|
|
22
23
|
ref
|
|
23
24
|
) {
|
|
24
|
-
const {
|
|
25
|
-
|
|
26
|
-
data,
|
|
27
|
-
state,
|
|
28
|
-
buttonRef,
|
|
29
|
-
listboxIdRef,
|
|
30
|
-
isVisible,
|
|
31
|
-
} = useComboBoxContext();
|
|
25
|
+
const { transition, data, state, buttonRef, listboxIdRef, isVisible } =
|
|
26
|
+
useComboBoxContext();
|
|
32
27
|
|
|
33
28
|
const handleKeyDown = useKeyDown();
|
|
34
29
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-use-before-define */
|
|
2
2
|
import { forwardRef, useEffect, useRef } from 'react';
|
|
3
|
+
import * as React from 'react';
|
|
3
4
|
|
|
4
|
-
import type * as React from 'react';
|
|
5
5
|
import { SELECT_WITH_CLICK, CLEAR_SELECTION } from './hooks';
|
|
6
6
|
import { wrapEvent } from '../utils/wrapEvent';
|
|
7
7
|
import { useComboBoxContext } from './context';
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { forwardRef } from 'react';
|
|
2
|
-
import
|
|
2
|
+
import * as React from 'react';
|
|
3
|
+
|
|
3
4
|
import { useKeyDown, useBlur } from './hooks';
|
|
4
5
|
import { wrapEvent } from '../utils/wrapEvent';
|
|
5
6
|
import { assignMultipleRefs } from '../utils/assignRef';
|
package/src/ComboBox/context.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { createContext, useContext } from 'react';
|
|
2
|
-
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
2
|
+
|
|
3
|
+
import type { ActionTypes, StateTypes, ReducerState } from './hooks';
|
|
4
|
+
import type { SelectEventHandler } from './Combobox';
|
|
5
|
+
import type { Scope } from '../hooks';
|
|
5
6
|
|
|
6
7
|
export interface ComboBoxContextProps {
|
|
7
8
|
data: Omit<ReducerState, 'state'>;
|
package/src/ComboBox/hooks.tsx
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-use-before-define */
|
|
2
2
|
/* eslint-disable default-case */
|
|
3
3
|
import { useEffect } from 'react';
|
|
4
|
-
|
|
4
|
+
|
|
5
|
+
import type {
|
|
5
6
|
StateChart as GenericStateChart,
|
|
6
7
|
StateMachineState,
|
|
7
8
|
} from '../hooks/useReducerMachine';
|
|
@@ -357,10 +358,8 @@ export function useKeyDown() {
|
|
|
357
358
|
}
|
|
358
359
|
case 'Enter': {
|
|
359
360
|
if (state === NAVIGATING && navigationItem !== '') {
|
|
360
|
-
const {
|
|
361
|
-
|
|
362
|
-
text: navigationText,
|
|
363
|
-
} = optionsRef.current[navigationItem];
|
|
361
|
+
const { value: navigationValue, text: navigationText } =
|
|
362
|
+
optionsRef.current[navigationItem];
|
|
364
363
|
|
|
365
364
|
// don't want to submit forms
|
|
366
365
|
event.preventDefault();
|
|
@@ -408,10 +407,8 @@ export function useBlur() {
|
|
|
408
407
|
transition(BLUR, { text: stateText, item: '' });
|
|
409
408
|
} else {
|
|
410
409
|
// select the currently selected item
|
|
411
|
-
const {
|
|
412
|
-
|
|
413
|
-
text: navigationText,
|
|
414
|
-
} = optionsRef.current[navigationItem];
|
|
410
|
+
const { value: navigationValue, text: navigationText } =
|
|
411
|
+
optionsRef.current[navigationItem];
|
|
415
412
|
|
|
416
413
|
onSelect &&
|
|
417
414
|
onSelect(navigationText, navigationItem, navigationValue);
|
|
@@ -26,3 +26,15 @@ export const getTabblableNodes = (
|
|
|
26
26
|
|
|
27
27
|
return Array.from(parentNode.querySelectorAll(tabblable));
|
|
28
28
|
};
|
|
29
|
+
|
|
30
|
+
export function focusOnChildNode(parentNode: HTMLElement, itemIndex: 0 | -1) {
|
|
31
|
+
const elements = getTabblableNodes(parentNode);
|
|
32
|
+
if (elements.length > 0) {
|
|
33
|
+
elements[itemIndex === -1 ? elements.length - 1 : 0].focus();
|
|
34
|
+
} else {
|
|
35
|
+
const currentTabIndex = parentNode.tabIndex;
|
|
36
|
+
parentNode.tabIndex = 0;
|
|
37
|
+
parentNode.focus();
|
|
38
|
+
parentNode.tabIndex = currentTabIndex;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { useEffect } from 'react';
|
|
2
|
-
|
|
2
|
+
|
|
3
|
+
import { focusOnChildNode } from './tabUtils';
|
|
3
4
|
|
|
4
5
|
export interface FocusLockOptions {
|
|
5
6
|
enabled: boolean;
|
|
@@ -28,23 +29,16 @@ export function useFocusLock(
|
|
|
28
29
|
}
|
|
29
30
|
|
|
30
31
|
if (event.target === lockEndRef.current) {
|
|
31
|
-
rootEl
|
|
32
|
+
focusOnChildNode(rootEl, 0);
|
|
32
33
|
} else if (event.target === lockStartRef.current) {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
if (nodes.length > 0) {
|
|
36
|
-
const nodeToFocus = nodes.length - 1;
|
|
37
|
-
nodes[nodeToFocus].focus();
|
|
38
|
-
} else {
|
|
39
|
-
rootEl.focus();
|
|
40
|
-
}
|
|
34
|
+
focusOnChildNode(rootEl, -1);
|
|
41
35
|
} else if (
|
|
42
36
|
document !== event.target &&
|
|
43
37
|
rootEl !== event.target &&
|
|
44
38
|
!rootEl.contains(event.target as any)
|
|
45
39
|
) {
|
|
46
40
|
event.preventDefault();
|
|
47
|
-
rootEl
|
|
41
|
+
focusOnChildNode(rootEl, 0);
|
|
48
42
|
}
|
|
49
43
|
};
|
|
50
44
|
|
package/src/List/List.tsx
CHANGED
package/src/List/ListItem.tsx
CHANGED
package/src/Menu/Menu.story.tsx
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { useState } from 'react';
|
|
2
|
-
import
|
|
3
|
-
import { Menu, MenuButton, MenuItem, MenuList, MenuPopover } from './';
|
|
2
|
+
import * as React from 'react';
|
|
4
3
|
import { animated, useSpring } from 'react-spring';
|
|
4
|
+
|
|
5
|
+
import { Menu, MenuButton, MenuItem, MenuList, MenuPopover } from './';
|
|
5
6
|
import './styles.css';
|
|
6
7
|
|
|
7
8
|
export default {
|
|
@@ -91,10 +92,10 @@ const MenuControlledWithAnimation = () => {
|
|
|
91
92
|
<MenuList
|
|
92
93
|
as={animated.ul}
|
|
93
94
|
style={{
|
|
94
|
-
opacity:
|
|
95
|
-
transform:
|
|
95
|
+
opacity: opacity as unknown as number,
|
|
96
|
+
transform: scale.to(
|
|
96
97
|
(x) => `scale(${x}, ${x * x})`
|
|
97
|
-
) as unknown
|
|
98
|
+
) as unknown as string,
|
|
98
99
|
}}
|
|
99
100
|
>
|
|
100
101
|
<MenuItem>Dog</MenuItem>
|
package/src/Menu/Menu.tsx
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { forwardRef, useRef, Fragment } from 'react';
|
|
2
|
-
import
|
|
3
|
-
|
|
4
|
-
import {
|
|
1
|
+
import { forwardRef, useRef, Fragment, useId } from 'react';
|
|
2
|
+
import * as React from 'react';
|
|
3
|
+
|
|
4
|
+
import type { MenuContextProps } from './context';
|
|
5
|
+
import { MenuProvider } from './context';
|
|
5
6
|
import { useControlledState } from '../hooks';
|
|
6
7
|
|
|
7
8
|
export interface MenuProps {
|
package/src/Menu/MenuButton.tsx
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { forwardRef } from 'react';
|
|
2
|
-
import
|
|
1
|
+
import { forwardRef, useId } from 'react';
|
|
2
|
+
import * as React from 'react';
|
|
3
|
+
|
|
3
4
|
import { useMenuContext } from './context';
|
|
4
5
|
import { wrapEvent } from '../utils/wrapEvent';
|
|
5
|
-
import { useId } from '../hooks';
|
|
6
6
|
|
|
7
7
|
export type MenuButtonProps = React.ButtonHTMLAttributes<HTMLButtonElement> & {
|
|
8
8
|
as?: React.ElementType<any>;
|
|
@@ -24,15 +24,11 @@ export const MenuButton = forwardRef<HTMLButtonElement, MenuButtonProps>(
|
|
|
24
24
|
disabled,
|
|
25
25
|
...otherProps
|
|
26
26
|
} = props;
|
|
27
|
-
const {
|
|
28
|
-
|
|
29
|
-
openWithArrowKeyRef,
|
|
30
|
-
open,
|
|
31
|
-
buttonRef,
|
|
32
|
-
onChange,
|
|
33
|
-
} = useMenuContext();
|
|
27
|
+
const { menuListIdRef, openWithArrowKeyRef, open, buttonRef, onChange } =
|
|
28
|
+
useMenuContext();
|
|
34
29
|
|
|
35
|
-
const
|
|
30
|
+
const buttonIdGenerated = useId();
|
|
31
|
+
const buttonId = preferredId || buttonIdGenerated;
|
|
36
32
|
|
|
37
33
|
const handleKeyDown = (e: React.KeyboardEvent<HTMLButtonElement>) => {
|
|
38
34
|
if (disabled) {
|
package/src/Menu/MenuItem.tsx
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { forwardRef, useRef } from 'react';
|
|
2
|
-
import
|
|
1
|
+
import { forwardRef, useRef, useId } from 'react';
|
|
2
|
+
import * as React from 'react';
|
|
3
|
+
|
|
3
4
|
import { useMenuContext, useMenuListContext } from './context';
|
|
4
5
|
import { assignMultipleRefs } from '../utils/assignRef';
|
|
5
6
|
import { wrapEvent } from '../utils';
|
|
@@ -25,10 +26,10 @@ export const MenuItem = forwardRef<any, MenuItemProps>(function MenuItem(
|
|
|
25
26
|
onKeyDown,
|
|
26
27
|
...otherProps
|
|
27
28
|
} = props;
|
|
28
|
-
const {
|
|
29
|
+
const { onChange, buttonRef } = useMenuContext();
|
|
29
30
|
const { navigationItem, onNavigate } = useMenuListContext();
|
|
30
31
|
const ref = useRef<HTMLLIElement>();
|
|
31
|
-
const
|
|
32
|
+
const itemId = useId();
|
|
32
33
|
|
|
33
34
|
const isActive = ref.current && ref.current === navigationItem;
|
|
34
35
|
|
|
@@ -65,9 +66,7 @@ export const MenuItem = forwardRef<any, MenuItemProps>(function MenuItem(
|
|
|
65
66
|
return (
|
|
66
67
|
<Comp
|
|
67
68
|
ref={assignMultipleRefs(ref, forwardedRef)}
|
|
68
|
-
id={
|
|
69
|
-
disabled ? undefined : `${menuListIdRef.current}_${itemIndex.current}`
|
|
70
|
-
}
|
|
69
|
+
id={disabled ? undefined : itemId}
|
|
71
70
|
data-menu-item=""
|
|
72
71
|
data-highlighted={isActive ? '' : undefined}
|
|
73
72
|
role="menuitem"
|
package/src/Menu/MenuList.tsx
CHANGED
|
@@ -5,7 +5,8 @@ import {
|
|
|
5
5
|
useState,
|
|
6
6
|
useLayoutEffect,
|
|
7
7
|
} from 'react';
|
|
8
|
-
import
|
|
8
|
+
import * as React from 'react';
|
|
9
|
+
|
|
9
10
|
import { useMenuContext, MenuListProvider } from './context';
|
|
10
11
|
import { assignMultipleRefs } from '../utils/assignRef';
|
|
11
12
|
import { useOnClickOutside } from '../hooks/useOnClickOutside';
|
|
@@ -32,13 +33,8 @@ export const MenuList = forwardRef<HTMLUListElement, MenuListProps>(
|
|
|
32
33
|
...otherProps
|
|
33
34
|
} = props;
|
|
34
35
|
|
|
35
|
-
const {
|
|
36
|
-
|
|
37
|
-
buttonRef,
|
|
38
|
-
onChange,
|
|
39
|
-
openWithArrowKeyRef,
|
|
40
|
-
open,
|
|
41
|
-
} = useMenuContext();
|
|
36
|
+
const { menuListIdRef, buttonRef, onChange, openWithArrowKeyRef, open } =
|
|
37
|
+
useMenuContext();
|
|
42
38
|
|
|
43
39
|
const [navigationItem, setNavigationItem] = useState<
|
|
44
40
|
HTMLElement | undefined
|
package/src/Menu/MenuPopover.tsx
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { forwardRef } from 'react';
|
|
2
|
-
import
|
|
3
|
-
|
|
2
|
+
import * as React from 'react';
|
|
3
|
+
|
|
4
|
+
import type { PopperProps } from '../Popper';
|
|
5
|
+
import { Popper } from '../Popper';
|
|
4
6
|
import { useMenuContext } from './context';
|
|
5
7
|
|
|
6
8
|
export interface MenuPopoverProps extends Omit<PopperProps, 'anchorEl'> {
|
package/src/Menu/context.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { useState } from 'react';
|
|
2
2
|
import { useSpring, animated } from 'react-spring';
|
|
3
|
+
|
|
3
4
|
import { Modal, ModalBackdrop } from './';
|
|
4
5
|
import { Portal } from '../Portal';
|
|
5
6
|
import './styles.css';
|
|
@@ -91,7 +92,9 @@ const SimpleModalControlledExample = () => {
|
|
|
91
92
|
|
|
92
93
|
return (
|
|
93
94
|
<>
|
|
94
|
-
<button onClick={() => setOpen(!open)}>
|
|
95
|
+
<button id="open-modal" onClick={() => setOpen(!open)}>
|
|
96
|
+
Open modal
|
|
97
|
+
</button>
|
|
95
98
|
{open && (
|
|
96
99
|
<Portal>
|
|
97
100
|
<ModalBackdrop onClose={handleClose}>
|
|
@@ -113,12 +116,16 @@ const NestedModalControlledExample = () => {
|
|
|
113
116
|
|
|
114
117
|
return (
|
|
115
118
|
<>
|
|
116
|
-
<button onClick={() => setOpen(!open)}>
|
|
119
|
+
<button id="open-modal" onClick={() => setOpen(!open)}>
|
|
120
|
+
Open modal
|
|
121
|
+
</button>
|
|
117
122
|
{open && (
|
|
118
123
|
<Portal>
|
|
119
124
|
<ModalBackdrop onClose={() => setOpen(false)}>
|
|
120
125
|
<Modal trapFocus={true}>
|
|
121
|
-
<button onClick={() => setOpen2(true)}>
|
|
126
|
+
<button id="open-another-modal" onClick={() => setOpen2(true)}>
|
|
127
|
+
Open another modal
|
|
128
|
+
</button>
|
|
122
129
|
{open2 && (
|
|
123
130
|
<Portal>
|
|
124
131
|
<ModalBackdrop onClose={() => setOpen2(false)}>
|
|
@@ -130,7 +137,13 @@ const NestedModalControlledExample = () => {
|
|
|
130
137
|
</Portal>
|
|
131
138
|
)}
|
|
132
139
|
<LoremIpsum numOfParagraphs={1} />
|
|
133
|
-
<button
|
|
140
|
+
<button
|
|
141
|
+
autoFocus
|
|
142
|
+
id="close-button"
|
|
143
|
+
onClick={() => setOpen(false)}
|
|
144
|
+
>
|
|
145
|
+
Close
|
|
146
|
+
</button>
|
|
134
147
|
</Modal>
|
|
135
148
|
</ModalBackdrop>
|
|
136
149
|
</Portal>
|
|
@@ -187,7 +200,9 @@ const SimpleModalControlledAnimatedExample = () => {
|
|
|
187
200
|
|
|
188
201
|
return (
|
|
189
202
|
<>
|
|
190
|
-
<button onClick={handleOpen}>
|
|
203
|
+
<button id="open-modal" onClick={handleOpen}>
|
|
204
|
+
Open modal
|
|
205
|
+
</button>
|
|
191
206
|
{open && (
|
|
192
207
|
<Portal>
|
|
193
208
|
<animated.div
|
package/src/Modal/Modal.tsx
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
import { ReactNode
|
|
2
|
-
import
|
|
1
|
+
import type { ReactNode } from 'react';
|
|
2
|
+
import { forwardRef, useRef } from 'react';
|
|
3
|
+
import * as React from 'react';
|
|
4
|
+
|
|
3
5
|
import { useAutoFocus, useFocusReturn, useRemoveBodyScroll } from '../hooks';
|
|
4
6
|
import { FocusLock } from '../FocusLock';
|
|
5
7
|
import { assignMultipleRefs } from '../utils';
|
|
@@ -19,7 +21,7 @@ export const Modal = forwardRef<HTMLDivElement, ModalProps>(
|
|
|
19
21
|
) => {
|
|
20
22
|
const modalRef = useRef<HTMLDivElement>(null);
|
|
21
23
|
|
|
22
|
-
useFocusReturn(trapFocus);
|
|
24
|
+
useFocusReturn(trapFocus, modalRef);
|
|
23
25
|
useRemoveBodyScroll(trapFocus);
|
|
24
26
|
useAutoFocus(trapFocus, modalRef);
|
|
25
27
|
|
|
@@ -31,7 +33,7 @@ export const Modal = forwardRef<HTMLDivElement, ModalProps>(
|
|
|
31
33
|
role="dialog"
|
|
32
34
|
aria-modal="true"
|
|
33
35
|
style={style}
|
|
34
|
-
tabIndex={
|
|
36
|
+
tabIndex={-1}
|
|
35
37
|
{...otherProps}
|
|
36
38
|
>
|
|
37
39
|
{children}
|