Skip to content

Commit a6b0bd5

Browse files
author
marker dao ®
committed
Revert "feat(button_group): Add new options"
This reverts commit c28d6c8.
1 parent 5c0439d commit a6b0bd5

11 files changed

Lines changed: 5 additions & 112 deletions

File tree

packages/devextreme-angular/src/ui/button-group/index.ts

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -151,16 +151,6 @@ export class DxButtonGroupComponent extends DxComponent implements OnDestroy, On
151151
}
152152

153153

154-
155-
@Input()
156-
get gap(): string {
157-
return this._getOption('gap');
158-
}
159-
set gap(value: string) {
160-
this._setOption('gap', value);
161-
}
162-
163-
164154
/**
165155
* [descr:DOMComponentOptions.height]
166156
@@ -329,16 +319,6 @@ export class DxButtonGroupComponent extends DxComponent implements OnDestroy, On
329319
this._setOption('width', value);
330320
}
331321

332-
333-
334-
@Input()
335-
get wrap(): boolean {
336-
return this._getOption('wrap');
337-
}
338-
set wrap(value: boolean) {
339-
this._setOption('wrap', value);
340-
}
341-
342322
/**
343323
344324
* [descr:dxButtonGroupOptions.onContentReady]
@@ -429,13 +409,6 @@ export class DxButtonGroupComponent extends DxComponent implements OnDestroy, On
429409
*/
430410
@Output() focusStateEnabledChange: EventEmitter<boolean>;
431411

432-
/**
433-
434-
* This member supports the internal infrastructure and is not intended to be used directly from your code.
435-
436-
*/
437-
@Output() gapChange: EventEmitter<string>;
438-
439412
/**
440413
441414
* This member supports the internal infrastructure and is not intended to be used directly from your code.
@@ -527,13 +500,6 @@ export class DxButtonGroupComponent extends DxComponent implements OnDestroy, On
527500
*/
528501
@Output() widthChange: EventEmitter<number | string | undefined>;
529502

530-
/**
531-
532-
* This member supports the internal infrastructure and is not intended to be used directly from your code.
533-
534-
*/
535-
@Output() wrapChange: EventEmitter<boolean>;
536-
537503

538504

539505

@@ -559,7 +525,6 @@ export class DxButtonGroupComponent extends DxComponent implements OnDestroy, On
559525
{ emit: 'disabledChange' },
560526
{ emit: 'elementAttrChange' },
561527
{ emit: 'focusStateEnabledChange' },
562-
{ emit: 'gapChange' },
563528
{ emit: 'heightChange' },
564529
{ emit: 'hintChange' },
565530
{ emit: 'hoverStateEnabledChange' },
@@ -572,8 +537,7 @@ export class DxButtonGroupComponent extends DxComponent implements OnDestroy, On
572537
{ emit: 'stylingModeChange' },
573538
{ emit: 'tabIndexChange' },
574539
{ emit: 'visibleChange' },
575-
{ emit: 'widthChange' },
576-
{ emit: 'wrapChange' }
540+
{ emit: 'widthChange' }
577541
]);
578542

579543
this._idh.setHost(this);

packages/devextreme-angular/src/ui/chat/nested/suggestions.ts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,6 @@ export class DxoChatSuggestionsComponent extends NestedOption implements OnDestr
9494
this._setOption('focusStateEnabled', value);
9595
}
9696

97-
@Input()
98-
get gap(): string {
99-
return this._getOption('gap');
100-
}
101-
set gap(value: string) {
102-
this._setOption('gap', value);
103-
}
104-
10597
@Input()
10698
get height(): number | string | undefined {
10799
return this._getOption('height');
@@ -254,14 +246,6 @@ export class DxoChatSuggestionsComponent extends NestedOption implements OnDestr
254246
this._setOption('width', value);
255247
}
256248

257-
@Input()
258-
get wrap(): boolean {
259-
return this._getOption('wrap');
260-
}
261-
set wrap(value: boolean) {
262-
this._setOption('wrap', value);
263-
}
264-
265249

