fix lint

Author: LFDanLu

packages/@react-spectrum/s2/src/Button.tsx

@@ -10,19 +10,19 @@
  * governing permissions and limitations under the License.
  */
 
-import {FocusableRef, FocusableRefValue, GlobalDOMAttributes} from '@react-types/shared';
-import {createContext, forwardRef, ReactNode, useContext, useEffect, useState} from 'react';
+import {baseColor, focusRing, fontRelative, lightDark, style} from '../style' with {type: 'macro'};
 import {ButtonRenderProps, ContextValue, Link, LinkProps, OverlayTriggerStateContext, Provider, Button as RACButton, ButtonProps as RACButtonProps} from 'react-aria-components';
+import {centerBaseline} from './CenterBaseline';
 // @ts-ignore
+import {control, getAllowedOverrides, staticColor, StyleProps} from './style-utils' with {type: 'macro'};
+import {createContext, forwardRef, ReactNode, useContext, useEffect, useState} from 'react';
+import {FocusableRef, FocusableRefValue, GlobalDOMAttributes} from '@react-types/shared';
+import {IconContext} from './Icon';
 import intlMessages from '../intl/*.json';
-import {baseColor, focusRing, fontRelative, lightDark, style} from '../style' with {type: 'macro'};
 import {linearGradient} from '../style/spectrum-theme' with {type: 'macro'};
-import {centerBaseline} from './CenterBaseline';
-import {IconContext} from './Icon';
 import {pressScale} from './pressScale';
 import {ProgressCircle} from './ProgressCircle';
 import {SkeletonContext} from './Skeleton';
-import {control, getAllowedOverrides, staticColor, StyleProps} from './style-utils' with {type: 'macro'};
 import {Text, TextContext} from './Content';
 import {useFocusableRef} from '@react-spectrum/utils';
 import {useFormProps} from './Form';

packages/@react-spectrum/s2/src/ComboBox.tsx

@@ -10,8 +10,6 @@
  * governing permissions and limitations under the License.
  */
 
