Skip to content

Commit

Permalink
Fix incorrectly typed docid
Browse files Browse the repository at this point in the history
  • Loading branch information
tongsonbarbs committed Sep 26, 2024
1 parent ce74b59 commit 7ad3017
Show file tree
Hide file tree
Showing 15 changed files with 52 additions and 14 deletions.
6 changes: 3 additions & 3 deletions packages/devextreme-angular/src/ui/data-grid/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -325,10 +325,10 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
*/
@Input()
get columnFixing(): { enabled?: boolean, icons?: { fix?: string, leftPosition?: string, rightPosition?: string, stickyPosition?: string, unfix?: string }, texts?: { fix?: string, leftPosition?: string, rightPosition?: string, unfix?: string } } {
get columnFixing(): { enabled?: boolean, icons?: { fix?: string, leftPosition?: string, rightPosition?: string, stickyPosition?: string, unfix?: string }, texts?: { fix?: string, leftPosition?: string, rightPosition?: string, stickPosition?: string, unfix?: string } } {
return this._getOption('columnFixing');
}
set columnFixing(value: { enabled?: boolean, icons?: { fix?: string, leftPosition?: string, rightPosition?: string, stickyPosition?: string, unfix?: string }, texts?: { fix?: string, leftPosition?: string, rightPosition?: string, unfix?: string } }) {
set columnFixing(value: { enabled?: boolean, icons?: { fix?: string, leftPosition?: string, rightPosition?: string, stickyPosition?: string, unfix?: string }, texts?: { fix?: string, leftPosition?: string, rightPosition?: string, stickPosition?: string, unfix?: string } }) {
this._setOption('columnFixing', value);
}

Expand Down Expand Up @@ -1575,7 +1575,7 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
* This member supports the internal infrastructure and is not intended to be used directly from your code.
*/
@Output() columnFixingChange: EventEmitter<{ enabled?: boolean, icons?: { fix?: string, leftPosition?: string, rightPosition?: string, stickyPosition?: string, unfix?: string }, texts?: { fix?: string, leftPosition?: string, rightPosition?: string, unfix?: string } }>;
@Output() columnFixingChange: EventEmitter<{ enabled?: boolean, icons?: { fix?: string, leftPosition?: string, rightPosition?: string, stickyPosition?: string, unfix?: string }, texts?: { fix?: string, leftPosition?: string, rightPosition?: string, stickPosition?: string, unfix?: string } }>;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ export class DxoDataGridColumnFixingComponent extends NestedOption implements On
}

@Input()
get texts(): { fix?: string, leftPosition?: string, rightPosition?: string, unfix?: string } {
get texts(): { fix?: string, leftPosition?: string, rightPosition?: string, stickPosition?: string, unfix?: string } {
return this._getOption('texts');
}
set texts(value: { fix?: string, leftPosition?: string, rightPosition?: string, unfix?: string }) {
set texts(value: { fix?: string, leftPosition?: string, rightPosition?: string, stickPosition?: string, unfix?: string }) {
this._setOption('texts', value);
}

Expand Down
8 changes: 8 additions & 0 deletions packages/devextreme-angular/src/ui/data-grid/nested/texts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@ export class DxoDataGridTextsComponent extends NestedOption implements OnDestroy
this._setOption('rightPosition', value);
}

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

@Input()
get unfix(): string {
return this._getOption('unfix');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ export abstract class DxoGanttHeaderFilterTexts extends NestedOption {
this._setOption('rightPosition', value);
}

get stickPosition(): string {
return this._getOption('stickPosition');
}
set stickPosition(value: string) {
this._setOption('stickPosition', value);
}

get unfix(): string {
return this._getOption('unfix');
}
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-angular/src/ui/nested/column-fixing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ export class DxoColumnFixingComponent extends NestedOption implements OnDestroy,
}

@Input()
get texts(): { fix?: string, leftPosition?: string, rightPosition?: string, unfix?: string } {
get texts(): { fix?: string, leftPosition?: string, rightPosition?: string, stickPosition?: string, unfix?: string } {
return this._getOption('texts');
}
set texts(value: { fix?: string, leftPosition?: string, rightPosition?: string, unfix?: string }) {
set texts(value: { fix?: string, leftPosition?: string, rightPosition?: string, stickPosition?: string, unfix?: string }) {
this._setOption('texts', value);
}

Expand Down
1 change: 1 addition & 0 deletions packages/devextreme-angular/src/ui/nested/texts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import { DxoGanttHeaderFilterTexts } from './base/gantt-header-filter-texts';
'fix',
'leftPosition',
'rightPosition',
'stickPosition',
'unfix',
'addRow',
'cancelAllChanges',
Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-angular/src/ui/tree-list/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,10 @@ export class DxTreeListComponent<TRowData = any, TKey = any> extends DxComponent
*/
@Input()
get columnFixing(): { enabled?: boolean, icons?: { fix?: string, leftPosition?: string, rightPosition?: string, stickyPosition?: string, unfix?: string }, texts?: { fix?: string, leftPosition?: string, rightPosition?: string, unfix?: string } } {
get columnFixing(): { enabled?: boolean, icons?: { fix?: string, leftPosition?: string, rightPosition?: string, stickyPosition?: string, unfix?: string }, texts?: { fix?: string, leftPosition?: string, rightPosition?: string, stickPosition?: string, unfix?: string } } {
return this._getOption('columnFixing');
}
set columnFixing(value: { enabled?: boolean, icons?: { fix?: string, leftPosition?: string, rightPosition?: string, stickyPosition?: string, unfix?: string }, texts?: { fix?: string, leftPosition?: string, rightPosition?: string, unfix?: string } }) {
set columnFixing(value: { enabled?: boolean, icons?: { fix?: string, leftPosition?: string, rightPosition?: string, stickyPosition?: string, unfix?: string }, texts?: { fix?: string, leftPosition?: string, rightPosition?: string, stickPosition?: string, unfix?: string } }) {
this._setOption('columnFixing', value);
}

Expand Down Expand Up @@ -1559,7 +1559,7 @@ export class DxTreeListComponent<TRowData = any, TKey = any> extends DxComponent
* This member supports the internal infrastructure and is not intended to be used directly from your code.
*/
@Output() columnFixingChange: EventEmitter<{ enabled?: boolean, icons?: { fix?: string, leftPosition?: string, rightPosition?: string, stickyPosition?: string, unfix?: string }, texts?: { fix?: string, leftPosition?: string, rightPosition?: string, unfix?: string } }>;
@Output() columnFixingChange: EventEmitter<{ enabled?: boolean, icons?: { fix?: string, leftPosition?: string, rightPosition?: string, stickyPosition?: string, unfix?: string }, texts?: { fix?: string, leftPosition?: string, rightPosition?: string, stickPosition?: string, unfix?: string } }>;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ export class DxoTreeListColumnFixingComponent extends NestedOption implements On
}

@Input()
get texts(): { fix?: string, leftPosition?: string, rightPosition?: string, unfix?: string } {
get texts(): { fix?: string, leftPosition?: string, rightPosition?: string, stickPosition?: string, unfix?: string } {
return this._getOption('texts');
}
set texts(value: { fix?: string, leftPosition?: string, rightPosition?: string, unfix?: string }) {
set texts(value: { fix?: string, leftPosition?: string, rightPosition?: string, stickPosition?: string, unfix?: string }) {
this._setOption('texts', value);
}

Expand Down
8 changes: 8 additions & 0 deletions packages/devextreme-angular/src/ui/tree-list/nested/texts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@ export class DxoTreeListTextsComponent extends NestedOption implements OnDestroy
this._setOption('rightPosition', value);
}

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

@Input()
get unfix(): string {
return this._getOption('unfix');
Expand Down
3 changes: 3 additions & 0 deletions packages/devextreme-react/src/data-grid.ts
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,7 @@ type IColumnFixingProps = React.PropsWithChildren<{
fix?: string;
leftPosition?: string;
rightPosition?: string;
stickPosition?: string;
unfix?: string;
};
}>
Expand All @@ -637,6 +638,7 @@ type IColumnFixingTextsProps = React.PropsWithChildren<{
fix?: string;
leftPosition?: string;
rightPosition?: string;
stickPosition?: string;
unfix?: string;
}>
const _componentColumnFixingTexts = memo(
Expand Down Expand Up @@ -2621,6 +2623,7 @@ type ITextsProps = React.PropsWithChildren<{
fix?: string;
leftPosition?: string;
rightPosition?: string;
stickPosition?: string;
unfix?: string;
clearFilter?: string;
createFilter?: string;
Expand Down
3 changes: 3 additions & 0 deletions packages/devextreme-react/src/tree-list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,7 @@ type IColumnFixingProps = React.PropsWithChildren<{
fix?: string;
leftPosition?: string;
rightPosition?: string;
stickPosition?: string;
unfix?: string;
};
}>
Expand All @@ -593,6 +594,7 @@ type IColumnFixingTextsProps = React.PropsWithChildren<{
fix?: string;
leftPosition?: string;
rightPosition?: string;
stickPosition?: string;
unfix?: string;
}>
const _componentColumnFixingTexts = memo(
Expand Down Expand Up @@ -2201,6 +2203,7 @@ type ITextsProps = React.PropsWithChildren<{
fix?: string;
leftPosition?: string;
rightPosition?: string;
stickPosition?: string;
unfix?: string;
clearFilter?: string;
createFilter?: string;
Expand Down
4 changes: 4 additions & 0 deletions packages/devextreme-vue/src/data-grid.ts
Original file line number Diff line number Diff line change
Expand Up @@ -887,12 +887,14 @@ const DxColumnFixingTextsConfig = {
"update:fix": null,
"update:leftPosition": null,
"update:rightPosition": null,
"update:stickPosition": null,
"update:unfix": null,
},
props: {
fix: String,
leftPosition: String,
rightPosition: String,
stickPosition: String,
unfix: String
}
};
Expand Down Expand Up @@ -3210,6 +3212,7 @@ const DxTextsConfig = {
"update:rightPosition": null,
"update:saveAllChanges": null,
"update:saveRowChanges": null,
"update:stickPosition": null,
"update:sum": null,
"update:sumOtherColumn": null,
"update:undeleteRow": null,
Expand Down Expand Up @@ -3250,6 +3253,7 @@ const DxTextsConfig = {
rightPosition: String,
saveAllChanges: String,
saveRowChanges: String,
stickPosition: String,
sum: String,
sumOtherColumn: String,
undeleteRow: String,
Expand Down
4 changes: 4 additions & 0 deletions packages/devextreme-vue/src/tree-list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -867,12 +867,14 @@ const DxColumnFixingTextsConfig = {
"update:fix": null,
"update:leftPosition": null,
"update:rightPosition": null,
"update:stickPosition": null,
"update:unfix": null,
},
props: {
fix: String,
leftPosition: String,
rightPosition: String,
stickPosition: String,
unfix: String
}
};
Expand Down Expand Up @@ -2785,6 +2787,7 @@ const DxTextsConfig = {
"update:rightPosition": null,
"update:saveAllChanges": null,
"update:saveRowChanges": null,
"update:stickPosition": null,
"update:undeleteRow": null,
"update:unfix": null,
"update:validationCancelChanges": null,
Expand All @@ -2809,6 +2812,7 @@ const DxTextsConfig = {
rightPosition: String,
saveAllChanges: String,
saveRowChanges: String,
stickPosition: String,
undeleteRow: String,
unfix: String,
validationCancelChanges: String
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/common/grids.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ export type ColumnFixingTexts = {
*/
unfix?: string;
/**
* @docid GridBaseOptions.columnFixing.texts.unfix
* @docid GridBaseOptions.columnFixing.texts.stickPosition
* @default "Stick in place"
*/
stickyPosition?: string;
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/ts/dx.all.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3025,7 +3025,7 @@ declare module DevExpress.common.grids {
*/
unfix?: string;
/**
* [descr:GridBaseOptions.columnFixing.texts.unfix]
* [descr:GridBaseOptions.columnFixing.texts.stickPosition]
*/
stickyPosition?: string;
};
Expand Down

0 comments on commit 7ad3017

Please sign in to comment.