From b5e1d5782c65254fe351bc54d63cd7e7a8173ef1 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Fri, 4 Oct 2024 18:04:23 +0300 Subject: [PATCH] . Signed-off-by: naumovdmitrii runtime Signed-off-by: naumovdmitrii arkui-common Signed-off-by: naumovdmitrii | undefined Signed-off-by: naumovdmitrii --- arkoala/ets-plugin/src/Importer.ts | 10 ++++++++++ arkoala/ets-plugin/test/golden/arkts/Rewrite.ts | 5 +++-- arkoala/ets-plugin/test/golden/arkts/Rewrite2.ts | 3 ++- arkoala/ets-plugin/test/golden/arkts/Rewrite3.ts | 3 ++- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/arkoala/ets-plugin/src/Importer.ts b/arkoala/ets-plugin/src/Importer.ts index 8d4cd6384..199546252 100644 --- a/arkoala/ets-plugin/src/Importer.ts +++ b/arkoala/ets-plugin/src/Importer.ts @@ -260,6 +260,16 @@ export class Importer { this.addImport(this.subproject.koalaRuntime, undefined, name) } addAdaptorImport(name: string) { + /* + temporary workaround for arkts reexport bug + */ + if (this.isArkts()) { + if (name === "ArkPageTransitionEnterComponent") return this.addArkuiCommonImport(name) + if (name === "ArkPageTransitionExitComponent") return this.addArkuiCommonImport(name) + if (name === "LocalStorage") return this.addArkuiCommonImport(name) + if (name === "observableProxy") return this.addArkuiCommonImport(name) + } + this.addImport(this.subproject.koalaAdaptor, undefined, name) } addArkuiCommonImport(name: string) { diff --git a/arkoala/ets-plugin/test/golden/arkts/Rewrite.ts b/arkoala/ets-plugin/test/golden/arkts/Rewrite.ts index 4b12cf9d6..17330e3d9 100644 --- a/arkoala/ets-plugin/test/golden/arkts/Rewrite.ts +++ b/arkoala/ets-plugin/test/golden/arkts/Rewrite.ts @@ -1,6 +1,7 @@ -import { AppStorageLinkState, ArkButton, ArkButtonComponent, ArkColumn, ArkColumnComponent, ArkCommonMethodInterface, ArkPageTransitionEnterComponent, ArkPageTransitionExitComponent, ArkStructBase, ArkText, ArkTextComponent, LocalStorage, SyncedProperty, bindCustomDialog, contextLocalStateOf, objectLinkState, observableProxy, propState, stateOf } from "@koalaui/arkts-arkui"; +import { AppStorageLinkState, ArkButton, ArkButtonComponent, ArkColumn, ArkColumnComponent, ArkCommonMethodInterface, ArkStructBase, ArkText, ArkTextComponent, SyncedProperty, bindCustomDialog, contextLocalStateOf, objectLinkState, propState } from "@koalaui/arkts-arkui"; +import { ArkPageTransitionEnterComponent, ArkPageTransitionExitComponent, LocalStorage, observableProxy } from "@koalaui/arkui-common"; import { registerArkuiEntry } from "@koalaui/arkts-arkui/ohos.router"; -import { MutableState, OnChange, contextLocal } from "@koalaui/runtime"; +import { MutableState, OnChange, contextLocal, stateOf } from "@koalaui/runtime"; export class ArkEntryExampleComponent extends ArkStructBase { private _entry_local_storage_ = new LocalStorage(); __initializeStruct(/**/ diff --git a/arkoala/ets-plugin/test/golden/arkts/Rewrite2.ts b/arkoala/ets-plugin/test/golden/arkts/Rewrite2.ts index bd7eef3e2..f24942d6e 100644 --- a/arkoala/ets-plugin/test/golden/arkts/Rewrite2.ts +++ b/arkoala/ets-plugin/test/golden/arkts/Rewrite2.ts @@ -1,4 +1,5 @@ -import { ArkPageTransitionEnterComponent, ArkPageTransitionExitComponent, ArkStructBase, ArkText, StorageLinkState, observableProxy } from "@koalaui/arkts-arkui"; +import { ArkStructBase, ArkText, StorageLinkState } from "@koalaui/arkts-arkui"; +import { ArkPageTransitionEnterComponent, ArkPageTransitionExitComponent, observableProxy } from "@koalaui/arkui-common"; import { registerArkuiEntry } from "@koalaui/arkts-arkui/ohos.router"; import { MutableState } from "@koalaui/runtime"; /* diff --git a/arkoala/ets-plugin/test/golden/arkts/Rewrite3.ts b/arkoala/ets-plugin/test/golden/arkts/Rewrite3.ts index 3633efd1c..0751d7d5a 100644 --- a/arkoala/ets-plugin/test/golden/arkts/Rewrite3.ts +++ b/arkoala/ets-plugin/test/golden/arkts/Rewrite3.ts @@ -1,4 +1,5 @@ -import { ArkPageTransitionEnterComponent, ArkPageTransitionExitComponent, ArkStructBase, StorageLinkState, SyncedProperty, observableProxy, propState } from "@koalaui/arkts-arkui"; +import { ArkStructBase, StorageLinkState, SyncedProperty, propState } from "@koalaui/arkts-arkui"; +import { ArkPageTransitionEnterComponent, ArkPageTransitionExitComponent, observableProxy } from "@koalaui/arkui-common"; import { registerArkuiEntry } from "@koalaui/arkts-arkui/ohos.router"; /* * Copyright (c) 2022-2023 Huawei Device Co., Ltd. -- Gitee