-import {BaseCollection, CollectionNode, createLeafComponent} from '@react-aria/collections';
-import {AsyncLoadable, GlobalDOMAttributes, HelpTextProps, LoadingState, SpectrumLabelableProps} from '@react-types/shared';
 import {
   ComboBox as AriaComboBox,
   ComboBoxProps as AriaComboBoxProps,
@@ -35,9 +33,10 @@ import {
   SectionProps,
   Virtualizer
 } from 'react-aria-components';
-import {baseColor, focusRing, space, style} from '../style' with {type: 'macro'};
-import {edgeToText} from '../style/spectrum-theme' with {type: 'macro'};
+import {AsyncLoadable, GlobalDOMAttributes, HelpTextProps, LoadingState, SpectrumLabelableProps} from '@react-types/shared';
 import {AvatarContext} from './Avatar';
+import {BaseCollection, CollectionNode, createLeafComponent} from '@react-aria/collections';
+import {baseColor, focusRing, space, style} from '../style' with {type: 'macro'};
 import {centerBaseline} from './CenterBaseline';
 import {centerPadding, control, controlBorderRadius, controlFont, controlSize, field, fieldInput, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {
@@ -52,6 +51,7 @@ import CheckmarkIcon from '../ui-icons/Checkmark';
 import ChevronIcon from '../ui-icons/Chevron';
 import {createContext, CSSProperties, ForwardedRef, forwardRef, ReactNode, Ref, useCallback, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState} from 'react';
 import {createFocusableRef} from '@react-spectrum/utils';
+import {edgeToText} from '../style/spectrum-theme' with {type: 'macro'};
 import {FieldErrorIcon, FieldGroup, FieldLabel, HelpText, Input} from './Field';
 import {FormContext, useFormProps} from './Form';
 import {forwardRefType} from './types';

packages/@react-spectrum/s2/src/Menu.tsx

@@ -10,8 +10,6 @@
  * governing permissions and limitations under the License.
  */
 
-import {DOMRef, DOMRefValue, GlobalDOMAttributes, PressEvent} from '@react-types/shared';
-import {createContext, forwardRef, JSX, ReactNode, useContext, useRef, useState} from 'react';
 import {
   Menu as AriaMenu,
   MenuItem as AriaMenuItem,
@@ -30,14 +28,16 @@ import {
   Separator,
   SeparatorProps
 } from 'react-aria-components';
-import CheckmarkIcon from '../ui-icons/Checkmark';
-import ChevronRightIcon from '../ui-icons/Chevron';
 import {baseColor, focusRing, fontRelative, size, space, style} from '../style' with {type: 'macro'};
-import {edgeToText} from '../style/spectrum-theme' with {type: 'macro'};
-import {centerBaseline} from './CenterBaseline';
 import {box, iconStyles} from './Checkbox';
-import {divider} from './Divider';
+import {centerBaseline} from './CenterBaseline';
 import {centerPadding, control, controlFont, controlSize, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
+import CheckmarkIcon from '../ui-icons/Checkmark';
+import ChevronRightIcon from '../ui-icons/Chevron';
+import {createContext, forwardRef, JSX, ReactNode, useContext, useRef, useState} from 'react';
+import {divider} from './Divider';
+import {DOMRef, DOMRefValue, GlobalDOMAttributes, PressEvent} from '@react-types/shared';
+import {edgeToText} from '../style/spectrum-theme' with {type: 'macro'};
 import {forwardRefType} from './types';
 import {HeaderContext, HeadingContext, KeyboardContext, Text, TextContext} from './Content';
 import {IconContext} from './Icon'; // chevron right removed??

packages/@react-spectrum/s2/src/Picker.tsx

@@ -33,11 +33,10 @@ import {
   Virtualizer
 } from 'react-aria-components';
 import {AsyncLoadable, FocusableRef, FocusableRefValue, GlobalDOMAttributes, HelpTextProps, LoadingState, PressEvent, RefObject, SpectrumLabelableProps} from '@react-types/shared';
-import {baseColor, focusRing, style} from '../style' with {type: 'macro'};
-import {edgeToText} from '../style/spectrum-theme' with {type: 'macro'};
 import {AvatarContext} from './Avatar';
-import {centerBaseline} from './CenterBaseline';
+import {baseColor, focusRing, style} from '../style' with {type: 'macro'};
 import {box, iconStyles as checkboxIconStyles} from './Checkbox';
+import {centerBaseline} from './CenterBaseline';
 import {
   checkbox,
   checkmark,
@@ -58,6 +57,7 @@ import {
   listboxItem,
   LOADER_ROW_HEIGHTS
 } from './ComboBox';
+import {edgeToText} from '../style/spectrum-theme' with {type: 'macro'};
 import {
   FieldErrorIcon,
   FieldLabel,

packages/@react-spectrum/s2/src/TabsPicker.tsx

@@ -23,15 +23,8 @@ import {
   Provider,
   SelectValue
 } from 'react-aria-components';
-import {FocusableRef, FocusableRefValue, SpectrumLabelableProps} from '@react-types/shared';
-import CheckmarkIcon from '../ui-icons/Checkmark';
-import ChevronIcon from '../ui-icons/Chevron';
 import {baseColor, focusRing, size, style} from '../style' with {type: 'macro'};
-import {edgeToText} from '../style/spectrum-theme' with {type: 'macro'};
 import {centerBaseline} from './CenterBaseline';
-import {
-  FieldLabel
-} from './Field';
 import {
   checkmark,
   description,
@@ -41,7 +34,14 @@ import {
   sectionHeader,
   sectionHeading
 } from './Menu';
+import CheckmarkIcon from '../ui-icons/Checkmark';
+import ChevronIcon from '../ui-icons/Chevron';
 import {controlFont, fieldInput, StyleProps} from './style-utils' with {type: 'macro'};
+import {edgeToText} from '../style/spectrum-theme' with {type: 'macro'};
+import {
+  FieldLabel
+} from './Field';
+import {FocusableRef, FocusableRefValue, SpectrumLabelableProps} from '@react-types/shared';
 import {forwardRefType} from './types';
 import {HeaderContext, HeadingContext, Text, TextContext} from './Content';
 import {IconContext} from './Icon';