Skip to content

Commit

Permalink
Merge pull request #556 from mathuo/555-import-react-vs-import-as-react
Browse files Browse the repository at this point in the history
chore: adjust react import
  • Loading branch information
mathuo authored Mar 16, 2024
2 parents 09edbdd + 61eaae3 commit b09ab48
Show file tree
Hide file tree
Showing 18 changed files with 23 additions and 24 deletions.
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion packages/dockview/src/__tests__/dockview/dockview.spec.tsx
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packages/dockview/src/__tests__/gridview/gridview.spec.tsx
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packages/dockview/src/__tests__/paneview/paneview.spec.tsx
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packages/dockview/src/__tests__/react.spec.tsx
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packages/dockview/src/dockview/defaultTab.tsx
Original file line number Diff line number Diff line change
@@ -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 &
Expand Down
2 changes: 1 addition & 1 deletion packages/dockview/src/dockview/dockview.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as React from 'react';
import React from 'react';
import {
DockviewComponent,
DockviewWillDropEvent,
Expand Down
2 changes: 1 addition & 1 deletion packages/dockview/src/dockview/headerActionsRenderer.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as React from 'react';
import React from 'react';
import { ReactPart, ReactPortalStore } from '../react';
import {
IDockviewPanel,
Expand Down
2 changes: 1 addition & 1 deletion packages/dockview/src/dockview/reactContentPart.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as React from 'react';
import React from 'react';
import { ReactPart, ReactPortalStore } from '../react';
import { IDockviewPanelProps } from '../dockview/dockview';
import {
Expand Down
2 changes: 1 addition & 1 deletion packages/dockview/src/dockview/reactHeaderPart.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as React from 'react';
import React from 'react';
import { ReactPart, ReactPortalStore } from '../react';
import { IGroupPanelBaseProps } from './dockview';
import {
Expand Down
2 changes: 1 addition & 1 deletion packages/dockview/src/dockview/reactWatermarkPart.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as React from 'react';
import React from 'react';
import { ReactPart, ReactPortalStore } from '../react';
import {
PanelUpdateEvent,
Expand Down
2 changes: 1 addition & 1 deletion packages/dockview/src/gridview/gridview.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as React from 'react';
import React from 'react';
import {
GridviewComponent,
IGridviewComponent,
Expand Down
2 changes: 1 addition & 1 deletion packages/dockview/src/paneview/paneview.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as React from 'react';
import React from 'react';
import {
PaneviewPanelApi,
PaneviewComponent,
Expand Down
2 changes: 1 addition & 1 deletion packages/dockview/src/paneview/view.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as React from 'react';
import React from 'react';
import {
PanelUpdateEvent,
IPaneBodyPart,
Expand Down
13 changes: 6 additions & 7 deletions packages/dockview/src/react.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion packages/dockview/src/splitview/splitview.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as React from 'react';
import React from 'react';
import {
SplitviewApi,
SplitviewPanelApi,
Expand Down
2 changes: 1 addition & 1 deletion packages/dockview/src/svg.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as React from 'react';
import React from 'react';

export const CloseButton = () => (
<svg
Expand Down

0 comments on commit b09ab48

Please sign in to comment.