diff --git a/core/src/components/accordion-group/accordion-group.tsx b/core/src/components/accordion-group/accordion-group.tsx index 4844edd8e8..6907e74569 100644 --- a/core/src/components/accordion-group/accordion-group.tsx +++ b/core/src/components/accordion-group/accordion-group.tsx @@ -1,8 +1,8 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Listen, Method, Prop, Watch, h } from '@stencil/core'; +import { printIonWarning } from '@utils/logging'; import { getIonMode } from '../../global/ionic-global'; -import { printIonWarning } from '../../utils/logging'; import type { AccordionGroupChangeEventDetail } from './accordion-group-interface'; diff --git a/core/src/components/accordion/accordion.tsx b/core/src/components/accordion/accordion.tsx index 8da0a312ff..674c97593d 100644 --- a/core/src/components/accordion/accordion.tsx +++ b/core/src/components/accordion/accordion.tsx @@ -1,10 +1,10 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Element, Host, Prop, State, h } from '@stencil/core'; +import { addEventListener, getElementRoot, raf, removeEventListener, transitionEndAsync } from '@utils/helpers'; import { chevronDown } from 'ionicons/icons'; import { config } from '../../global/config'; import { getIonMode } from '../../global/ionic-global'; -import { addEventListener, getElementRoot, raf, removeEventListener, transitionEndAsync } from '../../utils/helpers'; const enum AccordionState { Collapsed = 1 << 0, diff --git a/core/src/components/action-sheet/action-sheet.tsx b/core/src/components/action-sheet/action-sheet.tsx index 56732bb0cb..b8b9826d50 100644 --- a/core/src/components/action-sheet/action-sheet.tsx +++ b/core/src/components/action-sheet/action-sheet.tsx @@ -1,10 +1,7 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Watch, Component, Element, Event, Host, Method, Prop, h, readTask } from '@stencil/core'; - -import { getIonMode } from '../../global/ionic-global'; -import type { AnimationBuilder, CssClassMap, FrameworkDelegate, OverlayInterface } from '../../interface'; -import type { Gesture } from '../../utils/gesture'; -import { createButtonActiveGesture } from '../../utils/gesture/button-active'; +import type { Gesture } from '@utils/gesture'; +import { createButtonActiveGesture } from '@utils/gesture/button-active'; import { BACKDROP, createDelegateController, @@ -15,9 +12,12 @@ import { prepareOverlay, present, safeCall, -} from '../../utils/overlays'; +} from '@utils/overlays'; +import { getClassMap } from '@utils/theme'; + +import { getIonMode } from '../../global/ionic-global'; +import type { AnimationBuilder, CssClassMap, FrameworkDelegate, OverlayInterface } from '../../interface'; import type { OverlayEventDetail } from '../../utils/overlays-interface'; -import { getClassMap } from '../../utils/theme'; import type { ActionSheetButton } from './action-sheet-interface'; import { iosEnterAnimation } from './animations/ios.enter'; diff --git a/core/src/components/action-sheet/animations/ios.enter.ts b/core/src/components/action-sheet/animations/ios.enter.ts index 4235d1cc39..ff188415b4 100644 --- a/core/src/components/action-sheet/animations/ios.enter.ts +++ b/core/src/components/action-sheet/animations/ios.enter.ts @@ -1,5 +1,6 @@ +import { createAnimation } from '@utils/animation/animation'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; /** * iOS Action Sheet Enter Animation diff --git a/core/src/components/action-sheet/animations/ios.leave.ts b/core/src/components/action-sheet/animations/ios.leave.ts index ff6741d8d1..d29fca9b5b 100644 --- a/core/src/components/action-sheet/animations/ios.leave.ts +++ b/core/src/components/action-sheet/animations/ios.leave.ts @@ -1,5 +1,6 @@ +import { createAnimation } from '@utils/animation/animation'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; /** * iOS Action Sheet Leave Animation diff --git a/core/src/components/action-sheet/animations/md.enter.ts b/core/src/components/action-sheet/animations/md.enter.ts index b9dcaa0998..8053d8a962 100644 --- a/core/src/components/action-sheet/animations/md.enter.ts +++ b/core/src/components/action-sheet/animations/md.enter.ts @@ -1,5 +1,6 @@ +import { createAnimation } from '@utils/animation/animation'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; /** * MD Action Sheet Enter Animation diff --git a/core/src/components/action-sheet/animations/md.leave.ts b/core/src/components/action-sheet/animations/md.leave.ts index 952dd8ac1d..56255b23f7 100644 --- a/core/src/components/action-sheet/animations/md.leave.ts +++ b/core/src/components/action-sheet/animations/md.leave.ts @@ -1,5 +1,6 @@ +import { createAnimation } from '@utils/animation/animation'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; /** * MD Action Sheet Leave Animation diff --git a/core/src/components/alert/alert.tsx b/core/src/components/alert/alert.tsx index 83b945c6b0..9acc4dd14f 100644 --- a/core/src/components/alert/alert.tsx +++ b/core/src/components/alert/alert.tsx @@ -1,12 +1,8 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Listen, Method, Prop, Watch, forceUpdate, h } from '@stencil/core'; - -import { config } from '../../global/config'; -import { getIonMode } from '../../global/ionic-global'; -import type { AnimationBuilder, CssClassMap, OverlayInterface, FrameworkDelegate } from '../../interface'; -import { ENABLE_HTML_CONTENT_DEFAULT } from '../../utils/config'; -import type { Gesture } from '../../utils/gesture'; -import { createButtonActiveGesture } from '../../utils/gesture/button-active'; +import { ENABLE_HTML_CONTENT_DEFAULT } from '@utils/config'; +import type { Gesture } from '@utils/gesture'; +import { createButtonActiveGesture } from '@utils/gesture/button-active'; import { createDelegateController, createTriggerController, @@ -17,11 +13,15 @@ import { prepareOverlay, present, safeCall, -} from '../../utils/overlays'; +} from '@utils/overlays'; +import { sanitizeDOMString } from '@utils/sanitization'; +import { getClassMap } from '@utils/theme'; + +import { config } from '../../global/config'; +import { getIonMode } from '../../global/ionic-global'; +import type { AnimationBuilder, CssClassMap, OverlayInterface, FrameworkDelegate } from '../../interface'; import type { OverlayEventDetail } from '../../utils/overlays-interface'; import type { IonicSafeString } from '../../utils/sanitization'; -import { sanitizeDOMString } from '../../utils/sanitization'; -import { getClassMap } from '../../utils/theme'; import type { AlertButton, AlertInput } from './alert-interface'; import { iosEnterAnimation } from './animations/ios.enter'; diff --git a/core/src/components/alert/animations/ios.enter.ts b/core/src/components/alert/animations/ios.enter.ts index 839560fec6..ac7edcaabc 100644 --- a/core/src/components/alert/animations/ios.enter.ts +++ b/core/src/components/alert/animations/ios.enter.ts @@ -1,5 +1,6 @@ +import { createAnimation } from '@utils/animation/animation'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; /** * iOS Alert Enter Animation diff --git a/core/src/components/alert/animations/ios.leave.ts b/core/src/components/alert/animations/ios.leave.ts index ec4f4093f7..ac951b2b13 100644 --- a/core/src/components/alert/animations/ios.leave.ts +++ b/core/src/components/alert/animations/ios.leave.ts @@ -1,5 +1,6 @@ +import { createAnimation } from '@utils/animation/animation'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; /** * iOS Alert Leave Animation diff --git a/core/src/components/alert/animations/md.enter.ts b/core/src/components/alert/animations/md.enter.ts index 7d6b260dab..cc15d7a616 100644 --- a/core/src/components/alert/animations/md.enter.ts +++ b/core/src/components/alert/animations/md.enter.ts @@ -1,5 +1,6 @@ +import { createAnimation } from '@utils/animation/animation'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; /** * Md Alert Enter Animation diff --git a/core/src/components/alert/animations/md.leave.ts b/core/src/components/alert/animations/md.leave.ts index f2b5abd6fe..d4e1a85ddd 100644 --- a/core/src/components/alert/animations/md.leave.ts +++ b/core/src/components/alert/animations/md.leave.ts @@ -1,5 +1,6 @@ +import { createAnimation } from '@utils/animation/animation'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; /** * Md Alert Leave Animation diff --git a/core/src/components/app/app.tsx b/core/src/components/app/app.tsx index 9c3ba928f3..fd11019db2 100644 --- a/core/src/components/app/app.tsx +++ b/core/src/components/app/app.tsx @@ -1,9 +1,9 @@ import type { ComponentInterface } from '@stencil/core'; import { Build, Component, Element, Host, Method, h } from '@stencil/core'; +import { isPlatform } from '@utils/platform'; import { config } from '../../global/config'; import { getIonMode } from '../../global/ionic-global'; -import { isPlatform } from '../../utils/platform'; @Component({ tag: 'ion-app', diff --git a/core/src/components/back-button/back-button.tsx b/core/src/components/back-button/back-button.tsx index d7140f0811..b85e092eaf 100644 --- a/core/src/components/back-button/back-button.tsx +++ b/core/src/components/back-button/back-button.tsx @@ -1,14 +1,14 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Element, Host, Prop, h } from '@stencil/core'; +import type { ButtonInterface } from '@utils/element-interface'; +import type { Attributes } from '@utils/helpers'; +import { inheritAriaAttributes } from '@utils/helpers'; +import { createColorClasses, hostContext, openURL } from '@utils/theme'; import { arrowBackSharp, chevronBack } from 'ionicons/icons'; import { config } from '../../global/config'; import { getIonMode } from '../../global/ionic-global'; import type { AnimationBuilder, Color } from '../../interface'; -import type { ButtonInterface } from '../../utils/element-interface'; -import type { Attributes } from '../../utils/helpers'; -import { inheritAriaAttributes } from '../../utils/helpers'; -import { createColorClasses, hostContext, openURL } from '../../utils/theme'; /** * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use. diff --git a/core/src/components/backdrop/backdrop.tsx b/core/src/components/backdrop/backdrop.tsx index ae6930120a..1e566a4bc8 100644 --- a/core/src/components/backdrop/backdrop.tsx +++ b/core/src/components/backdrop/backdrop.tsx @@ -1,8 +1,8 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Event, Host, Listen, Prop, h } from '@stencil/core'; +import { GESTURE_CONTROLLER } from '@utils/gesture'; import { getIonMode } from '../../global/ionic-global'; -import { GESTURE_CONTROLLER } from '../../utils/gesture'; @Component({ tag: 'ion-backdrop', diff --git a/core/src/components/badge/badge.tsx b/core/src/components/badge/badge.tsx index 92ffb9a047..e443c3513b 100644 --- a/core/src/components/badge/badge.tsx +++ b/core/src/components/badge/badge.tsx @@ -1,9 +1,9 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Host, Prop, h } from '@stencil/core'; +import { createColorClasses } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color } from '../../interface'; -import { createColorClasses } from '../../utils/theme'; /** * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use. diff --git a/core/src/components/breadcrumb/breadcrumb.tsx b/core/src/components/breadcrumb/breadcrumb.tsx index 264b1919f9..1355022937 100644 --- a/core/src/components/breadcrumb/breadcrumb.tsx +++ b/core/src/components/breadcrumb/breadcrumb.tsx @@ -1,12 +1,12 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Prop, h } from '@stencil/core'; +import type { Attributes } from '@utils/helpers'; +import { inheritAriaAttributes } from '@utils/helpers'; +import { createColorClasses, hostContext, openURL } from '@utils/theme'; import { chevronForwardOutline, ellipsisHorizontal } from 'ionicons/icons'; import { getIonMode } from '../../global/ionic-global'; import type { AnimationBuilder, Color } from '../../interface'; -import type { Attributes } from '../../utils/helpers'; -import { inheritAriaAttributes } from '../../utils/helpers'; -import { createColorClasses, hostContext, openURL } from '../../utils/theme'; import type { RouterDirection } from '../router/utils/interface'; import type { BreadcrumbCollapsedClickEventDetail } from './breadcrumb-interface'; diff --git a/core/src/components/breadcrumbs/breadcrumbs.tsx b/core/src/components/breadcrumbs/breadcrumbs.tsx index 7b7bb2b738..7bba1284d1 100644 --- a/core/src/components/breadcrumbs/breadcrumbs.tsx +++ b/core/src/components/breadcrumbs/breadcrumbs.tsx @@ -1,9 +1,9 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Listen, Prop, State, Watch, h } from '@stencil/core'; +import { createColorClasses, hostContext } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color } from '../../interface'; -import { createColorClasses, hostContext } from '../../utils/theme'; import type { BreadcrumbCollapsedClickEventDetail } from '../breadcrumb/breadcrumb-interface'; /** diff --git a/core/src/components/button/button.tsx b/core/src/components/button/button.tsx index f187c429f1..a4e73d15f7 100644 --- a/core/src/components/button/button.tsx +++ b/core/src/components/button/button.tsx @@ -1,13 +1,13 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Prop, h } from '@stencil/core'; +import type { AnchorInterface, ButtonInterface } from '@utils/element-interface'; +import type { Attributes } from '@utils/helpers'; +import { inheritAriaAttributes, hasShadowDom } from '@utils/helpers'; +import { printIonWarning } from '@utils/logging'; +import { createColorClasses, hostContext, openURL } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { AnimationBuilder, Color } from '../../interface'; -import type { AnchorInterface, ButtonInterface } from '../../utils/element-interface'; -import type { Attributes } from '../../utils/helpers'; -import { inheritAriaAttributes, hasShadowDom } from '../../utils/helpers'; -import { printIonWarning } from '../../utils/logging'; -import { createColorClasses, hostContext, openURL } from '../../utils/theme'; import type { RouterDirection } from '../router/utils/interface'; /** diff --git a/core/src/components/card-header/card-header.tsx b/core/src/components/card-header/card-header.tsx index d4b463451b..982cf513ea 100644 --- a/core/src/components/card-header/card-header.tsx +++ b/core/src/components/card-header/card-header.tsx @@ -1,9 +1,9 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Host, Prop, h } from '@stencil/core'; +import { createColorClasses } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color } from '../../interface'; -import { createColorClasses } from '../../utils/theme'; /** * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use. diff --git a/core/src/components/card-subtitle/card-subtitle.tsx b/core/src/components/card-subtitle/card-subtitle.tsx index 4d00466435..898e2cb8d6 100644 --- a/core/src/components/card-subtitle/card-subtitle.tsx +++ b/core/src/components/card-subtitle/card-subtitle.tsx @@ -1,9 +1,9 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Host, Prop, h } from '@stencil/core'; +import { createColorClasses } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color } from '../../interface'; -import { createColorClasses } from '../../utils/theme'; /** * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use. diff --git a/core/src/components/card-title/card-title.tsx b/core/src/components/card-title/card-title.tsx index 2afec8b259..53cb8bc606 100644 --- a/core/src/components/card-title/card-title.tsx +++ b/core/src/components/card-title/card-title.tsx @@ -1,9 +1,9 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Host, Prop, h } from '@stencil/core'; +import { createColorClasses } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color } from '../../interface'; -import { createColorClasses } from '../../utils/theme'; /** * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use. diff --git a/core/src/components/card/card.tsx b/core/src/components/card/card.tsx index 641c745559..68e21d0ba5 100644 --- a/core/src/components/card/card.tsx +++ b/core/src/components/card/card.tsx @@ -1,12 +1,12 @@ import type { ComponentInterface } from '@stencil/core'; import { Element, Component, Host, Prop, h } from '@stencil/core'; +import type { AnchorInterface, ButtonInterface } from '@utils/element-interface'; +import type { Attributes } from '@utils/helpers'; +import { inheritAttributes } from '@utils/helpers'; +import { createColorClasses, openURL } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { AnimationBuilder, Color, Mode } from '../../interface'; -import type { AnchorInterface, ButtonInterface } from '../../utils/element-interface'; -import type { Attributes } from '../../utils/helpers'; -import { inheritAttributes } from '../../utils/helpers'; -import { createColorClasses, openURL } from '../../utils/theme'; import type { RouterDirection } from '../router/utils/interface'; /** diff --git a/core/src/components/checkbox/checkbox.tsx b/core/src/components/checkbox/checkbox.tsx index 7a2386f01a..08cfc581ff 100644 --- a/core/src/components/checkbox/checkbox.tsx +++ b/core/src/components/checkbox/checkbox.tsx @@ -1,15 +1,14 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Prop, Watch, h } from '@stencil/core'; +import type { LegacyFormController } from '@utils/forms'; +import { createLegacyFormController } from '@utils/forms'; +import type { Attributes } from '@utils/helpers'; +import { getAriaLabel, inheritAriaAttributes, renderHiddenInput } from '@utils/helpers'; +import { printIonWarning } from '@utils/logging'; +import { createColorClasses, hostContext } from '@utils/theme'; -// TODO(FW-2845) - Use @utils/forms and @utils/logging when https://github.com/ionic-team/stencil/issues/3826 is resolved import { getIonMode } from '../../global/ionic-global'; import type { Color, Mode, StyleEventDetail } from '../../interface'; -import type { LegacyFormController } from '../../utils/forms'; -import { createLegacyFormController } from '../../utils/forms'; -import type { Attributes } from '../../utils/helpers'; -import { getAriaLabel, inheritAriaAttributes, renderHiddenInput } from '../../utils/helpers'; -import { printIonWarning } from '../../utils/logging'; -import { createColorClasses, hostContext } from '../../utils/theme'; import type { CheckboxChangeEventDetail } from './checkbox-interface'; diff --git a/core/src/components/chip/chip.tsx b/core/src/components/chip/chip.tsx index 51100a992f..35f052b766 100644 --- a/core/src/components/chip/chip.tsx +++ b/core/src/components/chip/chip.tsx @@ -1,9 +1,9 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Host, Prop, h } from '@stencil/core'; +import { createColorClasses } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color } from '../../interface'; -import { createColorClasses } from '../../utils/theme'; /** * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use. diff --git a/core/src/components/col/col.tsx b/core/src/components/col/col.tsx index 7bea442b76..80480dfe7c 100644 --- a/core/src/components/col/col.tsx +++ b/core/src/components/col/col.tsx @@ -1,8 +1,8 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Host, Listen, Prop, forceUpdate, h } from '@stencil/core'; +import { matchBreakpoint } from '@utils/media'; import { getIonMode } from '../../global/ionic-global'; -import { matchBreakpoint } from '../../utils/media'; const win = typeof (window as any) !== 'undefined' ? (window as any) : undefined; // eslint-disable-next-line @typescript-eslint/prefer-optional-chain diff --git a/core/src/components/content/content.tsx b/core/src/components/content/content.tsx index b0d6ca1161..ca6a3a5e2b 100644 --- a/core/src/components/content/content.tsx +++ b/core/src/components/content/content.tsx @@ -1,12 +1,12 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Listen, Method, Prop, forceUpdate, h, readTask } from '@stencil/core'; +import { componentOnReady } from '@utils/helpers'; +import { isPlatform } from '@utils/platform'; +import { isRTL } from '@utils/rtl'; +import { createColorClasses, hostContext } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color } from '../../interface'; -import { componentOnReady } from '../../utils/helpers'; -import { isPlatform } from '../../utils/platform'; -import { isRTL } from '../../utils/rtl'; -import { createColorClasses, hostContext } from '../../utils/theme'; import type { ScrollBaseDetail, ScrollDetail } from './content-interface'; diff --git a/core/src/components/datetime-button/datetime-button.tsx b/core/src/components/datetime-button/datetime-button.tsx index c42fa0edd0..a4d72bca28 100644 --- a/core/src/components/datetime-button/datetime-button.tsx +++ b/core/src/components/datetime-button/datetime-button.tsx @@ -1,11 +1,11 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Element, Host, Prop, State, h } from '@stencil/core'; +import { componentOnReady, addEventListener } from '@utils/helpers'; +import { printIonError } from '@utils/logging'; +import { createColorClasses } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color } from '../../interface'; -import { componentOnReady, addEventListener } from '../../utils/helpers'; -import { printIonError } from '../../utils/logging'; -import { createColorClasses } from '../../utils/theme'; import type { DatetimePresentation } from '../datetime/datetime-interface'; import { getToday } from '../datetime/utils/data'; import { getMonthAndYear, getMonthDayAndYear, getLocalizedDateTime, getLocalizedTime } from '../datetime/utils/format'; diff --git a/core/src/components/datetime/datetime.tsx b/core/src/components/datetime/datetime.tsx index 1278693e90..4177d4f0ab 100644 --- a/core/src/components/datetime/datetime.tsx +++ b/core/src/components/datetime/datetime.tsx @@ -1,14 +1,14 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Method, Prop, State, Watch, h, writeTask } from '@stencil/core'; +import { startFocusVisible } from '@utils/focus-visible'; +import { getElementRoot, raf, renderHiddenInput } from '@utils/helpers'; +import { printIonError, printIonWarning } from '@utils/logging'; +import { isRTL } from '@utils/rtl'; +import { createColorClasses } from '@utils/theme'; import { caretDownSharp, caretUpSharp, chevronBack, chevronDown, chevronForward } from 'ionicons/icons'; import { getIonMode } from '../../global/ionic-global'; import type { Color, Mode, StyleEventDetail } from '../../interface'; -import { startFocusVisible } from '../../utils/focus-visible'; -import { getElementRoot, raf, renderHiddenInput } from '../../utils/helpers'; -import { printIonError, printIonWarning } from '../../utils/logging'; -import { isRTL } from '../../utils/rtl'; -import { createColorClasses } from '../../utils/theme'; import type { PickerColumnItem } from '../picker-column-internal/picker-column-internal-interfaces'; import type { diff --git a/core/src/components/datetime/utils/comparison.ts b/core/src/components/datetime/utils/comparison.ts index b35a81b0e1..0507b16908 100644 --- a/core/src/components/datetime/utils/comparison.ts +++ b/core/src/components/datetime/utils/comparison.ts @@ -1,4 +1,5 @@ -import { printIonWarning } from '../../../utils/logging'; +import { printIonWarning } from '@utils/logging'; + import type { DatetimeParts } from '../datetime-interface'; /** diff --git a/core/src/components/datetime/utils/state.ts b/core/src/components/datetime/utils/state.ts index d2a886537a..f709d7289a 100644 --- a/core/src/components/datetime/utils/state.ts +++ b/core/src/components/datetime/utils/state.ts @@ -1,4 +1,5 @@ -import { printIonError } from '../../../utils/logging'; +import { printIonError } from '@utils/logging'; + import type { DatetimeHighlight, DatetimeHighlightCallback, diff --git a/core/src/components/fab-button/fab-button.tsx b/core/src/components/fab-button/fab-button.tsx index a98052897c..2a7a4a6198 100755 --- a/core/src/components/fab-button/fab-button.tsx +++ b/core/src/components/fab-button/fab-button.tsx @@ -1,13 +1,13 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Prop, h } from '@stencil/core'; +import type { AnchorInterface, ButtonInterface } from '@utils/element-interface'; +import { inheritAriaAttributes } from '@utils/helpers'; +import type { Attributes } from '@utils/helpers'; +import { createColorClasses, hostContext, openURL } from '@utils/theme'; import { close } from 'ionicons/icons'; import { getIonMode } from '../../global/ionic-global'; import type { AnimationBuilder, Color } from '../../interface'; -import type { AnchorInterface, ButtonInterface } from '../../utils/element-interface'; -import { inheritAriaAttributes } from '../../utils/helpers'; -import type { Attributes } from '../../utils/helpers'; -import { createColorClasses, hostContext, openURL } from '../../utils/theme'; import type { RouterDirection } from '../router/utils/interface'; /** diff --git a/core/src/components/footer/footer.tsx b/core/src/components/footer/footer.tsx index fcdb283c1b..e2770884d8 100644 --- a/core/src/components/footer/footer.tsx +++ b/core/src/components/footer/footer.tsx @@ -1,10 +1,10 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Element, Host, Prop, State, h } from '@stencil/core'; +import { findIonContent, getScrollElement, printIonContentErrorMsg } from '@utils/content'; +import type { KeyboardController } from '@utils/keyboard/keyboard-controller'; +import { createKeyboardController } from '@utils/keyboard/keyboard-controller'; import { getIonMode } from '../../global/ionic-global'; -import { findIonContent, getScrollElement, printIonContentErrorMsg } from '../../utils/content'; -import type { KeyboardController } from '../../utils/keyboard/keyboard-controller'; -import { createKeyboardController } from '../../utils/keyboard/keyboard-controller'; import { handleFooterFade } from './footer.utils'; diff --git a/core/src/components/footer/footer.utils.ts b/core/src/components/footer/footer.utils.ts index 0ceae14057..a269ffb072 100644 --- a/core/src/components/footer/footer.utils.ts +++ b/core/src/components/footer/footer.utils.ts @@ -1,6 +1,5 @@ import { readTask, writeTask } from '@stencil/core'; - -import { clamp } from '../../utils/helpers'; +import { clamp } from '@utils/helpers'; export const handleFooterFade = (scrollEl: HTMLElement, baseEl: HTMLElement) => { readTask(() => { diff --git a/core/src/components/header/header.tsx b/core/src/components/header/header.tsx index 35b476d8fb..6b2102a7db 100644 --- a/core/src/components/header/header.tsx +++ b/core/src/components/header/header.tsx @@ -1,11 +1,11 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Element, Host, Prop, h, writeTask } from '@stencil/core'; +import { findIonContent, getScrollElement, printIonContentErrorMsg } from '@utils/content'; +import type { Attributes } from '@utils/helpers'; +import { inheritAriaAttributes } from '@utils/helpers'; +import { hostContext } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; -import { findIonContent, getScrollElement, printIonContentErrorMsg } from '../../utils/content'; -import type { Attributes } from '../../utils/helpers'; -import { inheritAriaAttributes } from '../../utils/helpers'; -import { hostContext } from '../../utils/theme'; import { cloneElement, diff --git a/core/src/components/header/header.utils.ts b/core/src/components/header/header.utils.ts index 77c3807cfe..f1b6273ef5 100644 --- a/core/src/components/header/header.utils.ts +++ b/core/src/components/header/header.utils.ts @@ -1,6 +1,5 @@ import { readTask, writeTask } from '@stencil/core'; - -import { clamp } from '../../utils/helpers'; +import { clamp } from '@utils/helpers'; const TRANSITION = 'all 0.2s ease-in-out'; diff --git a/core/src/components/img/img.tsx b/core/src/components/img/img.tsx index cee4c6f9fd..c83f0fab3c 100644 --- a/core/src/components/img/img.tsx +++ b/core/src/components/img/img.tsx @@ -1,9 +1,9 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Prop, State, Watch, h } from '@stencil/core'; +import type { Attributes } from '@utils/helpers'; +import { inheritAttributes } from '@utils/helpers'; import { getIonMode } from '../../global/ionic-global'; -import type { Attributes } from '../../utils/helpers'; -import { inheritAttributes } from '../../utils/helpers'; /** * @part image - The inner `img` element. diff --git a/core/src/components/infinite-scroll-content/infinite-scroll-content.tsx b/core/src/components/infinite-scroll-content/infinite-scroll-content.tsx index 747d6fab63..841ff278b0 100644 --- a/core/src/components/infinite-scroll-content/infinite-scroll-content.tsx +++ b/core/src/components/infinite-scroll-content/infinite-scroll-content.tsx @@ -1,11 +1,11 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Host, Prop, h } from '@stencil/core'; +import { ENABLE_HTML_CONTENT_DEFAULT } from '@utils/config'; +import { sanitizeDOMString } from '@utils/sanitization'; import { config } from '../../global/config'; import { getIonMode } from '../../global/ionic-global'; -import { ENABLE_HTML_CONTENT_DEFAULT } from '../../utils/config'; import type { IonicSafeString } from '../../utils/sanitization'; -import { sanitizeDOMString } from '../../utils/sanitization'; import type { SpinnerTypes } from '../spinner/spinner-configs'; @Component({ diff --git a/core/src/components/infinite-scroll/infinite-scroll.tsx b/core/src/components/infinite-scroll/infinite-scroll.tsx index f2c04fab73..190fab5863 100644 --- a/core/src/components/infinite-scroll/infinite-scroll.tsx +++ b/core/src/components/infinite-scroll/infinite-scroll.tsx @@ -1,8 +1,8 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Method, Prop, State, Watch, h, readTask, writeTask } from '@stencil/core'; +import { findClosestIonContent, getScrollElement, printIonContentErrorMsg } from '@utils/content'; import { getIonMode } from '../../global/ionic-global'; -import { findClosestIonContent, getScrollElement, printIonContentErrorMsg } from '../../utils/content'; @Component({ tag: 'ion-infinite-scroll', diff --git a/core/src/components/input/input.tsx b/core/src/components/input/input.tsx index 4ce1f39156..f36f3960ca 100644 --- a/core/src/components/input/input.tsx +++ b/core/src/components/input/input.tsx @@ -1,15 +1,15 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Build, Component, Element, Event, Host, Method, Prop, State, Watch, h } from '@stencil/core'; +import type { LegacyFormController } from '@utils/forms'; +import { createLegacyFormController } from '@utils/forms'; +import type { Attributes } from '@utils/helpers'; +import { inheritAriaAttributes, debounceEvent, findItemLabel, inheritAttributes } from '@utils/helpers'; +import { printIonWarning } from '@utils/logging'; +import { createColorClasses, hostContext } from '@utils/theme'; import { closeCircle, closeSharp } from 'ionicons/icons'; import { getIonMode } from '../../global/ionic-global'; import type { AutocompleteTypes, Color, StyleEventDetail, TextFieldTypes } from '../../interface'; -import type { LegacyFormController } from '../../utils/forms'; -import { createLegacyFormController } from '../../utils/forms'; -import type { Attributes } from '../../utils/helpers'; -import { inheritAriaAttributes, debounceEvent, findItemLabel, inheritAttributes } from '../../utils/helpers'; -import { printIonWarning } from '../../utils/logging'; -import { createColorClasses, hostContext } from '../../utils/theme'; import type { InputChangeEventDetail, InputInputEventDetail } from './input-interface'; import { getCounterText } from './input.utils'; diff --git a/core/src/components/input/input.utils.ts b/core/src/components/input/input.utils.ts index 809deb8a9a..d6812be12d 100644 --- a/core/src/components/input/input.utils.ts +++ b/core/src/components/input/input.utils.ts @@ -1,4 +1,4 @@ -import { printIonError } from '../../utils/logging'; +import { printIonError } from '@utils/logging'; export const getCounterText = ( value: string | number | null | undefined, diff --git a/core/src/components/item-divider/item-divider.tsx b/core/src/components/item-divider/item-divider.tsx index 92fc9e0338..ac449ffa3a 100644 --- a/core/src/components/item-divider/item-divider.tsx +++ b/core/src/components/item-divider/item-divider.tsx @@ -1,9 +1,9 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Element, Host, Prop, h } from '@stencil/core'; +import { createColorClasses } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color } from '../../interface'; -import { createColorClasses } from '../../utils/theme'; /** * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use. diff --git a/core/src/components/item-option/item-option.tsx b/core/src/components/item-option/item-option.tsx index a62990f250..81bee8b8fe 100644 --- a/core/src/components/item-option/item-option.tsx +++ b/core/src/components/item-option/item-option.tsx @@ -1,10 +1,10 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Element, Host, Prop, h } from '@stencil/core'; +import type { AnchorInterface, ButtonInterface } from '@utils/element-interface'; +import { createColorClasses } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color } from '../../interface'; -import type { AnchorInterface, ButtonInterface } from '../../utils/element-interface'; -import { createColorClasses } from '../../utils/theme'; /** * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use. diff --git a/core/src/components/item-options/item-options.tsx b/core/src/components/item-options/item-options.tsx index fcd84abcca..3b17a78fce 100644 --- a/core/src/components/item-options/item-options.tsx +++ b/core/src/components/item-options/item-options.tsx @@ -1,8 +1,8 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Method, Prop, h } from '@stencil/core'; +import { isEndSide } from '@utils/helpers'; import { getIonMode } from '../../global/ionic-global'; -import { isEndSide } from '../../utils/helpers'; import type { Side } from '../menu/menu-interface'; @Component({ diff --git a/core/src/components/item-sliding/item-sliding.tsx b/core/src/components/item-sliding/item-sliding.tsx index 3f671c0b1d..1ec174c2c7 100644 --- a/core/src/components/item-sliding/item-sliding.tsx +++ b/core/src/components/item-sliding/item-sliding.tsx @@ -1,10 +1,10 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Method, Prop, State, Watch, h } from '@stencil/core'; +import { findClosestIonContent, disableContentScrollY, resetContentScrollY } from '@utils/content'; +import { isEndSide } from '@utils/helpers'; import { getIonMode } from '../../global/ionic-global'; import type { Gesture, GestureDetail } from '../../interface'; -import { findClosestIonContent, disableContentScrollY, resetContentScrollY } from '../../utils/content'; -import { isEndSide } from '../../utils/helpers'; import type { Side } from '../menu/menu-interface'; const SWIPE_MARGIN = 30; diff --git a/core/src/components/item/item.tsx b/core/src/components/item/item.tsx index 3db4589d9d..4e06b0ec52 100644 --- a/core/src/components/item/item.tsx +++ b/core/src/components/item/item.tsx @@ -1,14 +1,14 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Element, Host, Listen, Prop, State, Watch, forceUpdate, h } from '@stencil/core'; +import type { AnchorInterface, ButtonInterface } from '@utils/element-interface'; +import type { Attributes } from '@utils/helpers'; +import { inheritAttributes, raf } from '@utils/helpers'; +import { printIonError, printIonWarning } from '@utils/logging'; +import { createColorClasses, hostContext, openURL } from '@utils/theme'; import { chevronForward } from 'ionicons/icons'; import { getIonMode } from '../../global/ionic-global'; import type { AnimationBuilder, Color, CssClassMap, StyleEventDetail } from '../../interface'; -import type { AnchorInterface, ButtonInterface } from '../../utils/element-interface'; -import type { Attributes } from '../../utils/helpers'; -import { inheritAttributes, raf } from '../../utils/helpers'; -import { printIonError, printIonWarning } from '../../utils/logging'; -import { createColorClasses, hostContext, openURL } from '../../utils/theme'; import type { InputInputEventDetail } from '../input/input-interface'; import type { RouterDirection } from '../router/utils/interface'; diff --git a/core/src/components/label/label.tsx b/core/src/components/label/label.tsx index f916be213b..1cfe88ffb7 100644 --- a/core/src/components/label/label.tsx +++ b/core/src/components/label/label.tsx @@ -1,9 +1,9 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Prop, State, Watch, h } from '@stencil/core'; +import { createColorClasses, hostContext } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color, StyleEventDetail } from '../../interface'; -import { createColorClasses, hostContext } from '../../utils/theme'; /** * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use. diff --git a/core/src/components/list-header/list-header.tsx b/core/src/components/list-header/list-header.tsx index 647ddac343..8fb939c127 100644 --- a/core/src/components/list-header/list-header.tsx +++ b/core/src/components/list-header/list-header.tsx @@ -1,9 +1,9 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Host, Prop, h } from '@stencil/core'; +import { createColorClasses } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color } from '../../interface'; -import { createColorClasses } from '../../utils/theme'; /** * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use. diff --git a/core/src/components/loading/animations/ios.enter.ts b/core/src/components/loading/animations/ios.enter.ts index 2aad2976af..eeaf4af527 100644 --- a/core/src/components/loading/animations/ios.enter.ts +++ b/core/src/components/loading/animations/ios.enter.ts @@ -1,5 +1,6 @@ +import { createAnimation } from '@utils/animation/animation'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; /** * iOS Loading Enter Animation diff --git a/core/src/components/loading/animations/ios.leave.ts b/core/src/components/loading/animations/ios.leave.ts index 9a9c340000..b02b1102c4 100644 --- a/core/src/components/loading/animations/ios.leave.ts +++ b/core/src/components/loading/animations/ios.leave.ts @@ -1,5 +1,6 @@ +import { createAnimation } from '@utils/animation/animation'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; /** * iOS Loading Leave Animation diff --git a/core/src/components/loading/animations/md.enter.ts b/core/src/components/loading/animations/md.enter.ts index 07dbf91285..c2cadf8e9b 100644 --- a/core/src/components/loading/animations/md.enter.ts +++ b/core/src/components/loading/animations/md.enter.ts @@ -1,5 +1,6 @@ +import { createAnimation } from '@utils/animation/animation'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; /** * Md Loading Enter Animation diff --git a/core/src/components/loading/animations/md.leave.ts b/core/src/components/loading/animations/md.leave.ts index d51c06773b..27d398955d 100644 --- a/core/src/components/loading/animations/md.leave.ts +++ b/core/src/components/loading/animations/md.leave.ts @@ -1,5 +1,6 @@ +import { createAnimation } from '@utils/animation/animation'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; /** * Md Loading Leave Animation diff --git a/core/src/components/loading/loading.tsx b/core/src/components/loading/loading.tsx index 13cb5c5c19..5453c6ed90 100644 --- a/core/src/components/loading/loading.tsx +++ b/core/src/components/loading/loading.tsx @@ -1,11 +1,7 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Watch, Component, Element, Event, Host, Method, Prop, h } from '@stencil/core'; - -import { config } from '../../global/config'; -import { getIonMode } from '../../global/ionic-global'; -import type { AnimationBuilder, FrameworkDelegate, OverlayInterface } from '../../interface'; -import { ENABLE_HTML_CONTENT_DEFAULT } from '../../utils/config'; -import { raf } from '../../utils/helpers'; +import { ENABLE_HTML_CONTENT_DEFAULT } from '@utils/config'; +import { raf } from '@utils/helpers'; import { BACKDROP, dismiss, @@ -14,11 +10,15 @@ import { present, createDelegateController, createTriggerController, -} from '../../utils/overlays'; +} from '@utils/overlays'; +import { sanitizeDOMString } from '@utils/sanitization'; +import { getClassMap } from '@utils/theme'; + +import { config } from '../../global/config'; +import { getIonMode } from '../../global/ionic-global'; +import type { AnimationBuilder, FrameworkDelegate, OverlayInterface } from '../../interface'; import type { OverlayEventDetail } from '../../utils/overlays-interface'; import type { IonicSafeString } from '../../utils/sanitization'; -import { sanitizeDOMString } from '../../utils/sanitization'; -import { getClassMap } from '../../utils/theme'; import type { SpinnerTypes } from '../spinner/spinner-configs'; import { iosEnterAnimation } from './animations/ios.enter'; diff --git a/core/src/components/menu-button/menu-button.tsx b/core/src/components/menu-button/menu-button.tsx index fd7c60108d..5441bf2a54 100644 --- a/core/src/components/menu-button/menu-button.tsx +++ b/core/src/components/menu-button/menu-button.tsx @@ -1,15 +1,15 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Element, Host, Listen, Prop, State, h } from '@stencil/core'; +import type { ButtonInterface } from '@utils/element-interface'; +import type { Attributes } from '@utils/helpers'; +import { inheritAriaAttributes } from '@utils/helpers'; +import { menuController } from '@utils/menu-controller'; +import { createColorClasses, hostContext } from '@utils/theme'; import { menuOutline, menuSharp } from 'ionicons/icons'; import { config } from '../../global/config'; import { getIonMode } from '../../global/ionic-global'; import type { Color } from '../../interface'; -import type { ButtonInterface } from '../../utils/element-interface'; -import type { Attributes } from '../../utils/helpers'; -import { inheritAriaAttributes } from '../../utils/helpers'; -import { menuController } from '../../utils/menu-controller'; -import { createColorClasses, hostContext } from '../../utils/theme'; import { updateVisibility } from '../menu-toggle/menu-toggle-util'; /** diff --git a/core/src/components/menu-toggle/menu-toggle-util.ts b/core/src/components/menu-toggle/menu-toggle-util.ts index 4dc64ff9a6..c684945c4d 100644 --- a/core/src/components/menu-toggle/menu-toggle-util.ts +++ b/core/src/components/menu-toggle/menu-toggle-util.ts @@ -1,4 +1,4 @@ -import { menuController } from '../../utils/menu-controller'; +import { menuController } from '@utils/menu-controller'; // Given a menu, return whether or not the menu toggle should be visible export const updateVisibility = async (menu: string | undefined) => { diff --git a/core/src/components/menu-toggle/menu-toggle.tsx b/core/src/components/menu-toggle/menu-toggle.tsx index 09a55d422c..c9dd7f3b9e 100644 --- a/core/src/components/menu-toggle/menu-toggle.tsx +++ b/core/src/components/menu-toggle/menu-toggle.tsx @@ -1,8 +1,8 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Host, Listen, Prop, State, h } from '@stencil/core'; +import { menuController } from '@utils/menu-controller'; import { getIonMode } from '../../global/ionic-global'; -import { menuController } from '../../utils/menu-controller'; import { updateVisibility } from './menu-toggle-util'; diff --git a/core/src/components/menu/menu.tsx b/core/src/components/menu/menu.tsx index f89a0cede9..56c6e3a919 100644 --- a/core/src/components/menu/menu.tsx +++ b/core/src/components/menu/menu.tsx @@ -1,15 +1,15 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Build, Component, Element, Event, Host, Listen, Method, Prop, State, Watch, h } from '@stencil/core'; +import { getTimeGivenProgression } from '@utils/animation/cubic-bezier'; +import { GESTURE_CONTROLLER } from '@utils/gesture'; +import type { Attributes } from '@utils/helpers'; +import { inheritAriaAttributes, assert, clamp, isEndSide as isEnd } from '@utils/helpers'; +import { menuController } from '@utils/menu-controller'; +import { getOverlay } from '@utils/overlays'; import { config } from '../../global/config'; import { getIonMode } from '../../global/ionic-global'; import type { Animation, Gesture, GestureDetail } from '../../interface'; -import { getTimeGivenProgression } from '../../utils/animation/cubic-bezier'; -import { GESTURE_CONTROLLER } from '../../utils/gesture'; -import type { Attributes } from '../../utils/helpers'; -import { inheritAriaAttributes, assert, clamp, isEndSide as isEnd } from '../../utils/helpers'; -import { menuController } from '../../utils/menu-controller'; -import { getOverlay } from '../../utils/overlays'; import type { MenuChangeEventDetail, MenuI, Side } from './menu-interface'; diff --git a/core/src/components/modal/animations/ios.enter.ts b/core/src/components/modal/animations/ios.enter.ts index caba8e3e74..2001cbdcf4 100644 --- a/core/src/components/modal/animations/ios.enter.ts +++ b/core/src/components/modal/animations/ios.enter.ts @@ -1,6 +1,7 @@ +import { createAnimation } from '@utils/animation/animation'; +import { getElementRoot } from '@utils/helpers'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; -import { getElementRoot } from '../../../utils/helpers'; import { SwipeToCloseDefaults } from '../gestures/swipe-to-close'; import type { ModalAnimationOptions } from '../modal-interface'; diff --git a/core/src/components/modal/animations/ios.leave.ts b/core/src/components/modal/animations/ios.leave.ts index 85b4aaccda..7fc235dea7 100644 --- a/core/src/components/modal/animations/ios.leave.ts +++ b/core/src/components/modal/animations/ios.leave.ts @@ -1,6 +1,7 @@ +import { createAnimation } from '@utils/animation/animation'; +import { getElementRoot } from '@utils/helpers'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; -import { getElementRoot } from '../../../utils/helpers'; import { SwipeToCloseDefaults } from '../gestures/swipe-to-close'; import type { ModalAnimationOptions } from '../modal-interface'; diff --git a/core/src/components/modal/animations/md.enter.ts b/core/src/components/modal/animations/md.enter.ts index 6197df74f4..a04c33e7f9 100644 --- a/core/src/components/modal/animations/md.enter.ts +++ b/core/src/components/modal/animations/md.enter.ts @@ -1,6 +1,7 @@ +import { createAnimation } from '@utils/animation/animation'; +import { getElementRoot } from '@utils/helpers'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; -import { getElementRoot } from '../../../utils/helpers'; import type { ModalAnimationOptions } from '../modal-interface'; import { createSheetEnterAnimation } from './sheet'; diff --git a/core/src/components/modal/animations/md.leave.ts b/core/src/components/modal/animations/md.leave.ts index cd3bb69379..9977c678d0 100644 --- a/core/src/components/modal/animations/md.leave.ts +++ b/core/src/components/modal/animations/md.leave.ts @@ -1,6 +1,7 @@ +import { createAnimation } from '@utils/animation/animation'; +import { getElementRoot } from '@utils/helpers'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; -import { getElementRoot } from '../../../utils/helpers'; import type { ModalAnimationOptions } from '../modal-interface'; import { createSheetLeaveAnimation } from './sheet'; diff --git a/core/src/components/modal/animations/sheet.ts b/core/src/components/modal/animations/sheet.ts index ae02b65ea0..760414f816 100644 --- a/core/src/components/modal/animations/sheet.ts +++ b/core/src/components/modal/animations/sheet.ts @@ -1,4 +1,5 @@ -import { createAnimation } from '../../../utils/animation/animation'; +import { createAnimation } from '@utils/animation/animation'; + import type { ModalAnimationOptions } from '../modal-interface'; import { getBackdropValueForSheet } from '../utils'; diff --git a/core/src/components/modal/gestures/sheet.ts b/core/src/components/modal/gestures/sheet.ts index 06c05fb4e0..9dafceff0d 100644 --- a/core/src/components/modal/gestures/sheet.ts +++ b/core/src/components/modal/gestures/sheet.ts @@ -1,7 +1,8 @@ +import { createGesture } from '@utils/gesture'; +import { clamp, raf } from '@utils/helpers'; + import type { Animation } from '../../../interface'; import type { GestureDetail } from '../../../utils/gesture'; -import { createGesture } from '../../../utils/gesture'; -import { clamp, raf } from '../../../utils/helpers'; import { getBackdropValueForSheet } from '../utils'; import { calculateSpringStep, handleCanDismiss } from './utils'; diff --git a/core/src/components/modal/gestures/swipe-to-close.ts b/core/src/components/modal/gestures/swipe-to-close.ts index ef807937e1..1c9fe95a2f 100644 --- a/core/src/components/modal/gestures/swipe-to-close.ts +++ b/core/src/components/modal/gestures/swipe-to-close.ts @@ -1,14 +1,10 @@ +import { getTimeGivenProgression } from '@utils/animation/cubic-bezier'; +import { isIonContent, findClosestIonContent, disableContentScrollY, resetContentScrollY } from '@utils/content'; +import { createGesture } from '@utils/gesture'; +import { clamp, getElementRoot } from '@utils/helpers'; + import type { Animation } from '../../../interface'; -import { getTimeGivenProgression } from '../../../utils/animation/cubic-bezier'; -import { - isIonContent, - findClosestIonContent, - disableContentScrollY, - resetContentScrollY, -} from '../../../utils/content'; import type { GestureDetail } from '../../../utils/gesture'; -import { createGesture } from '../../../utils/gesture'; -import { clamp, getElementRoot } from '../../../utils/helpers'; import type { Style as StatusBarStyle } from '../../../utils/native/status-bar'; import { setCardStatusBarDark, setCardStatusBarDefault } from '../utils'; diff --git a/core/src/components/modal/gestures/utils.ts b/core/src/components/modal/gestures/utils.ts index 54ebcba17a..694227d630 100644 --- a/core/src/components/modal/gestures/utils.ts +++ b/core/src/components/modal/gestures/utils.ts @@ -1,5 +1,6 @@ +import { GESTURE } from '@utils/overlays'; + import type { Animation } from '../../../interface'; -import { GESTURE } from '../../../utils/overlays'; export const handleCanDismiss = async (el: HTMLIonModalElement, animation: Animation) => { /** diff --git a/core/src/components/modal/modal.tsx b/core/src/components/modal/modal.tsx index d1e7e6345b..af872862cc 100644 --- a/core/src/components/modal/modal.tsx +++ b/core/src/components/modal/modal.tsx @@ -1,5 +1,23 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Method, Prop, State, Watch, h, writeTask } from '@stencil/core'; +import { findIonContent, printIonContentErrorMsg } from '@utils/content'; +import { CoreDelegate, attachComponent, detachComponent } from '@utils/framework-delegate'; +import { raf, inheritAttributes, hasLazyBuild } from '@utils/helpers'; +import type { Attributes } from '@utils/helpers'; +import { printIonWarning } from '@utils/logging'; +import { Style as StatusBarStyle, StatusBar } from '@utils/native/status-bar'; +import { + GESTURE, + BACKDROP, + activeAnimations, + dismiss, + eventMethod, + prepareOverlay, + present, + createTriggerController, +} from '@utils/overlays'; +import { getClassMap } from '@utils/theme'; +import { deepReady } from '@utils/transition'; import { config } from '../../global/config'; import { getIonMode } from '../../global/ionic-global'; @@ -12,26 +30,8 @@ import type { Gesture, OverlayInterface, } from '../../interface'; -import { findIonContent, printIonContentErrorMsg } from '../../utils/content'; -import { CoreDelegate, attachComponent, detachComponent } from '../../utils/framework-delegate'; -import { raf, inheritAttributes, hasLazyBuild } from '../../utils/helpers'; -import type { Attributes } from '../../utils/helpers'; import { KEYBOARD_DID_OPEN } from '../../utils/keyboard/keyboard'; -import { printIonWarning } from '../../utils/logging'; -import { Style as StatusBarStyle, StatusBar } from '../../utils/native/status-bar'; -import { - GESTURE, - BACKDROP, - activeAnimations, - dismiss, - eventMethod, - prepareOverlay, - present, - createTriggerController, -} from '../../utils/overlays'; import type { OverlayEventDetail } from '../../utils/overlays-interface'; -import { getClassMap } from '../../utils/theme'; -import { deepReady } from '../../utils/transition'; import { iosEnterAnimation } from './animations/ios.enter'; import { iosLeaveAnimation } from './animations/ios.leave'; diff --git a/core/src/components/modal/utils.ts b/core/src/components/modal/utils.ts index 99de3ba0e1..5b39e12a24 100644 --- a/core/src/components/modal/utils.ts +++ b/core/src/components/modal/utils.ts @@ -1,5 +1,5 @@ -import { StatusBar, Style } from '../../utils/native/status-bar'; -import { win } from '../../utils/window'; +import { StatusBar, Style } from '@utils/native/status-bar'; +import { win } from '@utils/window'; /** * Use y = mx + b to diff --git a/core/src/components/nav/nav.tsx b/core/src/components/nav/nav.tsx index 1516c731ce..733428e9f6 100644 --- a/core/src/components/nav/nav.tsx +++ b/core/src/components/nav/nav.tsx @@ -1,13 +1,13 @@ import type { EventEmitter } from '@stencil/core'; import { Build, Component, Element, Event, Method, Prop, Watch, h } from '@stencil/core'; +import { getTimeGivenProgression } from '@utils/animation/cubic-bezier'; +import { assert } from '@utils/helpers'; +import type { TransitionOptions } from '@utils/transition'; +import { lifecycle, setPageHidden, transition } from '@utils/transition'; import { config } from '../../global/config'; import { getIonMode } from '../../global/ionic-global'; import type { Animation, AnimationBuilder, ComponentProps, FrameworkDelegate, Gesture } from '../../interface'; -import { getTimeGivenProgression } from '../../utils/animation/cubic-bezier'; -import { assert } from '../../utils/helpers'; -import type { TransitionOptions } from '../../utils/transition'; -import { lifecycle, setPageHidden, transition } from '../../utils/transition'; import type { NavOutlet, RouteID, RouteWrite, RouterDirection } from '../router/utils/interface'; import { LIFECYCLE_DID_LEAVE, LIFECYCLE_WILL_LEAVE, LIFECYCLE_WILL_UNLOAD } from './constants'; diff --git a/core/src/components/nav/view-controller.ts b/core/src/components/nav/view-controller.ts index b20c27edac..08b246d8f5 100644 --- a/core/src/components/nav/view-controller.ts +++ b/core/src/components/nav/view-controller.ts @@ -1,6 +1,7 @@ +import { attachComponent } from '@utils/framework-delegate'; +import { assert, shallowEqualStringMap } from '@utils/helpers'; + import type { AnimationBuilder, ComponentProps, FrameworkDelegate, NavComponentWithProps } from '../../interface'; -import { attachComponent } from '../../utils/framework-delegate'; -import { assert, shallowEqualStringMap } from '../../utils/helpers'; export const VIEW_STATE_NEW = 1; export const VIEW_STATE_ATTACHED = 2; diff --git a/core/src/components/note/note.tsx b/core/src/components/note/note.tsx index 7b2a46270e..7dadb48438 100644 --- a/core/src/components/note/note.tsx +++ b/core/src/components/note/note.tsx @@ -1,9 +1,9 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Host, Prop, h } from '@stencil/core'; +import { createColorClasses } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color } from '../../interface'; -import { createColorClasses } from '../../utils/theme'; /** * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use. diff --git a/core/src/components/picker-column-internal/picker-column-internal.tsx b/core/src/components/picker-column-internal/picker-column-internal.tsx index 93e3a6a3a9..fd6e5209b3 100644 --- a/core/src/components/picker-column-internal/picker-column-internal.tsx +++ b/core/src/components/picker-column-internal/picker-column-internal.tsx @@ -1,12 +1,12 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Method, Prop, State, Watch, h } from '@stencil/core'; +import { getElementRoot, raf } from '@utils/helpers'; +import { hapticSelectionChanged, hapticSelectionEnd, hapticSelectionStart } from '@utils/native/haptic'; +import { isPlatform } from '@utils/platform'; +import { createColorClasses } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color } from '../../interface'; -import { getElementRoot, raf } from '../../utils/helpers'; -import { hapticSelectionChanged, hapticSelectionEnd, hapticSelectionStart } from '../../utils/native/haptic'; -import { isPlatform } from '../../utils/platform'; -import { createColorClasses } from '../../utils/theme'; import type { PickerInternalCustomEvent } from '../picker-internal/picker-internal-interfaces'; import type { PickerColumnItem } from './picker-column-internal-interfaces'; diff --git a/core/src/components/picker-column/picker-column.tsx b/core/src/components/picker-column/picker-column.tsx index 4eaf391afa..58fb5ae5d4 100644 --- a/core/src/components/picker-column/picker-column.tsx +++ b/core/src/components/picker-column/picker-column.tsx @@ -1,11 +1,11 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Prop, Watch, h } from '@stencil/core'; +import { clamp } from '@utils/helpers'; +import { hapticSelectionChanged, hapticSelectionEnd, hapticSelectionStart } from '@utils/native/haptic'; +import { getClassMap } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Gesture, GestureDetail } from '../../interface'; -import { clamp } from '../../utils/helpers'; -import { hapticSelectionChanged, hapticSelectionEnd, hapticSelectionStart } from '../../utils/native/haptic'; -import { getClassMap } from '../../utils/theme'; import type { PickerColumn } from '../picker/picker-interface'; /** diff --git a/core/src/components/picker-internal/picker-internal.tsx b/core/src/components/picker-internal/picker-internal.tsx index 080430cf63..af696d21b5 100644 --- a/core/src/components/picker-internal/picker-internal.tsx +++ b/core/src/components/picker-internal/picker-internal.tsx @@ -1,7 +1,6 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Listen, Method, Host, h } from '@stencil/core'; - -import { getElementRoot } from '../../utils/helpers'; +import { getElementRoot } from '@utils/helpers'; import type { PickerInternalChangeEventDetail } from './picker-internal-interfaces'; diff --git a/core/src/components/picker/animations/ios.enter.ts b/core/src/components/picker/animations/ios.enter.ts index 955e50dee1..113a6da400 100644 --- a/core/src/components/picker/animations/ios.enter.ts +++ b/core/src/components/picker/animations/ios.enter.ts @@ -1,5 +1,6 @@ +import { createAnimation } from '@utils/animation/animation'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; /** * iOS Picker Enter Animation diff --git a/core/src/components/picker/animations/ios.leave.ts b/core/src/components/picker/animations/ios.leave.ts index 55f3d89578..60de8d1c17 100644 --- a/core/src/components/picker/animations/ios.leave.ts +++ b/core/src/components/picker/animations/ios.leave.ts @@ -1,5 +1,6 @@ +import { createAnimation } from '@utils/animation/animation'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; /** * iOS Picker Leave Animation diff --git a/core/src/components/picker/picker.tsx b/core/src/components/picker/picker.tsx index 049dae6a20..46761042f5 100644 --- a/core/src/components/picker/picker.tsx +++ b/core/src/components/picker/picker.tsx @@ -1,8 +1,5 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Method, Prop, State, Watch, h } from '@stencil/core'; - -import { getIonMode } from '../../global/ionic-global'; -import type { AnimationBuilder, CssClassMap, OverlayInterface, FrameworkDelegate } from '../../interface'; import { createDelegateController, createTriggerController, @@ -13,9 +10,12 @@ import { prepareOverlay, present, safeCall, -} from '../../utils/overlays'; +} from '@utils/overlays'; +import { getClassMap } from '@utils/theme'; + +import { getIonMode } from '../../global/ionic-global'; +import type { AnimationBuilder, CssClassMap, OverlayInterface, FrameworkDelegate } from '../../interface'; import type { OverlayEventDetail } from '../../utils/overlays-interface'; -import { getClassMap } from '../../utils/theme'; import { iosEnterAnimation } from './animations/ios.enter'; import { iosLeaveAnimation } from './animations/ios.leave'; diff --git a/core/src/components/popover/animations/ios.enter.ts b/core/src/components/popover/animations/ios.enter.ts index e74fa4175b..4f2c74b9d5 100644 --- a/core/src/components/popover/animations/ios.enter.ts +++ b/core/src/components/popover/animations/ios.enter.ts @@ -1,6 +1,7 @@ +import { createAnimation } from '@utils/animation/animation'; +import { getElementRoot } from '@utils/helpers'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; -import { getElementRoot } from '../../../utils/helpers'; import { calculateWindowAdjustment, getArrowDimensions, diff --git a/core/src/components/popover/animations/ios.leave.ts b/core/src/components/popover/animations/ios.leave.ts index 1d8a282f42..77594c752f 100644 --- a/core/src/components/popover/animations/ios.leave.ts +++ b/core/src/components/popover/animations/ios.leave.ts @@ -1,6 +1,7 @@ +import { createAnimation } from '@utils/animation/animation'; +import { getElementRoot } from '@utils/helpers'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; -import { getElementRoot } from '../../../utils/helpers'; /** * iOS Popover Leave Animation diff --git a/core/src/components/popover/animations/md.enter.ts b/core/src/components/popover/animations/md.enter.ts index 27d9f9cf38..e25f745cec 100644 --- a/core/src/components/popover/animations/md.enter.ts +++ b/core/src/components/popover/animations/md.enter.ts @@ -1,6 +1,7 @@ +import { createAnimation } from '@utils/animation/animation'; +import { getElementRoot } from '@utils/helpers'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; -import { getElementRoot } from '../../../utils/helpers'; import { calculateWindowAdjustment, getPopoverDimensions, getPopoverPosition } from '../utils'; const POPOVER_MD_BODY_PADDING = 12; diff --git a/core/src/components/popover/animations/md.leave.ts b/core/src/components/popover/animations/md.leave.ts index e37506aaff..aa89ed0607 100644 --- a/core/src/components/popover/animations/md.leave.ts +++ b/core/src/components/popover/animations/md.leave.ts @@ -1,6 +1,7 @@ +import { createAnimation } from '@utils/animation/animation'; +import { getElementRoot } from '@utils/helpers'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; -import { getElementRoot } from '../../../utils/helpers'; /** * Md Popover Leave Animation diff --git a/core/src/components/popover/popover.tsx b/core/src/components/popover/popover.tsx index f93c6507b5..fcc67495b9 100644 --- a/core/src/components/popover/popover.tsx +++ b/core/src/components/popover/popover.tsx @@ -1,16 +1,16 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Method, Prop, State, Watch, h } from '@stencil/core'; +import { CoreDelegate, attachComponent, detachComponent } from '@utils/framework-delegate'; +import { addEventListener, raf, hasLazyBuild } from '@utils/helpers'; +import { printIonWarning } from '@utils/logging'; +import { BACKDROP, dismiss, eventMethod, focusFirstDescendant, prepareOverlay, present } from '@utils/overlays'; +import { isPlatform } from '@utils/platform'; +import { getClassMap } from '@utils/theme'; +import { deepReady } from '@utils/transition'; import { getIonMode } from '../../global/ionic-global'; import type { AnimationBuilder, ComponentProps, ComponentRef, FrameworkDelegate } from '../../interface'; -import { CoreDelegate, attachComponent, detachComponent } from '../../utils/framework-delegate'; -import { addEventListener, raf, hasLazyBuild } from '../../utils/helpers'; -import { printIonWarning } from '../../utils/logging'; -import { BACKDROP, dismiss, eventMethod, focusFirstDescendant, prepareOverlay, present } from '../../utils/overlays'; import type { OverlayEventDetail } from '../../utils/overlays-interface'; -import { isPlatform } from '../../utils/platform'; -import { getClassMap } from '../../utils/theme'; -import { deepReady } from '../../utils/transition'; import { iosEnterAnimation } from './animations/ios.enter'; import { iosLeaveAnimation } from './animations/ios.leave'; diff --git a/core/src/components/popover/utils.ts b/core/src/components/popover/utils.ts index 23182610d4..794ebb2088 100644 --- a/core/src/components/popover/utils.ts +++ b/core/src/components/popover/utils.ts @@ -1,4 +1,4 @@ -import { getElementRoot, raf } from '../../utils/helpers'; +import { getElementRoot, raf } from '@utils/helpers'; import type { PopoverSize, PositionAlign, PositionReference, PositionSide, TriggerAction } from './popover-interface'; diff --git a/core/src/components/progress-bar/progress-bar.tsx b/core/src/components/progress-bar/progress-bar.tsx index 5b458d9a2c..9753a50656 100644 --- a/core/src/components/progress-bar/progress-bar.tsx +++ b/core/src/components/progress-bar/progress-bar.tsx @@ -1,11 +1,11 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Host, Prop, h } from '@stencil/core'; +import { clamp } from '@utils/helpers'; +import { createColorClasses } from '@utils/theme'; import { config } from '../../global/config'; import { getIonMode } from '../../global/ionic-global'; import type { Color } from '../../interface'; -import { clamp } from '../../utils/helpers'; -import { createColorClasses } from '../../utils/theme'; /** * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use. diff --git a/core/src/components/radio-group/radio-group.tsx b/core/src/components/radio-group/radio-group.tsx index 68bd2ad64a..b4fabb9d4c 100644 --- a/core/src/components/radio-group/radio-group.tsx +++ b/core/src/components/radio-group/radio-group.tsx @@ -1,8 +1,8 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Listen, Prop, Watch, h } from '@stencil/core'; +import { renderHiddenInput } from '@utils/helpers'; import { getIonMode } from '../../global/ionic-global'; -import { renderHiddenInput } from '../../utils/helpers'; import type { RadioGroupChangeEventDetail } from './radio-group-interface'; diff --git a/core/src/components/radio/radio.tsx b/core/src/components/radio/radio.tsx index 38f9faaadb..5f6384448e 100644 --- a/core/src/components/radio/radio.tsx +++ b/core/src/components/radio/radio.tsx @@ -1,14 +1,14 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Method, Prop, State, Watch, h } from '@stencil/core'; +import type { LegacyFormController } from '@utils/forms'; +import { createLegacyFormController } from '@utils/forms'; +import type { Attributes } from '@utils/helpers'; +import { addEventListener, getAriaLabel, inheritAriaAttributes, removeEventListener } from '@utils/helpers'; +import { printIonWarning } from '@utils/logging'; +import { createColorClasses, hostContext } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color, StyleEventDetail } from '../../interface'; -import type { LegacyFormController } from '../../utils/forms'; -import { createLegacyFormController } from '../../utils/forms'; -import type { Attributes } from '../../utils/helpers'; -import { addEventListener, getAriaLabel, inheritAriaAttributes, removeEventListener } from '../../utils/helpers'; -import { printIonWarning } from '../../utils/logging'; -import { createColorClasses, hostContext } from '../../utils/theme'; /** * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use. diff --git a/core/src/components/range/range.tsx b/core/src/components/range/range.tsx index 6e7e04283c..971f33dcc7 100644 --- a/core/src/components/range/range.tsx +++ b/core/src/components/range/range.tsx @@ -1,16 +1,16 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Prop, State, Watch, h } from '@stencil/core'; +import { findClosestIonContent, disableContentScrollY, resetContentScrollY } from '@utils/content'; +import type { LegacyFormController } from '@utils/forms'; +import { createLegacyFormController } from '@utils/forms'; +import type { Attributes } from '@utils/helpers'; +import { inheritAriaAttributes, clamp, debounceEvent, getAriaLabel, renderHiddenInput } from '@utils/helpers'; +import { printIonWarning } from '@utils/logging'; +import { isRTL } from '@utils/rtl'; +import { createColorClasses, hostContext } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color, Gesture, GestureDetail, StyleEventDetail } from '../../interface'; -import { findClosestIonContent, disableContentScrollY, resetContentScrollY } from '../../utils/content'; -import type { LegacyFormController } from '../../utils/forms'; -import { createLegacyFormController } from '../../utils/forms'; -import type { Attributes } from '../../utils/helpers'; -import { inheritAriaAttributes, clamp, debounceEvent, getAriaLabel, renderHiddenInput } from '../../utils/helpers'; -import { printIonWarning } from '../../utils/logging'; -import { isRTL } from '../../utils/rtl'; -import { createColorClasses, hostContext } from '../../utils/theme'; import type { KnobName, diff --git a/core/src/components/refresher-content/refresher-content.tsx b/core/src/components/refresher-content/refresher-content.tsx index 0ade928a7c..35b6554a77 100644 --- a/core/src/components/refresher-content/refresher-content.tsx +++ b/core/src/components/refresher-content/refresher-content.tsx @@ -1,13 +1,13 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Element, Host, Prop, h } from '@stencil/core'; +import { ENABLE_HTML_CONTENT_DEFAULT } from '@utils/config'; +import { isPlatform } from '@utils/platform'; +import { sanitizeDOMString } from '@utils/sanitization'; import { arrowDown, caretBackSharp } from 'ionicons/icons'; import { config } from '../../global/config'; import { getIonMode } from '../../global/ionic-global'; -import { ENABLE_HTML_CONTENT_DEFAULT } from '../../utils/config'; -import { isPlatform } from '../../utils/platform'; import type { IonicSafeString } from '../../utils/sanitization'; -import { sanitizeDOMString } from '../../utils/sanitization'; import type { SpinnerTypes } from '../spinner/spinner-configs'; import { SPINNERS } from '../spinner/spinner-configs'; diff --git a/core/src/components/refresher/refresher.tsx b/core/src/components/refresher/refresher.tsx index 347c9bdf14..440756d2ef 100644 --- a/core/src/components/refresher/refresher.tsx +++ b/core/src/components/refresher/refresher.tsx @@ -1,17 +1,17 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Method, Prop, State, Watch, h, readTask, writeTask } from '@stencil/core'; - -import { getIonMode } from '../../global/ionic-global'; -import type { Animation, Gesture, GestureDetail } from '../../interface'; -import { getTimeGivenProgression } from '../../utils/animation/cubic-bezier'; +import { getTimeGivenProgression } from '@utils/animation/cubic-bezier'; import { getScrollElement, ION_CONTENT_CLASS_SELECTOR, ION_CONTENT_ELEMENT_SELECTOR, printIonContentErrorMsg, -} from '../../utils/content'; -import { clamp, componentOnReady, getElementRoot, raf, transitionEndAsync } from '../../utils/helpers'; -import { hapticImpact } from '../../utils/native/haptic'; +} from '@utils/content'; +import { clamp, componentOnReady, getElementRoot, raf, transitionEndAsync } from '@utils/helpers'; +import { hapticImpact } from '@utils/native/haptic'; + +import { getIonMode } from '../../global/ionic-global'; +import type { Animation, Gesture, GestureDetail } from '../../interface'; import type { RefresherEventDetail } from './refresher-interface'; import { diff --git a/core/src/components/refresher/refresher.utils.ts b/core/src/components/refresher/refresher.utils.ts index 38a44abb6d..d40653727d 100644 --- a/core/src/components/refresher/refresher.utils.ts +++ b/core/src/components/refresher/refresher.utils.ts @@ -1,8 +1,7 @@ import { writeTask } from '@stencil/core'; - -import { createAnimation } from '../../utils/animation/animation'; -import { clamp, componentOnReady, transitionEndAsync } from '../../utils/helpers'; -import { isPlatform } from '../../utils/platform'; +import { createAnimation } from '@utils/animation/animation'; +import { clamp, componentOnReady, transitionEndAsync } from '@utils/helpers'; +import { isPlatform } from '@utils/platform'; // MD Native Refresher // ----------------------------- diff --git a/core/src/components/reorder-group/reorder-group.tsx b/core/src/components/reorder-group/reorder-group.tsx index db6272f22e..3dba0535b8 100644 --- a/core/src/components/reorder-group/reorder-group.tsx +++ b/core/src/components/reorder-group/reorder-group.tsx @@ -1,11 +1,11 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Method, Prop, State, Watch, h } from '@stencil/core'; +import { findClosestIonContent, getScrollElement } from '@utils/content'; +import { raf } from '@utils/helpers'; +import { hapticSelectionChanged, hapticSelectionEnd, hapticSelectionStart } from '@utils/native/haptic'; import { getIonMode } from '../../global/ionic-global'; import type { Gesture, GestureDetail } from '../../interface'; -import { findClosestIonContent, getScrollElement } from '../../utils/content'; -import { raf } from '../../utils/helpers'; -import { hapticSelectionChanged, hapticSelectionEnd, hapticSelectionStart } from '../../utils/native/haptic'; import type { ItemReorderEventDetail } from './reorder-group-interface'; diff --git a/core/src/components/router-link/router-link.tsx b/core/src/components/router-link/router-link.tsx index d395561e9e..51ede733af 100644 --- a/core/src/components/router-link/router-link.tsx +++ b/core/src/components/router-link/router-link.tsx @@ -1,9 +1,9 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Host, Prop, h } from '@stencil/core'; +import { createColorClasses, openURL } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { AnimationBuilder, Color } from '../../interface'; -import { createColorClasses, openURL } from '../../utils/theme'; import type { RouterDirection } from '../router/utils/interface'; @Component({ diff --git a/core/src/components/router-outlet/route-outlet.tsx b/core/src/components/router-outlet/route-outlet.tsx index 358bc267ce..7e4ba3d42a 100644 --- a/core/src/components/router-outlet/route-outlet.tsx +++ b/core/src/components/router-outlet/route-outlet.tsx @@ -1,5 +1,9 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Method, Prop, Watch, h } from '@stencil/core'; +import { getTimeGivenProgression } from '@utils/animation/cubic-bezier'; +import { attachComponent, detachComponent } from '@utils/framework-delegate'; +import { shallowEqualStringMap, hasLazyBuild } from '@utils/helpers'; +import { transition } from '@utils/transition'; import { config } from '../../global/config'; import { getIonMode } from '../../global/ionic-global'; @@ -11,10 +15,6 @@ import type { FrameworkDelegate, Gesture, } from '../../interface'; -import { getTimeGivenProgression } from '../../utils/animation/cubic-bezier'; -import { attachComponent, detachComponent } from '../../utils/framework-delegate'; -import { shallowEqualStringMap, hasLazyBuild } from '../../utils/helpers'; -import { transition } from '../../utils/transition'; import type { RouterOutletOptions, SwipeGestureHandler } from '../nav/nav-interface'; import type { RouteID, RouterDirection, RouteWrite, NavOutlet } from '../router/utils/interface'; diff --git a/core/src/components/router/router.tsx b/core/src/components/router/router.tsx index 0daf2eeac8..7a4b73a818 100644 --- a/core/src/components/router/router.tsx +++ b/core/src/components/router/router.tsx @@ -1,8 +1,8 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Listen, Method, Prop } from '@stencil/core'; +import { debounce } from '@utils/helpers'; import type { AnimationBuilder, BackButtonEvent } from '../../interface'; -import { debounce } from '../../utils/helpers'; import type { NavigationHookResult } from '../route/route-interface'; import { ROUTER_INTENT_BACK, ROUTER_INTENT_FORWARD, ROUTER_INTENT_NONE } from './utils/constants'; diff --git a/core/src/components/router/utils/dom.ts b/core/src/components/router/utils/dom.ts index 528a873d59..95bc6fec53 100644 --- a/core/src/components/router/utils/dom.ts +++ b/core/src/components/router/utils/dom.ts @@ -1,5 +1,6 @@ +import { componentOnReady } from '@utils/helpers'; + import type { AnimationBuilder } from '../../../interface'; -import { componentOnReady } from '../../../utils/helpers'; import { ROUTER_INTENT_NONE } from './constants'; import type { NavOutletElement, RouteChain, RouteID, RouterDirection } from './interface'; diff --git a/core/src/components/searchbar/searchbar.tsx b/core/src/components/searchbar/searchbar.tsx index 85b717169a..5a432c065d 100644 --- a/core/src/components/searchbar/searchbar.tsx +++ b/core/src/components/searchbar/searchbar.tsx @@ -1,13 +1,13 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Method, Prop, State, Watch, forceUpdate, h } from '@stencil/core'; +import { debounceEvent, raf } from '@utils/helpers'; +import { isRTL } from '@utils/rtl'; +import { createColorClasses } from '@utils/theme'; import { arrowBackSharp, closeCircle, closeSharp, searchOutline, searchSharp } from 'ionicons/icons'; import { config } from '../../global/config'; import { getIonMode } from '../../global/ionic-global'; import type { AutocompleteTypes, Color, StyleEventDetail } from '../../interface'; -import { debounceEvent, raf } from '../../utils/helpers'; -import { isRTL } from '../../utils/rtl'; -import { createColorClasses } from '../../utils/theme'; import type { SearchbarChangeEventDetail, SearchbarInputEventDetail } from './searchbar-interface'; diff --git a/core/src/components/segment-button/segment-button.tsx b/core/src/components/segment-button/segment-button.tsx index b8629e8999..80bc3c589a 100644 --- a/core/src/components/segment-button/segment-button.tsx +++ b/core/src/components/segment-button/segment-button.tsx @@ -1,11 +1,11 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Element, Host, Prop, Method, State, Watch, forceUpdate, h } from '@stencil/core'; +import type { ButtonInterface } from '@utils/element-interface'; +import type { Attributes } from '@utils/helpers'; +import { addEventListener, removeEventListener, inheritAttributes } from '@utils/helpers'; +import { hostContext } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; -import type { ButtonInterface } from '../../utils/element-interface'; -import type { Attributes } from '../../utils/helpers'; -import { addEventListener, removeEventListener, inheritAttributes } from '../../utils/helpers'; -import { hostContext } from '../../utils/theme'; import type { SegmentButtonLayout } from './segment-button-interface'; diff --git a/core/src/components/segment/segment.tsx b/core/src/components/segment/segment.tsx index e242a1d76f..e1862d2fdc 100644 --- a/core/src/components/segment/segment.tsx +++ b/core/src/components/segment/segment.tsx @@ -1,13 +1,13 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Listen, Prop, State, Watch, h, writeTask } from '@stencil/core'; +import type { Gesture, GestureDetail } from '@utils/gesture'; +import { pointerCoord } from '@utils/helpers'; +import { isRTL } from '@utils/rtl'; +import { createColorClasses, hostContext } from '@utils/theme'; import { config } from '../../global/config'; import { getIonMode } from '../../global/ionic-global'; import type { Color, StyleEventDetail } from '../../interface'; -import type { Gesture, GestureDetail } from '../../utils/gesture'; -import { pointerCoord } from '../../utils/helpers'; -import { isRTL } from '../../utils/rtl'; -import { createColorClasses, hostContext } from '../../utils/theme'; import type { SegmentChangeEventDetail } from './segment-interface'; diff --git a/core/src/components/select-popover/select-popover.tsx b/core/src/components/select-popover/select-popover.tsx index 605269d407..a82597fe3b 100644 --- a/core/src/components/select-popover/select-popover.tsx +++ b/core/src/components/select-popover/select-popover.tsx @@ -1,9 +1,9 @@ import type { ComponentInterface } from '@stencil/core'; import { Element, Component, Host, Prop, h } from '@stencil/core'; +import { safeCall } from '@utils/overlays'; +import { getClassMap } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; -import { safeCall } from '../../utils/overlays'; -import { getClassMap } from '../../utils/theme'; import type { CheckboxCustomEvent } from '../checkbox/checkbox-interface'; import type { RadioGroupCustomEvent } from '../radio-group/radio-group-interface'; diff --git a/core/src/components/select/select.tsx b/core/src/components/select/select.tsx index 8f51db99e1..5931915cf3 100644 --- a/core/src/components/select/select.tsx +++ b/core/src/components/select/select.tsx @@ -1,5 +1,15 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Method, Prop, State, Watch, h, forceUpdate } from '@stencil/core'; +import type { LegacyFormController } from '@utils/forms'; +import { createLegacyFormController } from '@utils/forms'; +import { findItemLabel, focusElement, getAriaLabel, renderHiddenInput, inheritAttributes } from '@utils/helpers'; +import type { Attributes } from '@utils/helpers'; +import { printIonWarning } from '@utils/logging'; +import { actionSheetController, alertController, popoverController } from '@utils/overlays'; +import type { OverlaySelect } from '@utils/overlays-interface'; +import { isRTL } from '@utils/rtl'; +import { createColorClasses, hostContext } from '@utils/theme'; +import { watchForOptions } from '@utils/watch-options'; import { caretDownSharp, chevronExpand } from 'ionicons/icons'; import { getIonMode } from '../../global/ionic-global'; @@ -11,16 +21,6 @@ import type { PopoverOptions, StyleEventDetail, } from '../../interface'; -import type { LegacyFormController } from '../../utils/forms'; -import { createLegacyFormController } from '../../utils/forms'; -import { findItemLabel, focusElement, getAriaLabel, renderHiddenInput, inheritAttributes } from '../../utils/helpers'; -import type { Attributes } from '../../utils/helpers'; -import { printIonWarning } from '../../utils/logging'; -import { actionSheetController, alertController, popoverController } from '../../utils/overlays'; -import type { OverlaySelect } from '../../utils/overlays-interface'; -import { isRTL } from '../../utils/rtl'; -import { createColorClasses, hostContext } from '../../utils/theme'; -import { watchForOptions } from '../../utils/watch-options'; import type { ActionSheetButton } from '../action-sheet/action-sheet-interface'; import type { AlertInput } from '../alert/alert-interface'; import type { SelectPopoverOption } from '../select-popover/select-popover-interface'; diff --git a/core/src/components/skeleton-text/skeleton-text.tsx b/core/src/components/skeleton-text/skeleton-text.tsx index 8ca8098232..4ca8718db8 100644 --- a/core/src/components/skeleton-text/skeleton-text.tsx +++ b/core/src/components/skeleton-text/skeleton-text.tsx @@ -1,9 +1,9 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Element, Host, Prop, h } from '@stencil/core'; +import { hostContext } from '@utils/theme'; import { config } from '../../global/config'; import { getIonMode } from '../../global/ionic-global'; -import { hostContext } from '../../utils/theme'; @Component({ tag: 'ion-skeleton-text', diff --git a/core/src/components/spinner/spinner.tsx b/core/src/components/spinner/spinner.tsx index 7c01664c7b..d937f4fb0a 100644 --- a/core/src/components/spinner/spinner.tsx +++ b/core/src/components/spinner/spinner.tsx @@ -1,10 +1,10 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Host, Prop, h } from '@stencil/core'; +import { createColorClasses } from '@utils/theme'; import { config } from '../../global/config'; import { getIonMode } from '../../global/ionic-global'; import type { Color } from '../../interface'; -import { createColorClasses } from '../../utils/theme'; import type { SpinnerTypes } from './spinner-configs'; import { SPINNERS } from './spinner-configs'; diff --git a/core/src/components/tab-bar/tab-bar.tsx b/core/src/components/tab-bar/tab-bar.tsx index 327f54f09c..8976b44c29 100644 --- a/core/src/components/tab-bar/tab-bar.tsx +++ b/core/src/components/tab-bar/tab-bar.tsx @@ -1,11 +1,11 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Prop, State, Watch, h } from '@stencil/core'; +import type { KeyboardController } from '@utils/keyboard/keyboard-controller'; +import { createKeyboardController } from '@utils/keyboard/keyboard-controller'; +import { createColorClasses } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color } from '../../interface'; -import type { KeyboardController } from '../../utils/keyboard/keyboard-controller'; -import { createKeyboardController } from '../../utils/keyboard/keyboard-controller'; -import { createColorClasses } from '../../utils/theme'; import type { TabBarChangedEventDetail } from './tab-bar-interface'; diff --git a/core/src/components/tab-button/tab-button.tsx b/core/src/components/tab-button/tab-button.tsx index 08d299f647..7babc4573b 100644 --- a/core/src/components/tab-button/tab-button.tsx +++ b/core/src/components/tab-button/tab-button.tsx @@ -1,11 +1,11 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Listen, Prop, h } from '@stencil/core'; +import type { AnchorInterface } from '@utils/element-interface'; +import type { Attributes } from '@utils/helpers'; +import { inheritAttributes } from '@utils/helpers'; import { config } from '../../global/config'; import { getIonMode } from '../../global/ionic-global'; -import type { AnchorInterface } from '../../utils/element-interface'; -import type { Attributes } from '../../utils/helpers'; -import { inheritAttributes } from '../../utils/helpers'; import type { TabBarChangedEventDetail, TabButtonClickEventDetail, diff --git a/core/src/components/tab/tab.tsx b/core/src/components/tab/tab.tsx index a3f7ceca41..ce507867fd 100644 --- a/core/src/components/tab/tab.tsx +++ b/core/src/components/tab/tab.tsx @@ -1,8 +1,8 @@ import type { ComponentInterface } from '@stencil/core'; import { Build, Component, Element, Host, Method, Prop, Watch, h } from '@stencil/core'; +import { attachComponent } from '@utils/framework-delegate'; import type { ComponentRef, FrameworkDelegate } from '../../interface'; -import { attachComponent } from '../../utils/framework-delegate'; @Component({ tag: 'ion-tab', diff --git a/core/src/components/text/text.tsx b/core/src/components/text/text.tsx index 25da475a78..14f11a00cc 100644 --- a/core/src/components/text/text.tsx +++ b/core/src/components/text/text.tsx @@ -1,9 +1,9 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Host, Prop, h } from '@stencil/core'; +import { createColorClasses } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color } from '../../interface'; -import { createColorClasses } from '../../utils/theme'; /** * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use. diff --git a/core/src/components/textarea/textarea.tsx b/core/src/components/textarea/textarea.tsx index 37cf69fe39..0087813d54 100644 --- a/core/src/components/textarea/textarea.tsx +++ b/core/src/components/textarea/textarea.tsx @@ -1,14 +1,14 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Build, Component, Element, Event, Host, Method, Prop, State, Watch, h, writeTask } from '@stencil/core'; +import type { LegacyFormController } from '@utils/forms'; +import { createLegacyFormController } from '@utils/forms'; +import type { Attributes } from '@utils/helpers'; +import { inheritAriaAttributes, debounceEvent, findItemLabel, inheritAttributes } from '@utils/helpers'; +import { printIonWarning } from '@utils/logging'; +import { createColorClasses, hostContext } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color, StyleEventDetail } from '../../interface'; -import type { LegacyFormController } from '../../utils/forms'; -import { createLegacyFormController } from '../../utils/forms'; -import type { Attributes } from '../../utils/helpers'; -import { inheritAriaAttributes, debounceEvent, findItemLabel, inheritAttributes } from '../../utils/helpers'; -import { printIonWarning } from '../../utils/logging'; -import { createColorClasses, hostContext } from '../../utils/theme'; import { getCounterText } from '../input/input.utils'; import type { TextareaChangeEventDetail, TextareaInputEventDetail } from './textarea-interface'; diff --git a/core/src/components/title/title.tsx b/core/src/components/title/title.tsx index 851cde5068..82a108071f 100644 --- a/core/src/components/title/title.tsx +++ b/core/src/components/title/title.tsx @@ -1,9 +1,9 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Prop, Watch, h } from '@stencil/core'; +import { createColorClasses } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color, StyleEventDetail } from '../../interface'; -import { createColorClasses } from '../../utils/theme'; @Component({ tag: 'ion-title', diff --git a/core/src/components/toast/animations/ios.enter.ts b/core/src/components/toast/animations/ios.enter.ts index 9f18a096fe..a515924323 100644 --- a/core/src/components/toast/animations/ios.enter.ts +++ b/core/src/components/toast/animations/ios.enter.ts @@ -1,6 +1,7 @@ +import { createAnimation } from '@utils/animation/animation'; +import { getElementRoot } from '@utils/helpers'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; -import { getElementRoot } from '../../../utils/helpers'; /** * iOS Toast Enter Animation diff --git a/core/src/components/toast/animations/ios.leave.ts b/core/src/components/toast/animations/ios.leave.ts index e3b68d6451..8a7a131045 100644 --- a/core/src/components/toast/animations/ios.leave.ts +++ b/core/src/components/toast/animations/ios.leave.ts @@ -1,6 +1,7 @@ +import { createAnimation } from '@utils/animation/animation'; +import { getElementRoot } from '@utils/helpers'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; -import { getElementRoot } from '../../../utils/helpers'; /** * iOS Toast Leave Animation diff --git a/core/src/components/toast/animations/md.enter.ts b/core/src/components/toast/animations/md.enter.ts index 45511b0a8f..3d60caf5bf 100644 --- a/core/src/components/toast/animations/md.enter.ts +++ b/core/src/components/toast/animations/md.enter.ts @@ -1,6 +1,7 @@ +import { createAnimation } from '@utils/animation/animation'; +import { getElementRoot } from '@utils/helpers'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; -import { getElementRoot } from '../../../utils/helpers'; /** * MD Toast Enter Animation diff --git a/core/src/components/toast/animations/md.leave.ts b/core/src/components/toast/animations/md.leave.ts index abc6fae992..daaf4cc382 100644 --- a/core/src/components/toast/animations/md.leave.ts +++ b/core/src/components/toast/animations/md.leave.ts @@ -1,6 +1,7 @@ +import { createAnimation } from '@utils/animation/animation'; +import { getElementRoot } from '@utils/helpers'; + import type { Animation } from '../../../interface'; -import { createAnimation } from '../../../utils/animation/animation'; -import { getElementRoot } from '../../../utils/helpers'; /** * md Toast Leave Animation diff --git a/core/src/components/toast/toast.tsx b/core/src/components/toast/toast.tsx index 64dc0060ea..5cf59a404a 100644 --- a/core/src/components/toast/toast.tsx +++ b/core/src/components/toast/toast.tsx @@ -1,11 +1,7 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Watch, Component, Element, Event, h, Host, Method, Prop } from '@stencil/core'; - -import { config } from '../../global/config'; -import { getIonMode } from '../../global/ionic-global'; -import type { AnimationBuilder, Color, CssClassMap, OverlayInterface, FrameworkDelegate } from '../../interface'; -import { ENABLE_HTML_CONTENT_DEFAULT } from '../../utils/config'; -import { printIonWarning } from '../../utils/logging'; +import { ENABLE_HTML_CONTENT_DEFAULT } from '@utils/config'; +import { printIonWarning } from '@utils/logging'; import { createDelegateController, createTriggerController, @@ -15,11 +11,15 @@ import { prepareOverlay, present, safeCall, -} from '../../utils/overlays'; +} from '@utils/overlays'; +import { sanitizeDOMString } from '@utils/sanitization'; +import { createColorClasses, getClassMap } from '@utils/theme'; + +import { config } from '../../global/config'; +import { getIonMode } from '../../global/ionic-global'; +import type { AnimationBuilder, Color, CssClassMap, OverlayInterface, FrameworkDelegate } from '../../interface'; import type { OverlayEventDetail } from '../../utils/overlays-interface'; import type { IonicSafeString } from '../../utils/sanitization'; -import { sanitizeDOMString } from '../../utils/sanitization'; -import { createColorClasses, getClassMap } from '../../utils/theme'; import { iosEnterAnimation } from './animations/ios.enter'; import { iosLeaveAnimation } from './animations/ios.leave'; diff --git a/core/src/components/toggle/toggle.tsx b/core/src/components/toggle/toggle.tsx index bdb277fe8f..3f9168a4d4 100644 --- a/core/src/components/toggle/toggle.tsx +++ b/core/src/components/toggle/toggle.tsx @@ -1,19 +1,18 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Prop, State, Watch, h } from '@stencil/core'; -// TODO(FW-2845) - Use @utils/forms and @utils/logging when https://github.com/ionic-team/stencil/issues/3826 is resolved +import type { LegacyFormController } from '@utils/forms'; +import { createLegacyFormController } from '@utils/forms'; +import { getAriaLabel, renderHiddenInput, inheritAriaAttributes } from '@utils/helpers'; +import type { Attributes } from '@utils/helpers'; +import { printIonWarning } from '@utils/logging'; +import { hapticSelection } from '@utils/native/haptic'; +import { isRTL } from '@utils/rtl'; +import { createColorClasses, hostContext } from '@utils/theme'; import { checkmarkOutline, removeOutline, ellipseOutline } from 'ionicons/icons'; import { config } from '../../global/config'; import { getIonMode } from '../../global/ionic-global'; import type { Color, Gesture, GestureDetail, Mode, StyleEventDetail } from '../../interface'; -import type { LegacyFormController } from '../../utils/forms'; -import { createLegacyFormController } from '../../utils/forms'; -import { getAriaLabel, renderHiddenInput, inheritAriaAttributes } from '../../utils/helpers'; -import type { Attributes } from '../../utils/helpers'; -import { printIonWarning } from '../../utils/logging'; -import { hapticSelection } from '../../utils/native/haptic'; -import { isRTL } from '../../utils/rtl'; -import { createColorClasses, hostContext } from '../../utils/theme'; import type { ToggleChangeEventDetail } from './toggle-interface'; diff --git a/core/src/components/toolbar/toolbar.tsx b/core/src/components/toolbar/toolbar.tsx index 4e5e3f3d06..0999d40427 100644 --- a/core/src/components/toolbar/toolbar.tsx +++ b/core/src/components/toolbar/toolbar.tsx @@ -1,9 +1,9 @@ import type { ComponentInterface } from '@stencil/core'; import { Component, Element, Host, Listen, Prop, forceUpdate, h } from '@stencil/core'; +import { createColorClasses, hostContext } from '@utils/theme'; import { getIonMode } from '../../global/ionic-global'; import type { Color, CssClassMap, StyleEventDetail } from '../../interface'; -import { createColorClasses, hostContext } from '../../utils/theme'; /** * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use.