Skip to content

PivotGrid: update FieldChooser width/height d.ts #34618

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.

Sign up for GitHub

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

Open
sjbur wants to merge 1 commit into
base: main
Choose a base branch
from
Open

PivotGrid: update FieldChooser width/height d.ts #34618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions packages/devextreme-angular/src/ui/nested/field-chooser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ export class DxoFieldChooserComponent extends NestedOption implements OnDestroy,
}

@Input()
get height(): number {
get height(): number | string {
return this._getOption('height');
}
set height(value: number) {
set height(value: number | string) {
this._setOption('height', value);
}

Expand Down Expand Up @@ -97,10 +97,10 @@ export class DxoFieldChooserComponent extends NestedOption implements OnDestroy,
}

@Input()
get width(): number {
get width(): number | string {
return this._getOption('width');
}
set width(value: number) {
set width(value: number | string) {
this._setOption('width', value);
}

Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-angular/src/ui/pivot-grid/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,10 @@ export class DxPivotGridComponent extends DxComponent implements OnDestroy, OnCh

*/
@Input()
get fieldChooser(): { allowSearch?: boolean, applyChangesMode?: ApplyChangesMode, enabled?: boolean, height?: number, layout?: FieldChooserLayout, searchTimeout?: number, texts?: { allFields?: string, columnFields?: string, dataFields?: string, filterFields?: string, rowFields?: string }, title?: string, width?: number } {
get fieldChooser(): { allowSearch?: boolean, applyChangesMode?: ApplyChangesMode, enabled?: boolean, height?: number | string, layout?: FieldChooserLayout, searchTimeout?: number, texts?: { allFields?: string, columnFields?: string, dataFields?: string, filterFields?: string, rowFields?: string }, title?: string, width?: number | string } {
return this._getOption('fieldChooser');
}
set fieldChooser(value: { allowSearch?: boolean, applyChangesMode?: ApplyChangesMode, enabled?: boolean, height?: number, layout?: FieldChooserLayout, searchTimeout?: number, texts?: { allFields?: string, columnFields?: string, dataFields?: string, filterFields?: string, rowFields?: string }, title?: string, width?: number }) {
set fieldChooser(value: { allowSearch?: boolean, applyChangesMode?: ApplyChangesMode, enabled?: boolean, height?: number | string, layout?: FieldChooserLayout, searchTimeout?: number, texts?: { allFields?: string, columnFields?: string, dataFields?: string, filterFields?: string, rowFields?: string }, title?: string, width?: number | string }) {
this._setOption('fieldChooser', value);
}

Expand Down Expand Up @@ -637,7 +637,7 @@ export class DxPivotGridComponent extends DxComponent implements OnDestroy, OnCh
* This member supports the internal infrastructure and is not intended to be used directly from your code.

*/
@Output() fieldChooserChange: EventEmitter<{ allowSearch?: boolean, applyChangesMode?: ApplyChangesMode, enabled?: boolean, height?: number, layout?: FieldChooserLayout, searchTimeout?: number, texts?: { allFields?: string, columnFields?: string, dataFields?: string, filterFields?: string, rowFields?: string }, title?: string, width?: number }>;
@Output() fieldChooserChange: EventEmitter<{ allowSearch?: boolean, applyChangesMode?: ApplyChangesMode, enabled?: boolean, height?: number | string, layout?: FieldChooserLayout, searchTimeout?: number, texts?: { allFields?: string, columnFields?: string, dataFields?: string, filterFields?: string, rowFields?: string }, title?: string, width?: number | string }>;

/**

Expand Down
8 changes: 4 additions & 4 deletions packages/devextreme-angular/src/ui/pivot-grid/nested/field-chooser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ export class DxoPivotGridFieldChooserComponent extends NestedOption implements O
}

@Input()
get height(): number {
get height(): number | string {
return this._getOption('height');
}
set height(value: number) {
set height(value: number | string) {
this._setOption('height', value);
}

Expand Down Expand Up @@ -97,10 +97,10 @@ export class DxoPivotGridFieldChooserComponent extends NestedOption implements O
}

@Input()
get width(): number {
get width(): number | string {
return this._getOption('width');
}
set width(value: number) {
set width(value: number | string) {
this._setOption('width', value);
}

Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-react/src/pivot-grid.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ type IFieldChooserProps = React.PropsWithChildren<{
allowSearch?: boolean;
applyChangesMode?: ApplyChangesMode;
enabled?: boolean;
height?: number;
height?: number | string;
layout?: FieldChooserLayout;
searchTimeout?: number;
texts?: Record<string, any> | {
Expand All @@ -108,7 +108,7 @@ type IFieldChooserProps = React.PropsWithChildren<{
rowFields?: string;
};
title?: string;
width?: number;
width?: number | string;
}>
const _componentFieldChooser = (props: IFieldChooserProps) => {
return React.createElement(NestedOption<IFieldChooserProps>, {
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-vue/src/pivot-grid.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,12 +228,12 @@ const DxFieldChooserConfig = {
allowSearch: Boolean,
applyChangesMode: String as PropType<ApplyChangesMode>,
enabled: Boolean,
height: Number,
height: [Number, String],
layout: Number as PropType<FieldChooserLayout>,
searchTimeout: Number,
texts: Object as PropType<Record<string, any>>,
title: String,
width: Number
width: [Number, String]
}
};

Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme/js/ui/pivot_grid.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ export interface dxPivotGridOptions extends WidgetOptions<dxPivotGrid> {
* @docid
* @default 600
*/
height?: number;
height?: number | string;
/**
* @docid
* @default 0
Expand Down Expand Up @@ -331,7 +331,7 @@ export interface dxPivotGridOptions extends WidgetOptions<dxPivotGrid> {
* @docid
* @default 600
*/
width?: number;
width?: number | string;
};
/**
* @docid
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme/ts/dx.all.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24999,7 +24999,7 @@ declare module DevExpress.ui {
/**
* [descr:dxPivotGridOptions.fieldChooser.height]
*/
height?: number;
height?: number | string;
/**
* [descr:dxPivotGridOptions.fieldChooser.layout]
*/
Expand Down Expand Up @@ -25040,7 +25040,7 @@ declare module DevExpress.ui {
/**
* [descr:dxPivotGridOptions.fieldChooser.width]
*/
width?: number;
width?: number | string;
};
/**
* [descr:dxPivotGridOptions.fieldPanel]
Expand Down
Loading