From 61eaae30c8d2debb784095d743d9af273973fa48 Mon Sep 17 00:00:00 2001 From: mathuo <6710312+mathuo@users.noreply.github.com> Date: Sat, 16 Mar 2024 21:16:57 +0000 Subject: [PATCH] chore: adjust react import --- .../src/__tests__/dockview/defaultTab.spec.tsx | 2 +- .../src/__tests__/dockview/dockview.spec.tsx | 2 +- .../src/__tests__/gridview/gridview.spec.tsx | 2 +- .../src/__tests__/paneview/paneview.spec.tsx | 2 +- packages/dockview/src/__tests__/react.spec.tsx | 2 +- .../src/__tests__/splitview/splitview.spec.tsx | 2 +- packages/dockview/src/dockview/defaultTab.tsx | 2 +- packages/dockview/src/dockview/dockview.tsx | 2 +- .../dockview/src/dockview/headerActionsRenderer.ts | 2 +- packages/dockview/src/dockview/reactContentPart.ts | 2 +- packages/dockview/src/dockview/reactHeaderPart.ts | 2 +- .../dockview/src/dockview/reactWatermarkPart.ts | 2 +- packages/dockview/src/gridview/gridview.tsx | 2 +- packages/dockview/src/paneview/paneview.tsx | 2 +- packages/dockview/src/paneview/view.tsx | 2 +- packages/dockview/src/react.ts | 13 ++++++------- packages/dockview/src/splitview/splitview.tsx | 2 +- packages/dockview/src/svg.tsx | 2 +- 18 files changed, 23 insertions(+), 24 deletions(-) diff --git a/packages/dockview/src/__tests__/dockview/defaultTab.spec.tsx b/packages/dockview/src/__tests__/dockview/defaultTab.spec.tsx index 94f6b1050..18c462e72 100644 --- a/packages/dockview/src/__tests__/dockview/defaultTab.spec.tsx +++ b/packages/dockview/src/__tests__/dockview/defaultTab.spec.tsx @@ -1,6 +1,6 @@ import { fireEvent, render, screen } from '@testing-library/react'; import { DockviewDefaultTab } from '../../dockview/defaultTab'; -import * as React from 'react'; +import React from 'react'; import { fromPartial } from '@total-typescript/shoehorn'; import { DockviewApi, DockviewPanelApi } from 'dockview-core'; diff --git a/packages/dockview/src/__tests__/dockview/dockview.spec.tsx b/packages/dockview/src/__tests__/dockview/dockview.spec.tsx index 72e1feec5..c3d16f0ff 100644 --- a/packages/dockview/src/__tests__/dockview/dockview.spec.tsx +++ b/packages/dockview/src/__tests__/dockview/dockview.spec.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; +import React from 'react'; import { act, render, waitFor } from '@testing-library/react'; import { DockviewApi, IDockviewPanel } from 'dockview-core'; import { diff --git a/packages/dockview/src/__tests__/gridview/gridview.spec.tsx b/packages/dockview/src/__tests__/gridview/gridview.spec.tsx index 7fdce204c..52d410fc1 100644 --- a/packages/dockview/src/__tests__/gridview/gridview.spec.tsx +++ b/packages/dockview/src/__tests__/gridview/gridview.spec.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; +import React from 'react'; import { act, render, waitFor } from '@testing-library/react'; import { GridviewApi, IGridviewPanel, Orientation } from 'dockview-core'; import { diff --git a/packages/dockview/src/__tests__/paneview/paneview.spec.tsx b/packages/dockview/src/__tests__/paneview/paneview.spec.tsx index 53be8476a..8b354502a 100644 --- a/packages/dockview/src/__tests__/paneview/paneview.spec.tsx +++ b/packages/dockview/src/__tests__/paneview/paneview.spec.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; +import React from 'react'; import { act, render, waitFor } from '@testing-library/react'; import { IPaneviewPanel, PaneviewApi } from 'dockview-core'; import { diff --git a/packages/dockview/src/__tests__/react.spec.tsx b/packages/dockview/src/__tests__/react.spec.tsx index 9725cc0ff..eccbdc1cd 100644 --- a/packages/dockview/src/__tests__/react.spec.tsx +++ b/packages/dockview/src/__tests__/react.spec.tsx @@ -1,5 +1,5 @@ import { ReactPart, isReactComponent } from '../react'; -import * as React from 'react'; +import React from 'react'; import { render, screen, act } from '@testing-library/react'; interface TestInterface { diff --git a/packages/dockview/src/__tests__/splitview/splitview.spec.tsx b/packages/dockview/src/__tests__/splitview/splitview.spec.tsx index e85959656..9664a9d41 100644 --- a/packages/dockview/src/__tests__/splitview/splitview.spec.tsx +++ b/packages/dockview/src/__tests__/splitview/splitview.spec.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; +import React from 'react'; import { act, render, waitFor } from '@testing-library/react'; import { SplitviewApi, Orientation, ISplitviewPanel } from 'dockview-core'; import { diff --git a/packages/dockview/src/dockview/defaultTab.tsx b/packages/dockview/src/dockview/defaultTab.tsx index e00d9a7d8..d652852da 100644 --- a/packages/dockview/src/dockview/defaultTab.tsx +++ b/packages/dockview/src/dockview/defaultTab.tsx @@ -1,5 +1,5 @@ +import React from 'react'; import { IDockviewPanelHeaderProps } from './dockview'; -import * as React from 'react'; import { CloseButton } from '../svg'; export type IDockviewDefaultTabProps = IDockviewPanelHeaderProps & diff --git a/packages/dockview/src/dockview/dockview.tsx b/packages/dockview/src/dockview/dockview.tsx index 62f5b3194..065bdde66 100644 --- a/packages/dockview/src/dockview/dockview.tsx +++ b/packages/dockview/src/dockview/dockview.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; +import React from 'react'; import { DockviewComponent, DockviewWillDropEvent, diff --git a/packages/dockview/src/dockview/headerActionsRenderer.ts b/packages/dockview/src/dockview/headerActionsRenderer.ts index 552bbf465..6e866622c 100644 --- a/packages/dockview/src/dockview/headerActionsRenderer.ts +++ b/packages/dockview/src/dockview/headerActionsRenderer.ts @@ -1,4 +1,4 @@ -import * as React from 'react'; +import React from 'react'; import { ReactPart, ReactPortalStore } from '../react'; import { IDockviewPanel, diff --git a/packages/dockview/src/dockview/reactContentPart.ts b/packages/dockview/src/dockview/reactContentPart.ts index 653a736d1..28bde0d50 100644 --- a/packages/dockview/src/dockview/reactContentPart.ts +++ b/packages/dockview/src/dockview/reactContentPart.ts @@ -1,4 +1,4 @@ -import * as React from 'react'; +import React from 'react'; import { ReactPart, ReactPortalStore } from '../react'; import { IDockviewPanelProps } from '../dockview/dockview'; import { diff --git a/packages/dockview/src/dockview/reactHeaderPart.ts b/packages/dockview/src/dockview/reactHeaderPart.ts index 173ef8825..fc24102a9 100644 --- a/packages/dockview/src/dockview/reactHeaderPart.ts +++ b/packages/dockview/src/dockview/reactHeaderPart.ts @@ -1,4 +1,4 @@ -import * as React from 'react'; +import React from 'react'; import { ReactPart, ReactPortalStore } from '../react'; import { IGroupPanelBaseProps } from './dockview'; import { diff --git a/packages/dockview/src/dockview/reactWatermarkPart.ts b/packages/dockview/src/dockview/reactWatermarkPart.ts index ce13aa215..f9aa148f8 100644 --- a/packages/dockview/src/dockview/reactWatermarkPart.ts +++ b/packages/dockview/src/dockview/reactWatermarkPart.ts @@ -1,4 +1,4 @@ -import * as React from 'react'; +import React from 'react'; import { ReactPart, ReactPortalStore } from '../react'; import { PanelUpdateEvent, diff --git a/packages/dockview/src/gridview/gridview.tsx b/packages/dockview/src/gridview/gridview.tsx index fd6374c12..65bba2513 100644 --- a/packages/dockview/src/gridview/gridview.tsx +++ b/packages/dockview/src/gridview/gridview.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; +import React from 'react'; import { GridviewComponent, IGridviewComponent, diff --git a/packages/dockview/src/paneview/paneview.tsx b/packages/dockview/src/paneview/paneview.tsx index 001bcfc3a..cfae1b962 100644 --- a/packages/dockview/src/paneview/paneview.tsx +++ b/packages/dockview/src/paneview/paneview.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; +import React from 'react'; import { PaneviewPanelApi, PaneviewComponent, diff --git a/packages/dockview/src/paneview/view.tsx b/packages/dockview/src/paneview/view.tsx index 5a3ccfc2c..99c4d08b8 100644 --- a/packages/dockview/src/paneview/view.tsx +++ b/packages/dockview/src/paneview/view.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; +import React from 'react'; import { PanelUpdateEvent, IPaneBodyPart, diff --git a/packages/dockview/src/react.ts b/packages/dockview/src/react.ts index a87593536..d91fdce16 100644 --- a/packages/dockview/src/react.ts +++ b/packages/dockview/src/react.ts @@ -1,5 +1,5 @@ -import * as React from 'react'; -import * as ReactDOM from 'react-dom'; +import React from 'react'; +import ReactDOM from 'react-dom'; import { IFrameworkPart, IDockviewDisposable, Parameters } from 'dockview-core'; export interface ReactPortalStore { @@ -192,12 +192,11 @@ export const usePortalsLifecycle: PortalLifecycleHook = () => { return [portals, addPortal]; }; - export function isReactComponent(component: any): boolean { - /** - * Yes, we could use "react-is" but that would introduce an unwanted peer dependency - * so for now we will check in a rather crude fashion... - */ + /** + * Yes, we could use "react-is" but that would introduce an unwanted peer dependency + * so for now we will check in a rather crude fashion... + */ return ( typeof component === 'function' /** Functional Componnts */ || !!(component as React.ExoticComponent) diff --git a/packages/dockview/src/splitview/splitview.tsx b/packages/dockview/src/splitview/splitview.tsx index 218721632..559c21a9b 100644 --- a/packages/dockview/src/splitview/splitview.tsx +++ b/packages/dockview/src/splitview/splitview.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; +import React from 'react'; import { SplitviewApi, SplitviewPanelApi, diff --git a/packages/dockview/src/svg.tsx b/packages/dockview/src/svg.tsx index 06ef61d48..76143411a 100644 --- a/packages/dockview/src/svg.tsx +++ b/packages/dockview/src/svg.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; +import React from 'react'; export const CloseButton = () => (