From 1cabca51786c2fc89b8bca594b68213cfd7ba088 Mon Sep 17 00:00:00 2001 From: oh_ci Date: Wed, 3 Sep 2025 03:11:27 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!25507?= =?UTF-8?q?=20:=20Update=20ArkUI=20import=20dependencies=20to=20module=20s?= =?UTF-8?q?tyle'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 +- ...arkui.advanced.ProgressButton.static.d.ets | 10 +- ...os.arkui.advanced.SplitLayout.static.d.ets | 6 +- ...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 | 48 +++++++-- api/@ohos.arkui.node.static.d.ets | 95 ------------------ 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.measure.static.d.ets | 7 +- 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 | 98 +++++++++---------- 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 +- build-tools/delete_systemapi_plugin.js | 19 +--- 101 files changed, 347 insertions(+), 426 deletions(-) delete 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 1579d77922..3a86f1557c 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 '@ohos.arkui.component'; -import { ExpectedFrameRateRange } from '@ohos.arkui.component'; +import { FillMode, PlayMode } from './arkui/component/enums'; +import { ExpectedFrameRateRange } from './arkui/component/common'; /** diff --git a/api/@ohos.app.ability.autoFillManager.d.ts b/api/@ohos.app.ability.autoFillManager.d.ts index d84f3f2b18..3d380b49aa 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'; import _ViewData from './application/ViewData'; import _PageNodeInfo from './application/PageNodeInfo'; import { AutoFillType as _AutoFillType } from './application/AutoFillType'; diff --git a/api/@ohos.arkui.Parallelize.d.ets b/api/@ohos.arkui.Parallelize.d.ets index a716d58edd..7c061267c9 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 '@ohos.arkui.component'; +import { CustomBuilder } from './arkui/component/builder'; /** * 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 848cc3fee5..6e8f3ad6df 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 '@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'; + 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'; import { LocalStorage } from './arkui/stateManagement/storage/localStorage'; -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'; +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'; /** * class Font diff --git a/api/@ohos.arkui.advanced.ComposeListItem.static.d.ets b/api/@ohos.arkui.advanced.ComposeListItem.static.d.ets index 04cd35cd17..e31c772ece 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 '@ohos.arkui.component'; -import { ResourceStr } from '@ohos.arkui.component'; +import { Component } from './arkui/component/customComponent'; +import { ResourceStr } from './arkui/component/units'; import { PropRef } from './arkui/stateManagement/decorator'; -import { SymbolGlyphModifier } from 'arkui.SymbolGlyphModifier'; -import { Builder } from '@ohos.arkui.component'; +import { SymbolGlyphModifier } from './arkui/SymbolGlyphModifier'; +import { Builder } from './arkui/component/builder'; /** * Declare enum IconType * diff --git a/api/@ohos.arkui.advanced.ComposeTitleBar.static.d.ets b/api/@ohos.arkui.advanced.ComposeTitleBar.static.d.ets index 62ae7f6728..368ac0d049 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 '@ohos.arkui.component'; -import { Component } from '@ohos.arkui.component'; -import { SymbolGlyphModifier } from 'arkui.SymbolGlyphModifier'; -import { Builder } from '@ohos.arkui.component'; +import { ResourceStr } from './arkui/component/units'; +import { Component } from './arkui/component/customComponent'; +import { SymbolGlyphModifier } from './arkui/SymbolGlyphModifier'; +import { Builder } from './arkui/component/builder'; /** * 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 9d92654ff9..8998b01219 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 '@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 { 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 { PropRef, Prop, Link, Require } from './arkui/stateManagement/decorator'; import { Callback } from './@ohos.base'; -import { CustomDialogController } from '@ohos.arkui.component'; -import { BuilderParam, Builder } from '@ohos.arkui.component'; -import { SheetInfo } from '@ohos.arkui.component'; +import { CustomDialogController } from './arkui/component/customDialogController'; +import { BuilderParam, Builder } from './arkui/component/builder'; +import { SheetInfo } from './arkui/component/actionSheet'; /** * Declare ButtonOptions * diff --git a/api/@ohos.arkui.advanced.EditableTitleBar.static.d.ets b/api/@ohos.arkui.advanced.EditableTitleBar.static.d.ets index 76d62e4539..86960d70de 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 '@ohos.arkui.component'; -import { SafeAreaType, SafeAreaEdge, BlurStyle } from '@ohos.arkui.component'; -import { Component } from '@ohos.arkui.component'; -import { SymbolGlyphModifier } from 'arkui.SymbolGlyphModifier'; +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 { PropRef } from './arkui/stateManagement/decorator'; -import { Builder } from '@ohos.arkui.component'; +import { Builder } from './arkui/component/builder'; /** * 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 2e8632147d..99a72c3f38 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 '@ohos.arkui.component'; +import { ResourceStr, Dimension } from './arkui/component/units'; import { PropRef } from './arkui/stateManagement/decorator'; -import { Component } from '@ohos.arkui.component'; -import { SymbolGlyphModifier } from 'arkui.SymbolGlyphModifier'; -import { Builder } from '@ohos.arkui.component'; +import { Component } from './arkui/component/customComponent'; +import { SymbolGlyphModifier } from './arkui/SymbolGlyphModifier'; +import { Builder } from './arkui/component/builder'; /** * 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 0e56de3f1c..f88a9b7d0c 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 '@ohos.arkui.component'; -import { ResourceStr } from '@ohos.arkui.component'; -import { BuilderParam, Builder } from '@ohos.arkui.component'; +import { Component } from './arkui/component/customComponent'; +import { ResourceStr } from './arkui/component/units'; +import { BuilderParam, Builder } from './arkui/component/builder'; import { PropRef } from './arkui/stateManagement/decorator'; /** * Declare FilterType diff --git a/api/@ohos.arkui.advanced.ProgressButton.static.d.ets b/api/@ohos.arkui.advanced.ProgressButton.static.d.ets index 70b6dee48a..953aca8f52 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 '@ohos.arkui.component'; +import { Component } from './arkui/component/customComponent'; import { PropRef } from './arkui/stateManagement/decorator'; -import { ResourceColor, ResourceStr } from '@ohos.arkui.component'; -import { Builder } from '@ohos.arkui.component'; -import { LengthMetrics } from 'arkui.Graphics'; -import { Length } from '@ohos.arkui.component'; +import { ResourceColor, ResourceStr } from './arkui/component/units'; +import { Builder } from './arkui/component/builder'; +import { LengthMetrics } from './arkui/Graphics'; +import { Length } from './arkui/component/common'; /** * 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 611ea2d37c..18c9a9946b 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 '@ohos.arkui.component'; +import { ResourceStr } from './arkui/component/units'; import { State, PropRef } from './arkui/stateManagement/decorator'; -import { Component } from '@ohos.arkui.component'; -import { BuilderParam, Builder } from '@ohos.arkui.component'; +import { Component } from './arkui/component/customComponent'; +import { BuilderParam, Builder } from './arkui/component/builder'; /** * Declare SplitLayout.The SplitLayout is used for upper and lower graphic layouts. * @struct { SplitLayout } diff --git a/api/@ohos.arkui.advanced.SubHeader.static.d.ets b/api/@ohos.arkui.advanced.SubHeader.static.d.ets index 442368e28e..bf9577d0a6 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 '@ohos.arkui.component'; -import { SelectOption } from '@ohos.arkui.component'; +import { ResourceStr, Resource, ResourceColor, LocalizedMargin, LocalizedPadding } from './arkui/component/units'; +import { SelectOption } from './arkui/component/select'; import { PropRef } from './arkui/stateManagement/decorator'; -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'; +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'; /** * 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 85ab8cc896..41412209f6 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 '@ohos.arkui.component'; +import { ResourceStr } from './arkui/component/units'; import { PropRef } from './arkui/stateManagement/decorator'; -import { Component } from '@ohos.arkui.component'; -import { Builder } from '@ohos.arkui.component'; +import { Component } from './arkui/component/customComponent'; +import { Builder } from './arkui/component/builder'; /** * 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 d5eea2e0c8..884efb555c 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 '@ohos.arkui.component'; -import { ResourceStr } from '@ohos.arkui.component'; -import { SymbolGlyphModifier } from 'arkui.SymbolGlyphModifier'; -import { BuilderParam, Builder } from '@ohos.arkui.component'; +import { Component } from './arkui/component/customComponent'; +import { ResourceStr } from './arkui/component/units'; +import { SymbolGlyphModifier } from './arkui/SymbolGlyphModifier'; +import { BuilderParam, Builder } from './arkui/component/builder'; /** * 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 983fbf598f..2b82fb1557 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 '@ohos.arkui.component'; -import { ResourceStr, Resource, ResourceColor } from '@ohos.arkui.component'; +import { Component } from './arkui/component/customComponent'; +import { ResourceStr, Resource, ResourceColor } from './arkui/component/units'; 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 '@ohos.arkui.component'; -import { Builder } from '@ohos.arkui.component'; +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'; /** * Declare enum ItemState. * diff --git a/api/@ohos.arkui.advanced.TreeView.static.d.ets b/api/@ohos.arkui.advanced.TreeView.static.d.ets index 7164550491..c1ee31c87a 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 '@ohos.arkui.component'; -import { Component } from '@ohos.arkui.component'; -import { SymbolGlyphModifier } from 'arkui.SymbolGlyphModifier'; -import { Builder } from '@ohos.arkui.component'; +import { ResourceStr } from './arkui/component/units'; +import { Component } from './arkui/component/customComponent'; +import { SymbolGlyphModifier } from './arkui/SymbolGlyphModifier'; +import { Builder } from './arkui/component/builder'; /** * Control style of operation element * diff --git a/api/@ohos.arkui.componentSnapshot.static.d.ets b/api/@ohos.arkui.componentSnapshot.static.d.ets index 9d8af7bcee..f24eb7c1e6 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 '@ohos.arkui.component'; +import { CustomBuilder } from './arkui/component/builder'; 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 73c8e57283..a78d8c648f 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 '@ohos.arkui.component'; -import { CustomBuilder } from '@ohos.arkui.component'; -import { TouchPoint, ResourceColor } from '@ohos.arkui.component'; -import { Curve } from '@ohos.arkui.component'; +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 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 a5cea4e299..13a3b96de4 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 c4245bf4a4..7959cbdf82 100644 --- a/api/@ohos.arkui.node.d.ts +++ b/api/@ohos.arkui.node.d.ts @@ -29,7 +29,8 @@ * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 12 + * @since arkts { '1.1':'12','1.2':'20' } + * @arkts 1.1&1.2 */ export { NodeRenderType, RenderOptions, BuilderNode } from './arkui/BuilderNode'; @@ -38,7 +39,8 @@ export { NodeRenderType, RenderOptions, BuilderNode } from './arkui/BuilderNode' * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 12 + * @since arkts { '1.1':'12','1.2':'20' } + * @arkts 1.1&1.2 */ export { BuildOptions } from './arkui/BuilderNode'; @@ -66,7 +68,8 @@ export { InputEventType } from './arkui/BuilderNode'; * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 12 + * @since arkts { '1.1':'12','1.2':'20' } + * @arkts 1.1&1.2 */ export { NodeController } from './arkui/NodeController'; @@ -93,7 +96,19 @@ export { FrameNode, LayoutConstraint, ExpandMode, UIState } from './arkui/FrameN * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 12 + * @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 */ export { typeNode, NodeAdapter } from './arkui/FrameNode'; @@ -113,6 +128,16 @@ export { typeNode, NodeAdapter } from './arkui/FrameNode'; * @since arkts 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'; +/** + * Export Graphics. Defines the basic types related to the Graphics. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since arkts 20 + * @arkts 1.2 + */ +export { DrawContext, Size, Offset, Position, Pivot, Scale, Translation, Matrix4, Rotation, Frame, RoundRect, Circle, CommandPath, ShapeMask, ShapeClip, NodeBorderRadiuses, CornerRadius, Rect, Edges, edgeColors, edgeWidths, borderStyles, borderRadiuses, LengthMetricsUnit } from './arkui/Graphics'; /** * Export Graphics. Defines the basic types related to the Graphics. @@ -120,7 +145,8 @@ export { DrawContext, Size, Offset, Position, Pivot, Scale, Translation, Matrix4 * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 12 + * @since arkts { '1.1':'12','1.2':'20' } + * @arkts 1.1&1.2 */ export { LengthUnit, SizeT, LengthMetrics, ColorMetrics } from './arkui/Graphics'; @@ -137,7 +163,8 @@ export { LengthUnit, SizeT, LengthMetrics, ColorMetrics } from './arkui/Graphics * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 12 + * @since arkts { '1.1':'12','1.2':'20' } + * @arkts 1.1&1.2 */ export { RenderNode } from './arkui/RenderNode'; @@ -164,7 +191,8 @@ export { XComponentNode } from './arkui/XComponentNode'; * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 12 + * @since arkts { '1.1':'12','1.2':'20' } + * @arkts 1.1&1.2 */ export { Content } from './arkui/Content'; @@ -174,7 +202,8 @@ export { Content } from './arkui/Content'; * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 12 + * @since arkts { '1.1':'12','1.2':'20' } + * @arkts 1.1&1.2 */ export { ComponentContent , ComponentContentBase } from './arkui/ComponentContent'; @@ -184,6 +213,7 @@ export { ComponentContent , ComponentContentBase } from './arkui/ComponentConten * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 12 + * @since arkts { '1.1':'12','1.2':'20' } + * @arkts 1.1&1.2 */ 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 deleted file mode 100644 index 9a9aaa4b3a..0000000000 --- a/api/@ohos.arkui.node.static.d.ets +++ /dev/null @@ -1,95 +0,0 @@ -/* - * 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, NodeBorderRadiuses, 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 4734b5618e..f2f79f87fe 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 '@ohos.arkui.component'; -import { NavPathStack, NavigationOperation, NavBar } from '@ohos.arkui.component'; +import { ResourceStr } from './arkui/component/units'; +import { NavPathStack, NavigationOperation, NavBar } from './arkui/component/navigation'; import { UIContext } from '@ohos.arkui.UIContext'; import UIAbilityContext from './application/UIAbilityContext'; import { Callback } from './@ohos.base'; -import { NavDestinationMode } from '@ohos.arkui.component'; +import { NavDestinationMode } from './arkui/component/navDestination'; /** * 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 64fab1d291..c84cfe09e2 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 '@ohos.arkui.component'; +import { Position, ResourceColor, Length, SizeOptions } from './arkui/component/units'; /** * Interface for shape size properties. * diff --git a/api/@ohos.arkui.theme.static.d.ets b/api/@ohos.arkui.theme.static.d.ets index 4774b998fb..01238b37d2 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 '@ohos.arkui.component'; +import { ResourceColor } from './arkui/component/units'; /** * Defines the struct of Theme. * diff --git a/api/@ohos.measure.static.d.ets b/api/@ohos.measure.static.d.ets index c9203ca533..10b3e6f04f 100644 --- a/api/@ohos.measure.static.d.ets +++ b/api/@ohos.measure.static.d.ets @@ -19,8 +19,11 @@ * @arkts 1.2 */ -import { FontStyle, FontWeight, TextAlign, TextOverflow, TextCase, WordBreak } from '@ohos.arkui.component' -import { SizeOptions } from '@ohos.arkui.component'; + + + +import { FontStyle, FontWeight, TextAlign, TextOverflow, TextCase, WordBreak } from './arkui/component/enums' +import { SizeOptions } from './arkui/component/units'; import { Resource } from './global/resource' /** diff --git a/api/@ohos.promptAction.static.d.ets b/api/@ohos.promptAction.static.d.ets index f656437742..5344f93790 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 '@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'; +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'; /** * 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 46938525e8..ef4662f019 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 '@ohos.arkui.component'; +import { AttributeModifier } from './component/common' /** diff --git a/api/arkui/BlankModifier.static.d.ets b/api/arkui/BlankModifier.static.d.ets index 8084834705..9ce7ba4eaf 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 '@ohos.arkui.component'; -import { BlankAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { BlankAttribute } from './component/blank'; /** * Defines Blank Modifier @@ -30,4 +30,4 @@ import { BlankAttribute } from '@ohos.arkui.component'; * @syscap SystemCapability.ArkUI.ArkUI.Full * @since 20 */ -export declare class BlankModifier implements BlankAttribute, AttributeModifier {} +export declare class BlankModifier implements BlankAttribute, AttributeModifier {} \ No newline at end of file diff --git a/api/arkui/BuilderNode.static.d.ets b/api/arkui/BuilderNode.static.d.ets index 48ac3ff98d..b688a38248 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 'arkui.FrameNode'; -import { Size } from 'arkui.Graphics'; -import { TouchEvent, MouseEvent, AxisEvent } from '@ohos.arkui.component'; -import { WrappedBuilder, CustomBuilder, CustomBuilderT } from '@ohos.arkui.component'; +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'; /** * 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 5fba649674..c4cef34dd8 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 '@ohos.arkui.component'; -import { CalendarPickerAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { CalendarPickerAttribute } from './component/calendarPicker'; /** * Defines CalendarPicker Modifier diff --git a/api/arkui/CheckboxModifier.static.d.ets b/api/arkui/CheckboxModifier.static.d.ets index 67686cc26e..c8e634aa4d 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 '@ohos.arkui.component'; -import { CheckboxAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { CheckboxAttribute } from './component/checkbox'; /** * Defines Checkbox Modifier diff --git a/api/arkui/ColumnModifier.static.d.ets b/api/arkui/ColumnModifier.static.d.ets index dd79174657..c2fc15f304 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 '@ohos.arkui.component'; -import { ColumnAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { ColumnAttribute } from './component/column'; /** * Defines Column Modifier @@ -29,4 +29,4 @@ import { ColumnAttribute } from '@ohos.arkui.component'; * @syscap SystemCapability.ArkUI.ArkUI.Full * @since 20 */ -export declare class ColumnModifier implements ColumnAttribute, AttributeModifier {} +export declare class ColumnModifier implements ColumnAttribute, AttributeModifier {} \ No newline at end of file diff --git a/api/arkui/ColumnSplitModifier.static.d.ets b/api/arkui/ColumnSplitModifier.static.d.ets index 739700c2ca..f575f09cf2 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 '@ohos.arkui.component'; -import { ColumnSplitAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { ColumnSplitAttribute } from './component/columnSplit'; /** * Defines ColumnSplit Modifier diff --git a/api/arkui/CommonModifier.static.d.ets b/api/arkui/CommonModifier.static.d.ets index 4f0636ee80..a6cac8915b 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 '@ohos.arkui.component'; +import { AttributeModifier, CommonAttribute } from './component/common'; /** * Defines Common Modifier diff --git a/api/arkui/ComponentContent.static.d.ets b/api/arkui/ComponentContent.static.d.ets index e1d14e3fa9..1143847e3c 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 'arkui.BuilderNode'; -import { Content } from 'arkui.Content'; -import { UIContext } from '@ohos.arkui.UIContext'; -import { WrappedBuilder, CustomBuilder, CustomBuilderT } from '@ohos.arkui.component'; +import { BuildOptions } from './BuilderNode'; +import { Content } from './Content'; +import { UIContext } from '../@ohos.arkui.UIContext'; +import { WrappedBuilder, CustomBuilder, CustomBuilderT } from './component/builder'; /** * Defines the base class for ComponentContent. * diff --git a/api/arkui/ContainerSpanModifier.static.d.ets b/api/arkui/ContainerSpanModifier.static.d.ets index c9a3384d8b..0cf4cd87c3 100644 --- a/api/arkui/ContainerSpanModifier.static.d.ets +++ b/api/arkui/ContainerSpanModifier.static.d.ets @@ -22,8 +22,8 @@ -import { AttributeModifier } from '@ohos.arkui.component'; -import { ContainerSpanAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { ContainerSpanAttribute } from './component/containerSpan'; /** * Defines ContainerSpan Modifier diff --git a/api/arkui/CounterModifier.static.d.ets b/api/arkui/CounterModifier.static.d.ets index eb9b66b4ac..5ddcec6a40 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 '@ohos.arkui.component'; -import { CounterAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { CounterAttribute } from './component/counter'; /** * Defines Counter Modifier diff --git a/api/arkui/DataPanelModifier.static.d.ets b/api/arkui/DataPanelModifier.static.d.ets index 95f7709964..a6961ffa43 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 '@ohos.arkui.component'; -import { DataPanelAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { DataPanelAttribute } from './component/dataPanel'; /** * Defines DataPanel Modifier diff --git a/api/arkui/DatePickerModifier.static.d.ets b/api/arkui/DatePickerModifier.static.d.ets index a949bfdac4..0109436141 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 '@ohos.arkui.component'; -import { DatePickerAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { DatePickerAttribute } from './component/datePicker'; /** * Defines DatePicker Modifier diff --git a/api/arkui/DividerModifier.static.d.ets b/api/arkui/DividerModifier.static.d.ets index be36ba8be8..3e25c219f4 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 '@ohos.arkui.component'; -import { DividerAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { DividerAttribute } from './component/divider'; /** * Defines Divider Modifier diff --git a/api/arkui/FlexModifier.static.d.ets b/api/arkui/FlexModifier.static.d.ets index 2ab70aa98a..f3328cf0bb 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 '@ohos.arkui.component'; -import { FlexAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { FlexAttribute } from './component/flex'; /** * Defines Flex Modifier diff --git a/api/arkui/FolderStackModifier.static.d.ets b/api/arkui/FolderStackModifier.static.d.ets index cf7b1cd7d0..8d93d297fb 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 '@ohos.arkui.component'; -import { FolderStackAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { FolderStackAttribute } from './component/folderStack'; /** * Defines FolderStack Modifier diff --git a/api/arkui/FrameNode.static.d.ets b/api/arkui/FrameNode.static.d.ets index 6449e888ed..5d1349c615 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 '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 { 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 { UIContext } from '@ohos.arkui.UIContext'; -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 { 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 '@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 { RatingAttribute, RatingOptions } from '@ohos.arkui.component'; -import { SelectAttribute, SelectOption } 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'; +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 { RatingAttribute, RatingOptions } from './component/rating'; +import { SelectAttribute, SelectOption } from './component/select'; +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'; /** diff --git a/api/arkui/GaugeModifier.static.d.ets b/api/arkui/GaugeModifier.static.d.ets index 767e2e1706..27ee956b15 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 '@ohos.arkui.component'; -import { GaugeAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { GaugeAttribute } from './component/gauge'; /** * Defines Gauge Modifier diff --git a/api/arkui/Graphics.static.d.ets b/api/arkui/Graphics.static.d.ets index 7488a64101..0f20323450 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 '@ohos.arkui.component'; -import { BorderStyle } from '@ohos.arkui.component'; +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'; /** * Size info. diff --git a/api/arkui/GridColModifier.static.d.ets b/api/arkui/GridColModifier.static.d.ets index d3781a03e0..300a41cfbb 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 '@ohos.arkui.component'; -import { GridColAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { GridColAttribute } from './component/gridCol'; /** * Defines GridCol Modifier diff --git a/api/arkui/GridItemModifier.static.d.ets b/api/arkui/GridItemModifier.static.d.ets index a2e2619d21..6b24afe7d6 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 '@ohos.arkui.component'; -import { GridItemAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { GridItemAttribute } from './component/gridItem'; /** * Defines GridItem Modifier diff --git a/api/arkui/GridModifier.static.d.ets b/api/arkui/GridModifier.static.d.ets index 8a147dbf7e..74f6f823b0 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 '@ohos.arkui.component'; -import { GridAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { GridAttribute } from './component/grid'; /** diff --git a/api/arkui/GridRowModifier.static.d.ets b/api/arkui/GridRowModifier.static.d.ets index 823e61c843..ee49370e26 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 '@ohos.arkui.component'; -import { GridRowAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { GridRowAttribute } from './component/gridRow'; /** * Defines GridRow Modifier diff --git a/api/arkui/HyperlinkModifier.static.d.ets b/api/arkui/HyperlinkModifier.static.d.ets index c3ddabdac1..1b94894aab 100644 --- a/api/arkui/HyperlinkModifier.static.d.ets +++ b/api/arkui/HyperlinkModifier.static.d.ets @@ -22,8 +22,8 @@ -import { AttributeModifier } from '@ohos.arkui.component'; -import { HyperlinkAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { HyperlinkAttribute } from './component/hyperlink'; /** * Defines Hyperlink Modifier diff --git a/api/arkui/ImageAnimatorModifier.static.d.ets b/api/arkui/ImageAnimatorModifier.static.d.ets index b8c978f68c..8daae76888 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 '@ohos.arkui.component'; -import { ImageAnimatorAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { ImageAnimatorAttribute } from './component/imageAnimator'; /** * Defines ImageAnimator Modifier diff --git a/api/arkui/ImageSpanModifier.static.d.ets b/api/arkui/ImageSpanModifier.static.d.ets index 9be1549a14..85fd18b61a 100644 --- a/api/arkui/ImageSpanModifier.static.d.ets +++ b/api/arkui/ImageSpanModifier.static.d.ets @@ -22,8 +22,8 @@ -import { AttributeModifier } from '@ohos.arkui.component'; -import { ImageSpanAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { ImageSpanAttribute } from './component/imageSpan'; /** * Defines ImageSpan Modifier diff --git a/api/arkui/LineModifier.static.d.ets b/api/arkui/LineModifier.static.d.ets index d7ad85a5ee..854042a4c2 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 '@ohos.arkui.component'; -import { LineAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { LineAttribute } from './component/line'; /** * @file diff --git a/api/arkui/ListItemGroupModifier.static.d.ets b/api/arkui/ListItemGroupModifier.static.d.ets index 3a4961b592..35af8ac247 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 '@ohos.arkui.component'; -import { ListItemGroupAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { ListItemGroupAttribute } from './component/listItemGroup'; /** diff --git a/api/arkui/ListItemModifier.static.d.ets b/api/arkui/ListItemModifier.static.d.ets index 239255c255..10205482c8 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 '@ohos.arkui.component'; -import { ListItemAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { ListItemAttribute } from './component/listItem'; /** diff --git a/api/arkui/ListModifier.static.d.ets b/api/arkui/ListModifier.static.d.ets index 9c6ee9a7ac..7457f40ff6 100755 --- a/api/arkui/ListModifier.static.d.ets +++ b/api/arkui/ListModifier.static.d.ets @@ -21,8 +21,8 @@ */ -import { AttributeModifier } from '@ohos.arkui.component'; -import { ListAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { ListAttribute } from './component/list'; /** diff --git a/api/arkui/LoadingProgressModifier.static.d.ets b/api/arkui/LoadingProgressModifier.static.d.ets index d8911171e9..ed71e77a5a 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 '@ohos.arkui.component'; -import { LoadingProgressAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { LoadingProgressAttribute } from './component/loadingProgress'; /** * Defines LoadingProgress Modifier diff --git a/api/arkui/MarqueeModifier.static.d.ets b/api/arkui/MarqueeModifier.static.d.ets index 243bf67c23..0cc18159ef 100644 --- a/api/arkui/MarqueeModifier.static.d.ets +++ b/api/arkui/MarqueeModifier.static.d.ets @@ -21,8 +21,8 @@ */ -import { AttributeModifier } from '@ohos.arkui.component'; -import { MarqueeAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { MarqueeAttribute } from './component/marquee'; /** diff --git a/api/arkui/MenuItemModifier.static.d.ets b/api/arkui/MenuItemModifier.static.d.ets index 66cbda6c54..b16c6eeeb2 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 '@ohos.arkui.component'; -import { MenuItemAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { MenuItemAttribute } from './component/menuItem'; /** * Defines MenuItem Modifier diff --git a/api/arkui/MenuModifier.static.d.ets b/api/arkui/MenuModifier.static.d.ets index 5be9e268e1..cbcd7cc932 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 '@ohos.arkui.component'; -import { MenuAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { MenuAttribute } from './component/menu'; /** * Defines Menu Modifier diff --git a/api/arkui/NavDestinationModifier.static.d.ets b/api/arkui/NavDestinationModifier.static.d.ets index c2f2e5905a..759d74ac79 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 '@ohos.arkui.component'; -import { NavDestinationAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { NavDestinationAttribute } from './component/navDestination'; /** * Defines NavDestination Modifier diff --git a/api/arkui/NavigationModifier.static.d.ets b/api/arkui/NavigationModifier.static.d.ets index 6f5c82e3cd..4cb2d66285 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 '@ohos.arkui.component'; -import { NavigationAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { NavigationAttribute } from './component/navigation'; /** * Defines Navigation Modifier diff --git a/api/arkui/NodeContent.static.d.ets b/api/arkui/NodeContent.static.d.ets index 577b3c54cc..0be7a00ca9 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 'arkui.Content'; -import { FrameNode } from 'arkui.FrameNode'; +import { Content } from './Content'; +import { FrameNode } from './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 75ba77917f..a8e00a4c16 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 'arkui.FrameNode'; -import { Size } from 'arkui.Graphics'; -import { Callback } from '@ohos.base'; -import { TouchEvent } from '@ohos.arkui.component'; +import { UIContext } from '../@ohos.arkui.UIContext'; +import { FrameNode } from './FrameNode'; +import { Size } from './Graphics'; +import { Callback } from '../@ohos.base'; +import { TouchEvent } from './component/common'; /** diff --git a/api/arkui/ParticleModifier.static.d.ets b/api/arkui/ParticleModifier.static.d.ets index 3caeb35c58..e2365faf7c 100644 --- a/api/arkui/ParticleModifier.static.d.ets +++ b/api/arkui/ParticleModifier.static.d.ets @@ -21,8 +21,8 @@ */ -import { AttributeModifier } from '@ohos.arkui.component'; -import { ParticleAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { ParticleAttribute } from './component/particle'; /** diff --git a/api/arkui/PathModifier.static.d.ets b/api/arkui/PathModifier.static.d.ets index dd281417fb..85048b0bbb 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 '@ohos.arkui.component'; -import { PathAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { PathAttribute } from './component/path'; /** * @file diff --git a/api/arkui/PatternLockModifier.static.d.ets b/api/arkui/PatternLockModifier.static.d.ets index 365f040499..696417598e 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 '@ohos.arkui.component'; -import { PatternLockAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { PatternLockAttribute } from './component/patternLock'; /** * Defines PatternLock Modifier diff --git a/api/arkui/PolygonModifier.static.d.ets b/api/arkui/PolygonModifier.static.d.ets index 9fb408467b..8e9aa860dd 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 '@ohos.arkui.component'; -import { PolygonAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { PolygonAttribute } from './component/polygon'; /** * @file diff --git a/api/arkui/PolylineModifier.static.d.ets b/api/arkui/PolylineModifier.static.d.ets index 568a071312..e5f89c093c 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 '@ohos.arkui.component'; -import { PolylineAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { PolylineAttribute } from './component/polyline'; /** * @file diff --git a/api/arkui/ProgressModifier.static.d.ets b/api/arkui/ProgressModifier.static.d.ets index 882c5c7b52..0c1d3145c5 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 '@ohos.arkui.component'; -import { ProgressAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { ProgressAttribute } from './component/progress'; /** * Defines Progress Modifier diff --git a/api/arkui/QRCodeModifier.static.d.ets b/api/arkui/QRCodeModifier.static.d.ets index 27c2dce2b5..63b6089d42 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 '@ohos.arkui.component'; -import { QRCodeAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { QRCodeAttribute } from './component/qrcode'; /** * Defines QRCode Modifier diff --git a/api/arkui/RectModifier.static.d.ets b/api/arkui/RectModifier.static.d.ets index ed5caa53da..c5a4229906 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 '@ohos.arkui.component'; -import { RectAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { RectAttribute } from './component/rect'; /** * @file diff --git a/api/arkui/RefreshModifier.static.d.ets b/api/arkui/RefreshModifier.static.d.ets index 3fb1a27912..209eae697b 100644 --- a/api/arkui/RefreshModifier.static.d.ets +++ b/api/arkui/RefreshModifier.static.d.ets @@ -21,8 +21,8 @@ */ -import { AttributeModifier } from '@ohos.arkui.component'; -import { RefreshAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { RefreshAttribute } from './component/refresh'; /** * Defines Refresh Modifier diff --git a/api/arkui/RelativeContainerModifier.static.d.ets b/api/arkui/RelativeContainerModifier.static.d.ets index ae49ef64ce..c3d56722a3 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 '@ohos.arkui.component'; -import { RelativeContainerAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { RelativeContainerAttribute } from './component/relativeContainer'; /** * Defines RelativeContainer Modifier diff --git a/api/arkui/RenderNode.static.d.ets b/api/arkui/RenderNode.static.d.ets index 468b4ba6ea..6bd6560309 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, NodeBorderRadiuses, ShapeMask, ShapeClip, Edges, LengthMetricsUnit } from 'arkui.Graphics'; -import { BorderStyle } from '@ohos.arkui.component'; +import { DrawContext, Size, Offset, Position, Pivot, Scale, Translation, Matrix4, Rotation, Frame, NodeBorderRadiuses, ShapeMask, ShapeClip, Edges, LengthMetricsUnit } from './Graphics'; +import { BorderStyle } from './component/enums'; /** * 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 768ca347d0..19b4a5bdc8 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 '@ohos.arkui.component'; -import { RichEditorAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { RichEditorAttribute } from './component/richEditor'; /** * @file diff --git a/api/arkui/RowModifier.static.d.ets b/api/arkui/RowModifier.static.d.ets index 7a467f6c34..25c70364f7 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 '@ohos.arkui.component'; -import { RowAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { RowAttribute } from './component/row'; /** * Defines Row Modifier diff --git a/api/arkui/RowSplitModifier.static.d.ets b/api/arkui/RowSplitModifier.static.d.ets index 5701e8220d..7463aa6b7d 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 '@ohos.arkui.component'; -import { RowSplitAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { RowSplitAttribute } from './component/rowSplit'; /** * Defines RowSplit Modifier diff --git a/api/arkui/ScrollModifier.static.d.ets b/api/arkui/ScrollModifier.static.d.ets index 83889652f6..55104f3407 100755 --- a/api/arkui/ScrollModifier.static.d.ets +++ b/api/arkui/ScrollModifier.static.d.ets @@ -21,8 +21,8 @@ */ -import { AttributeModifier } from '@ohos.arkui.component'; -import { ScrollAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { ScrollAttribute } from './component/scroll'; diff --git a/api/arkui/SearchModifier.static.d.ets b/api/arkui/SearchModifier.static.d.ets index 2ce1737b9f..993f00728e 100644 --- a/api/arkui/SearchModifier.static.d.ets +++ b/api/arkui/SearchModifier.static.d.ets @@ -22,8 +22,8 @@ -import { AttributeModifier } from '@ohos.arkui.component'; -import { SearchAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { SearchAttribute } from './component/search'; /** * Defines Search Modifier diff --git a/api/arkui/SelectModifier.static.d.ets b/api/arkui/SelectModifier.static.d.ets index 821097c2d5..366cefabd0 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 '@ohos.arkui.component'; -import { SelectAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { SelectAttribute } from './component/select'; /** * Defines Select Modifier diff --git a/api/arkui/ShapeModifier.static.d.ets b/api/arkui/ShapeModifier.static.d.ets index 3b597b5749..8ec347ce99 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 '@ohos.arkui.component'; -import { ShapeAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { ShapeAttribute } from './component/shape'; /** * @file diff --git a/api/arkui/SideBarContainerModifier.static.d.ets b/api/arkui/SideBarContainerModifier.static.d.ets index 8d53324326..e8293a88bd 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 '@ohos.arkui.component'; -import { SideBarContainerAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { SideBarContainerAttribute } from './component/sidebar'; /** diff --git a/api/arkui/SpanModifier.static.d.ets b/api/arkui/SpanModifier.static.d.ets index fb3203f27c..fc33f6b993 100644 --- a/api/arkui/SpanModifier.static.d.ets +++ b/api/arkui/SpanModifier.static.d.ets @@ -22,8 +22,8 @@ -import { AttributeModifier } from '@ohos.arkui.component'; -import { SpanAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { SpanAttribute } from './component/span'; /** * Defines Span Modifier diff --git a/api/arkui/StackModifier.static.d.ets b/api/arkui/StackModifier.static.d.ets index f54a902ded..f54ea2b8ed 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 '@ohos.arkui.component'; -import { StackAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { StackAttribute } from './component/stack'; /** * Defines Stack Modifier diff --git a/api/arkui/StepperItemModifier.static.d.ets b/api/arkui/StepperItemModifier.static.d.ets index 6ab9f44fe2..3813e83be3 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 '@ohos.arkui.component'; -import { StepperItemAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { StepperItemAttribute } from './component/stepperItem'; /** diff --git a/api/arkui/StepperModifier.static.d.ets b/api/arkui/StepperModifier.static.d.ets index ed5d080a4e..22a7062d3e 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 '@ohos.arkui.component'; -import { StepperAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { StepperAttribute } from './component/stepper'; /** * Defines Stepper Modifier diff --git a/api/arkui/SwiperModifier.static.d.ets b/api/arkui/SwiperModifier.static.d.ets index 52d22c5385..1e229c50db 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 '@ohos.arkui.component'; -import { SwiperAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { SwiperAttribute } from './component/swiper'; /** diff --git a/api/arkui/SymbolGlyphModifier.static.d.ets b/api/arkui/SymbolGlyphModifier.static.d.ets index 18720a04f3..abc8e8ae96 100644 --- a/api/arkui/SymbolGlyphModifier.static.d.ets +++ b/api/arkui/SymbolGlyphModifier.static.d.ets @@ -22,8 +22,8 @@ -import { AttributeModifier } from '@ohos.arkui.component'; -import { SymbolGlyphAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { SymbolGlyphAttribute } from './component/symbolglyph'; import { Resource } from '../global/resource'; /** diff --git a/api/arkui/SymbolSpanModifier.static.d.ets b/api/arkui/SymbolSpanModifier.static.d.ets index 0db8206e7d..74e98fe0c6 100644 --- a/api/arkui/SymbolSpanModifier.static.d.ets +++ b/api/arkui/SymbolSpanModifier.static.d.ets @@ -22,9 +22,9 @@ -import { AttributeModifier } from '@ohos.arkui.component'; -import { SymbolSpanAttribute } from '@ohos.arkui.component'; -import { Resource } from 'global.resource'; +import { AttributeModifier } from './component/common'; +import { SymbolSpanAttribute } from './component/symbolSpan'; +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 4f1257f857..9d848f4e0b 100644 --- a/api/arkui/TextAreaModifier.static.d.ets +++ b/api/arkui/TextAreaModifier.static.d.ets @@ -22,8 +22,8 @@ -import { AttributeModifier } from '@ohos.arkui.component'; -import { TextAreaAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { TextAreaAttribute } from './component/textArea'; /** * Defines TextArea Modifier diff --git a/api/arkui/TextClockModifier.static.d.ets b/api/arkui/TextClockModifier.static.d.ets index d4829695e4..13abcd5d1b 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 '@ohos.arkui.component'; -import { TextClockAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { TextClockAttribute } from './component/textClock'; /** * Defines TextClock Modifier diff --git a/api/arkui/TextInputModifier.static.d.ets b/api/arkui/TextInputModifier.static.d.ets index e8573a2e4e..40c29b8a36 100644 --- a/api/arkui/TextInputModifier.static.d.ets +++ b/api/arkui/TextInputModifier.static.d.ets @@ -22,8 +22,8 @@ -import { AttributeModifier } from '@ohos.arkui.component'; -import { TextInputAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { TextInputAttribute } from './component/textInput'; /** * Defines TextInput Modifier diff --git a/api/arkui/TextModifier.static.d.ets b/api/arkui/TextModifier.static.d.ets index d574436066..703bc236a7 100644 --- a/api/arkui/TextModifier.static.d.ets +++ b/api/arkui/TextModifier.static.d.ets @@ -22,8 +22,8 @@ -import { AttributeModifier } from '@ohos.arkui.component'; -import { TextAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { TextAttribute } from './component/text'; /** * Defines Text Modifier diff --git a/api/arkui/TextPickerModifier.static.d.ets b/api/arkui/TextPickerModifier.static.d.ets index cd51507019..9997b07991 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 '@ohos.arkui.component'; -import { TextPickerAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { TextPickerAttribute } from './component/textPicker'; /** * Defines TextPicker Modifier diff --git a/api/arkui/TextTimerModifier.static.d.ets b/api/arkui/TextTimerModifier.static.d.ets index 9cbf6747b0..4778246f38 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 '@ohos.arkui.component'; -import { TextTimerAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { TextTimerAttribute } from './component/textTimer'; /** * Defines TextTimer Modifier diff --git a/api/arkui/TimePickerModifier.static.d.ets b/api/arkui/TimePickerModifier.static.d.ets index 83bf6f3bec..f347df79ec 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 '@ohos.arkui.component'; -import { TimePickerAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { TimePickerAttribute } from './component/timePicker'; /** * Defines TimePicker Modifier diff --git a/api/arkui/VideoModifier.static.d.ets b/api/arkui/VideoModifier.static.d.ets index ea38f52d8e..29c30bab24 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 '@ohos.arkui.component'; -import { VideoAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { VideoAttribute } from './component/video'; /** * @file diff --git a/api/arkui/WaterFlowModifier.static.d.ets b/api/arkui/WaterFlowModifier.static.d.ets index 21ac445249..3f650e3410 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 '@ohos.arkui.component'; -import { WaterFlowAttribute } from '@ohos.arkui.component'; +import { AttributeModifier } from './component/common'; +import { WaterFlowAttribute } from './component/waterFlow'; /** diff --git a/build-tools/delete_systemapi_plugin.js b/build-tools/delete_systemapi_plugin.js index fa1559f4d2..0a1e65a3a9 100644 --- a/build-tools/delete_systemapi_plugin.js +++ b/build-tools/delete_systemapi_plugin.js @@ -259,24 +259,7 @@ function hasFileByImportPath(apiDir, importPath) { fileDir = path.resolve(inputDir, '../arkts'); } return isExistImportFile(fileDir, importPath) || - isExistArkUIFile(path.resolve(inputDir, 'arkui', 'component'), importPath) || - isDotPathExist(fileDir, importPath); -} - -/** - * Dot路径特殊处理 - * @param {string} resolvedPath 引用接口所在目录 - * @param {string} importPath kit文件import - * @returns {boolean} importPath是否存在 - */ -function isDotPathExist(fileDir, importPath) { - if (['./', '@ohos', '@system'].every(str => { - return importPath.includes(str); - })) { - return false; - } - const replaced = importPath.replace(/\./g, '/'); - return isExistImportFile(fileDir, replaced); + isExistArkUIFile(path.resolve(inputDir, 'arkui', 'component'), importPath); } -- Gitee