diff --git a/arkoala/arkui-common/src/index.ts b/arkoala/arkui-common/src/index.ts index 3ec695986a1e505bb697ef3a8b12dfe74e3f333c..d4616773c033db4c0e37eb0bb3f93f0e42ab671d 100644 --- a/arkoala/arkui-common/src/index.ts +++ b/arkoala/arkui-common/src/index.ts @@ -1 +1 @@ -export * from "#arkcompat/index" +export * from "#arkcompat" diff --git a/arkoala/extension-component/src/ExampleComponents.ts b/arkoala/extension-component/src/ExampleComponents.ts index 831c0e9e943de0acb39981e11ae17ce8394815a9..737034dc79c1e7cc6f096355175ae19e108626ba 100644 --- a/arkoala/extension-component/src/ExampleComponents.ts +++ b/arkoala/extension-component/src/ExampleComponents.ts @@ -27,20 +27,14 @@ class ExampleNode extends ArkCommonMethodPeer { protected _x: int32 = 0 protected _y: int32 = 0 - public static create(component?: ComponentBase, flags: int32 = 0): ExampleNode { - // TODO: check this node creation - /** - * const _peerPtr = nativeModule()._CommonMethod_construct(0, flags) - */ - const _peerPtr = nativeModule()._CreateNode(ArkUINodeType.CustomNode, 0, 0) - const _peer = new ExampleNode(_peerPtr, "Example") - component?.setPeer(_peer) - return _peer + protected constructor(nodeType: ArkUINodeType, flags: int32 = 0, name: string = "") { + super(nodeType, flags, name) } - protected constructor(peerPtr: KPointer, name: string = "", flags: int32 = 0) { - super(peerPtr, name, 0); - this.markDirty(DirtyFlags.Geometry | DirtyFlags.Visual) + public static create(nodeType: ArkUINodeType, component?: ComponentBase, flags: int32 = 0): ExampleNode { + const _peer = new ExampleNode(nodeType, flags, "ExampleNode") + component?.setPeer(_peer) + return _peer } onMeasure(args: Float32Array): int32 { @@ -210,7 +204,7 @@ export function ExampleComponent(style: Partial) { const receiver = remember(() => { return new ExampleComponent_Component() }) - NodeAttach(() => ExampleNode.create(receiver), (node: ExampleNode) => { + NodeAttach(() => ExampleNode.create(ArkUINodeType.CustomNode, receiver), (node: ExampleNode) => { if (style.width !== undefined) node.width = style.width if (style.height !== undefined) node.height = style.height if (style.color !== undefined) node.color = style.color @@ -221,22 +215,15 @@ export function ExampleComponent(style: Partial) { class BoxNode extends ExampleNode { private _gap: int32 = 1 - public static create(component?: ComponentBase, flags: int32 = 0): BoxNode { - // TODO: check this node creation - /** - * const _peerPtr = nativeModule()._CommonMethod_construct(0, flags) - */ - const _peerPtr = nativeModule()._CreateNode(ArkUINodeType.CustomNode, 0, 0) - const _peer = new BoxNode(_peerPtr, "BoxNode") + protected constructor(nodeType: ArkUINodeType, flags: int32 = 0, name: string = "") { + super(nodeType, flags, name) + } + public static create(nodeType: ArkUINodeType, component?: ComponentBase, flags: int32 = 0): BoxNode { + const _peer = new BoxNode(ArkUINodeType.CustomNode, flags, "BoxNode") component?.setPeer(_peer) return _peer } - protected constructor(peerPtr: KPointer, name: string = "", flags: int32 = 0) { - super(peerPtr, name, 0); - this.markDirty(DirtyFlags.Geometry | DirtyFlags.Visual) - } - set gap(gap: int32) { if (gap != this._gap) { this._gap = gap @@ -320,7 +307,7 @@ export function Box( const receiver = remember(() => { return new BoxNode_Component() }) - NodeAttach(() => BoxNode.create(receiver), (node: BoxNode) => { + NodeAttach(() => BoxNode.create(ArkUINodeType.CustomNode, receiver), (node: BoxNode) => { if (style.width !== undefined) node.width = style.width if (style.height !== undefined) node.height = style.height if (style.color !== undefined) node.color = style.color @@ -375,5 +362,5 @@ export function OutlinedButton( /** @memo */ content?: () => void, ) { - Attach(() => OutlinedButtonPeer.create(), options, content) + Attach(() => OutlinedButtonPeer.create(ArkUINodeType.CustomNode), options, content) } diff --git a/arkoala/tests/src/ets-tests/tsconfig.json b/arkoala/tests/src/ets-tests/tsconfig.json index b4efa46305291c3e45fdd1a6bfa1ccbc90df5990..30026954befd815176fb19ea286e84819dda3265 100644 --- a/arkoala/tests/src/ets-tests/tsconfig.json +++ b/arkoala/tests/src/ets-tests/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@koalaui/arkui-common/config/tsconfig.base.json", + "extends": "../../../arkui-common/config/tsconfig.base.json", "exclude": ["node_modules", "js_output", "dependencies", "pages/Progress.test.ets", "pages/Marquee.test.ets"], "include": ["./**/*.ets"], "compilerOptions": { diff --git a/arkoala/tests/tsconfig-test.json b/arkoala/tests/tsconfig-test.json index 22648b9141fdfec624da76fbc0694f2ed638b7c2..7b1b26381cfbec68c8a14350faee5ee35c3e3322 100644 --- a/arkoala/tests/tsconfig-test.json +++ b/arkoala/tests/tsconfig-test.json @@ -24,9 +24,7 @@ } }, "files": [ - "../arkui-common/interface_sdk-js/api/@internal/component/ets/index-full.d.ts", - "../arkui-common/interface_sdk-js/api/@internal/component/ets/koala-extensions.d.ts", - "../arkui-common/interface_sdk-js/api/@internal/ets/global.d.ts" + "../arkui/types/index-full.d.ts" ], "exclude": [ "node_modules", "build", "dist", "lib", "app" @@ -35,9 +33,9 @@ "src/index.test.ts", "generated/ets-test/**/*" ], "references": [ - { "path": "../../incremental/compiler-plugin" }, + { "path": "../../arkoala/arkui" }, { "path": "../../incremental/runtime" }, { "path": "../../arkoala/framework" }, - { "path": "../../arkoala/arkui" } + { "path": "../../incremental/compiler-plugin" } ] }