266250
/**
267251

packages/devextreme-angular/src/ui/scheduler/nested/options.ts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,6 @@ export class DxoSchedulerOptionsComponent extends NestedOption implements OnDest
9595
this._setOption('focusStateEnabled', value);
9696
}
9797

98-
@Input()
99-
get gap(): string {
100-
return this._getOption('gap');
101-
}
102-
set gap(value: string) {
103-
this._setOption('gap', value);
104-
}
105-
10698
@Input()
10799
get height(): number | string | undefined {
108100
return this._getOption('height');
@@ -255,14 +247,6 @@ export class DxoSchedulerOptionsComponent extends NestedOption implements OnDest
255247
this._setOption('width', value);
256248
}
257249

258-
@Input()
259-
get wrap(): boolean {
260-
return this._getOption('wrap');
261-
}
262-
set wrap(value: boolean) {
263-
this._setOption('wrap', value);
264-
}
265-
266250

267251
/**
268252

packages/devextreme-metadata/make-angular-metadata.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ Ng.makeMetadata({
5353
removeMembers(
5454
/\/chat:dxChatOptions\.(fileUploaderOptions|inputFieldText|sendButtonOptions|speechToTextOptions|suggestions|onAttachmentDownloadClick)/,
5555
),
56-
removeMembers(/\/button_group:dxButtonGroupOptions\.(gap|wrap)/),
5756
removeMembers(/\/form:dxFormOptions\.(aiIntegration|onSmartPasting|onSmartPasted|smartPaste)/),
5857
removeMembers(/\/form:dxFormSimpleItem\.aiOptions/),
5958
removeMembers(/\/form:FormPredefinedButtonItem/),

packages/devextreme-react/src/chat.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,6 @@ type ISuggestionsProps = React.PropsWithChildren<{
524524
disabled?: boolean;
525525
elementAttr?: Record<string, any>;
526526
focusStateEnabled?: boolean;
527-
gap?: string;
528527
height?: number | string | undefined;
529528
hint?: string | undefined;
530529
hoverStateEnabled?: boolean;
@@ -544,7 +543,6 @@ type ISuggestionsProps = React.PropsWithChildren<{
544543
tabIndex?: number;
545544
visible?: boolean;
546545
width?: number | string | undefined;
547-
wrap?: boolean;
548546
defaultSelectedItemKeys?: Array<any>;
549547
onSelectedItemKeysChange?: (value: Array<any>) => void;
550548
defaultSelectedItems?: Array<any>;

packages/devextreme-react/src/scheduler.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,6 @@ type IOptionsProps = React.PropsWithChildren<{
805805
disabled?: boolean;
806806
elementAttr?: Record<string, any>;
807807
focusStateEnabled?: boolean;
808-
gap?: string;
809808
height?: number | string | undefined;
810809
hint?: string | undefined;
811810
hoverStateEnabled?: boolean;
@@ -825,7 +824,6 @@ type IOptionsProps = React.PropsWithChildren<{
825824
tabIndex?: number;
826825
visible?: boolean;
827826
width?: number | string | undefined;
828-
wrap?: boolean;
829827
defaultSelectedItemKeys?: Array<any>;
830828
onSelectedItemKeysChange?: (value: Array<any>) => void;
831829
defaultSelectedItems?: Array<any>;

packages/devextreme-vue/src/button-group.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ type AccessibleOptions = Pick<Properties,
2525
"disabled" |
2626
"elementAttr" |
2727
"focusStateEnabled" |
28-
"gap" |
2928
"height" |
3029
"hint" |
3130
"hoverStateEnabled" |
@@ -44,8 +43,7 @@ type AccessibleOptions = Pick<Properties,
4443
"stylingMode" |
4544
"tabIndex" |
4645
"visible" |
47-
"width" |
48-
"wrap"
46+
"width"
4947
>;
5048

5149
interface DxButtonGroup extends AccessibleOptions {
@@ -60,7 +58,6 @@ const componentConfig = {
6058
disabled: Boolean,
6159
elementAttr: Object as PropType<Record<string, any>>,
6260
focusStateEnabled: Boolean,
63-
gap: String,
6461
height: [Number, String],
6562
hint: String,
6663
hoverStateEnabled: Boolean,
@@ -79,8 +76,7 @@ const componentConfig = {
7976
stylingMode: String as PropType<ButtonStyle>,
8077
tabIndex: Number,
8178
visible: Boolean,
82-
width: [Number, String],
83-
wrap: Boolean
79+
width: [Number, String]
8480
},
8581
emits: {
8682
"update:isActive": null,
@@ -91,7 +87,6 @@ const componentConfig = {
9187
"update:disabled": null,
9288
"update:elementAttr": null,
9389
"update:focusStateEnabled": null,
94-
"update:gap": null,
9590
"update:height": null,
9691
"update:hint": null,
9792
"update:hoverStateEnabled": null,
@@ -111,7 +106,6 @@ const componentConfig = {
111106
"update:tabIndex": null,
112107
"update:visible": null,
113108
"update:width": null,
114-
"update:wrap": null,
115109
},
116110
computed: {
117111
instance(): ButtonGroup {

packages/devextreme-vue/src/chat.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,6 @@ const DxSuggestionsConfig = {
794794
"update:disabled": null,
795795
"update:elementAttr": null,
796796
"update:focusStateEnabled": null,
797-
"update:gap": null,
798797
"update:height": null,
799798
"update:hint": null,
800799
"update:hoverStateEnabled": null,
@@ -814,7 +813,6 @@ const DxSuggestionsConfig = {
814813
"update:tabIndex": null,
815814
"update:visible": null,
816815
"update:width": null,
817-
"update:wrap": null,
818816
},
819817
props: {
820818
accessKey: String,
@@ -823,7 +821,6 @@ const DxSuggestionsConfig = {
823821
disabled: Boolean,
824822
elementAttr: Object as PropType<Record<string, any>>,
825823
focusStateEnabled: Boolean,
826-
gap: String,
827824
height: [Number, String],
828825
hint: String,
829826
hoverStateEnabled: Boolean,
@@ -842,8 +839,7 @@ const DxSuggestionsConfig = {
842839
stylingMode: String as PropType<ButtonStyle>,
843840
tabIndex: Number,
844841
visible: Boolean,
845-
width: [Number, String],
846-
wrap: Boolean
842+
width: [Number, String]
847843
}
848844
};
849845

packages/devextreme-vue/src/scheduler.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,7 +1104,6 @@ const DxOptionsConfig = {
11041104
"update:disabled": null,
11051105
"update:elementAttr": null,
11061106
"update:focusStateEnabled": null,
1107-
"update:gap": null,
11081107
"update:height": null,
11091108
"update:hint": null,
11101109
"update:hoverStateEnabled": null,
@@ -1124,7 +1123,6 @@ const DxOptionsConfig = {
11241123
"update:tabIndex": null,
11251124
"update:visible": null,
11261125
"update:width": null,
1127-
"update:wrap": null,
11281126
},
11291127
props: {
11301128
accessKey: String,
@@ -1133,7 +1131,6 @@ const DxOptionsConfig = {
11331131
disabled: Boolean,
11341132
elementAttr: Object as PropType<Record<string, any>>,
11351133
focusStateEnabled: Boolean,
1136-
gap: String,
11371134
height: [Number, String],
11381135
hint: String,
11391136
hoverStateEnabled: Boolean,
@@ -1152,8 +1149,7 @@ const DxOptionsConfig = {
11521149
stylingMode: String as PropType<ButtonStyle>,
11531150
tabIndex: Number,
11541151
visible: Boolean,
1155-
width: [Number, String],
1156-
wrap: Boolean
1152+
width: [Number, String]
11571153
}
11581154
};
11591155

packages/devextreme/js/ui/button_group.d.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,6 @@ export interface dxButtonGroupOptions extends WidgetOptions<dxButtonGroup> {
101101
* @public
102102
*/
103103
focusStateEnabled?: boolean;
104-
/**
105-
* @docid
106-
* @default '12px'
107-
* @public
108-
*/
109-
gap?: string;
110104
/**
111105
* @docid
112106
* @default true
@@ -165,12 +159,6 @@ export interface dxButtonGroupOptions extends WidgetOptions<dxButtonGroup> {
165159
* @public
166160
*/
167161
stylingMode?: ButtonStyle;
168-
/**
169-
* @docid
170-
* @default false
171-
* @public
172-
*/
173-
wrap?: boolean;
174162
}
175163
/**
176164
* @docid

0 commit comments

Comments
 (0)