From 56b22d81e8d9542cb9e0e87e995c0762ab0d602c Mon Sep 17 00:00:00 2001 From: Bowen Tan Date: Tue, 10 May 2022 13:49:54 +0800 Subject: [PATCH] fix test --- packages/editor/__tests__/model/appModel.spec.ts | 2 +- packages/editor/__tests__/model/componentModel.spec.ts | 2 +- packages/editor/__tests__/operations/component.spec.ts | 2 +- packages/editor/__tests__/{sevices.ts => services.ts} | 0 packages/editor/__tests__/validator/allComponents.spec.ts | 2 +- packages/editor/__tests__/validator/component.spec.ts | 2 +- packages/editor/__tests__/validator/trait.spec.ts | 2 +- packages/editor/src/init.tsx | 3 +++ packages/runtime/index.html | 3 +-- packages/runtime/src/index.ts | 4 ++++ 10 files changed, 14 insertions(+), 8 deletions(-) rename packages/editor/__tests__/{sevices.ts => services.ts} (100%) diff --git a/packages/editor/__tests__/model/appModel.spec.ts b/packages/editor/__tests__/model/appModel.spec.ts index 0092c7ca..af894069 100644 --- a/packages/editor/__tests__/model/appModel.spec.ts +++ b/packages/editor/__tests__/model/appModel.spec.ts @@ -1,6 +1,6 @@ import { AppModel } from '../../src/AppModel/AppModel'; import { ComponentId, ComponentType } from '../../src/AppModel/IAppModel'; -import { registry } from '../sevices'; +import { registry } from '../services'; import { AppSchema, DuplicatedIdSchema } from './mock'; describe('AppModel test', () => { diff --git a/packages/editor/__tests__/model/componentModel.spec.ts b/packages/editor/__tests__/model/componentModel.spec.ts index dd376835..dca847d4 100644 --- a/packages/editor/__tests__/model/componentModel.spec.ts +++ b/packages/editor/__tests__/model/componentModel.spec.ts @@ -8,7 +8,7 @@ import { import { AppSchema, EventHandlerMockSchema } from './mock'; import { produce } from 'immer'; import { get } from 'lodash-es'; -import { registry } from '../sevices'; +import { registry } from '../services'; describe('ComponentModel test', () => { it('compute component property', () => { diff --git a/packages/editor/__tests__/operations/component.spec.ts b/packages/editor/__tests__/operations/component.spec.ts index e92549b3..ee0b38cc 100644 --- a/packages/editor/__tests__/operations/component.spec.ts +++ b/packages/editor/__tests__/operations/component.spec.ts @@ -1,6 +1,6 @@ import { AppModel } from '../../src/AppModel/AppModel'; import { ComponentId } from '../../src/AppModel/IAppModel'; -import { registry } from '../sevices'; +import { registry } from '../services'; import { AppSchema } from './mock'; import { genOperation } from '../../src/operations'; diff --git a/packages/editor/__tests__/sevices.ts b/packages/editor/__tests__/services.ts similarity index 100% rename from packages/editor/__tests__/sevices.ts rename to packages/editor/__tests__/services.ts diff --git a/packages/editor/__tests__/validator/allComponents.spec.ts b/packages/editor/__tests__/validator/allComponents.spec.ts index 504c41cd..cc6205dc 100644 --- a/packages/editor/__tests__/validator/allComponents.spec.ts +++ b/packages/editor/__tests__/validator/allComponents.spec.ts @@ -1,6 +1,6 @@ import { OrphanComponentSchema } from './mock'; import { SchemaValidator } from '../../src/validator'; -import { registry } from '../sevices'; +import { registry } from '../services'; const schemaValidator = new SchemaValidator(registry); diff --git a/packages/editor/__tests__/validator/component.spec.ts b/packages/editor/__tests__/validator/component.spec.ts index 504489b9..9e85caa7 100644 --- a/packages/editor/__tests__/validator/component.spec.ts +++ b/packages/editor/__tests__/validator/component.spec.ts @@ -4,7 +4,7 @@ import { ComponentWrongPropertyExpressionSchema, } from './mock'; import { SchemaValidator } from '../../src/validator'; -import { registry } from '../sevices'; +import { registry } from '../services'; const schemaValidator = new SchemaValidator(registry); diff --git a/packages/editor/__tests__/validator/trait.spec.ts b/packages/editor/__tests__/validator/trait.spec.ts index 0aa98926..083f297b 100644 --- a/packages/editor/__tests__/validator/trait.spec.ts +++ b/packages/editor/__tests__/validator/trait.spec.ts @@ -4,7 +4,7 @@ import { EventTraitTraitMethodSchema, } from './mock'; import { SchemaValidator } from '../../src/validator'; -import { registry } from '../sevices'; +import { registry } from '../services'; const schemaValidator = new SchemaValidator(registry); diff --git a/packages/editor/src/init.tsx b/packages/editor/src/init.tsx index 6d395efc..cfc8be57 100644 --- a/packages/editor/src/init.tsx +++ b/packages/editor/src/init.tsx @@ -50,12 +50,15 @@ export function initSunmaoUIEditor(props: SunmaoUIEditorProps = {}) { const didMount = () => { eventBus.send('HTMLElementsUpdated'); + if (props.runtimeProps?.hooks?.didMount) props.runtimeProps.hooks.didMount(); }; const didUpdate = () => { eventBus.send('HTMLElementsUpdated'); + if (props.runtimeProps?.hooks?.didUpdate) props.runtimeProps.hooks.didUpdate(); }; const didDomUpdate = () => { eventBus.send('HTMLElementsUpdated'); + if (props.runtimeProps?.hooks?.didDomUpdate) props.runtimeProps.hooks.didDomUpdate(); }; const ui = initSunmaoUI({ diff --git a/packages/runtime/index.html b/packages/runtime/index.html index 62650892..148d069b 100644 --- a/packages/runtime/index.html +++ b/packages/runtime/index.html @@ -29,8 +29,7 @@ const rootEl = document.querySelector('#root'); const render = example => { ReactDOM.unmountComponentAtNode(rootEl); - const { App, registry } = initSunmaoUI(); - registry.installLib(sunmaoChakraUILib); + const { App, registry } = initSunmaoUI({libs: [sunmaoChakraUILib]}); const { app, modules = [] } = example.value; modules.forEach(m => { registry.registerModule(m); diff --git a/packages/runtime/src/index.ts b/packages/runtime/src/index.ts index 08858d45..b72e37dd 100644 --- a/packages/runtime/src/index.ts +++ b/packages/runtime/src/index.ts @@ -36,6 +36,10 @@ export function initSunmaoUI(props: SunmaoUIRuntimeProps = {}) { ); const hooks = props.hooks; + props.libs?.forEach(lib => { + registry.installLib(lib); + }); + return { App: genApp( {