Skip to content

[WIP]: Upgrade to new react aria version #1950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jrgarciadev wants to merge 1 commit into from
Closed

[WIP]: Upgrade to new react aria version #1950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions packages/components/accordion/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,13 @@
"@nextui-org/framer-transitions": "workspace:*",
"@nextui-org/divider": "workspace:*",
"@nextui-org/use-aria-accordion": "workspace:*",
"@nextui-org/use-aria-press": "workspace:*",
"@react-aria/interactions": "^3.19.1",
"@react-aria/focus": "^3.14.3",
"@react-aria/utils": "^3.21.1",
"@react-stately/tree": "^3.7.3",
"@react-aria/button": "^3.8.4",
"@react-types/accordion": "3.0.0-alpha.17",
"@react-types/shared": "^3.21.0"
"@react-aria/interactions": "^3.20.0",
"@react-aria/focus": "^3.15.0",
"@react-aria/utils": "^3.22.0",
"@react-stately/tree": "^3.7.4",
"@react-aria/button": "^3.9.0",
"@react-types/accordion": "3.0.0-alpha.18",
"@react-types/shared": "^3.22.0"
},
"devDependencies": {
"@nextui-org/theme": "workspace:*",
Expand Down
3 changes: 1 addition & 2 deletions packages/components/accordion/src/use-accordion-item.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ import {NodeWithProps} from "@nextui-org/aria-utils";
import {useReactAriaAccordionItem} from "@nextui-org/use-aria-accordion";
import {useCallback, useMemo} from "react";
import {chain, mergeProps} from "@react-aria/utils";
import {useHover} from "@react-aria/interactions";
import {usePress} from "@nextui-org/use-aria-press";
import {useHover, usePress} from "@react-aria/interactions";
import {TreeState} from "@react-stately/tree";

import {AccordionItemBaseProps} from "./base/accordion-item-base";
Expand Down
20 changes: 10 additions & 10 deletions packages/components/autocomplete/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@
"@nextui-org/button": "workspace:*",
"@nextui-org/use-aria-button": "workspace:*",
"@nextui-org/shared-icons": "workspace:*",
"@react-aria/combobox": "^3.7.1",
"@react-aria/focus": "^3.14.3",
"@react-aria/i18n": "^3.8.4",
"@react-aria/interactions": "^3.19.1",
"@react-aria/utils": "^3.21.1",
"@react-aria/visually-hidden": "^3.8.6",
"@react-stately/combobox": "^3.7.1",
"@react-types/combobox": "^3.8.1",
"@react-types/shared": "^3.21.0"
"@react-aria/combobox": "^3.8.0",
"@react-aria/focus": "^3.15.0",
"@react-aria/i18n": "^3.9.0",
"@react-aria/interactions": "^3.20.0",
"@react-aria/utils": "^3.22.0",
"@react-aria/visually-hidden": "^3.8.7",
"@react-stately/combobox": "^3.8.0",
"@react-types/combobox": "^3.9.0",
"@react-types/shared": "^3.22.0"
},
"devDependencies": {
"@nextui-org/theme": "workspace:*",
Expand All @@ -69,7 +69,7 @@
"@nextui-org/chip": "workspace:*",
"@nextui-org/stories-utils": "workspace:*",
"@nextui-org/use-infinite-scroll": "workspace:*",
"@react-stately/data": "^3.10.3",
"@react-stately/data": "^3.11.0",
"framer-motion": "^10.16.4",
"clean-package": "2.2.0",
"react": "^18.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/components/avatar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
"@nextui-org/shared-utils": "workspace:*",
"@nextui-org/react-utils": "workspace:*",
"@nextui-org/use-image": "workspace:*",
"@react-aria/interactions": "^3.19.1",
"@react-aria/focus": "^3.14.3",
"@react-aria/utils": "^3.21.1"
"@react-aria/interactions": "^3.20.0",
"@react-aria/focus": "^3.15.0",
"@react-aria/utils": "^3.22.0"
},
"devDependencies": {
"@nextui-org/theme": "workspace:*",
Expand Down
10 changes: 5 additions & 5 deletions packages/components/breadcrumbs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
"@nextui-org/react-utils": "workspace:*",
"@nextui-org/shared-utils": "workspace:*",
"@nextui-org/shared-icons": "workspace:*",
"@react-aria/focus": "^3.14.3",
"@react-aria/breadcrumbs": "^3.5.7",
"@react-aria/utils": "^3.21.1",
"@react-types/breadcrumbs": "^3.7.1",
"@react-types/shared": "^3.21.0"
"@react-aria/focus": "^3.15.0",
"@react-aria/breadcrumbs": "^3.5.8",
"@react-aria/utils": "^3.22.0",
"@react-types/breadcrumbs": "^3.7.2",
"@react-types/shared": "^3.22.0"
},
"devDependencies": {
"@nextui-org/theme": "workspace:*",
Expand Down
12 changes: 6 additions & 6 deletions packages/components/button/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@
"@nextui-org/use-aria-button": "workspace:*",
"@nextui-org/ripple": "workspace:*",
"@nextui-org/spinner": "workspace:*",
"@react-aria/button": "^3.8.4",
"@react-aria/interactions": "^3.19.1",
"@react-aria/utils": "^3.21.1",
"@react-aria/focus": "^3.14.3",
"@react-types/shared": "^3.21.0",
"@react-types/button": "^3.9.0"
"@react-aria/button": "^3.9.0",
"@react-aria/interactions": "^3.20.0",
"@react-aria/utils": "^3.22.0",
"@react-aria/focus": "^3.15.0",
"@react-types/shared": "^3.22.0",
"@react-types/button": "^3.9.1"
},
"devDependencies": {
"@nextui-org/theme": "workspace:*",
Expand Down
10 changes: 5 additions & 5 deletions packages/components/card/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@
"@nextui-org/react-utils": "workspace:*",
"@nextui-org/use-aria-button": "workspace:*",
"@nextui-org/ripple": "workspace:*",
"@react-aria/focus": "^3.14.3",
"@react-aria/utils": "^3.21.1",
"@react-aria/interactions": "^3.19.1",
"@react-aria/button": "^3.8.4",
"@react-types/shared": "^3.21.0"
"@react-aria/focus": "^3.15.0",
"@react-aria/utils": "^3.22.0",
"@react-aria/interactions": "^3.20.0",
"@react-aria/button": "^3.9.0",
"@react-types/shared": "^3.22.0"
},
"devDependencies": {
"@nextui-org/theme": "workspace:*",
Expand Down
19 changes: 9 additions & 10 deletions packages/components/checkbox/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,15 @@
"dependencies": {
"@nextui-org/shared-utils": "workspace:*",
"@nextui-org/react-utils": "workspace:*",
"@nextui-org/use-aria-press": "workspace:*",
"@react-aria/checkbox": "^3.11.2",
"@react-aria/focus": "^3.14.3",
"@react-aria/interactions": "^3.19.1",
"@react-aria/visually-hidden": "^3.8.6",
"@react-stately/checkbox": "^3.5.1",
"@react-stately/toggle": "^3.6.3",
"@react-aria/utils": "^3.21.1",
"@react-types/checkbox": "^3.5.2",
"@react-types/shared": "^3.21.0"
"@react-aria/checkbox": "^3.12.0",
"@react-aria/focus": "^3.15.0",
"@react-aria/interactions": "^3.20.0",
"@react-aria/visually-hidden": "^3.8.7",
"@react-stately/checkbox": "^3.6.0",
"@react-stately/toggle": "^3.7.0",
"@react-aria/utils": "^3.22.0",
"@react-types/checkbox": "^3.6.0",
"@react-types/shared": "^3.22.0"
},
"devDependencies": {
"@nextui-org/theme": "workspace:*",
Expand Down
3 changes: 1 addition & 2 deletions packages/components/checkbox/src/use-checkbox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ import {ReactNode, Ref, useCallback, useId, useState} from "react";
import {useMemo, useRef} from "react";
import {useToggleState} from "@react-stately/toggle";
import {checkbox} from "@nextui-org/theme";
import {useHover} from "@react-aria/interactions";
import {usePress} from "@nextui-org/use-aria-press";
import {useHover, usePress} from "@react-aria/interactions";
import {useFocusRing} from "@react-aria/focus";
import {chain, mergeProps} from "@react-aria/utils";
import {useFocusableRef} from "@nextui-org/react-utils";
Expand Down
9 changes: 4 additions & 5 deletions packages/components/chip/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,10 @@
"@nextui-org/shared-icons": "workspace:*",
"@nextui-org/shared-utils": "workspace:*",
"@nextui-org/react-utils": "workspace:*",
"@nextui-org/use-aria-press": "workspace:*",
"@react-aria/focus": "^3.14.3",
"@react-aria/interactions": "^3.19.1",
"@react-aria/utils": "^3.21.1",
"@react-types/checkbox": "^3.5.2"
"@react-aria/focus": "^3.15.0",
"@react-aria/interactions": "^3.20.0",
"@react-aria/utils": "^3.22.0",
"@react-types/checkbox": "^3.6.0"
},
"devDependencies": {
"@nextui-org/theme": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/components/chip/src/use-chip.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type {ReactNode} from "react";

import {HTMLNextUIProps, mapPropsVariants, PropGetter} from "@nextui-org/system";
import {mergeProps} from "@react-aria/utils";
import {usePress} from "@nextui-org/use-aria-press";
import {usePress} from "@react-aria/interactions";
import {useFocusRing} from "@react-aria/focus";
import {chip} from "@nextui-org/theme";
import {useDOMRef} from "@nextui-org/react-utils";
Expand Down
2 changes: 1 addition & 1 deletion packages/components/divider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@nextui-org/shared-utils": "workspace:*",
"@nextui-org/react-rsc-utils": "workspace:*",
"@nextui-org/system-rsc": "workspace:*",
"@react-types/shared": "^3.21.0"
"@react-types/shared": "^3.22.0"
},
"devDependencies": {
"@nextui-org/theme": "workspace:*",
Expand Down
10 changes: 5 additions & 5 deletions packages/components/dropdown/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@
"@nextui-org/popover": "workspace:*",
"@nextui-org/shared-utils": "workspace:*",
"@nextui-org/react-utils": "workspace:*",
"@react-aria/menu": "^3.11.1",
"@react-aria/utils": "^3.21.1",
"@react-stately/menu": "^3.5.6",
"@react-aria/focus": "^3.14.3",
"@react-types/menu": "^3.9.5"
"@react-aria/menu": "^3.11.2",
"@react-aria/utils": "^3.22.0",
"@react-stately/menu": "^3.5.7",
"@react-aria/focus": "^3.15.0",
"@react-types/menu": "^3.9.6"
},
"devDependencies": {
"@nextui-org/theme": "workspace:*",
Expand Down
14 changes: 7 additions & 7 deletions packages/components/input/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@
"@nextui-org/react-utils": "workspace:*",
"@nextui-org/shared-icons": "workspace:*",
"@nextui-org/shared-utils": "workspace:*",
"@react-aria/focus": "^3.14.3",
"@react-aria/interactions": "^3.19.1",
"@react-aria/textfield": "^3.12.2",
"@react-aria/utils": "^3.21.1",
"@react-stately/utils": "^3.8.0",
"@react-types/shared": "^3.21.0",
"@react-types/textfield": "^3.8.1",
"@react-aria/focus": "^3.15.0",
"@react-aria/interactions": "^3.20.0",
"@react-aria/textfield": "^3.13.0",
"@react-aria/utils": "^3.22.0",
"@react-stately/utils": "^3.9.0",
"@react-types/shared": "^3.22.0",
"@react-types/textfield": "^3.9.0",
"react-textarea-autosize": "^8.5.2"
},
"devDependencies": {
Expand Down
6 changes: 6 additions & 0 deletions packages/components/input/src/textarea.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,12 @@ const Textarea = forwardRef<"textarea", TextAreaProps>(
return <div {...getInnerWrapperProps()}>{content}</div>;
}, [startContent, inputProps, endContent, getInnerWrapperProps]);

const errorMessageContent = useMemo(() => {
if (typeof errorMessage === "string") {
return errorMessage;
}
}, [errorMessage]);

return (
<Component {...getBaseProps()}>
{shouldLabelBeOutside ? labelContent : null}
Expand Down
10 changes: 9 additions & 1 deletion packages/components/input/src/use-input.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,15 @@ export function useInput<T extends HTMLInputElement | HTMLTextAreaElement = HTML
onClear?.();
}, [domRef, setInputValue, onClear]);

const {labelProps, inputProps, descriptionProps, errorMessageProps} = useTextField(
const {
labelProps,
inputProps,
isInvalid: isAriaInvalid,
validationErrors,
validationDetails,
descriptionProps,
errorMessageProps,
} = useTextField(
{
...originalProps,
"aria-label": safeAriaLabel(
Expand Down
2 changes: 1 addition & 1 deletion packages/components/kbd/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@nextui-org/system-rsc": "workspace:*",
"@nextui-org/shared-utils": "workspace:*",
"@nextui-org/react-utils": "workspace:*",
"@react-aria/utils": "^3.21.1"
"@react-aria/utils": "^3.22.0"
},
"devDependencies": {
"@nextui-org/theme": "workspace:*",
Expand Down
8 changes: 4 additions & 4 deletions packages/components/link/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
"@nextui-org/shared-icons": "workspace:*",
"@nextui-org/react-utils": "workspace:*",
"@nextui-org/use-aria-link": "workspace:*",
"@react-aria/link": "^3.6.1",
"@react-aria/utils": "^3.21.1",
"@react-aria/focus": "^3.14.3",
"@react-types/link": "^3.5.1"
"@react-aria/link": "^3.6.2",
"@react-aria/utils": "^3.22.0",
"@react-aria/focus": "^3.15.0",
"@react-types/link": "^3.5.2"
},
"devDependencies": {
"@nextui-org/theme": "workspace:*",
Expand Down
15 changes: 7 additions & 8 deletions packages/components/listbox/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,13 @@
"@nextui-org/divider": "workspace:*",
"@nextui-org/aria-utils": "workspace:*",
"@nextui-org/use-is-mobile": "workspace:*",
"@nextui-org/use-aria-press": "workspace:*",
"@react-aria/utils": "^3.21.1",
"@react-aria/listbox": "^3.11.1",
"@react-stately/list": "^3.10.0",
"@react-aria/focus": "^3.14.3",
"@react-aria/interactions": "^3.19.1",
"@react-types/menu": "^3.9.5",
"@react-types/shared": "^3.21.0"
"@react-aria/utils": "^3.22.0",
"@react-aria/listbox": "^3.11.2",
"@react-stately/list": "^3.10.1",
"@react-aria/focus": "^3.15.0",
"@react-aria/interactions": "^3.20.0",
"@react-types/menu": "^3.9.6",
"@react-types/shared": "^3.22.0"
},
"devDependencies": {
"@nextui-org/theme": "workspace:*",
Expand Down
3 changes: 1 addition & 2 deletions packages/components/listbox/src/use-listbox-item.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ import {filterDOMProps} from "@nextui-org/react-utils";
import {clsx, dataAttr, removeEvents} from "@nextui-org/shared-utils";
import {useOption} from "@react-aria/listbox";
import {mergeProps} from "@react-aria/utils";
import {useHover} from "@react-aria/interactions";
import {usePress} from "@nextui-org/use-aria-press";
import {useHover, usePress} from "@react-aria/interactions";
import {useIsMobile} from "@nextui-org/use-is-mobile";
import {ListState} from "@react-stately/list";

Expand Down
17 changes: 8 additions & 9 deletions packages/components/menu/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,14 @@
"@nextui-org/use-is-mobile": "workspace:*",
"@nextui-org/shared-utils": "workspace:*",
"@nextui-org/react-utils": "workspace:*",
"@nextui-org/use-aria-press": "workspace:*",
"@react-aria/menu": "^3.11.1",
"@react-aria/utils": "^3.21.1",
"@react-stately/menu": "^3.5.6",
"@react-stately/tree": "^3.7.3",
"@react-aria/focus": "^3.14.3",
"@react-aria/interactions": "^3.19.1",
"@react-types/menu": "^3.9.5",
"@react-types/shared": "^3.21.0"
"@react-aria/menu": "^3.11.2",
"@react-aria/utils": "^3.22.0",
"@react-stately/menu": "^3.5.7",
"@react-stately/tree": "^3.7.4",
"@react-aria/focus": "^3.15.0",
"@react-aria/interactions": "^3.20.0",
"@react-types/menu": "^3.9.6",
"@react-types/shared": "^3.22.0"
},
"devDependencies": {
"@nextui-org/theme": "workspace:*",
Expand Down
3 changes: 1 addition & 2 deletions packages/components/menu/src/use-menu-item.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import {TreeState} from "@react-stately/tree";
import {clsx, dataAttr, removeEvents} from "@nextui-org/shared-utils";
import {useMenuItem as useAriaMenuItem} from "@react-aria/menu";
import {chain, mergeProps} from "@react-aria/utils";
import {useHover} from "@react-aria/interactions";
import {usePress} from "@nextui-org/use-aria-press";
import {useHover, usePress} from "@react-aria/interactions";
import {useIsMobile} from "@nextui-org/use-is-mobile";

interface Props<T extends object> extends MenuItemBaseProps<T> {
Expand Down
14 changes: 7 additions & 7 deletions packages/components/modal/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@
"@nextui-org/react-utils": "workspace:*",
"@nextui-org/shared-icons": "workspace:*",
"@nextui-org/use-aria-modal-overlay": "workspace:*",
"@react-aria/dialog": "^3.5.7",
"@react-aria/interactions": "^3.19.1",
"@react-aria/overlays": "^3.18.1",
"@react-aria/utils": "^3.21.1",
"@react-stately/overlays": "^3.6.3",
"@react-aria/focus": "^3.14.3",
"@react-types/overlays": "^3.8.3",
"@react-aria/dialog": "^3.5.8",
"@react-aria/interactions": "^3.20.0",
"@react-aria/overlays": "^3.19.0",
"@react-aria/utils": "^3.22.0",
"@react-stately/overlays": "^3.6.4",
"@react-aria/focus": "^3.15.0",
"@react-types/overlays": "^3.8.4",
"react-remove-scroll": "^2.5.6"
},
"devDependencies": {
Expand Down
12 changes: 6 additions & 6 deletions packages/components/navbar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@
"@nextui-org/framer-transitions": "workspace:*",
"@nextui-org/use-aria-toggle-button": "workspace:*",
"@nextui-org/use-scroll-position": "workspace:*",
"@react-aria/focus": "^3.14.3",
"@react-aria/interactions": "^3.19.1",
"@react-aria/utils": "^3.21.1",
"@react-stately/toggle": "^3.6.3",
"@react-stately/utils": "^3.8.0",
"@react-aria/overlays": "^3.18.1",
"@react-aria/focus": "^3.15.0",
"@react-aria/interactions": "^3.20.0",
"@react-aria/utils": "^3.22.0",
"@react-stately/toggle": "^3.7.0",
"@react-stately/utils": "^3.9.0",
"@react-aria/overlays": "^3.19.0",
"react-remove-scroll": "^2.5.6"
},
"devDependencies": {
Expand Down
Loading