refactor: 渲染系统从 eventemitter3 换为钩子系统

This commit is contained in:
AncTe committed 2026-11-11 15:50:58 +08:00
1 parent e094ac28a4
commit 7acb1d52e7
12 files changed
+334 -316

No files matched your search

+20 -36
View File
@@ -1,5 +1,4 @@
import { ReservedProps } from 'vue';
import EventEmitter from 'eventemitter3';
import {
AnimatedProps,
BezierProps,
@@ -18,49 +17,34 @@ import {
ShaderProps,
TextProps
} from './props';
import { ERenderItemEvent } from '@motajs/render';
import { IRenderItemBaseHooks } from '@motajs/render';
export type WrapEventEmitterEvents<T extends EventEmitter.ValidEventTypes> =
T extends string | symbol
? T
: {
[P in keyof T]: T[P] extends any[]
? (...args: T[P]) => void
: (...args: any[]) => void;
};
type MappingEvent<E extends ERenderItemEvent> = {
[P in keyof WrapEventEmitterEvents<E> as P extends string
? `on${Capitalize<P>}`
: never]?: WrapEventEmitterEvents<E>[P];
};
export type TagDefine<T extends object, E extends ERenderItemEvent> = T &
MappingEvent<E> &
ReservedProps;
export type TagDefine<T extends object, H extends IRenderItemBaseHooks> = T & {
[K in keyof H]?: H[K];
} & ReservedProps;
declare module 'vue/jsx-runtime' {
namespace JSX {
export interface IntrinsicElements {
container: TagDefine<ContainerProps, ERenderItemEvent>;
container: TagDefine<ContainerProps, IRenderItemBaseHooks>;
'container-custom': TagDefine<
ConatinerCustomProps,
ERenderItemEvent
IRenderItemBaseHooks
>;
shader: TagDefine<ShaderProps, ERenderItemEvent>;
text: TagDefine<TextProps, ERenderItemEvent>;
image: TagDefine<ImageProps, ERenderItemEvent>;
animated: TagDefine<AnimatedProps, ERenderItemEvent>;
comment: TagDefine<CommentProps, ERenderItemEvent>;
custom: TagDefine<CustomProps, ERenderItemEvent>;
'g-rect': TagDefine<RectProps, ERenderItemEvent>;
'g-circle': TagDefine<CirclesProps, ERenderItemEvent>;
'g-ellipse': TagDefine<EllipseProps, ERenderItemEvent>;
'g-line': TagDefine<LineProps, ERenderItemEvent>;
'g-bezier': TagDefine<BezierProps, ERenderItemEvent>;
'g-quad': TagDefine<QuadraticProps, ERenderItemEvent>;
'g-path': TagDefine<PathProps, ERenderItemEvent>;
'g-rectr': TagDefine<RectRProps, ERenderItemEvent>;
shader: TagDefine<ShaderProps, IRenderItemBaseHooks>;
text: TagDefine<TextProps, IRenderItemBaseHooks>;
image: TagDefine<ImageProps, IRenderItemBaseHooks>;
animated: TagDefine<AnimatedProps, IRenderItemBaseHooks>;
comment: TagDefine<CommentProps, IRenderItemBaseHooks>;
custom: TagDefine<CustomProps, IRenderItemBaseHooks>;
'g-rect': TagDefine<RectProps, IRenderItemBaseHooks>;
'g-circle': TagDefine<CirclesProps, IRenderItemBaseHooks>;
'g-ellipse': TagDefine<EllipseProps, IRenderItemBaseHooks>;
'g-line': TagDefine<LineProps, IRenderItemBaseHooks>;
'g-bezier': TagDefine<BezierProps, IRenderItemBaseHooks>;
'g-quad': TagDefine<QuadraticProps, IRenderItemBaseHooks>;
'g-path': TagDefine<PathProps, IRenderItemBaseHooks>;
'g-rectr': TagDefine<RectRProps, IRenderItemBaseHooks>;
}
}
}
+7 -26
View File
@@ -1,4 +1,8 @@
import { ERenderItemEvent, IRenderItem, IRenderTreeRoot } from '@motajs/render';
import {
IRenderItem,
IRenderItemBaseHooks,
IRenderTreeRoot
} from '@motajs/render';
import { VNodeProps } from 'vue';
import { BaseProps } from './props';
import { TagDefine } from './elements';
@@ -8,7 +12,6 @@ import {
IExcitation,
ITransition
} from '@motajs/animate';
import EventEmitter from 'eventemitter3';
//#region 标签管理
@@ -57,8 +60,8 @@ export interface IRenderTagManager {
export type DefaultProps<
P extends BaseProps = BaseProps,
E extends ERenderItemEvent = ERenderItemEvent
> = TagDefine<P, E>;
H extends IRenderItemBaseHooks = IRenderItemBaseHooks
> = TagDefine<P, H>;
//#endregion
@@ -88,28 +91,6 @@ export interface IRendererUsing {
*/
onExcitedFunc(fn: (payload: number) => void): void;
/**
* 监听渲染元素的指定事件。
*
* 在组件内如果你需要监听事件,应该先考虑使用 `JSX` 的 `onXxx` 来监听事件,而不是使用此接口。
*
* 如果 `JSX` 的 `onXxx` 不能满足你的需求,再考虑使用此接口,在组件内**不要**直接使用 `item.on` 来监听事件,
* 否则可能导致事件监听没有正确删除,出现内存泄漏问题。
*
* 在**组件外不要**使用此接口,否则可能没有效果!
* @param item 要监听的渲染元素
* @param key 事件类型
* @param listener 当事件触发时执行的函数
*/
listenEvent<
T extends ERenderItemEvent,
K extends EventEmitter.EventNames<T>
>(
item: IRenderItem,
key: K,
listener: EventEmitter.EventListener<T, K>
): void;
/**
* 创建一个动画执行器。
*
+1 -16
View File
@@ -1,6 +1,5 @@
import { ERenderItemEvent, IRenderItem, IRenderTreeRoot } from '@motajs/render';
import { IRenderTreeRoot } from '@motajs/render';
import { onMounted, onUnmounted } from 'vue';
import EventEmitter from 'eventemitter3';
import { IRendererUsing } from './types';
import {
IExcitable,
@@ -28,20 +27,6 @@ export class RendererUsing implements IRendererUsing {
this.onExcited(excited(fn));
}
listenEvent<
T extends ERenderItemEvent,
K extends EventEmitter.EventNames<T>
>(
item: IRenderItem,
key: K,
listener: EventEmitter.EventListener<T, K>
): void {
item.on(key, listener);
onUnmounted(() => {
item.off(key, listener);
});
}
useAnimater(excitation: IExcitation<number>): IAnimater {
const anim = new Animater();
onMounted(() => {