Skip to content

Commit a0b85fe

Browse files
Pagination: Component is hidden when itemCount is lower than pageSize
Co-authored-by: Aleksey Semikozov <[email protected]>
1 parent 9a7ea2a commit a0b85fe

File tree

17 files changed

+166
-28
lines changed

17 files changed

+166
-28
lines changed

packages/devextreme-angular/src/ui/card-view/nested/pager.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ export class DxoCardViewPagerComponent extends NestedOption implements OnDestroy
8282
}
8383

8484
@Input()
85-
get showPageSizeSelector(): boolean {
85+
get showPageSizeSelector(): boolean | Mode {
8686
return this._getOption('showPageSizeSelector');
8787
}
88-
set showPageSizeSelector(value: boolean) {
88+
set showPageSizeSelector(value: boolean | Mode) {
8989
this._setOption('showPageSizeSelector', value);
9090
}
9191

packages/devextreme-angular/src/ui/data-grid/nested/pager.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ export class DxoDataGridPagerComponent extends NestedOption implements OnDestroy
8282
}
8383

8484
@Input()
85-
get showPageSizeSelector(): boolean {
85+
get showPageSizeSelector(): boolean | Mode {
8686
return this._getOption('showPageSizeSelector');
8787
}
88-
set showPageSizeSelector(value: boolean) {
88+
set showPageSizeSelector(value: boolean | Mode) {
8989
this._setOption('showPageSizeSelector', value);
9090
}
9191

packages/devextreme-angular/src/ui/nested/base/pager.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ export abstract class DxoPager extends NestedOption {
5454
this._setOption('showNavigationButtons', value);
5555
}
5656

57-
get showPageSizeSelector(): boolean {
57+
get showPageSizeSelector(): Mode | boolean {
5858
return this._getOption('showPageSizeSelector');
5959
}
60-
set showPageSizeSelector(value: boolean) {
60+
set showPageSizeSelector(value: Mode | boolean) {
6161
this._setOption('showPageSizeSelector', value);
6262
}
6363

packages/devextreme-angular/src/ui/pagination/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
} from '@angular/core';
2121

2222

23-
import { DisplayMode } from 'devextreme/common';
23+
import { DisplayMode, Mode } from 'devextreme/common';
2424
import { EventInfo } from 'devextreme/common/core/events';
2525

2626
import DxPagination from 'devextreme/ui/pagination';
@@ -300,10 +300,10 @@ export class DxPaginationComponent extends DxComponent implements OnDestroy, OnC
300300
301301
*/
302302
@Input()
303-
get showPageSizeSelector(): boolean {
303+
get showPageSizeSelector(): boolean | Mode {
304304
return this._getOption('showPageSizeSelector');
305305
}
306-
set showPageSizeSelector(value: boolean) {
306+
set showPageSizeSelector(value: boolean | Mode) {
307307
this._setOption('showPageSizeSelector', value);
308308
}
309309

@@ -509,7 +509,7 @@ export class DxPaginationComponent extends DxComponent implements OnDestroy, OnC
509509
* This member supports the internal infrastructure and is not intended to be used directly from your code.
510510
511511
*/
512-
@Output() showPageSizeSelectorChange: EventEmitter<boolean>;
512+
@Output() showPageSizeSelectorChange: EventEmitter<boolean | Mode>;
513513

514514
/**
515515

packages/devextreme-angular/src/ui/tree-list/nested/pager.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ export class DxoTreeListPagerComponent extends NestedOption implements OnDestroy
8282
}
8383

8484
@Input()
85-
get showPageSizeSelector(): boolean {
85+
get showPageSizeSelector(): boolean | Mode {
8686
return this._getOption('showPageSizeSelector');
8787
}
88-
set showPageSizeSelector(value: boolean) {
88+
set showPageSizeSelector(value: boolean | Mode) {
8989
this._setOption('showPageSizeSelector', value);
9090
}
9191

packages/devextreme-react/src/card-view.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1985,7 +1985,7 @@ type IPagerProps = React.PropsWithChildren<{
19851985
label?: string;
19861986
showInfo?: boolean;
19871987
showNavigationButtons?: boolean;
1988-
showPageSizeSelector?: boolean;
1988+
showPageSizeSelector?: boolean | Mode;
19891989
visible?: boolean | Mode;
19901990
}>
19911991
const _componentPager = (props: IPagerProps) => {

packages/devextreme-react/src/data-grid.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2178,7 +2178,7 @@ type IPagerProps = React.PropsWithChildren<{
21782178
label?: string;
21792179
showInfo?: boolean;
21802180
showNavigationButtons?: boolean;
2181-
showPageSizeSelector?: boolean;
2181+
showPageSizeSelector?: boolean | Mode;
21822182
visible?: boolean | Mode;
21832183
}>
21842184
const _componentPager = (props: IPagerProps) => {

packages/devextreme-react/src/tree-list.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1854,7 +1854,7 @@ type IPagerProps = React.PropsWithChildren<{
18541854
label?: string;
18551855
showInfo?: boolean;
18561856
showNavigationButtons?: boolean;
1857-
showPageSizeSelector?: boolean;
1857+
showPageSizeSelector?: boolean | Mode;
18581858
visible?: boolean | Mode;
18591859
}>
18601860
const _componentPager = (props: IPagerProps) => {

packages/devextreme-vue/src/card-view.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2409,7 +2409,7 @@ const DxPagerConfig = {
24092409
label: String,
24102410
showInfo: Boolean,
24112411
showNavigationButtons: Boolean,
2412-
showPageSizeSelector: Boolean,
2412+
showPageSizeSelector: [Boolean, String] as PropType<boolean | Mode>,
24132413
visible: [Boolean, String] as PropType<boolean | Mode>
24142414
}
24152415
};

packages/devextreme-vue/src/data-grid.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2727,7 +2727,7 @@ const DxPagerConfig = {
27272727
label: String,
27282728
showInfo: Boolean,
27292729
showNavigationButtons: Boolean,
2730-
showPageSizeSelector: Boolean,
2730+
showPageSizeSelector: [Boolean, String] as PropType<boolean | Mode>,
27312731
visible: [Boolean, String] as PropType<boolean | Mode>
27322732
}
27332733
};

0 commit comments

Comments
 (0)