@@ -82,11 +82,11 @@ export const Test_Demo = () => {
export const Test_Demo2 = () => {
return (
);
diff --git a/packages/inula-router/src/router/context.tsx b/packages/inula-router/src/router/context.tsx
index 76c69c56..8b8ca034 100644
--- a/packages/inula-router/src/router/context.tsx
+++ b/packages/inula-router/src/router/context.tsx
@@ -31,4 +31,4 @@ export type RouterContextValue = {
const RouterContext = createNamedContext
('Router', {} as any);
-export default RouterContext;
\ No newline at end of file
+export default RouterContext;
diff --git a/packages/inula-router/src/router/index2.ts b/packages/inula-router/src/router/index2.ts
index ea0025be..71703915 100644
--- a/packages/inula-router/src/router/index2.ts
+++ b/packages/inula-router/src/router/index2.ts
@@ -57,4 +57,4 @@ export type { RouteComponentProps, RouteChildrenProps, RouteProps } from './Rout
export { connectRouter, routerMiddleware, push, go, replace } from '../connect-router';
export const ConnectedRouter = getConnectedRouter('Redux');
-export const ConnectedHRouter = getConnectedRouter('InulaXCompat');
\ No newline at end of file
+export const ConnectedHRouter = getConnectedRouter('InulaXCompat');
diff --git a/packages/inula-router/src/router/matcher/__tests__/utils.test.ts b/packages/inula-router/src/router/matcher/__tests__/utils.test.ts
index accc2771..962bb1f2 100644
--- a/packages/inula-router/src/router/matcher/__tests__/utils.test.ts
+++ b/packages/inula-router/src/router/matcher/__tests__/utils.test.ts
@@ -22,12 +22,12 @@ describe('test for utils', () => {
expect(generated).toBe('/www.a.com/b/c');
});
- it('parse score compare1', function() {
+ it('parse score compare1', function () {
const res = [[5], [10], [10, 5]].sort((a, b) => scoreCompare(a, b));
expect(res).toStrictEqual([[10, 5], [10], [5]]);
});
- it('parse score compare2', function() {
+ it('parse score compare2', function () {
const res = [[10], [10], [10, 5]].sort((a, b) => scoreCompare(a, b));
expect(res).toStrictEqual([[10, 5], [10], [10]]);
});
diff --git a/packages/inula-router/src/router/matcher/parser.ts b/packages/inula-router/src/router/matcher/parser.ts
index ea75e4e5..969228d7 100644
--- a/packages/inula-router/src/router/matcher/parser.ts
+++ b/packages/inula-router/src/router/matcher/parser.ts
@@ -116,11 +116,11 @@ export function createPathParser(pathname: string, option: ParserOp
if (nextToken) {
switch (nextToken.type) {
case TokenType.LBracket:
- // 跳过当前Token和左括号
- tokenIdx += 2;
- while (tokens[tokenIdx].type !== TokenType.RBracket) {
- paramRegexp += tokens[tokenIdx].value;
- tokenIdx++;
+ // 跳过当前Token和左括号
+ tokenIdx += 2;
+ while (tokens[tokenIdx].type !== TokenType.RBracket) {
+ paramRegexp += tokens[tokenIdx].value;
+ tokenIdx++;
}
paramRegexp = `(${paramRegexp})`;
break;
@@ -183,7 +183,7 @@ export function createPathParser
(pathname: string, option: ParserOp
parseScore.splice(
scores.indexOf(MatchScore.placeholder),
1,
- ...new Array(value.length).fill(MatchScore.wildcard),
+ ...new Array(value.length).fill(MatchScore.wildcard)
);
} else {
params[key] = param ? param : undefined;
@@ -245,7 +245,7 @@ export function createPathParser
(pathname: string, option: ParserOp
export function matchPath
(
pathname: string,
pattern: string | string[],
- option?: ParserOption,
+ option?: ParserOption
): Matched
| null {
const patterns = Array.isArray(pattern) ? [...pattern] : [pattern];
const matchedResults: Matched
[] = [];
@@ -262,4 +262,4 @@ export function matchPath
(
export function generatePath
(path: string, params: Params
) {
const parser = createPathParser(path);
return parser.compile(params);
-}
\ No newline at end of file
+}
diff --git a/packages/inula-router/src/router/matcher/types.ts b/packages/inula-router/src/router/matcher/types.ts
index 9d64eda7..badd0a44 100644
--- a/packages/inula-router/src/router/matcher/types.ts
+++ b/packages/inula-router/src/router/matcher/types.ts
@@ -54,8 +54,8 @@ type ClearTailing = U extends `${infer L}/` ? ClearTailing
type ParseParam = Param extends `:${infer R}`
? {
- [K in R]: string;
- }
+ [K in R]: string;
+ }
: {};
type MergeParams, OtherParam extends Record> = {
diff --git a/packages/inula-router/src/router/withRouter.tsx b/packages/inula-router/src/router/withRouter.tsx
index 04c588c8..c07b50bb 100644
--- a/packages/inula-router/src/router/withRouter.tsx
+++ b/packages/inula-router/src/router/withRouter.tsx
@@ -18,7 +18,6 @@ import { useContext, ComponentType } from 'openinula';
import RouterContext from './context';
function withRouter(Component: C) {
-
function ComponentWithRouterProp(props: any) {
const { wrappedComponentRef, ...rest } = props;
const { history, location, match } = useContext(RouterContext);
@@ -30,4 +29,4 @@ function withRouter(Component: C) {
return ComponentWithRouterProp;
}
-export default withRouter;
\ No newline at end of file
+export default withRouter;
diff --git a/packages/inula/scripts/__tests__/ActTest/act.test.js b/packages/inula/__tests__/ActTest/act.test.js
similarity index 94%
rename from packages/inula/scripts/__tests__/ActTest/act.test.js
rename to packages/inula/__tests__/ActTest/act.test.js
index 6b012c89..b93520d7 100644
--- a/packages/inula/scripts/__tests__/ActTest/act.test.js
+++ b/packages/inula/__tests__/ActTest/act.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import Inula, { render, useState, act, useEffect } from '../../../src/index';
+import Inula, { render, useState, act, useEffect } from '../../src/index';
describe('Inula.act function Test', () => {
it('The act can wait for the useEffect update to complete.', function () {
diff --git a/packages/inula/scripts/__tests__/ComponentTest/ClassRefs.test.js b/packages/inula/__tests__/ComponentTest/ClassRefs.test.js
similarity index 96%
rename from packages/inula/scripts/__tests__/ComponentTest/ClassRefs.test.js
rename to packages/inula/__tests__/ComponentTest/ClassRefs.test.js
index 14c7db23..48018e20 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/ClassRefs.test.js
+++ b/packages/inula/__tests__/ComponentTest/ClassRefs.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../src/index';
+import * as Inula from '../../src/index';
describe('Class refs Test', () => {
it('Parent can get Child instance by refs', function () {
diff --git a/packages/inula/scripts/__tests__/ComponentTest/ComponentError.test.js b/packages/inula/__tests__/ComponentTest/ComponentError.test.js
similarity index 97%
rename from packages/inula/scripts/__tests__/ComponentTest/ComponentError.test.js
rename to packages/inula/__tests__/ComponentTest/ComponentError.test.js
index edee5d9c..9e57dee6 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/ComponentError.test.js
+++ b/packages/inula/__tests__/ComponentTest/ComponentError.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../src/index';
+import * as Inula from '../../src/index';
import { getLogUtils } from '../jest/testUtils';
describe('Component Error Test', () => {
diff --git a/packages/inula/scripts/__tests__/ComponentTest/Context.test.js b/packages/inula/__tests__/ComponentTest/Context.test.js
similarity index 99%
rename from packages/inula/scripts/__tests__/ComponentTest/Context.test.js
rename to packages/inula/__tests__/ComponentTest/Context.test.js
index f6de0274..34384a66 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/Context.test.js
+++ b/packages/inula/__tests__/ComponentTest/Context.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../src/index';
+import * as Inula from '../../src/index';
import { getLogUtils } from '../jest/testUtils';
describe('Context Test', () => {
diff --git a/packages/inula/scripts/__tests__/ComponentTest/DiffAlgorithm.test.js b/packages/inula/__tests__/ComponentTest/DiffAlgorithm.test.js
similarity index 96%
rename from packages/inula/scripts/__tests__/ComponentTest/DiffAlgorithm.test.js
rename to packages/inula/__tests__/ComponentTest/DiffAlgorithm.test.js
index 54e102dc..4879bdcd 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/DiffAlgorithm.test.js
+++ b/packages/inula/__tests__/ComponentTest/DiffAlgorithm.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../src/index';
+import * as Inula from '../../src/index';
describe('Diff Algorithm', () => {
it('null should diff correctly', () => {
diff --git a/packages/inula/scripts/__tests__/ComponentTest/ForwardRef.test.js b/packages/inula/__tests__/ComponentTest/ForwardRef.test.js
similarity index 97%
rename from packages/inula/scripts/__tests__/ComponentTest/ForwardRef.test.js
rename to packages/inula/__tests__/ComponentTest/ForwardRef.test.js
index 2e861595..213713ab 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/ForwardRef.test.js
+++ b/packages/inula/__tests__/ComponentTest/ForwardRef.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../src/index';
+import * as Inula from '../../src/index';
import { getLogUtils } from '../jest/testUtils';
describe('ForwardRef', () => {
diff --git a/packages/inula/scripts/__tests__/ComponentTest/FragmentComponent.test.js b/packages/inula/__tests__/ComponentTest/FragmentComponent.test.js
similarity index 99%
rename from packages/inula/scripts/__tests__/ComponentTest/FragmentComponent.test.js
rename to packages/inula/__tests__/ComponentTest/FragmentComponent.test.js
index 6ac08b89..d17f947b 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/FragmentComponent.test.js
+++ b/packages/inula/__tests__/ComponentTest/FragmentComponent.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../src/index';
+import * as Inula from '../../src/index';
import { Text } from '../jest/commonComponents';
import { getLogUtils } from '../jest/testUtils';
diff --git a/packages/inula/scripts/__tests__/ComponentTest/FunctionComponent.test.js b/packages/inula/__tests__/ComponentTest/FunctionComponent.test.js
similarity index 98%
rename from packages/inula/scripts/__tests__/ComponentTest/FunctionComponent.test.js
rename to packages/inula/__tests__/ComponentTest/FunctionComponent.test.js
index 0b5d18a8..3c156d06 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/FunctionComponent.test.js
+++ b/packages/inula/__tests__/ComponentTest/FunctionComponent.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../src/index';
+import * as Inula from '../../src/index';
describe('FunctionComponent Test', () => {
it('渲染无状态组件', () => {
const App = props => {
diff --git a/packages/inula/scripts/__tests__/ComponentTest/HookTest/UseCallback.test.js b/packages/inula/__tests__/ComponentTest/HookTest/UseCallback.test.js
similarity index 97%
rename from packages/inula/scripts/__tests__/ComponentTest/HookTest/UseCallback.test.js
rename to packages/inula/__tests__/ComponentTest/HookTest/UseCallback.test.js
index 5dc7a697..96c6b5a8 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/HookTest/UseCallback.test.js
+++ b/packages/inula/__tests__/ComponentTest/HookTest/UseCallback.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../../src/index';
+import * as Inula from '../../../src/index';
describe('useCallback Hook Test', () => {
const { useState, useCallback } = Inula;
diff --git a/packages/inula/scripts/__tests__/ComponentTest/HookTest/UseContext.test.js b/packages/inula/__tests__/ComponentTest/HookTest/UseContext.test.js
similarity index 98%
rename from packages/inula/scripts/__tests__/ComponentTest/HookTest/UseContext.test.js
rename to packages/inula/__tests__/ComponentTest/HookTest/UseContext.test.js
index e5db8cab..66abfbd0 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/HookTest/UseContext.test.js
+++ b/packages/inula/__tests__/ComponentTest/HookTest/UseContext.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../../src/index';
+import * as Inula from '../../../src/index';
describe('useContext Hook Test', () => {
const { useState, useContext, createContext, act, unmountComponentAtNode } = Inula;
diff --git a/packages/inula/scripts/__tests__/ComponentTest/HookTest/UseEffect.test.js b/packages/inula/__tests__/ComponentTest/HookTest/UseEffect.test.js
similarity index 99%
rename from packages/inula/scripts/__tests__/ComponentTest/HookTest/UseEffect.test.js
rename to packages/inula/__tests__/ComponentTest/HookTest/UseEffect.test.js
index a2699a3a..767f1891 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/HookTest/UseEffect.test.js
+++ b/packages/inula/__tests__/ComponentTest/HookTest/UseEffect.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../../src/index';
+import * as Inula from '../../../src/index';
import { getLogUtils } from '../../jest/testUtils';
import { Text } from '../../jest/commonComponents';
diff --git a/packages/inula/scripts/__tests__/ComponentTest/HookTest/UseImperativeHandle.test.js b/packages/inula/__tests__/ComponentTest/HookTest/UseImperativeHandle.test.js
similarity index 98%
rename from packages/inula/scripts/__tests__/ComponentTest/HookTest/UseImperativeHandle.test.js
rename to packages/inula/__tests__/ComponentTest/HookTest/UseImperativeHandle.test.js
index 3b80c679..2fa1504a 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/HookTest/UseImperativeHandle.test.js
+++ b/packages/inula/__tests__/ComponentTest/HookTest/UseImperativeHandle.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../../src/index';
+import * as Inula from '../../../src/index';
import { Text } from '../../jest/commonComponents';
import { getLogUtils } from '../../jest/testUtils';
diff --git a/packages/inula/scripts/__tests__/ComponentTest/HookTest/UseLayoutEffect.test.js b/packages/inula/__tests__/ComponentTest/HookTest/UseLayoutEffect.test.js
similarity index 98%
rename from packages/inula/scripts/__tests__/ComponentTest/HookTest/UseLayoutEffect.test.js
rename to packages/inula/__tests__/ComponentTest/HookTest/UseLayoutEffect.test.js
index 00a52813..c48122e0 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/HookTest/UseLayoutEffect.test.js
+++ b/packages/inula/__tests__/ComponentTest/HookTest/UseLayoutEffect.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../../src/index';
+import * as Inula from '../../../src/index';
import { getLogUtils } from '../../jest/testUtils';
import { Text } from '../../jest/commonComponents';
diff --git a/packages/inula/scripts/__tests__/ComponentTest/HookTest/UseMemo.test.js b/packages/inula/__tests__/ComponentTest/HookTest/UseMemo.test.js
similarity index 98%
rename from packages/inula/scripts/__tests__/ComponentTest/HookTest/UseMemo.test.js
rename to packages/inula/__tests__/ComponentTest/HookTest/UseMemo.test.js
index 460efa9b..cbf0920f 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/HookTest/UseMemo.test.js
+++ b/packages/inula/__tests__/ComponentTest/HookTest/UseMemo.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../../src/index';
+import * as Inula from '../../../src/index';
import { getLogUtils } from '../../jest/testUtils';
import { Text } from '../../jest/commonComponents';
diff --git a/packages/inula/scripts/__tests__/ComponentTest/HookTest/UseReducer.test.js b/packages/inula/__tests__/ComponentTest/HookTest/UseReducer.test.js
similarity index 98%
rename from packages/inula/scripts/__tests__/ComponentTest/HookTest/UseReducer.test.js
rename to packages/inula/__tests__/ComponentTest/HookTest/UseReducer.test.js
index e49842bd..75115151 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/HookTest/UseReducer.test.js
+++ b/packages/inula/__tests__/ComponentTest/HookTest/UseReducer.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../../src/index';
+import * as Inula from '../../../src/index';
describe('useReducer Hook Test', () => {
const { useReducer } = Inula;
diff --git a/packages/inula/scripts/__tests__/ComponentTest/HookTest/UseRef.test.js b/packages/inula/__tests__/ComponentTest/HookTest/UseRef.test.js
similarity index 97%
rename from packages/inula/scripts/__tests__/ComponentTest/HookTest/UseRef.test.js
rename to packages/inula/__tests__/ComponentTest/HookTest/UseRef.test.js
index 08c6ad69..3a1dedbc 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/HookTest/UseRef.test.js
+++ b/packages/inula/__tests__/ComponentTest/HookTest/UseRef.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../../src/index';
+import * as Inula from '../../../src/index';
import { getLogUtils } from '../../jest/testUtils';
import { Text } from '../../jest/commonComponents';
diff --git a/packages/inula/scripts/__tests__/ComponentTest/HookTest/UseState.test.js b/packages/inula/__tests__/ComponentTest/HookTest/UseState.test.js
similarity index 99%
rename from packages/inula/scripts/__tests__/ComponentTest/HookTest/UseState.test.js
rename to packages/inula/__tests__/ComponentTest/HookTest/UseState.test.js
index 2602b711..cb785c4c 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/HookTest/UseState.test.js
+++ b/packages/inula/__tests__/ComponentTest/HookTest/UseState.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../../src/index';
+import * as Inula from '../../../src/index';
import { getLogUtils } from '../../jest/testUtils';
import { Text } from '../../jest/commonComponents';
diff --git a/packages/inula/scripts/__tests__/ComponentTest/JsxElement.test.js b/packages/inula/__tests__/ComponentTest/JsxElement.test.js
similarity index 96%
rename from packages/inula/scripts/__tests__/ComponentTest/JsxElement.test.js
rename to packages/inula/__tests__/ComponentTest/JsxElement.test.js
index abf062c7..5712cb64 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/JsxElement.test.js
+++ b/packages/inula/__tests__/ComponentTest/JsxElement.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../src/index';
+import * as Inula from '../../src/index';
describe('JSX Element test', () => {
it('symbol attribute prevent cloneDeep unlimited loop', function () {
diff --git a/packages/inula/scripts/__tests__/ComponentTest/LazyComponent.test.js b/packages/inula/__tests__/ComponentTest/LazyComponent.test.js
similarity index 99%
rename from packages/inula/scripts/__tests__/ComponentTest/LazyComponent.test.js
rename to packages/inula/__tests__/ComponentTest/LazyComponent.test.js
index f9f340e0..1639ee4f 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/LazyComponent.test.js
+++ b/packages/inula/__tests__/ComponentTest/LazyComponent.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../src/index';
+import * as Inula from '../../src/index';
import { Text } from '../jest/commonComponents';
import { getLogUtils } from '../jest/testUtils';
diff --git a/packages/inula/scripts/__tests__/ComponentTest/LifeCycle.test.js b/packages/inula/__tests__/ComponentTest/LifeCycle.test.js
similarity index 99%
rename from packages/inula/scripts/__tests__/ComponentTest/LifeCycle.test.js
rename to packages/inula/__tests__/ComponentTest/LifeCycle.test.js
index 9cda4374..5246dc50 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/LifeCycle.test.js
+++ b/packages/inula/__tests__/ComponentTest/LifeCycle.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../src/index';
+import * as Inula from '../../src/index';
import { getLogUtils } from '../jest/testUtils';
describe('LifeCycle Test', () => {
diff --git a/packages/inula/scripts/__tests__/ComponentTest/Memo.test.js b/packages/inula/__tests__/ComponentTest/Memo.test.js
similarity index 96%
rename from packages/inula/scripts/__tests__/ComponentTest/Memo.test.js
rename to packages/inula/__tests__/ComponentTest/Memo.test.js
index 8d29a315..f6c30af7 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/Memo.test.js
+++ b/packages/inula/__tests__/ComponentTest/Memo.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../src/index';
+import * as Inula from '../../src/index';
describe('Memo Test', () => {
it('Memo should not make the path wrong', function () {
diff --git a/packages/inula/scripts/__tests__/ComponentTest/PortalComponent.test.js b/packages/inula/__tests__/ComponentTest/PortalComponent.test.js
similarity index 96%
rename from packages/inula/scripts/__tests__/ComponentTest/PortalComponent.test.js
rename to packages/inula/__tests__/ComponentTest/PortalComponent.test.js
index 98e55340..79801e02 100644
--- a/packages/inula/scripts/__tests__/ComponentTest/PortalComponent.test.js
+++ b/packages/inula/__tests__/ComponentTest/PortalComponent.test.js
@@ -13,7 +13,7 @@
* See the Mulan PSL v2 for more details.
*/
-import * as Inula from '../../../src/index';
+import * as Inula from '../../src/index';
import { getLogUtils } from '../jest/testUtils';
import dispatchChangeEvent from '../utils/dispatchChangeEvent';
@@ -287,66 +287,65 @@ describe('PortalComponent Test', () => {
expect(fn).toHaveBeenCalledTimes(1);
});
-
it('portal场景下,portal下元素点击事件冒泡到父元素', () => {
class Dialog extends Inula.Component {
node;
-
+
constructor(props) {
super(props);
this.node = window.document.createElement('div');
window.document.body.appendChild(this.node);
}
-
+
render() {
return Inula.createPortal(this.props.children, this.node);
}
}
-
+
const fn = jest.fn();
const subRef = Inula.createRef();
-
+
function App() {
return (