Skip to content

Commit 1ea6238

Browse files
authored
feat: adjust the import method (#400)
* feat: adjust the import method * test: update scrollable component snapshot * We are in Qiandao lake.
1 parent e5971b7 commit 1ea6238

File tree

100 files changed

+453
-450
lines changed

Some content is hidden

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

100 files changed

+453
-450
lines changed

build/web/app.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import * as React from 'react';
2-
import * as ReactDOM from 'react-dom';
1+
import React, { StrictMode } from 'react';
2+
import ReactDOM from 'react-dom';
33
import { Workbench, MoleculeProvider } from '../../esm';
44
import '../../esm/style/mo.css';
55

66
const App = () => (
7-
<React.StrictMode>
7+
<StrictMode>
88
<MoleculeProvider>
99
<Workbench />
1010
</MoleculeProvider>
11-
</React.StrictMode>
11+
</StrictMode>
1212
);
1313

1414
ReactDOM.render(<App />, document.getElementById('root'));

src/components/actionBar/__tests__/actionBar.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as React from 'react';
1+
import React from 'react';
22
import { fireEvent, render } from '@testing-library/react';
33
import renderer from 'react-test-renderer';
44

src/components/actionBar/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as React from 'react';
1+
import React from 'react';
22
import { useCallback, useEffect, useRef } from 'react';
33
import {
44
prefixClaName,

src/components/breadcrumb/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as React from 'react';
1+
import React from 'react';
22
import { prefixClaName, classNames, getBEMElement } from 'mo/common/className';
33
import { ComponentProps } from 'react';
44
import { Icon } from 'mo/components';

src/components/button/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as React from 'react';
1+
import React from 'react';
22
import { classNames, getBEMModifier, prefixClaName } from 'mo/common/className';
33

44
type BtnSizeType = 'normal' | 'large';

src/components/checkbox/__tests__/checkbox.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as React from 'react';
1+
import React from 'react';
22
import { render, fireEvent, screen } from '@testing-library/react';
33
import renderer from 'react-test-renderer';
44

src/components/checkbox/checkbox.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as React from 'react';
1+
import React from 'react';
22
import { ComponentProps } from 'react';
33
import { prefixClaName, classNames, getBEMElement } from 'mo/common/className';
44

src/components/collapse/index.tsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as React from 'react';
1+
import React, { useRef, useLayoutEffect, useEffect, useCallback } from 'react';
22
import { useState } from 'react';
33
import Logger from 'mo/common/logger';
44
import { Toolbar } from 'mo/components/toolbar';
@@ -57,8 +57,8 @@ export const MAX_GROW_HEIGHT = 220;
5757

5858
export function Collapse(props: ICollapseProps) {
5959
const [activePanelKeys, setActivePanelKeys] = useState<React.Key[]>([]);
60-
const wrapper = React.useRef<HTMLDivElement>(null);
61-
const requestAF = React.useRef<number>();
60+
const wrapper = useRef<HTMLDivElement>(null);
61+
const requestAF = useRef<number>();
6262

6363
const {
6464
className,
@@ -80,19 +80,19 @@ export function Collapse(props: ICollapseProps) {
8080

8181
// to save position temporarily, empty array when rerender
8282
const _cachePosition: number[][] = [];
83-
let _cacheWrapperHeight = React.useRef(0);
83+
const _cacheWrapperHeight = useRef(0);
8484

85-
const handleResize = React.useCallback(() => {
85+
const handleResize = useCallback(() => {
8686
// just want to trigger rerender
8787
setActivePanelKeys((keys) => keys.concat());
8888
}, []);
8989

90-
React.useEffect(() => {
90+
useEffect(() => {
9191
window.addEventListener('resize', handleResize);
9292
return () => window.removeEventListener('resize', handleResize);
9393
}, []);
9494

95-
React.useLayoutEffect(() => {
95+
useLayoutEffect(() => {
9696
// It's necessary to check panel's empty before calculate every panel
9797
filterData.forEach((panel) => {
9898
const isActive = activePanelKeys.includes(panel.id);

src/components/contextMenu/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as React from 'react';
1+
import React from 'react';
22
import { HTMLElementType } from 'mo/common/dom';
33
import { IContextView, useContextView } from 'mo/components/contextView';
44

src/components/contextView/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import * as React from 'react';
2-
import * as ReactDOM from 'react-dom';
1+
import React from 'react';
2+
import ReactDOM from 'react-dom';
33
import {
44
prefixClaName,
55
classNames,

src/components/dialog/actionButton.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import * as React from 'react';
1+
import React, { useRef } from 'react';
22
import { Button, IButtonProps } from 'mo/components/button';
33
export interface ActionButtonProps extends IButtonProps {
44
actionFn?: (...args: any[]) => any | PromiseLike<any>;
55
closeModal: Function;
66
}
77

88
const ActionButton: React.FC<ActionButtonProps> = (props) => {
9-
const clickedRef = React.useRef<boolean>(false);
9+
const clickedRef = useRef<boolean>(false);
1010

1111
const handlePromiseOnOk = (returnValueOfOnOk?: PromiseLike<any>) => {
1212
const { closeModal } = props;

src/components/dialog/confirm.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import * as React from 'react';
2-
import * as ReactDOM from 'react-dom';
1+
import React from 'react';
2+
import ReactDOM from 'react-dom';
33

44
import { Icon } from 'mo/components/icon';
55
import { IModalFuncProps, destroyFns } from './modal';

src/components/dialog/confirmDialog.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as React from 'react';
1+
import React from 'react';
22
import { classNames } from 'mo/common/className';
33
import {
44
confirmClassName,

src/components/dropdown/index.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as React from 'react';
1+
import React, { forwardRef, useImperativeHandle } from 'react';
22
import { classNames, getBEMModifier, prefixClaName } from 'mo/common/className';
33
import { useContextView } from '../contextView';
44
import {
@@ -20,7 +20,7 @@ export type DropDownRef = {
2020

2121
export const defaultDropDownClassName = prefixClaName('drop-down');
2222

23-
export const DropDown = React.forwardRef<DropDownRef, IDropDownProps>(
23+
export const DropDown = forwardRef<DropDownRef, IDropDownProps>(
2424
(props: IDropDownProps, ref) => {
2525
const {
2626
className,
@@ -34,7 +34,7 @@ export const DropDown = React.forwardRef<DropDownRef, IDropDownProps>(
3434
render: () => overlay,
3535
});
3636

37-
React.useImperativeHandle(ref, () => ({
37+
useImperativeHandle(ref, () => ({
3838
contextView,
3939
dispose: () => {
4040
contextView!.hide();

src/components/icon/__tests__/icon.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as React from 'react';
1+
import React from 'react';
22
import { fireEvent, render } from '@testing-library/react';
33
import renderer from 'react-test-renderer';
44

src/components/icon/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as React from 'react';
1+
import React from 'react';
22
import { classNames, prefixClaName } from 'mo/common/className';
33
import 'vscode-codicons/dist/codicon.css';
44
import { ComponentProps } from 'react';

src/components/input/input.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as React from 'react';
1+
import React from 'react';
22
import { classNames, prefixClaName, getBEMModifier } from 'mo/common/className';
33
import { KeyCodes } from 'mo/common/keyCodes';
44

src/components/input/textArea.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as React from 'react';
1+
import React from 'react';
22
import RcTextArea, { TextAreaProps } from 'rc-textarea';
33
import useMergedState from 'rc-util/lib/hooks/useMergedState';
44
import { useEffect, useRef } from 'react';

src/components/list/__tests__/list.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as React from 'react';
1+
import React from 'react';
22
import { fireEvent, render } from '@testing-library/react';
33
import renderer from 'react-test-renderer';
44

src/components/list/list.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as React from 'react';
1+
import React from 'react';
22
import { prefixClaName, classNames, getBEMModifier } from 'mo/common/className';
33
import { ComponentProps, useEffect, useState } from 'react';
44
import { cloneReactChildren } from 'mo/react';

src/components/menu/subMenu.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as React from 'react';
1+
import React from 'react';
22
import { classNames } from 'mo/common/className';
33
import { TriggerEvent } from 'mo/common/dom';
44
import { Icon } from 'mo/components/icon';

src/components/monaco/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'reflect-metadata';
2-
import * as React from 'react';
2+
import React from 'react';
33
import { PureComponent } from 'react';
44
import { editor } from 'monaco-editor';
55
import { isEqual } from 'lodash';

0 commit comments

Comments
 (0)