Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pager - rename filename #28163

Merged
merged 2 commits into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/devextreme-angular/src/ui/pagination/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {

import { DisplayMode } from 'devextreme/common';

import DxPagination from 'devextreme/ui/pager';
import DxPagination from 'devextreme/ui/pagination';


import {
Expand Down Expand Up @@ -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 };


4 changes: 2 additions & 2 deletions packages/devextreme-react/src/pagination.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -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 };

4 changes: 2 additions & 2 deletions packages/devextreme-vue/src/pagination.ts
Original file line number Diff line number Diff line change
@@ -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";

Expand Down Expand Up @@ -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 };
2 changes: 1 addition & 1 deletion packages/devextreme/build/gulp/modules_metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@
}
},
{
"name": "ui/pager",
"name": "ui/pagination",
"exports": {
"default": { "path": "ui.dxPagination", "isWidget": true }
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme/js/integration/jquery.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export {
PageSize,
dxPaginationOptions,
Properties,
} from './pager';
} from './pagination';
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand Down
Loading