chore: optimize imports * 5

Author: tenphi

pnpm-lock.yaml

@@ -13,39 +13,38 @@ import {
   useHover,
   useOverlayPosition,
   AriaComboBoxProps,
+  AriaTextFieldProps,
 } from 'react-aria';
 import { Item, useComboBoxState } from 'react-stately';
 
 import { useFieldProps, useFormProps, wrapWithField } from '../../form';
+import { DEFAULT_INPUT_STYLES, INPUT_WRAPPER_STYLES } from '../index';
 import { useProviderProps } from '../../../provider';
 import {
   BLOCK_STYLES,
   extractStyles,
   OUTER_STYLES,
   tasty,
-} from '../../../tasty/index';
+} from '../../../tasty';
 import { useFocus } from '../../../utils/react/interactions';
 import {
   mergeProps,
   modAttrs,
   useCombinedRefs,
   useLayoutEffect,
-} from '../../../utils/react/index';
+} from '../../../utils/react';
 import { CubeSelectBaseProps, ListBoxPopup } from '../Select';
-import { DEFAULT_INPUT_STYLES, INPUT_WRAPPER_STYLES } from '../index';
 import { OverlayWrapper } from '../../overlays/OverlayWrapper';
-import { LoadingIcon } from '../../../icons/index';
+import { LoadingIcon } from '../../../icons';
 import { InvalidIcon } from '../../shared/InvalidIcon';
 import { ValidIcon } from '../../shared/ValidIcon';
 
 import type { KeyboardDelegate, LoadingState } from '@react-types/shared';
 
-export type MenuTriggerAction = 'focus' | 'input' | 'manual';
-
-export type { AriaComboBoxProps };
-
 type FilterFn = (textValue: string, inputValue: string) => boolean;
 
+export type MenuTriggerAction = 'focus' | 'input' | 'manual';
+
 function CaretDownIcon() {
   return (
     <svg
@@ -105,7 +104,8 @@ export interface CubeComboBoxProps<T>
       CubeSelectBaseProps<T>,
       'onOpenChange' | 'onBlur' | 'onFocus' | 'validate' | 'onSelectionChange'
     >,
-    AriaComboBoxProps<T> {
+    AriaComboBoxProps<T>,
+    AriaTextFieldProps {
   icon?: ReactElement;
   multiLine?: boolean;
   autoComplete?: string;
@@ -189,14 +189,27 @@ export const ComboBox = forwardRef(function ComboBox<T extends object>(
   let isAsync = loadingState != null;
   let { contains } = useFilter({ sensitivity: 'base' });
 
-  const comboBoxProps = {
+  const comboboxProps = {
     ...props,
+    children: props.children,
+    items: props.items,
+    label: props.label,
+    isDisabled: props.isDisabled,
+    validationState: props.validationState,
+    description: props.description,
+    autoFocus: props.autoFocus,
+    isRequired: props.isRequired,
+    allowsCustomValue: props.allowsCustomValue,
+    menuTrigger,
+    disabledKeys: props.disabledKeys,
+    name: props.name,
+    isReadOnly: props.isReadOnly,
     defaultFilter: filter || contains,
     allowsEmptyCollection: isAsync,
-  };
+  } as const;
 
   let state = useComboBoxState({
-    comboBoxProps,
+    ...comboboxProps,
     defaultFilter: filter || contains,
     allowsEmptyCollection: isAsync,
   });
@@ -230,7 +243,7 @@ export const ComboBox = forwardRef(function ComboBox<T extends object>(
     buttonProps: triggerProps,
   } = useComboBox(
     {
-      ...comboBoxProps,
+      ...comboboxProps,
       inputRef,
       buttonRef: triggerRef,
       listBoxRef,

src/components/fields/ComboBox/ComboBox.tsx

@@ -1,6 +1,6 @@
 import { useFocusableRef } from '@react-spectrum/utils';
 import { forwardRef, useMemo, useRef } from 'react';
-import { useHover, useRadio, AriaRadioProps } from 'react-aria';
+import { useHover, useRadio } from 'react-aria';
 
 import {
   BaseProps,
@@ -21,6 +21,8 @@ import { FieldBaseProps } from '../../../shared';
 import { RadioGroup } from './RadioGroup';
 import { useRadioProvider } from './context';
 
+import type { AriaRadioProps } from 'react-aria';
+
 export { AriaRadioProps };
 export { useRadio };
 

src/components/fields/RadioGroup/Radio.tsx

@@ -1,7 +1,7 @@
-import { SliderState } from 'react-stately';
-
 import { SliderGradationElement, SliderGradeElement } from './elements';
 
+import type { SliderState } from 'react-stately';
+
 export type GradationProps = {
   state: SliderState;
   ranges: number[];

src/components/fields/Slider/Gradation.tsx

@@ -1,7 +1,7 @@
 import { RefObject, forwardRef, useRef, ReactNode } from 'react';
 import { useFocusableRef } from '@react-spectrum/utils';
 import { FocusableRef } from '@react-types/shared';
-import { SliderState, useSliderState } from 'react-stately';
+import { useSliderState } from 'react-stately';
 import { useSlider, useNumberFormatter } from 'react-aria';
 
 import { extractStyles, OUTER_STYLES, tasty } from '../../../tasty';
@@ -10,7 +10,9 @@ import { Text } from '../../content/Text';
 import { mergeProps } from '../../../utils/react';
 
 import { SliderControlsElement, SliderElement } from './elements';
-import { CubeSliderBaseProps } from './types';
+
+import type { SliderState } from 'react-stately';
+import type { CubeSliderBaseProps } from './types';
 
 export interface SliderBaseChildArguments {
   inputRef: RefObject<HTMLInputElement>;

src/components/fields/Slider/SliderBase.tsx

@@ -1,8 +1,9 @@
 import { useCallback } from 'react';
-import { SliderState } from 'react-stately';
 
 import { CubeNumberInputProps, NumberInput } from '../../../';
 
+import type { SliderState } from 'react-stately';
+
 export interface RangeInputProps extends CubeNumberInputProps {
   index: number;
   state: SliderState;

src/components/fields/Slider/SliderInput.tsx

@@ -5,12 +5,13 @@ import {
   useSliderThumb,
   VisuallyHidden,
 } from 'react-aria';
-import { SliderState } from 'react-stately';
 
 import { mergeProps } from '../../../utils/react';
 
 import { SliderThumbElement } from './elements';
 
+import type { SliderState } from 'react-stately';
+
 export interface SliderThumbProps extends AriaSliderThumbOptions {
   state: SliderState;
   isDisabled?: boolean;

src/components/fields/Slider/SliderThumb.tsx

@@ -1,8 +1,9 @@
-import { SliderState } from 'react-stately';
 import { useMemo } from 'react';
 
 import { SliderTrackContainerElement } from './elements';
 
+import type { SliderState } from 'react-stately';
+
 export type SliderTrackProps = {
   state: SliderState;
   orientation?: 'horizontal' | 'vertical';

src/components/fields/Slider/SliderTrack.tsx

@@ -1,4 +1,5 @@
 export * from './RangeSlider';
 export * from './Slider';
 export * from './types';
-export { SliderState, useSliderState } from 'react-stately';
+export { useSliderState } from 'react-stately';
+export type { SliderState } from 'react-stately';