diff --git a/packages/devextreme/js/__internal/pager/base_props.ts b/packages/devextreme/js/__internal/core/r1/base_props.ts similarity index 100% rename from packages/devextreme/js/__internal/pager/base_props.ts rename to packages/devextreme/js/__internal/core/r1/base_props.ts diff --git a/packages/devextreme/js/__internal/pager/common/widget.tsx b/packages/devextreme/js/__internal/core/r1/widget.tsx similarity index 95% rename from packages/devextreme/js/__internal/pager/common/widget.tsx rename to packages/devextreme/js/__internal/core/r1/widget.tsx index ac2ce249df88..916c2be3df47 100644 --- a/packages/devextreme/js/__internal/pager/common/widget.tsx +++ b/packages/devextreme/js/__internal/core/r1/widget.tsx @@ -2,30 +2,32 @@ /* eslint-disable spellcheck/spell-checker */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable @typescript-eslint/no-explicit-any */ -import '../../../events/click'; -import '../../../events/hover'; +import '@js/events/click'; +import '@js/events/hover'; import { createReRenderEffect, InfernoEffect, InfernoWrapperComponent, } from '@devextreme/runtime/inferno'; import type { RefObject } from '@devextreme-generator/declarations'; -import { createRef as infernoCreateRef } from 'inferno'; - -import domAdapter from '../../../core/dom_adapter'; -import errors from '../../../core/errors'; -import { extend } from '../../../core/utils/extend'; -import resizeCallbacks from '../../../core/utils/resize_callbacks'; -import { normalizeStyleProp } from '../../../core/utils/style'; -import { isFunction } from '../../../core/utils/type'; +import domAdapter from '@js/core/dom_adapter'; +import errors from '@js/core/errors'; +import { extend } from '@js/core/utils/extend'; +import resizeCallbacks from '@js/core/utils/resize_callbacks'; +import { normalizeStyleProp } from '@js/core/utils/style'; +import { isFunction } from '@js/core/utils/type'; import { dxClick, focus, keyboard, resize, visibility, -} from '../../../events/short'; -import type { ConfigContextValue } from '../../core/r1/config_context'; -import { ConfigContext } from '../../core/r1/config_context'; -import { ConfigProvider } from '../../core/r1/config_provider'; -import type { EffectReturn } from '../../core/r1/utils/effect_return'; -import { combineClasses } from '../../core/r1/utils/render_utils'; -import { resolveRtlEnabled, resolveRtlEnabledDefinition } from '../../core/r1/utils/resolve_rtl'; +} from '@js/events/short'; +import type { ConfigContextValue } from '@ts/core/r1/config_context'; +import { ConfigContext } from '@ts/core/r1/config_context'; +import { ConfigProvider } from '@ts/core/r1/config_provider'; +import type { EffectReturn } from '@ts/core/r1/utils/effect_return'; +import { combineClasses } from '@ts/core/r1/utils/render_utils'; +import { resolveRtlEnabled, resolveRtlEnabledDefinition } from '@ts/core/r1/utils/resolve_rtl'; +import { createRef as infernoCreateRef } from 'inferno'; + +import type { BaseWidgetProps } from './base_props'; +import { BaseWidgetDefaultProps } from './base_props'; import { subscribeToDxActiveEvent, subscribeToDxFocusInEvent, @@ -33,9 +35,7 @@ import { subscribeToDxHoverEndEvent, subscribeToDxHoverStartEvent, subscribeToDxInactiveEvent, -} from '../../core/r1/utils/subscribe_to_event'; -import type { BaseWidgetProps } from '../base_props'; -import { BaseWidgetDefaultProps } from '../base_props'; +} from './utils/subscribe_to_event'; const DEFAULT_FEEDBACK_HIDE_TIMEOUT = 400; const DEFAULT_FEEDBACK_SHOW_TIMEOUT = 30; diff --git a/packages/devextreme/js/__internal/pager/common/base_pagination_props.ts b/packages/devextreme/js/__internal/pager/common/base_pagination_props.ts index 187d0835c0e8..7e2b48c1b369 100644 --- a/packages/devextreme/js/__internal/pager/common/base_pagination_props.ts +++ b/packages/devextreme/js/__internal/pager/common/base_pagination_props.ts @@ -1,9 +1,9 @@ import type { DisplayMode } from '@js/common'; import type { PageSize } from '@js/ui/pagination_types'; +import { BaseWidgetDefaultProps, type BaseWidgetProps } from '@ts/core/r1/base_props'; import messageLocalization from '../../../localization/message'; import type { EventCallback } from '../../core/r1/event_callback'; -import { BaseWidgetDefaultProps, type BaseWidgetProps } from '../base_props'; export interface BasePaginationProps extends BaseWidgetProps { isGridCompatibilityMode?: boolean; diff --git a/packages/devextreme/js/__internal/pager/content.tsx b/packages/devextreme/js/__internal/pager/content.tsx index af8d20d8fda0..4b812dc62445 100644 --- a/packages/devextreme/js/__internal/pager/content.tsx +++ b/packages/devextreme/js/__internal/pager/content.tsx @@ -3,6 +3,7 @@ import { InfernoComponent, InfernoEffect } from '@devextreme/runtime/inferno'; import type { RefObject } from '@devextreme-generator/declarations'; import type { DisplayMode } from '@js/common'; +import { Widget } from '@ts/core/r1/widget'; import { createRef as infernoCreateRef } from 'inferno'; import { registerKeyboardAction } from '../../ui/shared/accessibility'; @@ -17,7 +18,6 @@ import { KeyboardActionContext } from './common/keyboard_action_context'; import { PaginationConfigProvider } from './common/pagination_config_provider'; import type { PaginationProps } from './common/pagination_props'; import { PaginationDefaultProps } from './common/pagination_props'; -import { Widget } from './common/widget'; import { InfoText } from './info'; import { PageSizeSelector } from './page_size/selector'; import { PageIndexSelector } from './pages/page_index_selector'; diff --git a/packages/devextreme/js/__internal/pager/editors/common/widget_props.ts b/packages/devextreme/js/__internal/pager/editors/common/widget_props.ts index eef15999cb51..9e144d4b1a0b 100644 --- a/packages/devextreme/js/__internal/pager/editors/common/widget_props.ts +++ b/packages/devextreme/js/__internal/pager/editors/common/widget_props.ts @@ -1,6 +1,6 @@ +import { BaseWidgetDefaultProps } from '@ts/core/r1/base_props'; import type { RefObject } from 'inferno'; -import { BaseWidgetDefaultProps } from '../../base_props'; import type { BaseWidgetProps } from './base_widget_props'; const DEFAULT_FEEDBACK_HIDE_TIMEOUT = 400;