Skip to content

Commit 63a2ff6

Browse files
Fix Compat for React 19 types (#6632)
* Fix install * Fix Compat for React 19 types * remove unneeded imports --------- Co-authored-by: Daniel Lu <[email protected]>
1 parent caff840 commit 63a2ff6

File tree

141 files changed

+287
-262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+287
-262
lines changed

packages/@react-aria/accordion/src/useAccordion.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
*/
1212

1313
import {AriaAccordionProps} from '@react-types/accordion';
14-
import {ButtonHTMLAttributes, RefObject} from 'react';
15-
import {DOMAttributes, Node} from '@react-types/shared';
14+
import {ButtonHTMLAttributes} from 'react';
15+
import {DOMAttributes, Node, RefObject} from '@react-types/shared';
1616
import {mergeProps, useId} from '@react-aria/utils';
1717
import {TreeState} from '@react-stately/tree';
1818
import {useButton} from '@react-aria/button';

packages/@react-aria/actiongroup/src/useActionGroup.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
import {AriaActionGroupProps} from '@react-types/actiongroup';
1414
import {createFocusManager} from '@react-aria/focus';
15-
import {DOMAttributes, FocusableElement, Orientation} from '@react-types/shared';
15+
import {DOMAttributes, FocusableElement, Orientation, RefObject} from '@react-types/shared';
1616
import {filterDOMProps, useLayoutEffect} from '@react-aria/utils';
1717
import {ListState} from '@react-stately/list';
18-
import {RefObject, useState} from 'react';
1918
import {useLocale} from '@react-aria/i18n';
19+
import {useState} from 'react';
2020

2121
const BUTTON_GROUP_ROLES = {
2222
'none': 'toolbar',

packages/@react-aria/actiongroup/src/useActionGroupItem.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
* governing permissions and limitations under the License.
1111
*/
1212

13-
import {DOMAttributes, FocusableElement, Key} from '@react-types/shared';
13+
import {DOMAttributes, FocusableElement, Key, RefObject} from '@react-types/shared';
1414
import {ListState} from '@react-stately/list';
1515
import {mergeProps, useEffectEvent} from '@react-aria/utils';
1616
import {PressProps} from '@react-aria/interactions';
17-
import {RefObject, useEffect} from 'react';
17+
import {useEffect} from 'react';
1818

1919
export interface AriaActionGroupItemProps {
2020
key: Key

packages/@react-aria/autocomplete/src/useSearchAutocomplete.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import {AriaButtonProps} from '@react-types/button';
1414
import {AriaListBoxOptions} from '@react-aria/listbox';
1515
import {AriaSearchAutocompleteProps} from '@react-types/autocomplete';
1616
import {ComboBoxState} from '@react-stately/combobox';
17-
import {DOMAttributes, KeyboardDelegate, LayoutDelegate, ValidationResult} from '@react-types/shared';
18-
import {InputHTMLAttributes, RefObject} from 'react';
17+
import {DOMAttributes, KeyboardDelegate, LayoutDelegate, RefObject, ValidationResult} from '@react-types/shared';
18+
import {InputHTMLAttributes} from 'react';
1919
import {mergeProps} from '@react-aria/utils';
2020
import {useComboBox} from '@react-aria/combobox';
2121
import {useSearchField} from '@react-aria/searchfield';

packages/@react-aria/breadcrumbs/src/useBreadcrumbItem.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
*/
1212

1313
import {AriaBreadcrumbItemProps} from '@react-types/breadcrumbs';
14-
import {DOMAttributes, FocusableElement} from '@react-types/shared';
15-
import {RefObject} from 'react';
14+
import {DOMAttributes, FocusableElement, RefObject} from '@react-types/shared';
1615
import {useLink} from '@react-aria/link';
1716

1817
export interface BreadcrumbItemAria {

packages/@react-aria/calendar/src/useCalendarCell.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212

1313
import {CalendarDate, isEqualDay, isSameDay, isToday} from '@internationalized/date';
1414
import {CalendarState, RangeCalendarState} from '@react-stately/calendar';
15-
import {DOMAttributes} from '@react-types/shared';
15+
import {DOMAttributes, RefObject} from '@react-types/shared';
1616
import {focusWithoutScrolling, getScrollParent, mergeProps, scrollIntoViewport, useDeepMemo, useDescription} from '@react-aria/utils';
1717
import {getEraFormat, hookData} from './utils';
1818
import {getInteractionModality, usePress} from '@react-aria/interactions';
1919
// @ts-ignore
2020
import intlMessages from '../intl/*.json';
21-
import {RefObject, useEffect, useMemo, useRef} from 'react';
2221
import {useDateFormatter, useLocalizedStringFormatter} from '@react-aria/i18n';
22+
import {useEffect, useMemo, useRef} from 'react';
2323

2424
export interface AriaCalendarCellProps {
2525
/** The date that this cell represents. */

packages/@react-aria/calendar/src/useRangeCalendar.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212

1313
import {AriaRangeCalendarProps, DateValue} from '@react-types/calendar';
1414
import {CalendarAria, useCalendarBase} from './useCalendarBase';
15-
import {FocusableElement} from '@react-types/shared';
15+
import {FocusableElement, RefObject} from '@react-types/shared';
1616
import {RangeCalendarState} from '@react-stately/calendar';
17-
import {RefObject, useRef} from 'react';
1817
import {useEvent} from '@react-aria/utils';
18+
import {useRef} from 'react';
1919

2020
/**
2121
* Provides the behavior and accessibility implementation for a range calendar component.

packages/@react-aria/checkbox/src/useCheckbox.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
*/
1212

1313
import {AriaCheckboxProps} from '@react-types/checkbox';
14-
import {InputHTMLAttributes, LabelHTMLAttributes, RefObject, useEffect} from 'react';
14+
import {InputHTMLAttributes, LabelHTMLAttributes, useEffect} from 'react';
15+
import {RefObject, ValidationResult} from '@react-types/shared';
1516
import {ToggleState} from '@react-stately/toggle';
1617
import {useFormValidation} from '@react-aria/form';
1718
import {useFormValidationState} from '@react-stately/form';
1819
import {useToggle} from '@react-aria/toggle';
19-
import {ValidationResult} from '@react-types/shared';
2020

2121
export interface CheckboxAria extends ValidationResult {
2222
/** Props for the label wrapper element. */

packages/@react-aria/checkbox/src/useCheckboxGroupItem.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import {CheckboxAria, useCheckbox} from './useCheckbox';
1515
import {checkboxGroupData} from './utils';
1616
import {CheckboxGroupState} from '@react-stately/checkbox';
1717
import {DEFAULT_VALIDATION_RESULT, privateValidationStateProp, useFormValidationState} from '@react-stately/form';
18-
import {RefObject, useEffect, useRef} from 'react';
18+
import {RefObject, ValidationResult} from '@react-types/shared';
19+
import {useEffect, useRef} from 'react';
1920
import {useToggleState} from '@react-stately/toggle';
20-
import {ValidationResult} from '@react-types/shared';
2121

2222
/**
2323
* Provides the behavior and accessibility implementation for a checkbox component contained within a checkbox group.

packages/@react-aria/color/src/useColorArea.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
import {AriaColorAreaProps, ColorChannel} from '@react-types/color';
1414
import {ColorAreaState} from '@react-stately/color';
15-
import {DOMAttributes} from '@react-types/shared';
15+
import {DOMAttributes, RefObject} from '@react-types/shared';
1616
import {focusWithoutScrolling, isAndroid, isIOS, mergeProps, useFormReset, useGlobalListeners, useLabels} from '@react-aria/utils';
1717
// @ts-ignore
1818
import intlMessages from '../intl/*.json';
19-
import React, {ChangeEvent, InputHTMLAttributes, RefObject, useCallback, useRef, useState} from 'react';
19+
import React, {ChangeEvent, InputHTMLAttributes, useCallback, useRef, useState} from 'react';
2020
import {useColorAreaGradient} from './useColorAreaGradient';
2121
import {useFocus, useFocusWithin, useKeyboard, useMove} from '@react-aria/interactions';
2222
import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';

0 commit comments

Comments
 (0)