From a257bac862317b1430257d35e75157c23e022185 Mon Sep 17 00:00:00 2001 From: guozejun Date: Tue, 26 Aug 2025 15:29:59 +0800 Subject: [PATCH] Update ArkUI import dependencies to module style Signed-off-by: guozejun Change-Id: I77606225bd42c8958d511be69dbd994c2c34ca6d --- api/@ohos.animator.static.d.ets | 4 +- api/@ohos.app.ability.autoFillManager.d.ts | 2 +- api/@ohos.arkui.Parallelize.d.ets | 2 +- api/@ohos.arkui.UIContext.static.d.ets | 28 ++--- ...rkui.advanced.ComposeListItem.static.d.ets | 8 +- ...rkui.advanced.ComposeTitleBar.static.d.ets | 8 +- api/@ohos.arkui.advanced.Dialog.static.d.ets | 14 +-- ...kui.advanced.EditableTitleBar.static.d.ets | 10 +- ...rkui.advanced.ExceptionPrompt.static.d.ets | 8 +- api/@ohos.arkui.advanced.Filter.static.d.ets | 6 +- ...kui.advanced.GridObjectSortComponent.d.ets | 4 +- ...arkui.advanced.ProgressButton.static.d.ets | 10 +- ...os.arkui.advanced.SplitLayout.static.d.ets | 6 +- api/@ohos.arkui.advanced.SubHeader.d.ets | 4 +- ...ohos.arkui.advanced.SubHeader.static.d.ets | 12 +-- ...arkui.advanced.SwipeRefresher.static.d.ets | 6 +- ...os.arkui.advanced.TabTitleBar.static.d.ets | 8 +- api/@ohos.arkui.advanced.ToolBar.static.d.ets | 14 +-- ...@ohos.arkui.advanced.TreeView.static.d.ets | 8 +- ...@ohos.arkui.componentSnapshot.static.d.ets | 2 +- api/@ohos.arkui.dragController.static.d.ets | 8 +- api/@ohos.arkui.modifier.static.d.ets | 2 +- api/@ohos.arkui.node.d.ts | 41 ++----- api/@ohos.arkui.node.static.d.ets | 94 ++++++++++++++++ api/@ohos.arkui.observer.static.d.ets | 6 +- api/@ohos.arkui.shape.static.d.ets | 2 +- api/@ohos.arkui.theme.static.d.ets | 2 +- api/@ohos.graphics.displaySync.d.ts | 2 +- api/@ohos.i18n.d.ts | 2 +- api/@ohos.measure.static.d.ets | 4 +- api/@ohos.promptAction.static.d.ets | 18 ++-- api/arkui/AttributeUpdater.static.d.ets | 2 +- api/arkui/BlankModifier.static.d.ets | 6 +- api/arkui/BuilderNode.static.d.ets | 10 +- api/arkui/CalendarPickerModifier.static.d.ets | 4 +- api/arkui/CheckboxModifier.static.d.ets | 4 +- api/arkui/ColumnModifier.static.d.ets | 6 +- api/arkui/ColumnSplitModifier.static.d.ets | 4 +- api/arkui/CommonModifier.static.d.ets | 2 +- api/arkui/ComponentContent.static.d.ets | 8 +- api/arkui/ContainerSpanModifier.static.d.ets | 4 +- api/arkui/CounterModifier.static.d.ets | 4 +- api/arkui/DataPanelModifier.static.d.ets | 4 +- api/arkui/DatePickerModifier.static.d.ets | 4 +- api/arkui/DividerModifier.static.d.ets | 4 +- api/arkui/FlexModifier.static.d.ets | 4 +- api/arkui/FolderStackModifier.static.d.ets | 4 +- api/arkui/FrameNode.static.d.ets | 100 +++++++++--------- api/arkui/GaugeModifier.static.d.ets | 4 +- api/arkui/Graphics.static.d.ets | 10 +- api/arkui/GridColModifier.static.d.ets | 4 +- api/arkui/GridItemModifier.static.d.ets | 4 +- api/arkui/GridModifier.static.d.ets | 4 +- api/arkui/GridRowModifier.static.d.ets | 4 +- api/arkui/HyperlinkModifier.static.d.ets | 4 +- api/arkui/ImageAnimatorModifier.static.d.ets | 4 +- api/arkui/ImageSpanModifier.static.d.ets | 4 +- api/arkui/LineModifier.static.d.ets | 4 +- api/arkui/ListItemGroupModifier.static.d.ets | 4 +- api/arkui/ListItemModifier.static.d.ets | 4 +- api/arkui/ListModifier.static.d.ets | 4 +- .../LoadingProgressModifier.static.d.ets | 4 +- api/arkui/MarqueeModifier.static.d.ets | 4 +- api/arkui/MenuItemModifier.static.d.ets | 4 +- api/arkui/MenuModifier.static.d.ets | 4 +- api/arkui/NavDestinationModifier.static.d.ets | 4 +- api/arkui/NavigationModifier.static.d.ets | 4 +- api/arkui/NodeContent.static.d.ets | 4 +- api/arkui/NodeController.static.d.ets | 10 +- api/arkui/ParticleModifier.static.d.ets | 4 +- api/arkui/PathModifier.static.d.ets | 4 +- api/arkui/PatternLockModifier.static.d.ets | 4 +- api/arkui/PolygonModifier.static.d.ets | 4 +- api/arkui/PolylineModifier.static.d.ets | 4 +- api/arkui/ProgressModifier.static.d.ets | 4 +- api/arkui/QRCodeModifier.static.d.ets | 4 +- api/arkui/RectModifier.static.d.ets | 4 +- api/arkui/RefreshModifier.static.d.ets | 4 +- .../RelativeContainerModifier.static.d.ets | 4 +- api/arkui/RenderNode.static.d.ets | 4 +- api/arkui/RichEditorModifier.static.d.ets | 4 +- api/arkui/RowModifier.static.d.ets | 4 +- api/arkui/RowSplitModifier.static.d.ets | 4 +- api/arkui/ScrollModifier.static.d.ets | 4 +- api/arkui/SearchModifier.static.d.ets | 4 +- api/arkui/SelectModifier.static.d.ets | 4 +- api/arkui/ShapeModifier.static.d.ets | 4 +- .../SideBarContainerModifier.static.d.ets | 4 +- api/arkui/SpanModifier.static.d.ets | 4 +- api/arkui/StackModifier.static.d.ets | 4 +- api/arkui/StepperItemModifier.static.d.ets | 4 +- api/arkui/StepperModifier.static.d.ets | 4 +- api/arkui/SwiperModifier.static.d.ets | 4 +- api/arkui/SymbolGlyphModifier.static.d.ets | 4 +- api/arkui/SymbolSpanModifier.static.d.ets | 6 +- api/arkui/TextAreaModifier.static.d.ets | 4 +- api/arkui/TextClockModifier.static.d.ets | 4 +- api/arkui/TextInputModifier.static.d.ets | 4 +- api/arkui/TextModifier.static.d.ets | 4 +- api/arkui/TextPickerModifier.static.d.ets | 4 +- api/arkui/TextTimerModifier.static.d.ets | 4 +- api/arkui/TimePickerModifier.static.d.ets | 4 +- api/arkui/VideoModifier.static.d.ets | 4 +- api/arkui/WaterFlowModifier.static.d.ets | 4 +- 104 files changed, 415 insertions(+), 342 deletions(-) create mode 100644 api/@ohos.arkui.node.static.d.ets diff --git a/api/@ohos.animator.static.d.ets b/api/@ohos.animator.static.d.ets index 3a86f1557c..1579d77922 100644 --- a/api/@ohos.animator.static.d.ets +++ b/api/@ohos.animator.static.d.ets @@ -20,8 +20,8 @@ * @arkts 1.2 */ -import { FillMode, PlayMode } from './arkui/component/enums'; -import { ExpectedFrameRateRange } from './arkui/component/common'; +import { FillMode, PlayMode } from '@ohos.arkui.component'; +import { ExpectedFrameRateRange } from '@ohos.arkui.component'; /** diff --git a/api/@ohos.app.ability.autoFillManager.d.ts b/api/@ohos.app.ability.autoFillManager.d.ts index 59c3caf071..aad00d9227 100644 --- a/api/@ohos.app.ability.autoFillManager.d.ts +++ b/api/@ohos.app.ability.autoFillManager.d.ts @@ -30,7 +30,7 @@ import type * as _AutoFillPopupConfig from './application/AutoFillPopupConfig'; import { PopupPlacement } from './application/AutoFillPopupConfig'; /*** endif */ /*** if arkts 1.2 */ -import { UIContext } from './@ohos.arkui.UIContext'; +import { UIContext } from '@ohos.arkui.UIContext'; /*** endif */ /** diff --git a/api/@ohos.arkui.Parallelize.d.ets b/api/@ohos.arkui.Parallelize.d.ets index 7c061267c9..a716d58edd 100644 --- a/api/@ohos.arkui.Parallelize.d.ets +++ b/api/@ohos.arkui.Parallelize.d.ets @@ -20,7 +20,7 @@ */ import { ComponentBuilder } from './arkui/stateManagement/runtime' -import { CustomBuilder } from './arkui/component/builder'; +import { CustomBuilder } from '@ohos.arkui.component'; /** * Describe the options for the ParallelizeUI. diff --git a/api/@ohos.arkui.UIContext.static.d.ets b/api/@ohos.arkui.UIContext.static.d.ets index 6b7cf7b16e..aeff1a4961 100755 --- a/api/@ohos.arkui.UIContext.static.d.ets +++ b/api/@ohos.arkui.UIContext.static.d.ets @@ -39,21 +39,21 @@ import { ComponentContent, FrameNode, Frame } from '@ohos.arkui.node'; import { AnimatorOptions, AnimatorResult } from './@ohos.animator'; import { ClickEvent, ExpectedFrameRateRange, DragItemInfo, AnimateParam, KeyframeAnimateParam, KeyframeState, SheetOptions, PopupCommonOptions, MenuOptions, KeyEvent, Optional, - ContentCoverOptions } from './arkui/component/common'; -import { CustomBuilder, CustomBuilderT } from './arkui/component/builder'; -import { GestureEvent, GestureRecognizer } from './arkui/component/gesture'; -import { ResourceStr, SizeOptions, VoidCallback } from './arkui/component/units'; -import { Nullable, Color, FontStyle, WidthBreakpoint, HeightBreakpoint, PixelRoundMode } from './arkui/component/enums'; -import { TimePickerDialogOptions } from './arkui/component/timePicker'; -import { AlertDialogParamWithConfirm, AlertDialogParamWithButtons, AlertDialogParamWithOptions } from './arkui/component/alertDialog'; -import { ActionSheetOptions } from './arkui/component/actionSheet'; -import { TextPickerDialogOptions } from './arkui/component/textPicker'; + ContentCoverOptions } from '@ohos.arkui.component'; +import { CustomBuilder, CustomBuilderT } from '@ohos.arkui.component'; +import { GestureEvent, GestureRecognizer } from '@ohos.arkui.component'; +import { ResourceStr, SizeOptions, VoidCallback } from '@ohos.arkui.component'; +import { Nullable, Color, FontStyle, WidthBreakpoint, HeightBreakpoint, PixelRoundMode } from '@ohos.arkui.component'; +import { TimePickerDialogOptions } from '@ohos.arkui.component'; +import { AlertDialogParamWithConfirm, AlertDialogParamWithButtons, AlertDialogParamWithOptions } from '@ohos.arkui.component'; +import { ActionSheetOptions } from '@ohos.arkui.component'; +import { TextPickerDialogOptions } from '@ohos.arkui.component'; import { LocalStorage } from './arkui/stateManagement/storage/localStorage'; -import { DatePickerDialogOptions } from './arkui/component/datePicker'; -import { TabsController } from './arkui/component/tabs'; -import { Scroller } from './arkui/component/scroll'; -import { KeyProcessingMode } from './arkui/component/focus'; -import { TextMenuOptions } from './arkui/component/textCommon'; +import { DatePickerDialogOptions } from '@ohos.arkui.component'; +import { TabsController } from '@ohos.arkui.component'; +import { Scroller } from '@ohos.arkui.component'; +import { KeyProcessingMode } from '@ohos.arkui.component'; +import { TextMenuOptions } from '@ohos.arkui.component'; /** * class Font diff --git a/api/@ohos.arkui.advanced.ComposeListItem.static.d.ets b/api/@ohos.arkui.advanced.ComposeListItem.static.d.ets index e31c772ece..04cd35cd17 100644 --- a/api/@ohos.arkui.advanced.ComposeListItem.static.d.ets +++ b/api/@ohos.arkui.advanced.ComposeListItem.static.d.ets @@ -19,11 +19,11 @@ * @kit ArkUI * @arkts 1.2 */ -import { Component } from './arkui/component/customComponent'; -import { ResourceStr } from './arkui/component/units'; +import { Component } from '@ohos.arkui.component'; +import { ResourceStr } from '@ohos.arkui.component'; import { PropRef } from './arkui/stateManagement/decorator'; -import { SymbolGlyphModifier } from './arkui/SymbolGlyphModifier'; -import { Builder } from './arkui/component/builder'; +import { SymbolGlyphModifier } from 'arkui.SymbolGlyphModifier'; +import { Builder } from '@ohos.arkui.component'; /** * Declare enum IconType * diff --git a/api/@ohos.arkui.advanced.ComposeTitleBar.static.d.ets b/api/@ohos.arkui.advanced.ComposeTitleBar.static.d.ets index 368ac0d049..62ae7f6728 100644 --- a/api/@ohos.arkui.advanced.ComposeTitleBar.static.d.ets +++ b/api/@ohos.arkui.advanced.ComposeTitleBar.static.d.ets @@ -19,10 +19,10 @@ * @kit ArkUI * @arkts 1.2 */ -import { ResourceStr } from './arkui/component/units'; -import { Component } from './arkui/component/customComponent'; -import { SymbolGlyphModifier } from './arkui/SymbolGlyphModifier'; -import { Builder } from './arkui/component/builder'; +import { ResourceStr } from '@ohos.arkui.component'; +import { Component } from '@ohos.arkui.component'; +import { SymbolGlyphModifier } from 'arkui.SymbolGlyphModifier'; +import { Builder } from '@ohos.arkui.component'; /** * Declaration of the menu item on the right side. * diff --git a/api/@ohos.arkui.advanced.Dialog.static.d.ets b/api/@ohos.arkui.advanced.Dialog.static.d.ets index 8998b01219..9d92654ff9 100644 --- a/api/@ohos.arkui.advanced.Dialog.static.d.ets +++ b/api/@ohos.arkui.advanced.Dialog.static.d.ets @@ -20,15 +20,15 @@ * @arkts 1.2 */ import { Theme, CustomTheme } from './@ohos.arkui.theme'; -import { Component, CustomDialog } from './arkui/component/customComponent'; -import { ResourceStr, ResourceColor, Padding, LocalizedPadding, SizeOptions } from './arkui/component/units'; -import { ButtonStyleMode, ButtonRole } from './arkui/component/button'; -import { PixelMap, ThemeColorMode, CustomPopupOptions } from './arkui/component/common'; +import { Component, CustomDialog } from '@ohos.arkui.component'; +import { ResourceStr, ResourceColor, Padding, LocalizedPadding, SizeOptions } from '@ohos.arkui.component'; +import { ButtonStyleMode, ButtonRole } from '@ohos.arkui.component'; +import { PixelMap, ThemeColorMode, CustomPopupOptions } from '@ohos.arkui.component'; import { PropRef, Prop, Link, Require } from './arkui/stateManagement/decorator'; import { Callback } from './@ohos.base'; -import { CustomDialogController } from './arkui/component/customDialogController'; -import { BuilderParam, Builder } from './arkui/component/builder'; -import { SheetInfo } from './arkui/component/actionSheet'; +import { CustomDialogController } from '@ohos.arkui.component'; +import { BuilderParam, Builder } from '@ohos.arkui.component'; +import { SheetInfo } from '@ohos.arkui.component'; /** * Declare ButtonOptions * diff --git a/api/@ohos.arkui.advanced.EditableTitleBar.static.d.ets b/api/@ohos.arkui.advanced.EditableTitleBar.static.d.ets index 86960d70de..76d62e4539 100644 --- a/api/@ohos.arkui.advanced.EditableTitleBar.static.d.ets +++ b/api/@ohos.arkui.advanced.EditableTitleBar.static.d.ets @@ -19,12 +19,12 @@ * @kit ArkUI * @arkts 1.2 */ -import { ResourceStr, ResourceColor, LocalizedMargin } from './arkui/component/units'; -import { SafeAreaType, SafeAreaEdge, BlurStyle } from './arkui/component/common'; -import { Component } from './arkui/component/customComponent'; -import { SymbolGlyphModifier } from './arkui/SymbolGlyphModifier'; +import { ResourceStr, ResourceColor, LocalizedMargin } from '@ohos.arkui.component'; +import { SafeAreaType, SafeAreaEdge, BlurStyle } from '@ohos.arkui.component'; +import { Component } from '@ohos.arkui.component'; +import { SymbolGlyphModifier } from 'arkui.SymbolGlyphModifier'; import { PropRef } from './arkui/stateManagement/decorator'; -import { Builder } from './arkui/component/builder'; +import { Builder } from '@ohos.arkui.component'; /** * Declaration of the menu item on the right side. * diff --git a/api/@ohos.arkui.advanced.ExceptionPrompt.static.d.ets b/api/@ohos.arkui.advanced.ExceptionPrompt.static.d.ets index 99a72c3f38..2e8632147d 100644 --- a/api/@ohos.arkui.advanced.ExceptionPrompt.static.d.ets +++ b/api/@ohos.arkui.advanced.ExceptionPrompt.static.d.ets @@ -19,11 +19,11 @@ * @kit ArkUI * @arkts 1.2 */ -import { ResourceStr, Dimension } from './arkui/component/units'; +import { ResourceStr, Dimension } from '@ohos.arkui.component'; import { PropRef } from './arkui/stateManagement/decorator'; -import { Component } from './arkui/component/customComponent'; -import { SymbolGlyphModifier } from './arkui/SymbolGlyphModifier'; -import { Builder } from './arkui/component/builder'; +import { Component } from '@ohos.arkui.component'; +import { SymbolGlyphModifier } from 'arkui.SymbolGlyphModifier'; +import { Builder } from '@ohos.arkui.component'; /** * Control margin status of ExceptionPrompt. * diff --git a/api/@ohos.arkui.advanced.Filter.static.d.ets b/api/@ohos.arkui.advanced.Filter.static.d.ets index f88a9b7d0c..0e56de3f1c 100644 --- a/api/@ohos.arkui.advanced.Filter.static.d.ets +++ b/api/@ohos.arkui.advanced.Filter.static.d.ets @@ -19,9 +19,9 @@ * @kit ArkUI * @arkts 1.2 */ -import { Component } from './arkui/component/customComponent'; -import { ResourceStr } from './arkui/component/units'; -import { BuilderParam, Builder } from './arkui/component/builder'; +import { Component } from '@ohos.arkui.component'; +import { ResourceStr } from '@ohos.arkui.component'; +import { BuilderParam, Builder } from '@ohos.arkui.component'; import { PropRef } from './arkui/stateManagement/decorator'; /** * Declare FilterType diff --git a/api/@ohos.arkui.advanced.GridObjectSortComponent.d.ets b/api/@ohos.arkui.advanced.GridObjectSortComponent.d.ets index 98356fbb68..4d104756f4 100644 --- a/api/@ohos.arkui.advanced.GridObjectSortComponent.d.ets +++ b/api/@ohos.arkui.advanced.GridObjectSortComponent.d.ets @@ -19,9 +19,9 @@ */ /*** if arkts 1.2 */ -import { Resource, ResourceStr, ResourceColor, LocalizedMargin } from './arkui/component/units'; +import { Resource, ResourceStr, ResourceColor, LocalizedMargin } from '@ohos.arkui.component'; import { Prop } from './arkui/stateManagement/common'; -import { Component } from './arkui/component/customComponent'; +import { Component } from '@ohos.arkui.component'; /*** endif */ /** diff --git a/api/@ohos.arkui.advanced.ProgressButton.static.d.ets b/api/@ohos.arkui.advanced.ProgressButton.static.d.ets index 953aca8f52..70b6dee48a 100644 --- a/api/@ohos.arkui.advanced.ProgressButton.static.d.ets +++ b/api/@ohos.arkui.advanced.ProgressButton.static.d.ets @@ -19,12 +19,12 @@ * @kit ArkUI * @arkts 1.2 */ -import { Component } from './arkui/component/customComponent'; +import { Component } from '@ohos.arkui.component'; import { PropRef } from './arkui/stateManagement/decorator'; -import { ResourceColor, ResourceStr } from './arkui/component/units'; -import { Builder } from './arkui/component/builder'; -import { LengthMetrics } from './arkui/Graphics'; -import { Length } from './arkui/component/common'; +import { ResourceColor, ResourceStr } from '@ohos.arkui.component'; +import { Builder } from '@ohos.arkui.component'; +import { LengthMetrics } from 'arkui.Graphics'; +import { Length } from '@ohos.arkui.component'; /** * Declare Component ProgressButton * @struct { ProgressButton } diff --git a/api/@ohos.arkui.advanced.SplitLayout.static.d.ets b/api/@ohos.arkui.advanced.SplitLayout.static.d.ets index 18c9a9946b..611ea2d37c 100644 --- a/api/@ohos.arkui.advanced.SplitLayout.static.d.ets +++ b/api/@ohos.arkui.advanced.SplitLayout.static.d.ets @@ -19,10 +19,10 @@ * @kit ArkUI * @arkts 1.2 */ -import { ResourceStr } from './arkui/component/units'; +import { ResourceStr } from '@ohos.arkui.component'; import { State, PropRef } from './arkui/stateManagement/decorator'; -import { Component } from './arkui/component/customComponent'; -import { BuilderParam, Builder } from './arkui/component/builder'; +import { Component } from '@ohos.arkui.component'; +import { BuilderParam, Builder } from '@ohos.arkui.component'; /** * Declare SplitLayout.The SplitLayout is used for upper and lower graphic layouts. * @struct { SplitLayout } diff --git a/api/@ohos.arkui.advanced.SubHeader.d.ets b/api/@ohos.arkui.advanced.SubHeader.d.ets index 547d2f9016..3553e5d8ce 100644 --- a/api/@ohos.arkui.advanced.SubHeader.d.ets +++ b/api/@ohos.arkui.advanced.SubHeader.d.ets @@ -21,11 +21,11 @@ import { TextModifier } from './@ohos.arkui.modifier'; /*** if arkts 1.2 */ -import { Resource, ResourceStr, ResourceColor, LocalizedPadding, LocalizedMargin } from './arkui/component/units'; +import { Resource, ResourceStr, ResourceColor, LocalizedPadding, LocalizedMargin } from '@ohos.arkui.component'; import { SymbolEffectStrategy, SymbolRenderingStrategy } from './arkui/component/symbolglyph'; import { SelectOption } from './arkui/component/select'; import { Prop, BuilderParam } from './arkui/stateManagement/common'; -import { Component } from './arkui/component/customComponent'; +import { Component } from '@ohos.arkui.component'; import { FontWeight } from './arkui/component/enums'; /*** endif */ diff --git a/api/@ohos.arkui.advanced.SubHeader.static.d.ets b/api/@ohos.arkui.advanced.SubHeader.static.d.ets index bf9577d0a6..442368e28e 100644 --- a/api/@ohos.arkui.advanced.SubHeader.static.d.ets +++ b/api/@ohos.arkui.advanced.SubHeader.static.d.ets @@ -20,13 +20,13 @@ * @arkts 1.2 */ import { TextModifier } from './arkui/TextModifier'; -import { ResourceStr, Resource, ResourceColor, LocalizedMargin, LocalizedPadding } from './arkui/component/units'; -import { SelectOption } from './arkui/component/select'; +import { ResourceStr, Resource, ResourceColor, LocalizedMargin, LocalizedPadding } from '@ohos.arkui.component'; +import { SelectOption } from '@ohos.arkui.component'; import { PropRef } from './arkui/stateManagement/decorator'; -import { Component } from './arkui/component/customComponent'; -import { FontWeight } from './arkui/component/enums'; -import { SymbolEffectStrategy, SymbolRenderingStrategy } from './arkui/component/symbolglyph'; -import { BuilderParam, Builder } from './arkui/component/builder'; +import { Component } from '@ohos.arkui.component'; +import { FontWeight } from '@ohos.arkui.component'; +import { SymbolEffectStrategy, SymbolRenderingStrategy } from '@ohos.arkui.component'; +import { BuilderParam, Builder } from '@ohos.arkui.component'; /** * Control style of operation element * diff --git a/api/@ohos.arkui.advanced.SwipeRefresher.static.d.ets b/api/@ohos.arkui.advanced.SwipeRefresher.static.d.ets index 41412209f6..85ab8cc896 100644 --- a/api/@ohos.arkui.advanced.SwipeRefresher.static.d.ets +++ b/api/@ohos.arkui.advanced.SwipeRefresher.static.d.ets @@ -19,10 +19,10 @@ * @kit ArkUI * @arkts 1.2 */ -import { ResourceStr } from './arkui/component/units'; +import { ResourceStr } from '@ohos.arkui.component'; import { PropRef } from './arkui/stateManagement/decorator'; -import { Component } from './arkui/component/customComponent'; -import { Builder } from './arkui/component/builder'; +import { Component } from '@ohos.arkui.component'; +import { Builder } from '@ohos.arkui.component'; /** * Declare component SwipeRefresher * @struct { SwipeRefresher } diff --git a/api/@ohos.arkui.advanced.TabTitleBar.static.d.ets b/api/@ohos.arkui.advanced.TabTitleBar.static.d.ets index 884efb555c..d5eea2e0c8 100644 --- a/api/@ohos.arkui.advanced.TabTitleBar.static.d.ets +++ b/api/@ohos.arkui.advanced.TabTitleBar.static.d.ets @@ -19,10 +19,10 @@ * @kit ArkUI * @arkts 1.2 */ -import { Component } from './arkui/component/customComponent'; -import { ResourceStr } from './arkui/component/units'; -import { SymbolGlyphModifier } from './arkui/SymbolGlyphModifier'; -import { BuilderParam, Builder } from './arkui/component/builder'; +import { Component } from '@ohos.arkui.component'; +import { ResourceStr } from '@ohos.arkui.component'; +import { SymbolGlyphModifier } from 'arkui.SymbolGlyphModifier'; +import { BuilderParam, Builder } from '@ohos.arkui.component'; /** * Declaration of the menu item on the right side. * diff --git a/api/@ohos.arkui.advanced.ToolBar.static.d.ets b/api/@ohos.arkui.advanced.ToolBar.static.d.ets index 2b82fb1557..983fbf598f 100644 --- a/api/@ohos.arkui.advanced.ToolBar.static.d.ets +++ b/api/@ohos.arkui.advanced.ToolBar.static.d.ets @@ -19,14 +19,14 @@ * @kit ArkUI * @arkts 1.2 */ -import { Component } from './arkui/component/customComponent'; -import { ResourceStr, Resource, ResourceColor } from './arkui/component/units'; +import { Component } from '@ohos.arkui.component'; +import { ResourceStr, Resource, ResourceColor } from '@ohos.arkui.component'; import { PropRef, Observed, ObjectLink } from './arkui/stateManagement/decorator'; -import { SymbolGlyphModifier } from './arkui/SymbolGlyphModifier'; -import { DividerModifier } from './arkui/DividerModifier'; -import { LengthMetrics } from './arkui/Graphics'; -import { TabsController } from './arkui/component/tabs'; -import { Builder } from './arkui/component/builder'; +import { SymbolGlyphModifier } from 'arkui.SymbolGlyphModifier'; +import { DividerModifier } from 'arkui.DividerModifier'; +import { LengthMetrics } from 'arkui.Graphics'; +import { TabsController } from '@ohos.arkui.component'; +import { Builder } from '@ohos.arkui.component'; /** * Declare enum ItemState. * diff --git a/api/@ohos.arkui.advanced.TreeView.static.d.ets b/api/@ohos.arkui.advanced.TreeView.static.d.ets index c1ee31c87a..7164550491 100644 --- a/api/@ohos.arkui.advanced.TreeView.static.d.ets +++ b/api/@ohos.arkui.advanced.TreeView.static.d.ets @@ -19,10 +19,10 @@ * @kit ArkUI * @arkts 1.2 */ -import { ResourceStr } from './arkui/component/units'; -import { Component } from './arkui/component/customComponent'; -import { SymbolGlyphModifier } from './arkui/SymbolGlyphModifier'; -import { Builder } from './arkui/component/builder'; +import { ResourceStr } from '@ohos.arkui.component'; +import { Component } from '@ohos.arkui.component'; +import { SymbolGlyphModifier } from 'arkui.SymbolGlyphModifier'; +import { Builder } from '@ohos.arkui.component'; /** * Control style of operation element * diff --git a/api/@ohos.arkui.componentSnapshot.static.d.ets b/api/@ohos.arkui.componentSnapshot.static.d.ets index f24eb7c1e6..9d8af7bcee 100644 --- a/api/@ohos.arkui.componentSnapshot.static.d.ets +++ b/api/@ohos.arkui.componentSnapshot.static.d.ets @@ -17,7 +17,7 @@ * @kit ArkUI * @arkts 1.2 */ -import { CustomBuilder } from './arkui/component/builder'; +import { CustomBuilder } from '@ohos.arkui.component'; import { AsyncCallback } from './@ohos.base'; import image from './@ohos.multimedia.image'; diff --git a/api/@ohos.arkui.dragController.static.d.ets b/api/@ohos.arkui.dragController.static.d.ets index a78d8c648f..73c8e57283 100644 --- a/api/@ohos.arkui.dragController.static.d.ets +++ b/api/@ohos.arkui.dragController.static.d.ets @@ -17,10 +17,10 @@ * @kit ArkUI * @arkts 1.2 */ -import { DragEvent, DragPreviewOptions, DragItemInfo, ICurve } from './arkui/component/common'; -import { CustomBuilder } from './arkui/component/builder'; -import { TouchPoint, ResourceColor } from './arkui/component/units'; -import { Curve } from './arkui/component/enums'; +import { DragEvent, DragPreviewOptions, DragItemInfo, ICurve } from '@ohos.arkui.component'; +import { CustomBuilder } from '@ohos.arkui.component'; +import { TouchPoint, ResourceColor } from '@ohos.arkui.component'; +import { Curve } from '@ohos.arkui.component'; import type { AsyncCallback, BusinessError, Callback } from './@ohos.base'; import type unifiedDataChannel from './@ohos.data.unifiedDataChannel'; diff --git a/api/@ohos.arkui.modifier.static.d.ets b/api/@ohos.arkui.modifier.static.d.ets index e09e283e64..724cee86b0 100644 --- a/api/@ohos.arkui.modifier.static.d.ets +++ b/api/@ohos.arkui.modifier.static.d.ets @@ -246,7 +246,7 @@ export { ButtonModifier } from './arkui/ButtonModifier'; * @syscap SystemCapability.ArkUI.ArkUI.Full * @since 20 */ -export { SymbolGlyphModifier } from './arkui/SymbolGlyphModifier'; +export { SymbolGlyphModifier } from 'arkui.SymbolGlyphModifier'; /** * Export LineModifier, which is used to update attributes to native side. diff --git a/api/@ohos.arkui.node.d.ts b/api/@ohos.arkui.node.d.ts index 7c332a641f..e384de6c31 100644 --- a/api/@ohos.arkui.node.d.ts +++ b/api/@ohos.arkui.node.d.ts @@ -29,8 +29,7 @@ * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts { '1.1':'12','1.2':'20' } - * @arkts 1.1&1.2 + * @since 12 */ export { NodeRenderType, RenderOptions, BuilderNode } from './arkui/BuilderNode'; @@ -39,8 +38,7 @@ export { NodeRenderType, RenderOptions, BuilderNode } from './arkui/BuilderNode' * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts { '1.1':'12','1.2':'20' } - * @arkts 1.1&1.2 + * @since 12 */ export { BuildOptions } from './arkui/BuilderNode'; @@ -68,8 +66,7 @@ export { InputEventType } from './arkui/BuilderNode'; * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts { '1.1':'12','1.2':'20' } - * @arkts 1.1&1.2 + * @since 12 */ export { NodeController } from './arkui/NodeController'; @@ -96,19 +93,7 @@ export { FrameNode, LayoutConstraint, ExpandMode, UIState } from './arkui/FrameN * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 20 - * @arkts 1.2 - */ -export { FrameNode, LayoutConstraint, ExpandMode } from './arkui/FrameNode'; - -/** - * Export FrameNode. FrameNode defines a basic type of node which contains a RenderNode. - * - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since arkts { '1.1':'12','1.2':'20' } - * @arkts 1.1&1.2 + * @since 12 */ export { typeNode, NodeAdapter } from './arkui/FrameNode'; @@ -125,8 +110,7 @@ export { typeNode, NodeAdapter } from './arkui/FrameNode'; * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts { '1.1':'12','1.2':'20' } - * @arkts 1.1&1.2 + * @since 12 */ export { DrawContext, Size, Offset, Position, Pivot, Scale, Translation, Matrix4, Rotation, Frame, RoundRect, Circle, CommandPath, ShapeMask, ShapeClip, BorderRadiuses, CornerRadius, Rect, Edges, edgeColors, edgeWidths, borderStyles, borderRadiuses, LengthMetricsUnit } from './arkui/Graphics'; @@ -136,8 +120,7 @@ export { DrawContext, Size, Offset, Position, Pivot, Scale, Translation, Matrix4 * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts { '1.1':'12','1.2':'20' } - * @arkts 1.1&1.2 + * @since 12 */ export { LengthUnit, SizeT, LengthMetrics, ColorMetrics } from './arkui/Graphics'; @@ -154,8 +137,7 @@ export { LengthUnit, SizeT, LengthMetrics, ColorMetrics } from './arkui/Graphics * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts { '1.1':'12','1.2':'20' } - * @arkts 1.1&1.2 + * @since 12 */ export { RenderNode } from './arkui/RenderNode'; @@ -182,8 +164,7 @@ export { XComponentNode } from './arkui/XComponentNode'; * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts { '1.1':'12','1.2':'20' } - * @arkts 1.1&1.2 + * @since 12 */ export { Content } from './arkui/Content'; @@ -193,8 +174,7 @@ export { Content } from './arkui/Content'; * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts { '1.1':'12','1.2':'20' } - * @arkts 1.1&1.2 + * @since 12 */ export { ComponentContent , ComponentContentBase } from './arkui/ComponentContent'; @@ -204,7 +184,6 @@ export { ComponentContent , ComponentContentBase } from './arkui/ComponentConten * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts { '1.1':'12','1.2':'20' } - * @arkts 1.1&1.2 + * @since 12 */ export { NodeContent } from './arkui/NodeContent'; \ No newline at end of file diff --git a/api/@ohos.arkui.node.static.d.ets b/api/@ohos.arkui.node.static.d.ets new file mode 100644 index 0000000000..2e253c22a3 --- /dev/null +++ b/api/@ohos.arkui.node.static.d.ets @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * @file + * @kit ArkUI + * @arkts 1.2 + */ + +export { NodeRenderType, RenderOptions, BuilderNode } from 'arkui.BuilderNode'; +/** + * Export BuildOptions which is used to create a node trees by builder function and manage the update of the tree. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export { BuildOptions } from 'arkui.BuilderNode'; + +/** + * Export NodeController, which defines the controller of node container. Provides lifecycle callbacks for the associated NodeContainer + * and methods to control the child node of the NodeContainer. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export { NodeController } from 'arkui.NodeController'; +/** + * Export FrameNode. FrameNode defines a basic type of node which contains a RenderNode. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export { FrameNode, LayoutConstraint, ExpandMode } from 'arkui.FrameNode'; +/** + * Export FrameNode. FrameNode defines a basic type of node which contains a RenderNode. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export { typeNode, NodeAdapter } from 'arkui.FrameNode'; + +/** + * Export Graphics. Defines the basic types related to the Graphics. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export { DrawContext, Size, Offset, Position, Pivot, Scale, Translation, Matrix4, Rotation, Frame, RoundRect, Circle, CommandPath, ShapeMask, ShapeClip, BorderRadiuses, CornerRadius, Rect, Edges, edgeColors, edgeWidths, borderStyles, borderRadiuses, LengthMetricsUnit } from 'arkui.Graphics'; +/** + * Export Graphics. Defines the basic types related to the Graphics. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export { LengthUnit, SizeT, LengthMetrics, ColorMetrics } from 'arkui.Graphics'; + +/** + * Export RenderNode. RenderNode contains node tree operations and render property operations on node. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export { RenderNode } from 'arkui.RenderNode'; +/** + * Export Content. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export { Content } from 'arkui.Content'; +/** + * Export ComponentContent. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export { ComponentContent, ComponentContentBase } from 'arkui.ComponentContent'; +/** + * Export NodeContent. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export { NodeContent } from 'arkui.NodeContent'; diff --git a/api/@ohos.arkui.observer.static.d.ets b/api/@ohos.arkui.observer.static.d.ets index 96c1b2bcc3..704b73f452 100644 --- a/api/@ohos.arkui.observer.static.d.ets +++ b/api/@ohos.arkui.observer.static.d.ets @@ -19,12 +19,12 @@ * @kit ArkUI * @arkts 1.2 */ -import { ResourceStr } from './arkui/component/units'; -import { NavPathStack, NavigationOperation, NavBar } from './arkui/component/navigation'; +import { ResourceStr } from '@ohos.arkui.component'; +import { NavPathStack, NavigationOperation, NavBar } from '@ohos.arkui.component'; import { UIContext } from '@ohos.arkui.UIContext'; import UIAbilityContext from './application/UIAbilityContext'; import { Callback } from './@ohos.base'; -import { NavDestinationMode } from './arkui/component/navDestination'; +import { NavDestinationMode } from '@ohos.arkui.component'; /** * Register callbacks to observe ArkUI behavior. diff --git a/api/@ohos.arkui.shape.static.d.ets b/api/@ohos.arkui.shape.static.d.ets index c84cfe09e2..64fab1d291 100644 --- a/api/@ohos.arkui.shape.static.d.ets +++ b/api/@ohos.arkui.shape.static.d.ets @@ -20,7 +20,7 @@ * @arkts 1.2 */ -import { Position, ResourceColor, Length, SizeOptions } from './arkui/component/units'; +import { Position, ResourceColor, Length, SizeOptions } from '@ohos.arkui.component'; /** * Interface for shape size properties. * diff --git a/api/@ohos.arkui.theme.static.d.ets b/api/@ohos.arkui.theme.static.d.ets index 01238b37d2..4774b998fb 100644 --- a/api/@ohos.arkui.theme.static.d.ets +++ b/api/@ohos.arkui.theme.static.d.ets @@ -19,7 +19,7 @@ * @kit ArkUI * @arkts 1.2 */ -import { ResourceColor } from './arkui/component/units'; +import { ResourceColor } from '@ohos.arkui.component'; /** * Defines the struct of Theme. * diff --git a/api/@ohos.graphics.displaySync.d.ts b/api/@ohos.graphics.displaySync.d.ts index 18e8192b67..74bf70b2ac 100644 --- a/api/@ohos.graphics.displaySync.d.ts +++ b/api/@ohos.graphics.displaySync.d.ts @@ -21,7 +21,7 @@ import type { Callback } from './@ohos.base'; /*** if arkts 1.2 */ -import { ExpectedFrameRateRange } from './arkui/component/common'; +import { ExpectedFrameRateRange } from '@ohos.arkui.component'; /*** endif */ /** diff --git a/api/@ohos.i18n.d.ts b/api/@ohos.i18n.d.ts index 0dcb20174c..557c6e8b43 100644 --- a/api/@ohos.i18n.d.ts +++ b/api/@ohos.i18n.d.ts @@ -23,7 +23,7 @@ import { BusinessError } from './@ohos.base'; import intl from './@ohos.intl'; /*** endif */ /*** if arkts 1.2 */ -import { StyledString, TextStyle } from './arkui/component/styledString'; +import { StyledString, TextStyle } from '@ohos.arkui.component'; /*** endif */ /** diff --git a/api/@ohos.measure.static.d.ets b/api/@ohos.measure.static.d.ets index bdb4f3a5b9..381999de45 100644 --- a/api/@ohos.measure.static.d.ets +++ b/api/@ohos.measure.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { FontStyle, FontWeight, TextAlign, TextOverflow, TextCase, WordBreak } from './arkui/component/enums' -import { SizeOptions } from './arkui/component/units'; +import { FontStyle, FontWeight, TextAlign, TextOverflow, TextCase, WordBreak } from '@ohos.arkui.component' +import { SizeOptions } from '@ohos.arkui.component'; import { Resource } from './global/resource' /** diff --git a/api/@ohos.promptAction.static.d.ets b/api/@ohos.promptAction.static.d.ets index 5344f93790..f656437742 100644 --- a/api/@ohos.promptAction.static.d.ets +++ b/api/@ohos.promptAction.static.d.ets @@ -18,15 +18,15 @@ * @kit ArkUI * @arkts 1.2 */ -import { ResourceColor, Offset, Dimension, EdgeStyles, EdgeColors, EdgeWidths, BorderRadiuses } from './arkui/component/units'; -import { AsyncCallback, Callback } from './@ohos.base'; -import { BlurStyle, ShadowOptions, ShadowStyle, HoverModeAreaType, Rectangle, TransitionEffect, KeyboardAvoidMode, DismissReason, BackgroundBlurStyleOptions, BackgroundEffectOptions } from './arkui/component/common'; -import { CustomBuilder } from './arkui/component/builder'; -import { DialogAlignment } from './arkui/component/alertDialog'; -import { DismissDialogAction } from './arkui/component/actionSheet'; -import { BorderStyle, Alignment } from './arkui/component/enums'; -import { Resource } from './global/resource'; -import { LengthMetrics } from './arkui/Graphics'; +import { ResourceColor, Offset, Dimension, EdgeStyles, EdgeColors, EdgeWidths, BorderRadiuses } from '@ohos.arkui.component'; +import { AsyncCallback, Callback } from '@ohos.base'; +import { BlurStyle, ShadowOptions, ShadowStyle, HoverModeAreaType, Rectangle, TransitionEffect, KeyboardAvoidMode, DismissReason, BackgroundBlurStyleOptions, BackgroundEffectOptions } from '@ohos.arkui.component'; +import { CustomBuilder } from '@ohos.arkui.component'; +import { DialogAlignment } from '@ohos.arkui.component'; +import { DismissDialogAction } from '@ohos.arkui.component'; +import { BorderStyle, Alignment } from '@ohos.arkui.component'; +import { Resource } from 'global.resource'; +import { LengthMetrics } from 'arkui.Graphics'; /** * Define the display mode of all kind of dialog * diff --git a/api/arkui/AttributeUpdater.static.d.ets b/api/arkui/AttributeUpdater.static.d.ets index ef4662f019..46938525e8 100644 --- a/api/arkui/AttributeUpdater.static.d.ets +++ b/api/arkui/AttributeUpdater.static.d.ets @@ -20,7 +20,7 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common' +import { AttributeModifier } from '@ohos.arkui.component'; /** diff --git a/api/arkui/BlankModifier.static.d.ets b/api/arkui/BlankModifier.static.d.ets index 9ce7ba4eaf..8084834705 100644 --- a/api/arkui/BlankModifier.static.d.ets +++ b/api/arkui/BlankModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { BlankAttribute } from './component/blank'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { BlankAttribute } from '@ohos.arkui.component'; /** * Defines Blank Modifier @@ -30,4 +30,4 @@ import { BlankAttribute } from './component/blank'; * @syscap SystemCapability.ArkUI.ArkUI.Full * @since 20 */ -export declare class BlankModifier implements BlankAttribute, AttributeModifier {} \ No newline at end of file +export declare class BlankModifier implements BlankAttribute, AttributeModifier {} diff --git a/api/arkui/BuilderNode.static.d.ets b/api/arkui/BuilderNode.static.d.ets index b688a38248..48ac3ff98d 100644 --- a/api/arkui/BuilderNode.static.d.ets +++ b/api/arkui/BuilderNode.static.d.ets @@ -20,11 +20,11 @@ * @arkts 1.2 */ -import { UIContext } from '../@ohos.arkui.UIContext'; -import { FrameNode } from './FrameNode'; -import { Size } from './Graphics'; -import { TouchEvent, MouseEvent, AxisEvent } from './component/common'; -import { WrappedBuilder, CustomBuilder, CustomBuilderT } from './component/builder'; +import { UIContext } from '@ohos.arkui.UIContext'; +import { FrameNode } from 'arkui.FrameNode'; +import { Size } from 'arkui.Graphics'; +import { TouchEvent, MouseEvent, AxisEvent } from '@ohos.arkui.component'; +import { WrappedBuilder, CustomBuilder, CustomBuilderT } from '@ohos.arkui.component'; /** * Render type of the node using for indicating that diff --git a/api/arkui/CalendarPickerModifier.static.d.ets b/api/arkui/CalendarPickerModifier.static.d.ets index c4cef34dd8..5fba649674 100644 --- a/api/arkui/CalendarPickerModifier.static.d.ets +++ b/api/arkui/CalendarPickerModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { CalendarPickerAttribute } from './component/calendarPicker'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { CalendarPickerAttribute } from '@ohos.arkui.component'; /** * Defines CalendarPicker Modifier diff --git a/api/arkui/CheckboxModifier.static.d.ets b/api/arkui/CheckboxModifier.static.d.ets index c8e634aa4d..67686cc26e 100755 --- a/api/arkui/CheckboxModifier.static.d.ets +++ b/api/arkui/CheckboxModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { CheckboxAttribute } from './component/checkbox'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { CheckboxAttribute } from '@ohos.arkui.component'; /** * Defines Checkbox Modifier diff --git a/api/arkui/ColumnModifier.static.d.ets b/api/arkui/ColumnModifier.static.d.ets index c2fc15f304..dd79174657 100644 --- a/api/arkui/ColumnModifier.static.d.ets +++ b/api/arkui/ColumnModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { ColumnAttribute } from './component/column'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { ColumnAttribute } from '@ohos.arkui.component'; /** * Defines Column Modifier @@ -29,4 +29,4 @@ import { ColumnAttribute } from './component/column'; * @syscap SystemCapability.ArkUI.ArkUI.Full * @since 20 */ -export declare class ColumnModifier implements ColumnAttribute, AttributeModifier {} \ No newline at end of file +export declare class ColumnModifier implements ColumnAttribute, AttributeModifier {} diff --git a/api/arkui/ColumnSplitModifier.static.d.ets b/api/arkui/ColumnSplitModifier.static.d.ets index f575f09cf2..739700c2ca 100644 --- a/api/arkui/ColumnSplitModifier.static.d.ets +++ b/api/arkui/ColumnSplitModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { ColumnSplitAttribute } from './component/columnSplit'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { ColumnSplitAttribute } from '@ohos.arkui.component'; /** * Defines ColumnSplit Modifier diff --git a/api/arkui/CommonModifier.static.d.ets b/api/arkui/CommonModifier.static.d.ets index a6cac8915b..4f0636ee80 100644 --- a/api/arkui/CommonModifier.static.d.ets +++ b/api/arkui/CommonModifier.static.d.ets @@ -20,7 +20,7 @@ * @arkts 1.2 */ -import { AttributeModifier, CommonAttribute } from './component/common'; +import { AttributeModifier, CommonAttribute } from '@ohos.arkui.component'; /** * Defines Common Modifier diff --git a/api/arkui/ComponentContent.static.d.ets b/api/arkui/ComponentContent.static.d.ets index 1143847e3c..e1d14e3fa9 100644 --- a/api/arkui/ComponentContent.static.d.ets +++ b/api/arkui/ComponentContent.static.d.ets @@ -20,10 +20,10 @@ * @arkts 1.2 */ -import { BuildOptions } from './BuilderNode'; -import { Content } from './Content'; -import { UIContext } from '../@ohos.arkui.UIContext'; -import { WrappedBuilder, CustomBuilder, CustomBuilderT } from './component/builder'; +import { BuildOptions } from 'arkui.BuilderNode'; +import { Content } from 'arkui.Content'; +import { UIContext } from '@ohos.arkui.UIContext'; +import { WrappedBuilder, CustomBuilder, CustomBuilderT } from '@ohos.arkui.component'; /** * Defines the base class for ComponentContent. * diff --git a/api/arkui/ContainerSpanModifier.static.d.ets b/api/arkui/ContainerSpanModifier.static.d.ets index 0cf4cd87c3..c9a3384d8b 100644 --- a/api/arkui/ContainerSpanModifier.static.d.ets +++ b/api/arkui/ContainerSpanModifier.static.d.ets @@ -22,8 +22,8 @@ -import { AttributeModifier } from './component/common'; -import { ContainerSpanAttribute } from './component/containerSpan'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { ContainerSpanAttribute } from '@ohos.arkui.component'; /** * Defines ContainerSpan Modifier diff --git a/api/arkui/CounterModifier.static.d.ets b/api/arkui/CounterModifier.static.d.ets index 5ddcec6a40..eb9b66b4ac 100644 --- a/api/arkui/CounterModifier.static.d.ets +++ b/api/arkui/CounterModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { CounterAttribute } from './component/counter'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { CounterAttribute } from '@ohos.arkui.component'; /** * Defines Counter Modifier diff --git a/api/arkui/DataPanelModifier.static.d.ets b/api/arkui/DataPanelModifier.static.d.ets index a6961ffa43..95f7709964 100644 --- a/api/arkui/DataPanelModifier.static.d.ets +++ b/api/arkui/DataPanelModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { DataPanelAttribute } from './component/dataPanel'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { DataPanelAttribute } from '@ohos.arkui.component'; /** * Defines DataPanel Modifier diff --git a/api/arkui/DatePickerModifier.static.d.ets b/api/arkui/DatePickerModifier.static.d.ets index 0109436141..a949bfdac4 100644 --- a/api/arkui/DatePickerModifier.static.d.ets +++ b/api/arkui/DatePickerModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { DatePickerAttribute } from './component/datePicker'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { DatePickerAttribute } from '@ohos.arkui.component'; /** * Defines DatePicker Modifier diff --git a/api/arkui/DividerModifier.static.d.ets b/api/arkui/DividerModifier.static.d.ets index 3e25c219f4..be36ba8be8 100644 --- a/api/arkui/DividerModifier.static.d.ets +++ b/api/arkui/DividerModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { DividerAttribute } from './component/divider'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { DividerAttribute } from '@ohos.arkui.component'; /** * Defines Divider Modifier diff --git a/api/arkui/FlexModifier.static.d.ets b/api/arkui/FlexModifier.static.d.ets index f3328cf0bb..2ab70aa98a 100644 --- a/api/arkui/FlexModifier.static.d.ets +++ b/api/arkui/FlexModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { FlexAttribute } from './component/flex'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { FlexAttribute } from '@ohos.arkui.component'; /** * Defines Flex Modifier diff --git a/api/arkui/FolderStackModifier.static.d.ets b/api/arkui/FolderStackModifier.static.d.ets index 8d93d297fb..cf7b1cd7d0 100644 --- a/api/arkui/FolderStackModifier.static.d.ets +++ b/api/arkui/FolderStackModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { FolderStackAttribute } from './component/folderStack'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { FolderStackAttribute } from '@ohos.arkui.component'; /** * Defines FolderStack Modifier diff --git a/api/arkui/FrameNode.static.d.ets b/api/arkui/FrameNode.static.d.ets index 7d01d7afda..093b22d5b2 100644 --- a/api/arkui/FrameNode.static.d.ets +++ b/api/arkui/FrameNode.static.d.ets @@ -19,57 +19,57 @@ * @arkts 1.2 */ -import { RenderNode } from './RenderNode'; -import { Size, Position, Edges, LengthMetrics, SizeT } from './Graphics'; -import { DrawContext } from './Graphics'; -import { ComponentContent } from './ComponentContent'; -import { BusinessError } from '../@ohos.base'; +import { RenderNode } from 'arkui.RenderNode'; +import { Size, Position, Edges, LengthMetrics, SizeT } from 'arkui.Graphics'; +import { DrawContext } from 'arkui.Graphics'; +import { ComponentContent } from 'arkui.ComponentContent'; +import { BusinessError } from '@ohos.base'; import { UIContext } from '@ohos.arkui.UIContext'; -import { UICommonEvent, UIGestureEvent, CommonAttribute, CustomProperty } from './component/common'; -import { SwiperAttribute, SwiperController } from './component/swiper'; -import { ScrollAttribute, Scroller } from './component/scroll'; -import { ListAttribute, ListOptions } from './component/list'; -import { ListItemAttribute, ListItemOptions } from './component/listItem'; -import { ListItemGroupAttribute, ListItemGroupOptions } from './component/listItemGroup'; -import { WaterFlowAttribute, WaterFlowOptions } from './component/waterFlow'; -import { FlowItemAttribute } from './component/flowItem'; -import { GridAttribute, GridLayoutOptions } from './component/grid'; -import { GridItemAttribute, GridItemOptions } from './component/gridItem'; -import { Resource } from '../global/resource'; -import { TextAttribute, TextOptions } from './component/text'; -import { TextInputAttribute, TextInputOptions } from './component/textInput'; -import { TextAreaAttribute, TextAreaOptions } from './component/textArea'; -import { SearchAttribute, SearchOptions } from './component/search'; -import { SymbolGlyphAttribute } from './component/symbolglyph'; -import { MarqueeAttribute, MarqueeOptions } from './component/marquee'; -import { ColumnAttribute, ColumnOptions, ColumnOptionsV2 } from './component/column'; -import { RowAttribute, RowOptions, RowOptionsV2 } from './component/row'; -import { StackAttribute, StackOptions } from './component/stack'; -import { FlexAttribute, FlexOptions } from './component/flex'; -import { RelativeContainerAttribute } from './component/relativeContainer'; -import { DividerAttribute } from './component/divider'; -import { BlankAttribute } from './component/blank'; -import { GridRowAttribute, GridRowOptions } from './component/gridRow'; -import { GridColAttribute, GridColOptions } from './component/gridCol'; -import { ProgressAttribute, ProgressOptions } from './component/progress'; -import { QRCodeAttribute } from './component/qrcode'; -import { BadgeAttribute, BadgeParamWithNumber, BadgeParamWithString } from './component/badge'; -import { TextClockAttribute, TextClockOptions } from './component/textClock'; -import { TextTimerAttribute, TextTimerOptions } from './component/textTimer'; -import { ImageAttribute, ImageContent } from './component/image'; -import { DrawableDescriptor } from '../@ohos.arkui.drawableDescriptor'; -import { ButtonAttribute, ButtonOptions } from './component/button'; -import { CheckboxOptions, CheckboxAttribute } from './component/checkbox'; -import { RadioOptions, RadioAttribute } from './component/radio'; -import { SliderAttribute, SliderOptions } from './component/slider'; -import { ToggleAttribute, ToggleOptions } from './component/toggle'; -import { CheckboxGroupAttribute, CheckboxGroupOptions } from './component/checkboxgroup'; -import { RatingAttribute, RatingOptions } from './component/rating'; -import { XComponentAttribute, XComponentController, XComponentOptions, XComponentParameters, NativeXComponentParameters } from './component/xcomponent'; -import image from '../@ohos.multimedia.image'; -import { ImageAIOptions } from './component/imageCommon'; -import { ResourceStr } from './component/units'; -import { LoadingProgressAttribute } from './component/loadingProgress'; +import { UICommonEvent, UIGestureEvent, CommonAttribute, CustomProperty } from '@ohos.arkui.component'; +import { SwiperAttribute, SwiperController } from '@ohos.arkui.component'; +import { ScrollAttribute, Scroller } from '@ohos.arkui.component'; +import { ListAttribute, ListOptions } from '@ohos.arkui.component'; +import { ListItemAttribute, ListItemOptions } from '@ohos.arkui.component'; +import { ListItemGroupAttribute, ListItemGroupOptions } from '@ohos.arkui.component'; +import { WaterFlowAttribute, WaterFlowOptions } from '@ohos.arkui.component'; +import { FlowItemAttribute } from '@ohos.arkui.component'; +import { GridAttribute, GridLayoutOptions } from '@ohos.arkui.component'; +import { GridItemAttribute, GridItemOptions } from '@ohos.arkui.component'; +import { Resource } from 'global.resource'; +import { TextAttribute, TextOptions } from '@ohos.arkui.component'; +import { TextInputAttribute, TextInputOptions } from '@ohos.arkui.component'; +import { TextAreaAttribute, TextAreaOptions } from '@ohos.arkui.component'; +import { SearchAttribute, SearchOptions } from '@ohos.arkui.component'; +import { SymbolGlyphAttribute } from '@ohos.arkui.component'; +import { MarqueeAttribute, MarqueeOptions } from '@ohos.arkui.component'; +import { ColumnAttribute, ColumnOptions, ColumnOptionsV2 } from '@ohos.arkui.component'; +import { RowAttribute, RowOptions, RowOptionsV2 } from '@ohos.arkui.component'; +import { StackAttribute, StackOptions } from '@ohos.arkui.component'; +import { FlexAttribute, FlexOptions } from '@ohos.arkui.component'; +import { RelativeContainerAttribute } from '@ohos.arkui.component'; +import { DividerAttribute } from '@ohos.arkui.component'; +import { BlankAttribute } from '@ohos.arkui.component'; +import { GridRowAttribute, GridRowOptions } from '@ohos.arkui.component'; +import { GridColAttribute, GridColOptions } from '@ohos.arkui.component'; +import { ProgressAttribute, ProgressOptions } from '@ohos.arkui.component'; +import { QRCodeAttribute } from '@ohos.arkui.component'; +import { BadgeAttribute, BadgeParamWithNumber, BadgeParamWithString } from '@ohos.arkui.component'; +import { TextClockAttribute, TextClockOptions } from '@ohos.arkui.component'; +import { TextTimerAttribute, TextTimerOptions } from '@ohos.arkui.component'; +import { ImageAttribute, ImageContent } from '@ohos.arkui.component'; +import { DrawableDescriptor } from '@ohos.arkui.drawableDescriptor'; +import { ButtonAttribute, ButtonOptions } from '@ohos.arkui.component'; +import { CheckboxOptions, CheckboxAttribute } from '@ohos.arkui.component'; +import { RadioOptions, RadioAttribute } from '@ohos.arkui.component'; +import { SliderAttribute, SliderOptions } from '@ohos.arkui.component'; +import { ToggleAttribute, ToggleOptions } from '@ohos.arkui.component'; +import { CheckboxGroupAttribute, CheckboxGroupOptions } from '@ohos.arkui.component'; +import { RatingAttribute, RatingOptions } from '@ohos.arkui.component'; +import { XComponentAttribute, XComponentController, XComponentOptions, XComponentParameters, NativeXComponentParameters } from '@ohos.arkui.component'; +import image from '@ohos.multimedia.image'; +import { ImageAIOptions } from '@ohos.arkui.component'; +import { ResourceStr } from '@ohos.arkui.component'; +import { LoadingProgressAttribute } from '@ohos.arkui.component'; /** diff --git a/api/arkui/GaugeModifier.static.d.ets b/api/arkui/GaugeModifier.static.d.ets index 27ee956b15..767e2e1706 100644 --- a/api/arkui/GaugeModifier.static.d.ets +++ b/api/arkui/GaugeModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { GaugeAttribute } from './component/gauge'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { GaugeAttribute } from '@ohos.arkui.component'; /** * Defines Gauge Modifier diff --git a/api/arkui/Graphics.static.d.ets b/api/arkui/Graphics.static.d.ets index da1d5b639e..2e10c0648a 100644 --- a/api/arkui/Graphics.static.d.ets +++ b/api/arkui/Graphics.static.d.ets @@ -19,11 +19,11 @@ * @kit ArkUI * @arkts 1.2 */ -import drawing from '../@ohos.graphics.drawing'; -import type common2D from '../@ohos.graphics.common2D'; -import { Resource } from '../global/resource'; -import { ResourceColor } from './component/units'; -import { BorderStyle } from './component/enums'; +import drawing from '@ohos.graphics.drawing'; +import type common2D from '@ohos.graphics.common2D'; +import { Resource } from 'global.resource'; +import { ResourceColor } from '@ohos.arkui.component'; +import { BorderStyle } from '@ohos.arkui.component'; /** * Size info. diff --git a/api/arkui/GridColModifier.static.d.ets b/api/arkui/GridColModifier.static.d.ets index 300a41cfbb..d3781a03e0 100644 --- a/api/arkui/GridColModifier.static.d.ets +++ b/api/arkui/GridColModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { GridColAttribute } from './component/gridCol'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { GridColAttribute } from '@ohos.arkui.component'; /** * Defines GridCol Modifier diff --git a/api/arkui/GridItemModifier.static.d.ets b/api/arkui/GridItemModifier.static.d.ets index 6b24afe7d6..a2e2619d21 100755 --- a/api/arkui/GridItemModifier.static.d.ets +++ b/api/arkui/GridItemModifier.static.d.ets @@ -20,8 +20,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { GridItemAttribute } from './component/gridItem'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { GridItemAttribute } from '@ohos.arkui.component'; /** * Defines GridItem Modifier diff --git a/api/arkui/GridModifier.static.d.ets b/api/arkui/GridModifier.static.d.ets index 74f6f823b0..8a147dbf7e 100755 --- a/api/arkui/GridModifier.static.d.ets +++ b/api/arkui/GridModifier.static.d.ets @@ -20,8 +20,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { GridAttribute } from './component/grid'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { GridAttribute } from '@ohos.arkui.component'; /** diff --git a/api/arkui/GridRowModifier.static.d.ets b/api/arkui/GridRowModifier.static.d.ets index ee49370e26..823e61c843 100644 --- a/api/arkui/GridRowModifier.static.d.ets +++ b/api/arkui/GridRowModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { GridRowAttribute } from './component/gridRow'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { GridRowAttribute } from '@ohos.arkui.component'; /** * Defines GridRow Modifier diff --git a/api/arkui/HyperlinkModifier.static.d.ets b/api/arkui/HyperlinkModifier.static.d.ets index 1b94894aab..c3ddabdac1 100644 --- a/api/arkui/HyperlinkModifier.static.d.ets +++ b/api/arkui/HyperlinkModifier.static.d.ets @@ -22,8 +22,8 @@ -import { AttributeModifier } from './component/common'; -import { HyperlinkAttribute } from './component/hyperlink'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { HyperlinkAttribute } from '@ohos.arkui.component'; /** * Defines Hyperlink Modifier diff --git a/api/arkui/ImageAnimatorModifier.static.d.ets b/api/arkui/ImageAnimatorModifier.static.d.ets index 8daae76888..b8c978f68c 100644 --- a/api/arkui/ImageAnimatorModifier.static.d.ets +++ b/api/arkui/ImageAnimatorModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { ImageAnimatorAttribute } from './component/imageAnimator'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { ImageAnimatorAttribute } from '@ohos.arkui.component'; /** * Defines ImageAnimator Modifier diff --git a/api/arkui/ImageSpanModifier.static.d.ets b/api/arkui/ImageSpanModifier.static.d.ets index 85fd18b61a..9be1549a14 100644 --- a/api/arkui/ImageSpanModifier.static.d.ets +++ b/api/arkui/ImageSpanModifier.static.d.ets @@ -22,8 +22,8 @@ -import { AttributeModifier } from './component/common'; -import { ImageSpanAttribute } from './component/imageSpan'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { ImageSpanAttribute } from '@ohos.arkui.component'; /** * Defines ImageSpan Modifier diff --git a/api/arkui/LineModifier.static.d.ets b/api/arkui/LineModifier.static.d.ets index 854042a4c2..d7ad85a5ee 100644 --- a/api/arkui/LineModifier.static.d.ets +++ b/api/arkui/LineModifier.static.d.ets @@ -13,8 +13,8 @@ * limitations under the License. */ -import { AttributeModifier } from './component/common'; -import { LineAttribute } from './component/line'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { LineAttribute } from '@ohos.arkui.component'; /** * @file diff --git a/api/arkui/ListItemGroupModifier.static.d.ets b/api/arkui/ListItemGroupModifier.static.d.ets index 35af8ac247..3a4961b592 100755 --- a/api/arkui/ListItemGroupModifier.static.d.ets +++ b/api/arkui/ListItemGroupModifier.static.d.ets @@ -20,8 +20,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { ListItemGroupAttribute } from './component/listItemGroup'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { ListItemGroupAttribute } from '@ohos.arkui.component'; /** diff --git a/api/arkui/ListItemModifier.static.d.ets b/api/arkui/ListItemModifier.static.d.ets index 10205482c8..239255c255 100755 --- a/api/arkui/ListItemModifier.static.d.ets +++ b/api/arkui/ListItemModifier.static.d.ets @@ -20,8 +20,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { ListItemAttribute } from './component/listItem'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { ListItemAttribute } from '@ohos.arkui.component'; /** diff --git a/api/arkui/ListModifier.static.d.ets b/api/arkui/ListModifier.static.d.ets index 7457f40ff6..9c6ee9a7ac 100755 --- a/api/arkui/ListModifier.static.d.ets +++ b/api/arkui/ListModifier.static.d.ets @@ -21,8 +21,8 @@ */ -import { AttributeModifier } from './component/common'; -import { ListAttribute } from './component/list'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { ListAttribute } from '@ohos.arkui.component'; /** diff --git a/api/arkui/LoadingProgressModifier.static.d.ets b/api/arkui/LoadingProgressModifier.static.d.ets index ed71e77a5a..d8911171e9 100644 --- a/api/arkui/LoadingProgressModifier.static.d.ets +++ b/api/arkui/LoadingProgressModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { LoadingProgressAttribute } from './component/loadingProgress'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { LoadingProgressAttribute } from '@ohos.arkui.component'; /** * Defines LoadingProgress Modifier diff --git a/api/arkui/MarqueeModifier.static.d.ets b/api/arkui/MarqueeModifier.static.d.ets index 0cc18159ef..243bf67c23 100644 --- a/api/arkui/MarqueeModifier.static.d.ets +++ b/api/arkui/MarqueeModifier.static.d.ets @@ -21,8 +21,8 @@ */ -import { AttributeModifier } from './component/common'; -import { MarqueeAttribute } from './component/marquee'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { MarqueeAttribute } from '@ohos.arkui.component'; /** diff --git a/api/arkui/MenuItemModifier.static.d.ets b/api/arkui/MenuItemModifier.static.d.ets index b16c6eeeb2..66cbda6c54 100755 --- a/api/arkui/MenuItemModifier.static.d.ets +++ b/api/arkui/MenuItemModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { MenuItemAttribute } from './component/menuItem'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { MenuItemAttribute } from '@ohos.arkui.component'; /** * Defines MenuItem Modifier diff --git a/api/arkui/MenuModifier.static.d.ets b/api/arkui/MenuModifier.static.d.ets index cbcd7cc932..5be9e268e1 100755 --- a/api/arkui/MenuModifier.static.d.ets +++ b/api/arkui/MenuModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { MenuAttribute } from './component/menu'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { MenuAttribute } from '@ohos.arkui.component'; /** * Defines Menu Modifier diff --git a/api/arkui/NavDestinationModifier.static.d.ets b/api/arkui/NavDestinationModifier.static.d.ets index 759d74ac79..c2f2e5905a 100644 --- a/api/arkui/NavDestinationModifier.static.d.ets +++ b/api/arkui/NavDestinationModifier.static.d.ets @@ -20,8 +20,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { NavDestinationAttribute } from './component/navDestination'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { NavDestinationAttribute } from '@ohos.arkui.component'; /** * Defines NavDestination Modifier diff --git a/api/arkui/NavigationModifier.static.d.ets b/api/arkui/NavigationModifier.static.d.ets index 4cb2d66285..6f5c82e3cd 100644 --- a/api/arkui/NavigationModifier.static.d.ets +++ b/api/arkui/NavigationModifier.static.d.ets @@ -19,8 +19,8 @@ * @kit ArkUI * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { NavigationAttribute } from './component/navigation'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { NavigationAttribute } from '@ohos.arkui.component'; /** * Defines Navigation Modifier diff --git a/api/arkui/NodeContent.static.d.ets b/api/arkui/NodeContent.static.d.ets index 0be7a00ca9..577b3c54cc 100644 --- a/api/arkui/NodeContent.static.d.ets +++ b/api/arkui/NodeContent.static.d.ets @@ -18,8 +18,8 @@ * @file * @kit ArkUI */ -import { Content } from './Content'; -import { FrameNode } from './FrameNode'; +import { Content } from 'arkui.Content'; +import { FrameNode } from 'arkui.FrameNode'; /** * NodeContent is the entity encapsulation of the node content. diff --git a/api/arkui/NodeController.static.d.ets b/api/arkui/NodeController.static.d.ets index a8e00a4c16..75ba77917f 100644 --- a/api/arkui/NodeController.static.d.ets +++ b/api/arkui/NodeController.static.d.ets @@ -20,11 +20,11 @@ * @arkts 1.2 */ -import { UIContext } from '../@ohos.arkui.UIContext'; -import { FrameNode } from './FrameNode'; -import { Size } from './Graphics'; -import { Callback } from '../@ohos.base'; -import { TouchEvent } from './component/common'; +import { UIContext } from '@ohos.arkui.UIContext'; +import { FrameNode } from 'arkui.FrameNode'; +import { Size } from 'arkui.Graphics'; +import { Callback } from '@ohos.base'; +import { TouchEvent } from '@ohos.arkui.component'; /** diff --git a/api/arkui/ParticleModifier.static.d.ets b/api/arkui/ParticleModifier.static.d.ets index e2365faf7c..3caeb35c58 100644 --- a/api/arkui/ParticleModifier.static.d.ets +++ b/api/arkui/ParticleModifier.static.d.ets @@ -21,8 +21,8 @@ */ -import { AttributeModifier } from './component/common'; -import { ParticleAttribute } from './component/particle'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { ParticleAttribute } from '@ohos.arkui.component'; /** diff --git a/api/arkui/PathModifier.static.d.ets b/api/arkui/PathModifier.static.d.ets index 85048b0bbb..dd281417fb 100644 --- a/api/arkui/PathModifier.static.d.ets +++ b/api/arkui/PathModifier.static.d.ets @@ -13,8 +13,8 @@ * limitations under the License. */ -import { AttributeModifier } from './component/common'; -import { PathAttribute } from './component/path'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { PathAttribute } from '@ohos.arkui.component'; /** * @file diff --git a/api/arkui/PatternLockModifier.static.d.ets b/api/arkui/PatternLockModifier.static.d.ets index 696417598e..365f040499 100644 --- a/api/arkui/PatternLockModifier.static.d.ets +++ b/api/arkui/PatternLockModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { PatternLockAttribute } from './component/patternLock'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { PatternLockAttribute } from '@ohos.arkui.component'; /** * Defines PatternLock Modifier diff --git a/api/arkui/PolygonModifier.static.d.ets b/api/arkui/PolygonModifier.static.d.ets index 8e9aa860dd..9fb408467b 100644 --- a/api/arkui/PolygonModifier.static.d.ets +++ b/api/arkui/PolygonModifier.static.d.ets @@ -13,8 +13,8 @@ * limitations under the License. */ -import { AttributeModifier } from './component/common'; -import { PolygonAttribute } from './component/polygon'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { PolygonAttribute } from '@ohos.arkui.component'; /** * @file diff --git a/api/arkui/PolylineModifier.static.d.ets b/api/arkui/PolylineModifier.static.d.ets index e5f89c093c..568a071312 100644 --- a/api/arkui/PolylineModifier.static.d.ets +++ b/api/arkui/PolylineModifier.static.d.ets @@ -13,8 +13,8 @@ * limitations under the License. */ -import { AttributeModifier } from './component/common'; -import { PolylineAttribute } from './component/polyline'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { PolylineAttribute } from '@ohos.arkui.component'; /** * @file diff --git a/api/arkui/ProgressModifier.static.d.ets b/api/arkui/ProgressModifier.static.d.ets index 0c1d3145c5..882c5c7b52 100644 --- a/api/arkui/ProgressModifier.static.d.ets +++ b/api/arkui/ProgressModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { ProgressAttribute } from './component/progress'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { ProgressAttribute } from '@ohos.arkui.component'; /** * Defines Progress Modifier diff --git a/api/arkui/QRCodeModifier.static.d.ets b/api/arkui/QRCodeModifier.static.d.ets index 63b6089d42..27c2dce2b5 100644 --- a/api/arkui/QRCodeModifier.static.d.ets +++ b/api/arkui/QRCodeModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { QRCodeAttribute } from './component/qrcode'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { QRCodeAttribute } from '@ohos.arkui.component'; /** * Defines QRCode Modifier diff --git a/api/arkui/RectModifier.static.d.ets b/api/arkui/RectModifier.static.d.ets index c5a4229906..ed5caa53da 100644 --- a/api/arkui/RectModifier.static.d.ets +++ b/api/arkui/RectModifier.static.d.ets @@ -13,8 +13,8 @@ * limitations under the License. */ -import { AttributeModifier } from './component/common'; -import { RectAttribute } from './component/rect'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { RectAttribute } from '@ohos.arkui.component'; /** * @file diff --git a/api/arkui/RefreshModifier.static.d.ets b/api/arkui/RefreshModifier.static.d.ets index 209eae697b..3fb1a27912 100644 --- a/api/arkui/RefreshModifier.static.d.ets +++ b/api/arkui/RefreshModifier.static.d.ets @@ -21,8 +21,8 @@ */ -import { AttributeModifier } from './component/common'; -import { RefreshAttribute } from './component/refresh'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { RefreshAttribute } from '@ohos.arkui.component'; /** * Defines Refresh Modifier diff --git a/api/arkui/RelativeContainerModifier.static.d.ets b/api/arkui/RelativeContainerModifier.static.d.ets index c3d56722a3..ae49ef64ce 100644 --- a/api/arkui/RelativeContainerModifier.static.d.ets +++ b/api/arkui/RelativeContainerModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { RelativeContainerAttribute } from './component/relativeContainer'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { RelativeContainerAttribute } from '@ohos.arkui.component'; /** * Defines RelativeContainer Modifier diff --git a/api/arkui/RenderNode.static.d.ets b/api/arkui/RenderNode.static.d.ets index 7955d7dff9..c74b3b29ed 100644 --- a/api/arkui/RenderNode.static.d.ets +++ b/api/arkui/RenderNode.static.d.ets @@ -19,8 +19,8 @@ * @kit ArkUI * @arkts 1.2 */ -import { DrawContext, Size, Offset, Position, Pivot, Scale, Translation, Matrix4, Rotation, Frame, BorderRadiuses, ShapeMask, ShapeClip, Edges, LengthMetricsUnit } from './Graphics'; -import { BorderStyle } from './component/enums'; +import { DrawContext, Size, Offset, Position, Pivot, Scale, Translation, Matrix4, Rotation, Frame, BorderRadiuses, ShapeMask, ShapeClip, Edges, LengthMetricsUnit } from 'arkui.Graphics'; +import { BorderStyle } from '@ohos.arkui.component'; /** * Defines RenderNode. Contains node tree operations and render property operations on node. diff --git a/api/arkui/RichEditorModifier.static.d.ets b/api/arkui/RichEditorModifier.static.d.ets index 19b4a5bdc8..768ca347d0 100644 --- a/api/arkui/RichEditorModifier.static.d.ets +++ b/api/arkui/RichEditorModifier.static.d.ets @@ -13,8 +13,8 @@ * limitations under the License. */ -import { AttributeModifier } from './component/common'; -import { RichEditorAttribute } from './component/richEditor'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { RichEditorAttribute } from '@ohos.arkui.component'; /** * @file diff --git a/api/arkui/RowModifier.static.d.ets b/api/arkui/RowModifier.static.d.ets index 25c70364f7..7a467f6c34 100644 --- a/api/arkui/RowModifier.static.d.ets +++ b/api/arkui/RowModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { RowAttribute } from './component/row'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { RowAttribute } from '@ohos.arkui.component'; /** * Defines Row Modifier diff --git a/api/arkui/RowSplitModifier.static.d.ets b/api/arkui/RowSplitModifier.static.d.ets index 7463aa6b7d..5701e8220d 100644 --- a/api/arkui/RowSplitModifier.static.d.ets +++ b/api/arkui/RowSplitModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { RowSplitAttribute } from './component/rowSplit'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { RowSplitAttribute } from '@ohos.arkui.component'; /** * Defines RowSplit Modifier diff --git a/api/arkui/ScrollModifier.static.d.ets b/api/arkui/ScrollModifier.static.d.ets index 55104f3407..83889652f6 100755 --- a/api/arkui/ScrollModifier.static.d.ets +++ b/api/arkui/ScrollModifier.static.d.ets @@ -21,8 +21,8 @@ */ -import { AttributeModifier } from './component/common'; -import { ScrollAttribute } from './component/scroll'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { ScrollAttribute } from '@ohos.arkui.component'; diff --git a/api/arkui/SearchModifier.static.d.ets b/api/arkui/SearchModifier.static.d.ets index 993f00728e..2ce1737b9f 100644 --- a/api/arkui/SearchModifier.static.d.ets +++ b/api/arkui/SearchModifier.static.d.ets @@ -22,8 +22,8 @@ -import { AttributeModifier } from './component/common'; -import { SearchAttribute } from './component/search'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { SearchAttribute } from '@ohos.arkui.component'; /** * Defines Search Modifier diff --git a/api/arkui/SelectModifier.static.d.ets b/api/arkui/SelectModifier.static.d.ets index 366cefabd0..821097c2d5 100755 --- a/api/arkui/SelectModifier.static.d.ets +++ b/api/arkui/SelectModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { SelectAttribute } from './component/select'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { SelectAttribute } from '@ohos.arkui.component'; /** * Defines Select Modifier diff --git a/api/arkui/ShapeModifier.static.d.ets b/api/arkui/ShapeModifier.static.d.ets index 8ec347ce99..3b597b5749 100644 --- a/api/arkui/ShapeModifier.static.d.ets +++ b/api/arkui/ShapeModifier.static.d.ets @@ -13,8 +13,8 @@ * limitations under the License. */ -import { AttributeModifier } from './component/common'; -import { ShapeAttribute } from './component/shape'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { ShapeAttribute } from '@ohos.arkui.component'; /** * @file diff --git a/api/arkui/SideBarContainerModifier.static.d.ets b/api/arkui/SideBarContainerModifier.static.d.ets index e8293a88bd..8d53324326 100644 --- a/api/arkui/SideBarContainerModifier.static.d.ets +++ b/api/arkui/SideBarContainerModifier.static.d.ets @@ -20,8 +20,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { SideBarContainerAttribute } from './component/sidebar'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { SideBarContainerAttribute } from '@ohos.arkui.component'; /** diff --git a/api/arkui/SpanModifier.static.d.ets b/api/arkui/SpanModifier.static.d.ets index fc33f6b993..fb3203f27c 100644 --- a/api/arkui/SpanModifier.static.d.ets +++ b/api/arkui/SpanModifier.static.d.ets @@ -22,8 +22,8 @@ -import { AttributeModifier } from './component/common'; -import { SpanAttribute } from './component/span'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { SpanAttribute } from '@ohos.arkui.component'; /** * Defines Span Modifier diff --git a/api/arkui/StackModifier.static.d.ets b/api/arkui/StackModifier.static.d.ets index f54ea2b8ed..f54a902ded 100644 --- a/api/arkui/StackModifier.static.d.ets +++ b/api/arkui/StackModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { StackAttribute } from './component/stack'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { StackAttribute } from '@ohos.arkui.component'; /** * Defines Stack Modifier diff --git a/api/arkui/StepperItemModifier.static.d.ets b/api/arkui/StepperItemModifier.static.d.ets index 3813e83be3..6ab9f44fe2 100644 --- a/api/arkui/StepperItemModifier.static.d.ets +++ b/api/arkui/StepperItemModifier.static.d.ets @@ -20,8 +20,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { StepperItemAttribute } from './component/stepperItem'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { StepperItemAttribute } from '@ohos.arkui.component'; /** diff --git a/api/arkui/StepperModifier.static.d.ets b/api/arkui/StepperModifier.static.d.ets index 22a7062d3e..ed5d080a4e 100644 --- a/api/arkui/StepperModifier.static.d.ets +++ b/api/arkui/StepperModifier.static.d.ets @@ -20,8 +20,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { StepperAttribute } from './component/stepper'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { StepperAttribute } from '@ohos.arkui.component'; /** * Defines Stepper Modifier diff --git a/api/arkui/SwiperModifier.static.d.ets b/api/arkui/SwiperModifier.static.d.ets index 1e229c50db..52d22c5385 100644 --- a/api/arkui/SwiperModifier.static.d.ets +++ b/api/arkui/SwiperModifier.static.d.ets @@ -20,8 +20,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { SwiperAttribute } from './component/swiper'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { SwiperAttribute } from '@ohos.arkui.component'; /** diff --git a/api/arkui/SymbolGlyphModifier.static.d.ets b/api/arkui/SymbolGlyphModifier.static.d.ets index abc8e8ae96..18720a04f3 100644 --- a/api/arkui/SymbolGlyphModifier.static.d.ets +++ b/api/arkui/SymbolGlyphModifier.static.d.ets @@ -22,8 +22,8 @@ -import { AttributeModifier } from './component/common'; -import { SymbolGlyphAttribute } from './component/symbolglyph'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { SymbolGlyphAttribute } from '@ohos.arkui.component'; import { Resource } from '../global/resource'; /** diff --git a/api/arkui/SymbolSpanModifier.static.d.ets b/api/arkui/SymbolSpanModifier.static.d.ets index 74e98fe0c6..0db8206e7d 100644 --- a/api/arkui/SymbolSpanModifier.static.d.ets +++ b/api/arkui/SymbolSpanModifier.static.d.ets @@ -22,9 +22,9 @@ -import { AttributeModifier } from './component/common'; -import { SymbolSpanAttribute } from './component/symbolSpan'; -import { Resource } from '../global/resource'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { SymbolSpanAttribute } from '@ohos.arkui.component'; +import { Resource } from 'global.resource'; /** * Defines SymbolSpan Modifier diff --git a/api/arkui/TextAreaModifier.static.d.ets b/api/arkui/TextAreaModifier.static.d.ets index 9d848f4e0b..4f1257f857 100644 --- a/api/arkui/TextAreaModifier.static.d.ets +++ b/api/arkui/TextAreaModifier.static.d.ets @@ -22,8 +22,8 @@ -import { AttributeModifier } from './component/common'; -import { TextAreaAttribute } from './component/textArea'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { TextAreaAttribute } from '@ohos.arkui.component'; /** * Defines TextArea Modifier diff --git a/api/arkui/TextClockModifier.static.d.ets b/api/arkui/TextClockModifier.static.d.ets index 13abcd5d1b..d4829695e4 100644 --- a/api/arkui/TextClockModifier.static.d.ets +++ b/api/arkui/TextClockModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { TextClockAttribute } from './component/textClock'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { TextClockAttribute } from '@ohos.arkui.component'; /** * Defines TextClock Modifier diff --git a/api/arkui/TextInputModifier.static.d.ets b/api/arkui/TextInputModifier.static.d.ets index 40c29b8a36..e8573a2e4e 100644 --- a/api/arkui/TextInputModifier.static.d.ets +++ b/api/arkui/TextInputModifier.static.d.ets @@ -22,8 +22,8 @@ -import { AttributeModifier } from './component/common'; -import { TextInputAttribute } from './component/textInput'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { TextInputAttribute } from '@ohos.arkui.component'; /** * Defines TextInput Modifier diff --git a/api/arkui/TextModifier.static.d.ets b/api/arkui/TextModifier.static.d.ets index 703bc236a7..d574436066 100644 --- a/api/arkui/TextModifier.static.d.ets +++ b/api/arkui/TextModifier.static.d.ets @@ -22,8 +22,8 @@ -import { AttributeModifier } from './component/common'; -import { TextAttribute } from './component/text'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { TextAttribute } from '@ohos.arkui.component'; /** * Defines Text Modifier diff --git a/api/arkui/TextPickerModifier.static.d.ets b/api/arkui/TextPickerModifier.static.d.ets index 9997b07991..cd51507019 100644 --- a/api/arkui/TextPickerModifier.static.d.ets +++ b/api/arkui/TextPickerModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { TextPickerAttribute } from './component/textPicker'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { TextPickerAttribute } from '@ohos.arkui.component'; /** * Defines TextPicker Modifier diff --git a/api/arkui/TextTimerModifier.static.d.ets b/api/arkui/TextTimerModifier.static.d.ets index 4778246f38..9cbf6747b0 100644 --- a/api/arkui/TextTimerModifier.static.d.ets +++ b/api/arkui/TextTimerModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { TextTimerAttribute } from './component/textTimer'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { TextTimerAttribute } from '@ohos.arkui.component'; /** * Defines TextTimer Modifier diff --git a/api/arkui/TimePickerModifier.static.d.ets b/api/arkui/TimePickerModifier.static.d.ets index f347df79ec..83bf6f3bec 100644 --- a/api/arkui/TimePickerModifier.static.d.ets +++ b/api/arkui/TimePickerModifier.static.d.ets @@ -19,8 +19,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { TimePickerAttribute } from './component/timePicker'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { TimePickerAttribute } from '@ohos.arkui.component'; /** * Defines TimePicker Modifier diff --git a/api/arkui/VideoModifier.static.d.ets b/api/arkui/VideoModifier.static.d.ets index 29c30bab24..ea38f52d8e 100644 --- a/api/arkui/VideoModifier.static.d.ets +++ b/api/arkui/VideoModifier.static.d.ets @@ -13,8 +13,8 @@ * limitations under the License. */ -import { AttributeModifier } from './component/common'; -import { VideoAttribute } from './component/video'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { VideoAttribute } from '@ohos.arkui.component'; /** * @file diff --git a/api/arkui/WaterFlowModifier.static.d.ets b/api/arkui/WaterFlowModifier.static.d.ets index 3f650e3410..21ac445249 100755 --- a/api/arkui/WaterFlowModifier.static.d.ets +++ b/api/arkui/WaterFlowModifier.static.d.ets @@ -20,8 +20,8 @@ * @arkts 1.2 */ -import { AttributeModifier } from './component/common'; -import { WaterFlowAttribute } from './component/waterFlow'; +import { AttributeModifier } from '@ohos.arkui.component'; +import { WaterFlowAttribute } from '@ohos.arkui.component'; /** -- Gitee