Merge branch '26_1' into 26_1_dx_scss_nx_infra_p

GoodDayForSurf · web-flow · commit ff20343f000b · 2026-05-05T17:34:23.000+04:00
diff --git a/packages/devextreme-angular/src/ui/color-box/index.ts b/packages/devextreme-angular/src/ui/color-box/index.ts
@@ -295,10 +295,10 @@ export class DxColorBoxComponent extends DxComponent implements OnDestroy, Contr
     
      */
     @Input()
-    get fieldAddons(): FieldAddons {
+    get fieldAddons(): FieldAddons | null {
         return this._getOption('fieldAddons');
     }
-    set fieldAddons(value: FieldAddons) {
+    set fieldAddons(value: FieldAddons | null) {
         this._setOption('fieldAddons', value);
     }
 
@@ -918,7 +918,7 @@ export class DxColorBoxComponent extends DxComponent implements OnDestroy, Contr
      * This member supports the internal infrastructure and is not intended to be used directly from your code.
     
      */
-    @Output() fieldAddonsChange: EventEmitter<FieldAddons>;
+    @Output() fieldAddonsChange: EventEmitter<FieldAddons | null>;
 
     /**
     
diff --git a/packages/devextreme-angular/src/ui/drop-down-box/index.ts b/packages/devextreme-angular/src/ui/drop-down-box/index.ts
@@ -304,10 +304,10 @@ export class DxDropDownBoxComponent extends DxComponent implements OnDestroy, Co
     
      */
     @Input()
-    get fieldAddons(): FieldAddons {
+    get fieldAddons(): FieldAddons | null {
         return this._getOption('fieldAddons');
     }
-    set fieldAddons(value: FieldAddons) {
+    set fieldAddons(value: FieldAddons | null) {
         this._setOption('fieldAddons', value);
     }
 
@@ -966,7 +966,7 @@ export class DxDropDownBoxComponent extends DxComponent implements OnDestroy, Co
      * This member supports the internal infrastructure and is not intended to be used directly from your code.
     
      */
-    @Output() fieldAddonsChange: EventEmitter<FieldAddons>;
+    @Output() fieldAddonsChange: EventEmitter<FieldAddons | null>;
 
     /**
     
diff --git a/packages/devextreme-angular/src/ui/select-box/index.ts b/packages/devextreme-angular/src/ui/select-box/index.ts
@@ -306,10 +306,10 @@ export class DxSelectBoxComponent extends DxComponent implements OnDestroy, Cont
     
      */
     @Input()
-    get fieldAddons(): FieldAddons {
+    get fieldAddons(): FieldAddons | null {
         return this._getOption('fieldAddons');
     }
-    set fieldAddons(value: FieldAddons) {
+    set fieldAddons(value: FieldAddons | null) {
         this._setOption('fieldAddons', value);
     }
 
@@ -1195,7 +1195,7 @@ export class DxSelectBoxComponent extends DxComponent implements OnDestroy, Cont
      * This member supports the internal infrastructure and is not intended to be used directly from your code.
     
      */
-    @Output() fieldAddonsChange: EventEmitter<FieldAddons>;
+    @Output() fieldAddonsChange: EventEmitter<FieldAddons | null>;
 
     /**
     
diff --git a/packages/devextreme-angular/src/ui/tag-box/index.ts b/packages/devextreme-angular/src/ui/tag-box/index.ts
@@ -306,10 +306,10 @@ export class DxTagBoxComponent extends DxComponent implements OnDestroy, Control
     
      */
     @Input()
-    get fieldAddons(): FieldAddons {
+    get fieldAddons(): FieldAddons | null {
         return this._getOption('fieldAddons');
     }
-    set fieldAddons(value: FieldAddons) {
+    set fieldAddons(value: FieldAddons | null) {
         this._setOption('fieldAddons', value);
     }
 
@@ -1278,7 +1278,7 @@ export class DxTagBoxComponent extends DxComponent implements OnDestroy, Control
      * This member supports the internal infrastructure and is not intended to be used directly from your code.
     
      */
-    @Output() fieldAddonsChange: EventEmitter<FieldAddons>;
+    @Output() fieldAddonsChange: EventEmitter<FieldAddons | null>;
 
     /**
     
diff --git a/packages/devextreme-vue/src/color-box.ts b/packages/devextreme-vue/src/color-box.ts
@@ -164,7 +164,7 @@ const componentConfig = {
     dropDownOptions: Object as PropType<dxPopupOptions<any> | Record<string, any>>,
     editAlphaChannel: Boolean,
     elementAttr: Object as PropType<Record<string, any>>,
-    fieldAddons: Object as PropType<FieldAddons | Record<string, any>>,
+    fieldAddons: Object as PropType<FieldAddons | null | Record<string, any>>,
     fieldTemplate: {},
     focusStateEnabled: Boolean,
     height: [Number, String],
diff --git a/packages/devextreme-vue/src/drop-down-box.ts b/packages/devextreme-vue/src/drop-down-box.ts
@@ -173,7 +173,7 @@ const componentConfig = {
     dropDownButtonTemplate: {},
     dropDownOptions: Object as PropType<dxPopupOptions<any> | Record<string, any>>,
     elementAttr: Object as PropType<Record<string, any>>,
-    fieldAddons: Object as PropType<FieldAddons | Record<string, any>>,
+    fieldAddons: Object as PropType<FieldAddons | null | Record<string, any>>,
     fieldTemplate: {},
     focusStateEnabled: Boolean,
     height: [Number, String],
diff --git a/packages/devextreme-vue/src/select-box.ts b/packages/devextreme-vue/src/select-box.ts
@@ -200,7 +200,7 @@ const componentConfig = {
     dropDownButtonTemplate: {},
     dropDownOptions: Object as PropType<dxPopupOptions<any> | Record<string, any>>,
     elementAttr: Object as PropType<Record<string, any>>,
-    fieldAddons: Object as PropType<FieldAddons | Record<string, any>>,
+    fieldAddons: Object as PropType<FieldAddons | null | Record<string, any>>,
     fieldTemplate: {},
     focusStateEnabled: Boolean,
     grouped: Boolean,
diff --git a/packages/devextreme-vue/src/tag-box.ts b/packages/devextreme-vue/src/tag-box.ts
@@ -207,7 +207,7 @@ const componentConfig = {
     dropDownButtonTemplate: {},
     dropDownOptions: Object as PropType<dxPopupOptions<any> | Record<string, any>>,
     elementAttr: Object as PropType<Record<string, any>>,
-    fieldAddons: Object as PropType<FieldAddons | Record<string, any>>,
+    fieldAddons: Object as PropType<FieldAddons | null | Record<string, any>>,
     fieldTemplate: {},
     focusStateEnabled: Boolean,
     grouped: Boolean,
diff --git a/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_editor.ts b/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_editor.ts
@@ -224,6 +224,7 @@ class DropDownEditor<
       activeStateEnabled: true,
       dropDownButtonTemplate: 'dropDownButton',
       fieldTemplate: null,
+      fieldAddons: null,
       openOnFieldClick: false,
       showDropDownButton: true,
       // eslint-disable-next-line no-void
diff --git a/packages/devextreme/js/__internal/ui/radio_group/m_radio_button.ts b/packages/devextreme/js/__internal/ui/radio_group/m_radio_button.ts
@@ -8,7 +8,7 @@ import type { dxElementWrapper } from '@js/core/renderer';
 import $ from '@js/core/renderer';
 import type { DxEvent } from '@js/events';
 import type { OptionChanged } from '@ts/core/widget/types';
-import type { EditorProperties } from '@ts/ui/editor/editor';
+import type { EditorProperties, ValueChangedEvent } from '@ts/ui/editor/editor';
 import Editor from '@ts/ui/editor/editor';
 
 const RADIO_BUTTON_CLASS = 'dx-radiobutton';
@@ -24,11 +24,10 @@ class RadioButton extends Editor {
 
   _clickAction?: (event?: Record<string, unknown>) => void;
 
-  // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
-  _supportedKeys(): Record<string, (e: KeyboardEvent) => void | boolean> {
-    const click = function (e) {
+  _supportedKeys(): Record<string, (e: KeyboardEvent) => void> {
+    const click = (e: KeyboardEvent): void => {
       e.preventDefault();
-      this._clickAction({ event: e });
+      this._clickAction?.({ event: e });
     };
     return {
       ...super._supportedKeys(),
@@ -70,10 +69,12 @@ class RadioButton extends Editor {
   }
 
   _initMarkup(): void {
+    const { value } = this.option();
+
     super._initMarkup();
 
     this._renderIcon();
-    this._renderCheckedState(this.option('value'));
+    this._renderCheckedState(value);
     this._renderClick();
     this.setAria('role', 'radio');
   }
@@ -85,7 +86,7 @@ class RadioButton extends Editor {
     this.$element().append(this._$icon);
   }
 
-  _renderCheckedState(checked): void {
+  _renderCheckedState(checked: boolean): void {
     this.$element()
       .toggleClass(RADIO_BUTTON_CHECKED_CLASS, checked)
       .find(`.${RADIO_BUTTON_ICON_CLASS}`)
@@ -94,10 +95,9 @@ class RadioButton extends Editor {
   }
 
   _renderClick(): void {
-    // @ts-expect-error ts-error
-    const eventName = addNamespace(clickEventName, this.NAME);
+    const eventName = addNamespace(clickEventName, this.NAME ?? '');
 
-    this._clickAction = this._createAction((args): void => {
+    this._clickAction = this._createAction((args: { event: ValueChangedEvent }): void => {
       this._clickHandler(args.event);
     });
 
@@ -107,7 +107,7 @@ class RadioButton extends Editor {
     });
   }
 
-  _clickHandler(e): void {
+  _clickHandler(e: ValueChangedEvent): void {
     this._saveValueChangeEvent(e);
     this.option('value', true);
     this._saveValueChangeEvent(undefined);
diff --git a/packages/devextreme/js/__internal/ui/radio_group/m_radio_collection.ts b/packages/devextreme/js/__internal/ui/radio_group/m_radio_collection.ts
@@ -2,9 +2,10 @@ import Guid from '@js/core/guid';
 import type { dxElementWrapper } from '@js/core/renderer';
 import $ from '@js/core/renderer';
 import { deferRender } from '@js/core/utils/common';
-import { extend } from '@js/core/utils/extend';
+import type { DxEvent } from '@js/events';
+import type { CollectionWidgetItem as CollectionWidgetItemProperties } from '@js/ui/collection/ui.collection_widget.base';
 import DataExpressionMixin from '@js/ui/editor/ui.data_expression';
-import type { CollectionWidgetBaseProperties } from '@ts/ui/collection/collection_widget.base';
+import type { CollectionWidgetBaseProperties, PostprocessRenderItemInfo } from '@ts/ui/collection/collection_widget.base';
 import CollectionWidget from '@ts/ui/collection/collection_widget.edit';
 
 const RADIO_BUTTON_CHECKED_CLASS = 'dx-radiobutton-checked';
@@ -29,10 +30,12 @@ class RadioCollection extends CollectionWidget<Properties> {
   }
 
   _getDefaultOptions(): Properties {
-    const defaultOptions = super._getDefaultOptions();
-
-    // @ts-expect-error
-    return extend(defaultOptions, DataExpressionMixin._dataExpressionDefaultOptions());
+    return {
+      ...super._getDefaultOptions(),
+      // @ts-expect-error DataExpressionMixin._dataExpressionDefaultOptions()
+      // should be added to the type
+      ...DataExpressionMixin._dataExpressionDefaultOptions(),
+    } as Properties;
   }
 
   _initMarkup(): void {
@@ -59,7 +62,7 @@ class RadioCollection extends CollectionWidget<Properties> {
     return $target;
   }
 
-  _postprocessRenderItem(args): void {
+  _postprocessRenderItem(args: PostprocessRenderItemInfo<CollectionWidgetItemProperties>): void {
     const { itemData, itemElement } = args;
     const { html } = itemData;
 
@@ -126,22 +129,21 @@ class RadioCollection extends CollectionWidget<Properties> {
     this._renderContent();
   }
 
-  _supportedKeys(): Record<string, (e: KeyboardEvent) => void> {
+  _supportedKeys(): Record<string, (e: DxEvent<KeyboardEvent>) => void> {
     const parent = super._supportedKeys();
 
-    return extend({}, parent, {
-      enter(e) {
+    return {
+      ...parent,
+      enter(e: DxEvent<KeyboardEvent>): void {
         e.preventDefault();
-        // @ts-expect-error
-        return parent.enter.apply(this, arguments);
+        parent.enter?.apply(this, [e]);
       },
 
-      space(e) {
+      space(e: DxEvent<KeyboardEvent>): void {
         e.preventDefault();
-        // @ts-expect-error
-        return parent.space.apply(this, arguments);
+        parent.space?.apply(this, [e]);
       },
-    });
+    };
   }
 
   _itemElements(): dxElementWrapper {
diff --git a/packages/devextreme/js/__internal/ui/radio_group/m_radio_group.ts b/packages/devextreme/js/__internal/ui/radio_group/m_radio_group.ts
diff --git a/packages/devextreme/js/ui/drop_down_editor/ui.drop_down_editor.d.ts b/packages/devextreme/js/ui/drop_down_editor/ui.drop_down_editor.d.ts
diff --git a/packages/devextreme/js/ui/select_box.d.ts b/packages/devextreme/js/ui/select_box.d.ts
diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts
