diff --git a/packages/editor/src/services/editor.ts b/packages/editor/src/services/editor.ts index 228ce89b..4b1ab2ce 100644 --- a/packages/editor/src/services/editor.ts +++ b/packages/editor/src/services/editor.ts @@ -230,7 +230,7 @@ class Editor extends BaseService { if (node?.id) { this.get('stage') ?.renderer.runtime?.getApp?.() - ?.emit( + .page?.emit( 'editor:select', { node, diff --git a/packages/ui-react/src/overlay/Overlay.tsx b/packages/ui-react/src/overlay/Overlay.tsx index eb3ea55c..a31b5a8f 100644 --- a/packages/ui-react/src/overlay/Overlay.tsx +++ b/packages/ui-react/src/overlay/Overlay.tsx @@ -16,7 +16,7 @@ * limitations under the License. */ -import React, { useContext, useEffect, useState } from 'react'; +import React, { useContext, useState } from 'react'; import Core from '@tmagic/core'; import type { MComponent, MNode } from '@tmagic/schema'; @@ -31,7 +31,7 @@ interface OverlayProps { const Overlay: React.FC = ({ config }) => { const [visible, setVisible] = useState(false); - const app: Core = useContext(AppContent); + const app: Core | undefined = useContext(AppContent); const node = app?.page?.getNode(config.id); if (!app) return null; @@ -58,7 +58,7 @@ const Overlay: React.FC = ({ config }) => { }, }); - app?.on('editor:select', (info: any, path: MNode[]) => { + app?.page?.on('editor:select', (info: any, path: MNode[]) => { if (path.find((node: MNode) => node.id === config.id)) { openOverlay(); } else { diff --git a/packages/ui-react/src/useApp.ts b/packages/ui-react/src/useApp.ts index b9b43a18..420b35cd 100644 --- a/packages/ui-react/src/useApp.ts +++ b/packages/ui-react/src/useApp.ts @@ -26,12 +26,12 @@ import AppContent from './AppContent'; interface UseAppOptions { config: MComponent; methods?: { - string: Function; + [key: string]: Function; }; } export default ({ config, methods }: UseAppOptions) => { - const app: Core = useContext(AppContent); + const app: Core | undefined = useContext(AppContent); const node = app?.page?.getNode(config.id); const [created, setCreated] = useState(false); diff --git a/packages/ui-vue2/src/overlay/src/index.vue b/packages/ui-vue2/src/overlay/src/index.vue index 644497b2..c88f32c6 100644 --- a/packages/ui-vue2/src/overlay/src/index.vue +++ b/packages/ui-vue2/src/overlay/src/index.vue @@ -43,7 +43,7 @@ export default defineComponent({ } }; - app?.on('editor:select', (info, path) => { + app?.page?.on('editor:select', (info, path) => { if (path.find((node: MNode) => node.id === props.config.id)) { openOverlay(); } else { diff --git a/packages/ui/src/overlay/src/index.vue b/packages/ui/src/overlay/src/index.vue index 644497b2..c88f32c6 100644 --- a/packages/ui/src/overlay/src/index.vue +++ b/packages/ui/src/overlay/src/index.vue @@ -43,7 +43,7 @@ export default defineComponent({ } }; - app?.on('editor:select', (info, path) => { + app?.page?.on('editor:select', (info, path) => { if (path.find((node: MNode) => node.id === props.config.id)) { openOverlay(); } else {