From d146b78a97417217c91e60dff1edae2e6daa9a49 Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Mon, 6 Feb 2023 12:30:30 +0100 Subject: [PATCH] Revert "Use the `import * as React from 'react'` pattern (#2242)" This reverts commit 0276231c318f443f1821de29e7cb08b0c9b5f003. --- packages/@headlessui-react/CHANGELOG.md | 1 - .../@headlessui-react/src/components/combobox/combobox.tsx | 3 +-- .../src/components/description/description.tsx | 3 +-- packages/@headlessui-react/src/components/dialog/dialog.tsx | 3 +-- .../@headlessui-react/src/components/disclosure/disclosure.tsx | 3 +-- .../@headlessui-react/src/components/focus-trap/focus-trap.tsx | 3 +-- packages/@headlessui-react/src/components/label/label.tsx | 3 +-- packages/@headlessui-react/src/components/listbox/listbox.tsx | 3 +-- packages/@headlessui-react/src/components/menu/menu.tsx | 3 +-- packages/@headlessui-react/src/components/popover/popover.tsx | 3 +-- packages/@headlessui-react/src/components/portal/portal.tsx | 3 +-- .../src/components/radio-group/radio-group.tsx | 3 +-- packages/@headlessui-react/src/components/switch/switch.tsx | 3 +-- packages/@headlessui-react/src/components/tabs/tabs.tsx | 3 +-- .../src/components/transitions/transition.tsx | 3 +-- packages/@headlessui-react/src/hooks/use-event.ts | 2 +- packages/@headlessui-react/src/hooks/use-id.ts | 2 +- packages/@headlessui-react/src/internal/focus-sentinel.tsx | 3 +-- packages/@headlessui-react/src/internal/open-closed.tsx | 3 +-- packages/@headlessui-react/src/internal/portal-force-root.tsx | 3 +-- packages/@headlessui-react/src/internal/stack-context.tsx | 3 +-- packages/@headlessui-react/src/utils/start-transition.ts | 2 +- 22 files changed, 21 insertions(+), 40 deletions(-) diff --git a/packages/@headlessui-react/CHANGELOG.md b/packages/@headlessui-react/CHANGELOG.md index b0bb4c4..46e0cd8 100644 --- a/packages/@headlessui-react/CHANGELOG.md +++ b/packages/@headlessui-react/CHANGELOG.md @@ -16,7 +16,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fix SSR tab hydration when using Strict Mode in development ([#2231](https://github.com/tailwindlabs/headlessui/pull/2231)) - Don't break overflow when multiple dialogs are open at the same time ([#2215](https://github.com/tailwindlabs/headlessui/pull/2215)) - Fix "This `Suspense` boundary received an update before it finished hydrating" error in the `Disclosure` component ([#2238](https://github.com/tailwindlabs/headlessui/pull/2238)) -- Use the `import * as React from 'react'` pattern ([#2242](https://github.com/tailwindlabs/headlessui/pull/2242)) ## [1.7.8] - 2023-01-27 diff --git a/packages/@headlessui-react/src/components/combobox/combobox.tsx b/packages/@headlessui-react/src/components/combobox/combobox.tsx index 765c822..256b408 100644 --- a/packages/@headlessui-react/src/components/combobox/combobox.tsx +++ b/packages/@headlessui-react/src/components/combobox/combobox.tsx @@ -1,5 +1,4 @@ -import * as React from 'react' -import { +import React, { Fragment, createContext, createRef, diff --git a/packages/@headlessui-react/src/components/description/description.tsx b/packages/@headlessui-react/src/components/description/description.tsx index 8500295..1924fba 100644 --- a/packages/@headlessui-react/src/components/description/description.tsx +++ b/packages/@headlessui-react/src/components/description/description.tsx @@ -1,5 +1,4 @@ -import * as React from 'react' -import { +import React, { createContext, useContext, useMemo, diff --git a/packages/@headlessui-react/src/components/dialog/dialog.tsx b/packages/@headlessui-react/src/components/dialog/dialog.tsx index 84bb48e..bb83b30 100644 --- a/packages/@headlessui-react/src/components/dialog/dialog.tsx +++ b/packages/@headlessui-react/src/components/dialog/dialog.tsx @@ -1,6 +1,5 @@ // WAI-ARIA: https://www.w3.org/WAI/ARIA/apg/patterns/dialogmodal/ -import * as React from 'react' -import { +import React, { createContext, createRef, useContext, diff --git a/packages/@headlessui-react/src/components/disclosure/disclosure.tsx b/packages/@headlessui-react/src/components/disclosure/disclosure.tsx index 911ee73..d62a91c 100644 --- a/packages/@headlessui-react/src/components/disclosure/disclosure.tsx +++ b/packages/@headlessui-react/src/components/disclosure/disclosure.tsx @@ -1,6 +1,5 @@ // WAI-ARIA: https://www.w3.org/WAI/ARIA/apg/patterns/disclosure/ -import * as React from 'react' -import { +import React, { Fragment, createContext, useContext, diff --git a/packages/@headlessui-react/src/components/focus-trap/focus-trap.tsx b/packages/@headlessui-react/src/components/focus-trap/focus-trap.tsx index 71777b6..df13b43 100644 --- a/packages/@headlessui-react/src/components/focus-trap/focus-trap.tsx +++ b/packages/@headlessui-react/src/components/focus-trap/focus-trap.tsx @@ -1,5 +1,4 @@ -import * as React from 'react' -import { +import React, { useEffect, useRef, diff --git a/packages/@headlessui-react/src/components/label/label.tsx b/packages/@headlessui-react/src/components/label/label.tsx index ea10ace..2873449 100644 --- a/packages/@headlessui-react/src/components/label/label.tsx +++ b/packages/@headlessui-react/src/components/label/label.tsx @@ -1,5 +1,4 @@ -import * as React from 'react' -import { +import React, { createContext, useContext, useMemo, diff --git a/packages/@headlessui-react/src/components/listbox/listbox.tsx b/packages/@headlessui-react/src/components/listbox/listbox.tsx index 50ff041..bae2046 100644 --- a/packages/@headlessui-react/src/components/listbox/listbox.tsx +++ b/packages/@headlessui-react/src/components/listbox/listbox.tsx @@ -1,5 +1,4 @@ -import * as React from 'react' -import { +import React, { Fragment, createContext, createRef, diff --git a/packages/@headlessui-react/src/components/menu/menu.tsx b/packages/@headlessui-react/src/components/menu/menu.tsx index 8eaa94f..578f22c 100644 --- a/packages/@headlessui-react/src/components/menu/menu.tsx +++ b/packages/@headlessui-react/src/components/menu/menu.tsx @@ -1,6 +1,5 @@ // WAI-ARIA: https://www.w3.org/WAI/ARIA/apg/patterns/menubutton/ -import * as React from 'react' -import { +import React, { Fragment, createContext, createRef, diff --git a/packages/@headlessui-react/src/components/popover/popover.tsx b/packages/@headlessui-react/src/components/popover/popover.tsx index 419e0af..3e21cbb 100644 --- a/packages/@headlessui-react/src/components/popover/popover.tsx +++ b/packages/@headlessui-react/src/components/popover/popover.tsx @@ -1,5 +1,4 @@ -import * as React from 'react' -import { +import React, { createContext, createRef, useContext, diff --git a/packages/@headlessui-react/src/components/portal/portal.tsx b/packages/@headlessui-react/src/components/portal/portal.tsx index b27f8ae..3a37561 100644 --- a/packages/@headlessui-react/src/components/portal/portal.tsx +++ b/packages/@headlessui-react/src/components/portal/portal.tsx @@ -1,5 +1,4 @@ -import * as React from 'react' -import { +import React, { Fragment, createContext, useContext, diff --git a/packages/@headlessui-react/src/components/radio-group/radio-group.tsx b/packages/@headlessui-react/src/components/radio-group/radio-group.tsx index 96048eb..c1af35c 100644 --- a/packages/@headlessui-react/src/components/radio-group/radio-group.tsx +++ b/packages/@headlessui-react/src/components/radio-group/radio-group.tsx @@ -1,5 +1,4 @@ -import * as React from 'react' -import { +import React, { createContext, useContext, useMemo, diff --git a/packages/@headlessui-react/src/components/switch/switch.tsx b/packages/@headlessui-react/src/components/switch/switch.tsx index a807138..9e07285 100644 --- a/packages/@headlessui-react/src/components/switch/switch.tsx +++ b/packages/@headlessui-react/src/components/switch/switch.tsx @@ -1,5 +1,4 @@ -import * as React from 'react' -import { +import React, { Fragment, createContext, useContext, diff --git a/packages/@headlessui-react/src/components/tabs/tabs.tsx b/packages/@headlessui-react/src/components/tabs/tabs.tsx index 748ccd1..6c27793 100644 --- a/packages/@headlessui-react/src/components/tabs/tabs.tsx +++ b/packages/@headlessui-react/src/components/tabs/tabs.tsx @@ -1,5 +1,4 @@ -import * as React from 'react' -import { +import React, { Fragment, createContext, useContext, diff --git a/packages/@headlessui-react/src/components/transitions/transition.tsx b/packages/@headlessui-react/src/components/transitions/transition.tsx index 76f5d62..59c4f63 100644 --- a/packages/@headlessui-react/src/components/transitions/transition.tsx +++ b/packages/@headlessui-react/src/components/transitions/transition.tsx @@ -1,5 +1,4 @@ -import * as React from 'react' -import { +import React, { Fragment, createContext, useContext, diff --git a/packages/@headlessui-react/src/hooks/use-event.ts b/packages/@headlessui-react/src/hooks/use-event.ts index 300062a..47115aa 100644 --- a/packages/@headlessui-react/src/hooks/use-event.ts +++ b/packages/@headlessui-react/src/hooks/use-event.ts @@ -1,4 +1,4 @@ -import * as React from 'react' +import React from 'react' import { useLatestValue } from './use-latest-value' export let useEvent = diff --git a/packages/@headlessui-react/src/hooks/use-id.ts b/packages/@headlessui-react/src/hooks/use-id.ts index 897bcad..761d6c1 100644 --- a/packages/@headlessui-react/src/hooks/use-id.ts +++ b/packages/@headlessui-react/src/hooks/use-id.ts @@ -1,4 +1,4 @@ -import * as React from 'react' +import React from 'react' import { useIsoMorphicEffect } from './use-iso-morphic-effect' import { useServerHandoffComplete } from './use-server-handoff-complete' import { env } from '../utils/env' diff --git a/packages/@headlessui-react/src/internal/focus-sentinel.tsx b/packages/@headlessui-react/src/internal/focus-sentinel.tsx index 7e6b8ff..de32682 100644 --- a/packages/@headlessui-react/src/internal/focus-sentinel.tsx +++ b/packages/@headlessui-react/src/internal/focus-sentinel.tsx @@ -1,5 +1,4 @@ -import * as React from 'react' -import { useState, FocusEvent as ReactFocusEvent } from 'react' +import React, { useState, FocusEvent as ReactFocusEvent } from 'react' import { Hidden, Features } from './hidden' diff --git a/packages/@headlessui-react/src/internal/open-closed.tsx b/packages/@headlessui-react/src/internal/open-closed.tsx index f596ddb..143dc26 100644 --- a/packages/@headlessui-react/src/internal/open-closed.tsx +++ b/packages/@headlessui-react/src/internal/open-closed.tsx @@ -1,5 +1,4 @@ -import * as React from 'react' -import { +import React, { createContext, useContext, diff --git a/packages/@headlessui-react/src/internal/portal-force-root.tsx b/packages/@headlessui-react/src/internal/portal-force-root.tsx index 56ea227..d688f28 100644 --- a/packages/@headlessui-react/src/internal/portal-force-root.tsx +++ b/packages/@headlessui-react/src/internal/portal-force-root.tsx @@ -1,5 +1,4 @@ -import * as React from 'react' -import { +import React, { createContext, useContext, diff --git a/packages/@headlessui-react/src/internal/stack-context.tsx b/packages/@headlessui-react/src/internal/stack-context.tsx index df7b5b7..e8ff63d 100644 --- a/packages/@headlessui-react/src/internal/stack-context.tsx +++ b/packages/@headlessui-react/src/internal/stack-context.tsx @@ -1,5 +1,4 @@ -import * as React from 'react' -import { +import React, { createContext, useContext, diff --git a/packages/@headlessui-react/src/utils/start-transition.ts b/packages/@headlessui-react/src/utils/start-transition.ts index e9b389b..9fe7864 100644 --- a/packages/@headlessui-react/src/utils/start-transition.ts +++ b/packages/@headlessui-react/src/utils/start-transition.ts @@ -1,4 +1,4 @@ -import * as React from 'react' +import React from 'react' export let startTransition = // Prefer React's `startTransition` if it's available.