Skip to content

Commit ea4919a

Browse files
author
Alyar
committed
CardView: Implement PagerView
1 parent 26def52 commit ea4919a

File tree

17 files changed

+960
-101
lines changed

17 files changed

+960
-101
lines changed

packages/devextreme/js/__internal/grids/new/card_view/__snapshots__/widget.test.ts.snap

Lines changed: 11 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -156,25 +156,21 @@ exports[`common initial render should be successfull 1`] = `
156156
class="dx-cardview-headers"
157157
>
158158
<div
159-
class="dx-sortable"
159+
class="dx-cardview-header-item"
160160
>
161+
A
161162
<div
162-
class="dx-cardview-header-item"
163+
aria-label="Close"
164+
class="dx-widget dx-button dx-button-mode-text dx-button-normal dx-button-has-icon dx-cardview-header-item-button"
165+
role="button"
166+
tabindex="0"
163167
>
164-
A
165168
<div
166-
aria-label="Close"
167-
class="dx-widget dx-button dx-button-mode-text dx-button-normal dx-button-has-icon dx-cardview-header-item-button"
168-
role="button"
169-
tabindex="0"
169+
class="dx-button-content"
170170
>
171-
<div
172-
class="dx-button-content"
173-
>
174-
<i
175-
class="dx-icon dx-icon-close"
176-
/>
177-
</div>
171+
<i
172+
class="dx-icon dx-icon-close"
173+
/>
178174
</div>
179175
</div>
180176
</div>
@@ -292,50 +288,7 @@ exports[`common initial render should be successfull 1`] = `
292288
/>
293289
</div>
294290
295-
<div
296-
aria-label="Page navigation"
297-
class="dx-widget dx-pagination"
298-
role="navigation"
299-
>
300-
<div
301-
class="dx-page-sizes"
302-
>
303-
<div
304-
aria-label="Items per page: 5"
305-
class="dx-page-size dx-first-child"
306-
role="button"
307-
tabindex="0"
308-
>
309-
5
310-
</div>
311-
<div
312-
aria-label="Items per page: 10"
313-
class="dx-page-size"
314-
role="button"
315-
tabindex="0"
316-
>
317-
10
318-
</div>
319-
</div>
320-
<div
321-
class="dx-pages"
322-
style="visibility: hidden;"
323-
>
324-
<div
325-
class="dx-page-indexes"
326-
>
327-
<div
328-
aria-current="page"
329-
aria-label="Page 1"
330-
class="dx-page dx-selection"
331-
role="button"
332-
tabindex="0"
333-
>
334-
1
335-
</div>
336-
</div>
337-
</div>
338-
</div>
291+
339292
340293
</div>
341294
`;

packages/devextreme/js/__internal/grids/new/card_view/main_view.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { combined } from '@ts/core/reactive/index';
44
import { ColumnsChooserView } from '@ts/grids/new/grid_core/columns_chooser/view';
55
import { View } from '@ts/grids/new/grid_core/core/view';
66
import { FilterPanelView } from '@ts/grids/new/grid_core/filtering/filter_panel/filter_panel';
7-
import { PagerView } from '@ts/grids/new/grid_core/pager';
7+
import { PagerView } from '@ts/grids/new/grid_core/pager/view';
88
import { ToolbarView } from '@ts/grids/new/grid_core/toolbar/view';
99
import type { ComponentType } from 'inferno';
1010

packages/devextreme/js/__internal/grids/new/data_grid/main_view.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type { Subscribable } from '@ts/core/reactive/index';
44
import { ColumnsChooserView } from '@ts/grids/new/grid_core/columns_chooser/view';
55
import { View } from '@ts/grids/new/grid_core/core/view_old';
66
import { FilterPanelView } from '@ts/grids/new/grid_core/filtering/filter_panel/filter_panel';
7-
import { PagerView } from '@ts/grids/new/grid_core/pager';
7+
import { PagerView } from '@ts/grids/new/grid_core/pager/view';
88
import { ToolbarView } from '@ts/grids/new/grid_core/toolbar/view';
99
import type { InfernoNode } from 'inferno';
1010

packages/devextreme/js/__internal/grids/new/grid_core/options.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import type { WidgetOptions } from '@js/ui/widget/ui.widget';
55
import * as columnsController from './columns_controller';
66
import * as dataController from './data_controller';
77
import { filterPanel } from './filtering';
8+
import * as pager from './pager';
89
import type { SearchProperties } from './search/types';
910
import * as toolbar from './toolbar';
1011
import type { GridCoreNew } from './widget';
@@ -16,6 +17,7 @@ export type Options =
1617
& WidgetOptions<GridCoreNew>
1718
& dataController.Options
1819
& toolbar.Options
20+
& pager.Options
1921
& columnsController.Options
2022
& filterPanel.Options
2123
& SearchProperties
@@ -27,6 +29,7 @@ export const defaultOptions = {
2729
...dataController.defaultOptions,
2830
...columnsController.defaultOptions,
2931
...toolbar.defaultOptions,
32+
...pager.defaultOptions,
3033
...filterPanel.defaultOptions,
3134
searchText: '',
3235
} satisfies Options;
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
import type { defaultOptions, Options } from '../options';
1+
import type { Options } from '../options';
2+
import { defaultOptions } from '../options';
23
import { OptionsControllerMock as OptionsControllerBaseMock } from './options_controller_base.mock';
34

45
export class OptionsControllerMock extends OptionsControllerBaseMock<
56
Options, typeof defaultOptions
6-
> {}
7+
> {
8+
constructor(options: Options) {
9+
super(options, defaultOptions);
10+
}
11+
}

packages/devextreme/js/__internal/grids/new/grid_core/options_controller/options_controller_base.mock.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ export class OptionsControllerMock<
1313
TDefaultProps extends TProps,
1414
> extends OptionsController<TProps, TDefaultProps> {
1515
private readonly componentMock: Component<TProps>;
16-
constructor(options: TProps) {
16+
constructor(options: TProps, defaultOptions: TDefaultProps) {
1717
const componentMock = new Component(options);
1818
super(componentMock);
19+
this.defaults = defaultOptions;
1920
this.componentMock = componentMock;
2021
}
2122

packages/devextreme/js/__internal/grids/new/grid_core/options_controller/options_controller_base.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export class OptionsController<TProps, TDefaultProps extends TProps = TProps> {
7474

7575
private readonly props: SubsGetsUpd<TProps>;
7676

77-
private readonly defaults: TDefaultProps;
77+
protected defaults: TDefaultProps;
7878

7979
public static dependencies = [Component];
8080

packages/devextreme/js/__internal/grids/new/grid_core/pager.tsx

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)