From f89900b6d1baf62ef565af27106b4890c3a2ae82 Mon Sep 17 00:00:00 2001 From: Roman Semenov Date: Wed, 9 Oct 2024 16:14:00 +0400 Subject: [PATCH 1/2] fix --- packages/devextreme-angular/src/ui/pagination/index.ts | 4 ++-- packages/devextreme-react/src/pagination.ts | 4 ++-- packages/devextreme-vue/src/pagination.ts | 4 ++-- packages/devextreme/build/gulp/modules_metadata.json | 2 +- .../devextreme/js/__internal/pager/common/base_pager_props.ts | 2 +- packages/devextreme/js/bundles/modules/parts/widgets-base.js | 2 +- packages/devextreme/js/integration/jquery.d.ts | 4 ++-- packages/devextreme/js/ui/{pager.d.ts => pagination.d.ts} | 0 packages/devextreme/js/ui/{pager.js => pagination.js} | 0 .../js/ui/{pager_types.d.ts => pagination_types.d.ts} | 2 +- .../DevExpress.performance/dataGridRecaclulations.tests.js | 2 +- .../testing/tests/DevExpress.ui.widgets/pager.tests.js | 2 +- .../devextreme/testing/tests/Renovation/compatibility.test.js | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) rename packages/devextreme/js/ui/{pager.d.ts => pagination.d.ts} (100%) rename packages/devextreme/js/ui/{pager.js => pagination.js} (100%) rename packages/devextreme/js/ui/{pager_types.d.ts => pagination_types.d.ts} (76%) diff --git a/packages/devextreme-angular/src/ui/pagination/index.ts b/packages/devextreme-angular/src/ui/pagination/index.ts index 5b2f308a0ae0..361d6798ab94 100644 --- a/packages/devextreme-angular/src/ui/pagination/index.ts +++ b/packages/devextreme-angular/src/ui/pagination/index.ts @@ -22,7 +22,7 @@ import { import { DisplayMode } from 'devextreme/common'; -import DxPagination from 'devextreme/ui/pager'; +import DxPagination from 'devextreme/ui/pagination'; import { @@ -630,7 +630,7 @@ export class DxPaginationComponent extends DxComponent implements OnDestroy, OnC }) export class DxPaginationModule { } -import type * as DxPaginationTypes from "devextreme/ui/pager_types"; +import type * as DxPaginationTypes from "devextreme/ui/pagination_types"; export { DxPaginationTypes }; diff --git a/packages/devextreme-react/src/pagination.ts b/packages/devextreme-react/src/pagination.ts index 00634fad608a..13322f811f0d 100644 --- a/packages/devextreme-react/src/pagination.ts +++ b/packages/devextreme-react/src/pagination.ts @@ -3,7 +3,7 @@ import * as React from "react"; import { memo, forwardRef, useImperativeHandle, useRef, useMemo, ForwardedRef, Ref, ReactElement } from "react"; import dxPagination, { Properties -} from "devextreme/ui/pager"; +} from "devextreme/ui/pagination"; import { Component as BaseComponent, IHtmlOptions, ComponentRef } from "./core/component"; @@ -58,6 +58,6 @@ export { IPaginationOptions, PaginationRef }; -import type * as PaginationTypes from 'devextreme/ui/pager_types'; +import type * as PaginationTypes from 'devextreme/ui/pagination_types'; export { PaginationTypes }; diff --git a/packages/devextreme-vue/src/pagination.ts b/packages/devextreme-vue/src/pagination.ts index 6735f1afe405..833c54e5f62a 100644 --- a/packages/devextreme-vue/src/pagination.ts +++ b/packages/devextreme-vue/src/pagination.ts @@ -1,4 +1,4 @@ -import Pagination, { Properties } from "devextreme/ui/pager"; +import Pagination, { Properties } from "devextreme/ui/pagination"; import { defineComponent } from "vue"; import { prepareComponentConfig } from "./core/index"; @@ -113,5 +113,5 @@ export default DxPagination; export { DxPagination }; -import type * as DxPaginationTypes from "devextreme/ui/pager_types"; +import type * as DxPaginationTypes from "devextreme/ui/pagination_types"; export { DxPaginationTypes }; diff --git a/packages/devextreme/build/gulp/modules_metadata.json b/packages/devextreme/build/gulp/modules_metadata.json index b761c4894bbe..b29735d5bebe 100644 --- a/packages/devextreme/build/gulp/modules_metadata.json +++ b/packages/devextreme/build/gulp/modules_metadata.json @@ -501,7 +501,7 @@ } }, { - "name": "ui/pager", + "name": "ui/pagination", "exports": { "default": { "path": "ui.dxPagination", "isWidget": true } } diff --git a/packages/devextreme/js/__internal/pager/common/base_pager_props.ts b/packages/devextreme/js/__internal/pager/common/base_pager_props.ts index abb88e9b4502..0611abc32186 100644 --- a/packages/devextreme/js/__internal/pager/common/base_pager_props.ts +++ b/packages/devextreme/js/__internal/pager/common/base_pager_props.ts @@ -1,5 +1,5 @@ import type { DisplayMode } from '@js/common'; -import type { PageSize } from '@js/ui/pager_types'; +import type { PageSize } from '@js/ui/pagination_types'; import messageLocalization from '../../../localization/message'; import type { EventCallback } from '../../core/r1/event_callback'; diff --git a/packages/devextreme/js/bundles/modules/parts/widgets-base.js b/packages/devextreme/js/bundles/modules/parts/widgets-base.js index 9f50398b37f9..1c2eca906c45 100644 --- a/packages/devextreme/js/bundles/modules/parts/widgets-base.js +++ b/packages/devextreme/js/bundles/modules/parts/widgets-base.js @@ -47,7 +47,7 @@ ui.dxMap = require('../../../ui/map'); ui.dxMultiView = require('../../../ui/multi_view'); ui.dxNumberBox = require('../../../ui/number_box'); ui.dxOverlay = require('../../../ui/overlay/ui.overlay'); -ui.dxPagination = require('../../../ui/pager'); +ui.dxPagination = require('../../../ui/pagination'); ui.dxPopover = require('../../../ui/popover'); ui.dxPopup = require('../../../ui/popup'); ui.dxProgressBar = require('../../../ui/progress_bar'); diff --git a/packages/devextreme/js/integration/jquery.d.ts b/packages/devextreme/js/integration/jquery.d.ts index 206d3d8cf2f3..ccb50918ffb6 100644 --- a/packages/devextreme/js/integration/jquery.d.ts +++ b/packages/devextreme/js/integration/jquery.d.ts @@ -33,7 +33,7 @@ import dxMap, { Properties as MapProperties } from '../ui/map'; import dxMenu, { Properties as MenuProperties } from '../ui/menu'; import dxMultiView, { Properties as MultiViewProperties } from '../ui/multi_view'; import dxNumberBox, { Properties as NumberBoxProperties } from '../ui/number_box'; -import dxPagination, { Properties as PagerProperties } from '../ui/pager'; +import dxPagination, { Properties as PaginationProperties } from '../ui/pagination'; import dxPivotGrid, { Properties as PivotGridProperties } from '../ui/pivot_grid'; import dxPivotGridFieldChooser, { Properties as PivotGridFieldChooserProperties } from '../ui/pivot_grid_field_chooser'; import dxPopover, { Properties as PopoverProperties } from '../ui/popover'; @@ -356,7 +356,7 @@ declare global { dxPagination(): JQuery; dxPagination(options: 'instance'): dxPagination; - dxPagination(options: PagerProperties): JQuery; + dxPagination(options: PaginationProperties): JQuery; dxPagination(options: string): any; dxPagination(options: string, ...params: any[]): any; diff --git a/packages/devextreme/js/ui/pager.d.ts b/packages/devextreme/js/ui/pagination.d.ts similarity index 100% rename from packages/devextreme/js/ui/pager.d.ts rename to packages/devextreme/js/ui/pagination.d.ts diff --git a/packages/devextreme/js/ui/pager.js b/packages/devextreme/js/ui/pagination.js similarity index 100% rename from packages/devextreme/js/ui/pager.js rename to packages/devextreme/js/ui/pagination.js diff --git a/packages/devextreme/js/ui/pager_types.d.ts b/packages/devextreme/js/ui/pagination_types.d.ts similarity index 76% rename from packages/devextreme/js/ui/pager_types.d.ts rename to packages/devextreme/js/ui/pagination_types.d.ts index ccdd37c8d1c3..c82ba5ad3aec 100644 --- a/packages/devextreme/js/ui/pager_types.d.ts +++ b/packages/devextreme/js/ui/pagination_types.d.ts @@ -3,4 +3,4 @@ export { PageSize, dxPaginationOptions, Properties, -} from './pager'; +} from './pagination'; diff --git a/packages/devextreme/testing/tests/DevExpress.performance/dataGridRecaclulations.tests.js b/packages/devextreme/testing/tests/DevExpress.performance/dataGridRecaclulations.tests.js index f89ab0c10d9a..38dcf5ed3c93 100644 --- a/packages/devextreme/testing/tests/DevExpress.performance/dataGridRecaclulations.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.performance/dataGridRecaclulations.tests.js @@ -5,7 +5,7 @@ require('../../content/orders.js'); require('generic_light.css!'); const DataGrid = require('ui/data_grid'); -const Pager = require('ui/pager'); +const Pager = require('ui/pagination'); const Scrollable = require('ui/scroll_view/ui.scrollable'); const createDataGridMeasureFunction = function(options) { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/pager.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/pager.tests.js index e0e496acb625..d57fd708d8b2 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/pager.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/pager.tests.js @@ -5,7 +5,7 @@ import typeUtils from 'core/utils/type'; import resizeCallbacks from 'core/utils/resize_callbacks'; import 'generic_light.css!'; -import Pager from 'ui/pager'; +import Pager from 'ui/pagination'; import localization from 'localization'; const PAGER_LIGHT_MODE_WIDTH = 200; diff --git a/packages/devextreme/testing/tests/Renovation/compatibility.test.js b/packages/devextreme/testing/tests/Renovation/compatibility.test.js index b8ac1ad623d5..3eea785b78ba 100644 --- a/packages/devextreme/testing/tests/Renovation/compatibility.test.js +++ b/packages/devextreme/testing/tests/Renovation/compatibility.test.js @@ -3,7 +3,7 @@ import widgetsMeta from './widgets.json!'; import publicWidgets from 'renovation/components'; import Button from 'ui/button'; import 'ui/check_box'; -import 'ui/pager'; +import 'ui/pagination'; import 'ui/data_grid'; /** From a42b7dccf7985435cf31818433467852eefd50e6 Mon Sep 17 00:00:00 2001 From: Roman Semenov Date: Wed, 9 Oct 2024 19:24:35 +0400 Subject: [PATCH 2/2] fix: forgotten import --- .../tests/DevExpress.ui.widgets.dataGrid/pagerView.tests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/pagerView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/pagerView.tests.js index c54277fc0f39..00926234a4d4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/pagerView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/pagerView.tests.js @@ -8,7 +8,7 @@ import dataUtils from 'core/element_data'; import { createEvent } from 'events/utils/index'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; -import Pager from 'ui/pager'; +import Pager from 'ui/pagination'; QUnit.testStart(function() { const markup =