Skip to content

Commit 76dd10e

Browse files
RobinMalfaitRobinMalfait
authored
Sort imports automatically (#2741)
* add `prettier-plugin-organize-imports` and `prettier-plugin-tailwindcss` * format * bump Tailwind CSS * format playgrounds using updated Tailwind CSS and Prettier plugins * use import syntax
1 parent 8e93cd0 commit 76dd10e

File tree

173 files changed

+2877
-2938
lines changed

Some content is hidden

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

173 files changed

+2877
-2938
lines changed

‎package.json

+7-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@
3737
"printWidth": 100,
3838
"semi": false,
3939
"singleQuote": true,
40-
"trailingComma": "es5"
40+
"trailingComma": "es5",
41+
"plugins": [
42+
"prettier-plugin-organize-imports",
43+
"prettier-plugin-tailwindcss"
44+
]
4145
},
4246
"devDependencies": {
4347
"@swc/core": "^1.2.131",
@@ -51,7 +55,8 @@
5155
"lint-staged": "^12.2.1",
5256
"npm-run-all": "^4.1.5",
5357
"prettier": "^2.6.2",
54-
"prettier-plugin-tailwindcss": "^0.1.4",
58+
"prettier-plugin-organize-imports": "^3.2.3",
59+
"prettier-plugin-tailwindcss": "0.4",
5560
"rimraf": "^3.0.2",
5661
"tslib": "^2.3.1",
5762
"typescript": "^4.9.5"

‎packages/@headlessui-react/src/components/combobox/combobox.test.tsx

+28-28
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
1-
import React, { createElement, useState, useEffect } from 'react'
21
import { render } from '@testing-library/react'
2+
import React, { createElement, useEffect, useState } from 'react'
33

4-
import { Combobox } from './combobox'
5-
import { mockingConsoleLogs, suppressConsoleLogs } from '../../test-utils/suppress-console-logs'
64
import {
7-
click,
8-
focus,
9-
blur,
10-
mouseMove,
11-
mouseLeave,
12-
press,
13-
shift,
14-
type,
15-
word,
16-
Keys,
17-
MouseButton,
18-
} from '../../test-utils/interactions'
19-
import {
20-
assertActiveElement,
215
assertActiveComboboxOption,
22-
assertComboboxList,
6+
assertActiveElement,
7+
assertCombobox,
238
assertComboboxButton,
249
assertComboboxButtonLinkedWithCombobox,
2510
assertComboboxButtonLinkedWithComboboxLabel,
26-
assertComboboxOption,
11+
assertComboboxInput,
2712
assertComboboxLabel,
2813
assertComboboxLabelLinkedWithCombobox,
14+
assertComboboxList,
15+
assertComboboxOption,
2916
assertNoActiveComboboxOption,
3017
assertNoSelectedComboboxOption,
31-
getComboboxInput,
18+
assertNotActiveComboboxOption,
19+
ComboboxMode,
20+
ComboboxState,
21+
getByText,
3222
getComboboxButton,
3323
getComboboxButtons,
24+
getComboboxes,
25+
getComboboxInput,
3426
getComboboxInputs,
35-
getComboboxOptions,
3627
getComboboxLabel,
37-
ComboboxState,
38-
getByText,
39-
getComboboxes,
40-
assertCombobox,
41-
ComboboxMode,
42-
assertNotActiveComboboxOption,
43-
assertComboboxInput,
28+
getComboboxOptions,
4429
} from '../../test-utils/accessibility-assertions'
30+
import {
31+
blur,
32+
click,
33+
focus,
34+
Keys,
35+
MouseButton,
36+
mouseLeave,
37+
mouseMove,
38+
press,
39+
shift,
40+
type,
41+
word,
42+
} from '../../test-utils/interactions'
43+
import { mockingConsoleLogs, suppressConsoleLogs } from '../../test-utils/suppress-console-logs'
4544
import { Transition } from '../transitions/transition'
45+
import { Combobox } from './combobox'
4646

4747
let NOOP = () => {}
4848

‎packages/@headlessui-react/src/components/combobox/combobox.tsx

+19-21
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
import React, {
2-
Fragment,
32
createContext,
43
createRef,
4+
ElementType,
5+
FocusEvent as ReactFocusEvent,
6+
Fragment,
7+
KeyboardEvent as ReactKeyboardEvent,
8+
MouseEvent as ReactMouseEvent,
9+
MutableRefObject,
10+
Ref,
511
useCallback,
612
useContext,
713
useEffect,
814
useMemo,
915
useReducer,
1016
useRef,
11-
12-
// Types
13-
ElementType,
14-
KeyboardEvent as ReactKeyboardEvent,
15-
MouseEvent as ReactMouseEvent,
16-
FocusEvent as ReactFocusEvent,
17-
MutableRefObject,
18-
Ref,
1917
} from 'react'
2018
import { ByComparator, EnsureArray, Expand, Props } from '../../types'
2119

@@ -31,31 +29,31 @@ import { useSyncRefs } from '../../hooks/use-sync-refs'
3129
import { useTreeWalker } from '../../hooks/use-tree-walker'
3230
import { history } from '../../utils/active-element-history'
3331

32+
import { isDisabledReactIssue7711 } from '../../utils/bugs'
3433
import { calculateActiveIndex, Focus } from '../../utils/calculate-active-index'
3534
import { disposables } from '../../utils/disposables'
35+
import { sortByDomNode } from '../../utils/focus-management'
36+
import { objectToFormEntries } from '../../utils/form'
37+
import { match } from '../../utils/match'
3638
import {
37-
forwardRefWithAs,
38-
render,
3939
compact,
40-
PropsForFeatures,
4140
Features,
41+
forwardRefWithAs,
4242
HasDisplayName,
43+
PropsForFeatures,
4344
RefProp,
45+
render,
4446
} from '../../utils/render'
45-
import { isDisabledReactIssue7711 } from '../../utils/bugs'
46-
import { match } from '../../utils/match'
47-
import { objectToFormEntries } from '../../utils/form'
48-
import { sortByDomNode } from '../../utils/focus-management'
4947

50-
import { Hidden, Features as HiddenFeatures } from '../../internal/hidden'
51-
import { useOpenClosed, State, OpenClosedProvider } from '../../internal/open-closed'
48+
import { Features as HiddenFeatures, Hidden } from '../../internal/hidden'
49+
import { OpenClosedProvider, State, useOpenClosed } from '../../internal/open-closed'
5250

53-
import { Keys } from '../keyboard'
5451
import { useControllable } from '../../hooks/use-controllable'
55-
import { useWatch } from '../../hooks/use-watch'
52+
import { useOwnerDocument } from '../../hooks/use-owner'
5653
import { useTrackedPointer } from '../../hooks/use-tracked-pointer'
54+
import { useWatch } from '../../hooks/use-watch'
5755
import { isMobile } from '../../utils/platform'
58-
import { useOwnerDocument } from '../../hooks/use-owner'
56+
import { Keys } from '../keyboard'
5957

6058
enum ComboboxState {
6159
Open,

‎packages/@headlessui-react/src/components/description/description.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { render } from '@testing-library/react'
2-
import { Description, useDescriptions } from './description'
32
import React, { ReactNode } from 'react'
3+
import { Description, useDescriptions } from './description'
44

55
jest.mock('../../hooks/use-id')
66

‎packages/@headlessui-react/src/components/description/description.tsx

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
import React, {
22
createContext,
3-
useContext,
4-
useMemo,
5-
useState,
6-
7-
// Types
83
ElementType,
94
ReactNode,
105
Ref,
6+
useContext,
7+
useMemo,
8+
useState,
119
} from 'react'
1210

13-
import { Props } from '../../types'
11+
import { useEvent } from '../../hooks/use-event'
1412
import { useId } from '../../hooks/use-id'
15-
import { forwardRefWithAs, HasDisplayName, RefProp, render } from '../../utils/render'
1613
import { useIsoMorphicEffect } from '../../hooks/use-iso-morphic-effect'
1714
import { useSyncRefs } from '../../hooks/use-sync-refs'
18-
import { useEvent } from '../../hooks/use-event'
15+
import { Props } from '../../types'
16+
import { forwardRefWithAs, HasDisplayName, RefProp, render } from '../../utils/render'
1917

2018
// ---
2119

‎packages/@headlessui-react/src/components/dialog/dialog.test.tsx

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1+
import { render } from '@testing-library/react'
2+
import React, { createElement, Fragment, useCallback, useEffect, useRef, useState } from 'react'
13
import { createPortal } from 'react-dom'
2-
import React, { createElement, useRef, useState, Fragment, useEffect, useCallback } from 'react'
3-
import { render, screen } from '@testing-library/react'
44

5-
import { Dialog } from './dialog'
6-
import { Popover } from '../popover/popover'
7-
import { suppressConsoleLogs } from '../../test-utils/suppress-console-logs'
5+
import { OpenClosedProvider, State } from '../../internal/open-closed'
86
import {
9-
DialogState,
10-
PopoverState,
7+
assertActiveElement,
118
assertDialog,
129
assertDialogDescription,
1310
assertDialogOverlay,
1411
assertDialogTitle,
1512
assertPopoverPanel,
13+
DialogState,
14+
getByText,
1615
getDialog,
17-
getDialogOverlay,
1816
getDialogBackdrop,
19-
getPopoverButton,
20-
getByText,
21-
assertActiveElement,
22-
getDialogs,
17+
getDialogOverlay,
2318
getDialogOverlays,
19+
getDialogs,
20+
getPopoverButton,
21+
PopoverState,
2422
} from '../../test-utils/accessibility-assertions'
25-
import { click, mouseDrag, press, Keys, shift, focus } from '../../test-utils/interactions'
23+
import { click, focus, Keys, mouseDrag, press, shift } from '../../test-utils/interactions'
24+
import { suppressConsoleLogs } from '../../test-utils/suppress-console-logs'
2625
import { PropsOf } from '../../types'
26+
import { Popover } from '../popover/popover'
2727
import { Transition } from '../transitions/transition'
28-
import { OpenClosedProvider, State } from '../../internal/open-closed'
28+
import { Dialog } from './dialog'
2929

3030
jest.mock('../../hooks/use-id')
3131

‎packages/@headlessui-react/src/components/dialog/dialog.tsx

+27-29
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,54 @@
11
// WAI-ARIA: https://www.w3.org/WAI/ARIA/apg/patterns/dialogmodal/
22
import React, {
3+
ContextType,
34
createContext,
45
createRef,
6+
ElementType,
7+
MouseEvent as ReactMouseEvent,
8+
MutableRefObject,
9+
Ref,
10+
RefObject,
511
useCallback,
612
useContext,
713
useEffect,
814
useMemo,
915
useReducer,
1016
useRef,
1117
useState,
12-
13-
// Types
14-
ContextType,
15-
ElementType,
16-
MouseEvent as ReactMouseEvent,
17-
RefObject,
18-
MutableRefObject,
19-
Ref,
2018
} from 'react'
2119

20+
import { FocusTrap } from '../../components/focus-trap/focus-trap'
21+
import { Portal, useNestedPortals } from '../../components/portal/portal'
22+
import { useDocumentOverflowLockedEffect } from '../../hooks/document-overflow/use-document-overflow'
23+
import { useEvent } from '../../hooks/use-event'
24+
import { useEventListener } from '../../hooks/use-event-listener'
25+
import { useId } from '../../hooks/use-id'
26+
import { useInert } from '../../hooks/use-inert'
27+
import { useOutsideClick } from '../../hooks/use-outside-click'
28+
import { useOwnerDocument } from '../../hooks/use-owner'
29+
import { useRootContainers } from '../../hooks/use-root-containers'
30+
import { useServerHandoffComplete } from '../../hooks/use-server-handoff-complete'
31+
import { useSyncRefs } from '../../hooks/use-sync-refs'
32+
import { State, useOpenClosed } from '../../internal/open-closed'
33+
import { ForcePortalRoot } from '../../internal/portal-force-root'
34+
import { StackMessage, StackProvider } from '../../internal/stack-context'
2235
import { Props } from '../../types'
36+
import { isDisabledReactIssue7711 } from '../../utils/bugs'
2337
import { match } from '../../utils/match'
2438
import {
25-
forwardRefWithAs,
26-
render,
2739
Features,
28-
PropsForFeatures,
40+
forwardRefWithAs,
2941
HasDisplayName,
42+
PropsForFeatures,
3043
RefProp,
44+
render,
3145
} from '../../utils/render'
32-
import { useSyncRefs } from '../../hooks/use-sync-refs'
33-
import { Keys } from '../keyboard'
34-
import { isDisabledReactIssue7711 } from '../../utils/bugs'
35-
import { useId } from '../../hooks/use-id'
36-
import { FocusTrap } from '../../components/focus-trap/focus-trap'
37-
import { Portal, useNestedPortals } from '../../components/portal/portal'
38-
import { ForcePortalRoot } from '../../internal/portal-force-root'
3946
import {
40-
_internal_ComponentDescription,
4147
Description,
4248
useDescriptions,
49+
_internal_ComponentDescription,
4350
} from '../description/description'
44-
import { useOpenClosed, State } from '../../internal/open-closed'
45-
import { useServerHandoffComplete } from '../../hooks/use-server-handoff-complete'
46-
import { StackProvider, StackMessage } from '../../internal/stack-context'
47-
import { useOutsideClick } from '../../hooks/use-outside-click'
48-
import { useOwnerDocument } from '../../hooks/use-owner'
49-
import { useEventListener } from '../../hooks/use-event-listener'
50-
import { useEvent } from '../../hooks/use-event'
51-
import { useDocumentOverflowLockedEffect } from '../../hooks/document-overflow/use-document-overflow'
52-
import { useInert } from '../../hooks/use-inert'
53-
import { useRootContainers } from '../../hooks/use-root-containers'
51+
import { Keys } from '../keyboard'
5452

5553
enum DialogStates {
5654
Open,

‎packages/@headlessui-react/src/components/disclosure/disclosure.test.tsx

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
import React, { createElement, Suspense, useEffect, useRef } from 'react'
21
import { render } from '@testing-library/react'
2+
import React, { createElement, Suspense, useEffect, useRef } from 'react'
33

4-
import { Disclosure } from './disclosure'
5-
import { suppressConsoleLogs } from '../../test-utils/suppress-console-logs'
64
import {
7-
DisclosureState,
8-
assertDisclosurePanel,
5+
assertActiveElement,
96
assertDisclosureButton,
7+
assertDisclosurePanel,
8+
DisclosureState,
9+
getByText,
1010
getDisclosureButton,
1111
getDisclosurePanel,
12-
assertActiveElement,
13-
getByText,
1412
} from '../../test-utils/accessibility-assertions'
15-
import { click, press, focus, Keys, MouseButton } from '../../test-utils/interactions'
13+
import { click, focus, Keys, MouseButton, press } from '../../test-utils/interactions'
14+
import { suppressConsoleLogs } from '../../test-utils/suppress-console-logs'
1615
import { Transition } from '../transitions/transition'
16+
import { Disclosure } from './disclosure'
1717

1818
jest.mock('../../hooks/use-id')
1919

0 commit comments

Comments
 (0)