Skip to content

Commit 72050fc

Browse files
committed
fix lint
1 parent 5032328 commit 72050fc

File tree

3 files changed

+32
-29
lines changed

3 files changed

+32
-29
lines changed

src/QueueAnim.tsx

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
} from './utils';
2121
import AnimTypes from './animTypes';
2222

23-
import { IObject, IProps, IKeys, IQueueType } from './type';
23+
import type { IObject, IProps, IKeys, IQueueType } from './type';
2424

2525
const noop = () => {};
2626

@@ -117,8 +117,8 @@ export default forwardRef((props: IProps, ref: any) => {
117117
return getTweenSingleConfig(data, num, enterOrLeave);
118118
};
119119

120-
const getTweenType = (type: IQueueType, num: number) => {
121-
const data = AnimTypes[type];
120+
const getTweenType = ($type: IQueueType, num: number) => {
121+
const data = AnimTypes[$type];
122122
return getTweenAnimConfig(data, num);
123123
};
124124

@@ -136,13 +136,13 @@ export default forwardRef((props: IProps, ref: any) => {
136136
)
137137
: getTweenType(transformArguments(type, key, i)[enterOrLeave], startOrEnd);
138138

139-
const getTweenData = (key: string | number, i: number, type: string) => {
140-
const enterOrLeave = type === 'enter' ? 0 : 1;
141-
const start = type === 'enter' ? 1 : 0;
142-
const end = type === 'enter' ? 0 : 1;
139+
const getTweenData = (key: string | number, i: number, $type: string) => {
140+
const enterOrLeave = $type === 'enter' ? 0 : 1;
141+
const start = $type === 'enter' ? 1 : 0;
142+
const end = $type === 'enter' ? 0 : 1;
143143
const animate = getAnimData(key, i, enterOrLeave, end);
144144
const startAnim =
145-
type === 'enter' && (forcedReplay || !childrenShow.current[key])
145+
$type === 'enter' && (forcedReplay || !childrenShow.current[key])
146146
? getAnimData(key, i, enterOrLeave, start)
147147
: null;
148148
let $ease = transformArguments(ease, key, i)[enterOrLeave];
@@ -231,28 +231,32 @@ export default forwardRef((props: IProps, ref: any) => {
231231
}, $interval * i + $delay);
232232
};
233233

234-
const performLeave = (key: string | number, i: number) => {
234+
const performLeave = (key: string | number) => {
235235
Ticker.clear(placeholderTimeoutIds.current[key]);
236236
delete placeholderTimeoutIds.current[key];
237237
};
238238

239239
const getTweenOneEnterOrLeave = (
240240
key: string | number,
241241
i: number,
242-
delay: number,
243-
type: string,
242+
$delay: number,
243+
$type: string,
244244
) => {
245-
const animateData = getTweenData(key, i, type);
246-
const onStart = (type === 'enter' ? enterBegin : leaveBegin).bind(this, key);
247-
const onComplete = (type === 'enter' ? enterComplete : leaveComplete).bind(this, key);
245+
const animateData = getTweenData(key, i, $type);
246+
const onStart = (e: any) => {
247+
($type === 'enter' ? enterBegin : leaveBegin)(key, e);
248+
};
249+
const onComplete = (e: any) => {
250+
($type === 'enter' ? enterComplete : leaveComplete)(key, e);
251+
};
248252
if (Array.isArray(animateData.animate)) {
249253
const length = animateData.animate.length - 1;
250254
const animation = animateData.animate.map((item, ii) => {
251255
return {
252256
...item,
253257
startAt: animateData.startAnim ? animateData.startAnim[ii] : undefined,
254258
duration: animateData.duration / length,
255-
delay: !ii && type === 'leave' ? delay : 0,
259+
delay: !ii && $type === 'leave' ? $delay : 0,
256260
onStart: !ii ? onStart : undefined,
257261
onComplete: ii === length ? onComplete : undefined,
258262
};
@@ -266,7 +270,7 @@ export default forwardRef((props: IProps, ref: any) => {
266270
duration: animateData.duration,
267271
onStart,
268272
onComplete,
269-
delay,
273+
delay: $delay,
270274
};
271275
};
272276
useEffect(
@@ -283,17 +287,17 @@ export default forwardRef((props: IProps, ref: any) => {
283287
);
284288
useEffect(() => {
285289
const nextChildren = toArrayChildren(props.children).filter((c) => c);
286-
let currentChildren = originalChildren.current.filter((item) => item);
290+
const currentChildren = originalChildren.current.filter((item) => item);
287291
const newChildren = mergeChildren(currentChildren, nextChildren);
288292
const $keysToEnter: IKeys = [];
289293
const $keysToLeave: IKeys = [];
290294
if (!appear && !oneEnterBool.current) {
291295
const $childShow: IObject = {};
292-
newChildren.forEach((child: any) => {
293-
if (!child || !child.key) {
296+
newChildren.forEach((c: any) => {
297+
if (!c || !c.key) {
294298
return;
295299
}
296-
$childShow[child.key] = true;
300+
$childShow[c.key] = true;
297301
});
298302
originalChildren.current = newChildren;
299303
childrenShow.current = { ...$childShow };
@@ -303,7 +307,7 @@ export default forwardRef((props: IProps, ref: any) => {
303307
if (!c) {
304308
return;
305309
}
306-
const key = c.key;
310+
const { key } = c;
307311
const hasNext = findChildInChildrenByKey(nextChildren, key);
308312
if (!hasNext && key) {
309313
$keysToLeave.push(key);
@@ -359,13 +363,13 @@ export default forwardRef((props: IProps, ref: any) => {
359363
return;
360364
}
361365
let animation;
362-
let index = keysToLeave.current.indexOf(key); //children.findIndex(c => c.key === key);
366+
let index = keysToLeave.current.indexOf(key); // children.findIndex(c => c.key === key);
363367
const $interval = transformArguments(interval, key, index);
364-
let $delay = transformArguments(delay, key, index);
368+
const $delay = transformArguments(delay, key, index);
365369

366370
// 处理出场
367371
if (index >= 0) {
368-
if (recordAnimKeys.current[key] == 'leave') {
372+
if (recordAnimKeys.current[key] === 'leave') {
369373
return;
370374
}
371375

@@ -402,7 +406,6 @@ export default forwardRef((props: IProps, ref: any) => {
402406
recordTweenKeys.current[key] = TweenOne(dom, {
403407
animation,
404408
});
405-
406409
});
407410
}
408411
}, [childShow, child]);

src/type.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { IObject as IObj } from 'tween-one/lib/typings';
2-
import { IEaseType as IEase } from 'tween-one/lib/typings/IAnimObject';
3-
import React from 'react';
1+
import type { IObject as IObj } from 'tween-one/lib/typings';
2+
import type { IEaseType as IEase } from 'tween-one/lib/typings/IAnimObject';
3+
import type React from 'react';
44

55
export type IObject = IObj;
66

src/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint no-prototype-builtins: 0 */
2-
import { IObject } from './type';
2+
import type { IObject } from './type';
33
import React from 'react';
44

55
export const windowIsUndefined = !(

0 commit comments

Comments
 (0)