diff --git a/api/@ohos.animator.static.d.ets b/api/@ohos.animator.static.d.ets index 1579d779225e0f1546594359972fc04211a72fa6..3a86f1557c86c2ca742b2b2c8ba23fb3f3ddb419 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 d84f3f2b1825c58f19dd206945d1478f2cd55b60..3d380b49aa2ff66c8c7987e8f29e24544bccfd3c 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 a716d58edd43f90ff12be6f8cd7df012718202b0..7c061267c9ad80882be9eb079b68e5aa7170b34a 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 848cc3fee53d42ab098d956a02ffd7b1c0dc88dd..6e8f3ad6df0a9be6cb7c41a2a5f49ad28bb19405 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 04cd35cd171c851229091a2267289e9069967d2b..e31c772eceb2642b4152914c72701fb1fc7495fa 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 62ae7f67288960149022559c5010c52339c47c82..368ac0d0499d9f5df8aff7e56b050f34bab7af33 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 9d92654ff94fda1915f60843c9c6ed5d9951702c..8998b01219769de99a7fff93c504fbc5677cf975 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 76d62e45394478d1cfcc31eb4edc8a82bc427a76..86960d70de70bc49b4775ec0168a4d3314fac322 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 2e8632147d1d3635bc936a71d648c4ab29caaa30..99a72c3f38cb0b76f39d33bafbfede8e91b83a16 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 0e56de3f1c77d4db5c613ae2e5db1fd939094f32..f88a9b7d0ceda4ffb88a7e295774a8478710e5a1 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 70b6dee48a73efd42c88be8e0e1b00b8f6a05662..953aca8f520980af45c063fa2807db01c78eeafb 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 611ea2d37cacf6bfd51f42776c1ad73d2d2b36a4..18c9a9946b0b16ed9f08332f1c6a6be4c6a9a959 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 442368e28e1b37cfbed3e706ec637322d002a3b6..bf9577d0a64a9ff5f2472f28bdaa3ba001753387 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 85ab8cc896267ffaa475e596d8f095a35cb4fdb5..41412209f62d522f7a7f6db931da3dea883687c8 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 d5eea2e0c8fc59a459424f60b3800132e2547761..884efb555c92dbbf81167beca98f586edc44d7cb 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 983fbf598f229bd4b3c0e11abeb02fa83687e708..2b82fb1557b672e44ee9e038101228a0c1e98b5f 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 71645504910620fd36fac8903aeefd27e81a79d5..c1ee31c87a7588b2b37f413452219075d2d385d1 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 9d8af7bceeabb178df7760866655dbb1083148a4..f24eb7c1e67aa9f5b50ad05921e459e0bcd69855 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 73c8e572834c183cf94e27aba97373fe615a466e..a78d8c648fa5e0b2f760775e65be8c1f7c816299 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 a5cea4e299ca1bc82b563e2118195a2f8988357c..13a3b96de4216b46980ca34dde02e585074e769e 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 c4245bf4a4349de5bd6ac2f09e9adb8c13c61af7..7959cbdf82ed51117af7f4f1ad33808290ea74da 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 9a9aaa4b3a1cfe902af44e7199471e23c523b642..0000000000000000000000000000000000000000 --- 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 4734b5618eff3120ebf8f7193662ce098cfb9edf..f2f79f87feddb8666e938e43cae6370e2533b3a9 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 64fab1d291dc8ea171cd6bf2e5c7f408ead27bd8..c84cfe09e2ae98ef477db1f4e3ba3c029e265dfc 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 4774b998fb0e97d107647143890371471595e204..01238b37d2b98d943dc3632c142906e641fc9deb 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 c9203ca53322de8ea17ea6943420bc4709d41970..10b3e6f04f9b44f69919bb048202cf69b1938563 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 f65643774285cd2cc03d353658efee9582ae5664..5344f9379054908924bc53aeb7284d167c9d6cf6 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 46938525e80418b83a51f6275facb9cd427a3791..ef4662f019ae19b8e03796e49a4460fd8d5733bd 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 80848347057e12777143298013439be8205b799a..9ce7ba4eaf83065bcaa79a8b3d9479515872622f 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 48ac3ff98d01fd95a6b1e632fec7ac84c23a6cbc..b688a382483a2fb55f10e564988d67fc9c7e716e 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 5fba649674e3a31442c74abaa45ec2c7df4c3086..c4cef34dd8a9e916c00d8d9f8ff3d6dd0f2ce2c7 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 67686cc26ea7d787b2f5472a264cae7a34ca1897..c8e634aa4dfc92bfa6fdc2e2ba07bd56c2af8d34 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 dd791746573c814fdb29502ef546a61a90e88312..c2fc15f304e586baf44d749ad9fa62cd41ddb8c6 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 739700c2ca5c2999ca2aa051903476ff53152d22..f575f09cf27d44f47f9ee26cbc2680cedda7fb94 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 4f0636ee800cb09d35a191eac704da604fa712d3..a6cac8915b1256e72e6d4608c3a8e600974c740e 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 e1d14e3fa96b8016d23fea279784f04a44db7129..1143847e3c13de735b69693e6b623e4589a226e0 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 c9a3384d8bd4bff8569341f0ef6ba2e21e60dac9..0cf4cd87c3d0d48fbae02f36c6b9229f058ac181 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 eb9b66b4ac445c976e0b7370839ad95d1a1488df..5ddcec6a4069350bbc0d4f0bb887ec49be8c671b 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 95f7709964919501f52156de8fc907e2ee0bfe01..a6961ffa43bd977d5f2b1e249ad79e5607715c07 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 a949bfdac4a12d05c1221b947782bb373d30585e..01094361415d9b6c17cc2296cc63a915fe6c5484 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 be36ba8be872103be1e1c3f076ac4bbad6f123cc..3e25c219f4a71cd15d95049ecb5fa8ad7c198a19 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 2ab70aa98ad63eceb47d14f0a99a6a06392dcf05..f3328cf0bbf279e2ce704a33abae194856201b80 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 cf7b1cd7d088483e803838fac4f11632655a6843..8d93d297fb3f88c8597a883c61d8a6f65371cdff 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 6449e888edad2fa94300210b3616826b7f02f060..5d1349c615c0d7614dab5c81b1d5bd31a5778146 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 767e2e17062ecdea464a046f5be3af885cef6181..27ee956b1527676109f9fc885f90645b50f83200 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 7488a64101d24a07d1e1ddcc78a3b7b8d743dc3d..0f203234508650d652423179963dc443df7e0f7e 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 d3781a03e051fca4ca74aca0189a11f063e130bc..300a41cfbb35e0d15d31e0cf8c496bed49d8937b 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 a2e2619d21b200287440afebd19d4991ef68ef5d..6b24afe7d66b4ceafb9d5bce20cde8b6100e6646 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 8a147dbf7e9ee7ccd9ad0e6fc3cae18f9286836b..74f6f823b0e273f95d920d7e2449aa77556a1110 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 823e61c8437f5231f1d5a05d8f88f5f39da09e94..ee49370e2646f64b6c142520cc95148b1c3c682c 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 c3ddabdac1a4a6662052e741306359fcb8b5081e..1b94894aab10318f17dac483b6ec9adfb428a9d6 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 b8c978f68c5ec5fb7e4636dba9d24c7d56845261..8daae76888dbb9b5d66b868d4812502d59334148 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 9be1549a14c0234180211440b2f01c460f3ee667..85fd18b61a3ea5c3c531d15fe225144417d1a1ff 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 d7ad85a5ee570df11754101e97aea6db2d7f00c0..854042a4c2ccbb42002c29324e1ce305c0d222c7 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 3a4961b592b2e0667fbd2c6b349b4d05084cc1f5..35af8ac2476c550d0dcd9efefac40441781552b5 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 239255c255f863576d868560f4cf35382c36e341..10205482c83128b7438d8789b2d4cc35178719ca 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 9c6ee9a7ac14483046d219951cdbc2e41ac0b0ae..7457f40ff62bce36f906924f729d8123cdbc93bc 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 d8911171e94c534808912fe3efd1cf1d576d9d32..ed71e77a5ab741a43f8775ee5632f2df9aa0d3e5 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 243bf67c23a22c415f6b5c6a0cc983ee6945a6a0..0cc18159efe6965200d5d6238157802922603002 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 66cbda6c5403c0c07ea049d53719ecb11022078f..b16c6eeeb28d7023ce1431d92120883c4a10441b 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 5be9e268e1bc2b3f783966daf3ee3481f426d230..cbcd7cc932ad550d95f77c73bddc48481c2890f0 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 c2f2e5905acb53dba6a4f3fb1f7fa3dd4fc529b4..759d74ac791cc0a5a5af8c9b8fc596da09781b4c 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 6f5c82e3cdd2c824661041de55cf0f5c95b39140..4cb2d66285dd9033915e2d6743d167bc3b195f07 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 577b3c54cc84f380d0d0add121eec1f2c66a6e2a..0be7a00ca9387dd83becada673d682ece552156f 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 75ba77917f93d83c434da9408a338745bc6a0e2a..a8e00a4c1642469159eb25e03dc66a473e4d3d58 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 3caeb35c583fea41df6b2741e2a3913c97bfd830..e2365faf7cdc6b10f159a82f259eb9294b7d4390 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 dd281417fb404f44488300b52fe5288767aa4624..85048b0bbb5618b6babd162dde6925fba5b3c64b 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 365f040499762ed90f9ce4c643cd6b68f2f2fdce..696417598ea065deb755a174816cfa9ca2dbb514 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 9fb408467b781d9f512baa4cd2e0a6b2ab68864a..8e9aa860ddadc86800fbb250fad9f744f4063f53 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 568a071312f455616995b10689415325cdc039ad..e5f89c093cf292eb71e797ce19e7c5fb324ffe2a 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 882c5c7b522ff35e54a304c1ff97312f822d5928..0c1d3145c55de3c3ea8450256a7e6490cc900fcb 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 27c2dce2b55fc5810612a823f6b408df5d59c65e..63b6089d42b999c79ac5b1b198d349f5c9880df5 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 ed5caa53daf0fae0c4cba7cf6955dcfad3c484a1..c5a42299063dde9f06f88058c28a3aee91f88bfd 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 3fb1a279125098cfdb092fbed461c45ecc4baac3..209eae697be3051596c00da4f575f7699ddb3130 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 ae49ef64ceede5cfcf25f0cde62f10ec123f4bad..c3d56722a3f84800e1c59918a9a6f309c5deb5a0 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 468b4ba6ea493f18b5070bfd41ec6d55258f580a..6bd6560309568fe98a7b2f1b4d4fafdd2ae220f1 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 768ca347d082af3dc0f9dd803e3315e9ca81d049..19b4a5bdc87726adaee78e47a609ca5c19caa7ca 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 7a467f6c341b3360f62fb7efe1dedccab4b13089..25c70364f78e93a712b988b8851f42fab380d3f7 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 5701e8220d5d9de1ccef08e71fcccaac798f3362..7463aa6b7dfb3f26911840dc3bedd505e2d4284d 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 83889652f6c477f7ce5f185286d6aa6dd84fdbd0..55104f3407b16d1ad52a9c9af5784e5b26983a5c 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 2ce1737b9fe34f24fd83742479a78a933e111922..993f00728e69ac3ffcef8abbc05ad97ad7143990 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 821097c2d59e8248d6e064446b7f682bfcfc6bb9..366cefabd00ec32770f8ebfb85f5a29a7af22270 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 3b597b5749fc5c2922221bb927a0d63dd7a9b06f..8ec347ce99f097f1d45ea0c2ac94fc69a7c06310 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 8d53324326109d8cddd540a37648b2167d5f029a..e8293a88bd77ab9e4fe96bec04235d82f1109ece 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 fb3203f27ca062420e750e2be6971e837bcdd2cd..fc33f6b993d74fc8bef6a5011ae11d02ec9ecb5d 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 f54a902ded60a819fbfeb75b19c2861c9fde3cb0..f54ea2b8ed34a0521416ed2a3ee511775ca7a611 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 6ab9f44fe281ef0d375e30044de548c808faae9c..3813e83be35fda10d492dcc7b3845f52f58ab920 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 ed5d080a4effcddd7dd10ab602df757cef002d23..22a7062d3e9353f66c849c5f3b907e08f984009c 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 52d22c5385b22fa63c84296cfc144858bda30f5c..1e229c50dbdf8e2bae99a074c1c110e78fb53c27 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 18720a04f3db4c87febcb685804259bcfdfbeacf..abc8e8ae967036ad9cc6b1811276d9db5f084939 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 0db8206e7df2319cb69067db1e5ac767593afabd..74e98fe0c6054ae386be5c09a7d703b6af5a7e71 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 4f1257f8573e75e965579602c2a945e8e51edf63..9d848f4e0b43e201cf8fd2c15594a096165ad8a1 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 d4829695e404fb06871d4c96c30e6695aad99ed5..13abcd5d1b1ed7177627bfc3863abbc4647dbeed 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 e8573a2e4e435767ff8e9e435100af2b38c914ff..40c29b8a36e1ddd48e81a11150f3b5fed8ac2801 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 d5744360668e29d477ff6f741d5dc27f8167119e..703bc236a7a731c56e74e407182b9717d09906fa 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 cd51507019a271c9419d1f68dae6b7e433d1e548..9997b07991d94ad244a2fecf5f4cbb6b25e61e09 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 9cbf6747b0479410468ff45741e6e783e8bb366d..4778246f38a79b48ed49bb76bfe1462aed31a562 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 83bf6f3bec958da7ab75fb621644ac75be338284..f347df79eccb27e509b2fbf5c714bd78d34b1179 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 ea38f52d8eee1a1c08c508bd59a56e2abb2c04a1..29c30bab24c0c75f88af9d1ce7738923cc15b1fb 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 21ac445249ffe2682edb36947db49f43c1421110..3f650e3410b4eff9951922e8987fbe791ce317c2 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 fa1559f4d2386b0c63a42fa040c35b7814565a91..0a1e65a3a94cedbe2439562d5dc88ea5e3dd287d 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); }