The renderer function’s argument must include the full range of possible types (DevExpress#30613)

EugeniyKiyashko · web-flow · commit a394d020afa9 · 2025-08-05T16:58:19.000+04:00
Signed-off-by: EugeniyKiyashko &lt;EugeniyKiyashko@users.noreply.github.com&gt;
diff --git a/packages/devextreme/js/__internal/core/m_devices.ts b/packages/devextreme/js/__internal/core/m_devices.ts
@@ -355,7 +355,6 @@ class Devices {
   }
 
   _changeOrientation() {
-    // @ts-expect-error
     const $window = $(this._window);
     const orientation = getHeight($window) > getWidth($window) ? 'portrait' : 'landscape';
 
diff --git a/packages/devextreme/js/__internal/core/r1/template_wrapper.ts b/packages/devextreme/js/__internal/core/r1/template_wrapper.ts
@@ -124,9 +124,7 @@ export class TemplateWrapper extends InfernoComponent<TemplateWrapperProps> {
     const $oldContainerContent = $container.contents().toArray();
 
     const content = renderTemplateContent(this.props, getPublicElement($container));
-    // TODO Vinogradov: Fix the renderer function type.
-    // @ts-expect-error The renderer function's argument hasn't the full range of possible types
-    // (the Element[] type is missing).
+
     replaceWith($(node), $(content));
 
     // NOTE: This is a dispose method that called before renderTemplate.
diff --git a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/method-signature-style */
 /* eslint-disable max-classes-per-file */
 import { name as clickEventName } from '@js/common/core/events/click';
 import eventsEngine from '@js/common/core/events/core/events_engine';
@@ -808,7 +807,6 @@ export class AdaptiveColumnsController extends modules.ViewController {
       return;
     }
 
-    // @ts-expect-errors
     const $row = $(this.component.getRowElement(rowIndex));
 
     this.setCommandAdaptiveAriaLabel($row, label);
diff --git a/packages/devextreme/js/__internal/grids/grid_core/column_headers/m_column_headers.ts b/packages/devextreme/js/__internal/grids/grid_core/column_headers/m_column_headers.ts
@@ -483,7 +483,6 @@ export class ColumnHeadersView extends ColumnContextMenuMixin(ColumnsView) {
           $cellElement && result.push($cellElement.get(0));
         });
 
-        // @ts-expect-error
         return $(result);
       } if (!index || index < rowCount) {
         return that.getCellElements(index || 0);
diff --git a/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts b/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts
@@ -239,7 +239,6 @@ export default {
   },
 
   calculateLoadPanelPosition($element) {
-    // @ts-expect-error
     const $window = $(getWindow());
     if (getHeight($element) > getHeight($window)) {
       return {
diff --git a/packages/devextreme/js/__internal/grids/new/card_view/content_view/content/card/caption.tsx b/packages/devextreme/js/__internal/grids/new/card_view/content_view/content/card/caption.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { getPublicElement } from '@js/core/element';
 import $ from '@js/core/renderer';
 import type { FieldInfo } from '@ts/grids/new/grid_core/columns_controller/types';
@@ -20,7 +19,7 @@ export class Caption extends Component<CaptionProps> {
   private readonly onClick = (e): void => {
     const args = {
       event: e,
-      fieldCaptionElement: getPublicElement($(this.ref.current!)),
+      fieldCaptionElement: getPublicElement($(this.ref.current)),
       field: this.props.field,
     };
 
@@ -30,7 +29,7 @@ export class Caption extends Component<CaptionProps> {
   private readonly onDblClick = (e): void => {
     const args = {
       event: e,
-      fieldCaptionElement: getPublicElement($(this.ref.current!)),
+      fieldCaptionElement: getPublicElement($(this.ref.current)),
       field: this.props.field,
     };
 
@@ -58,7 +57,7 @@ export class Caption extends Component<CaptionProps> {
 
   componentDidMount(): void {
     const args = {
-      fieldCaptionElement: getPublicElement($(this.ref.current!)),
+      fieldCaptionElement: getPublicElement($(this.ref.current)),
       field: this.props.field,
     };
 
diff --git a/packages/devextreme/js/__internal/grids/new/card_view/content_view/content/card/card.tsx b/packages/devextreme/js/__internal/grids/new/card_view/content_view/content/card/card.tsx
@@ -235,7 +235,7 @@ export class Card extends Component<CardProps> {
 
   componentDidMount(): void {
     const onPreparedArgs = {
-      cardElement: getPublicElement($(this.containerRef.current!)),
+      cardElement: getPublicElement($(this.containerRef.current)),
       card: this.props.card,
     };
 
@@ -260,7 +260,7 @@ export class Card extends Component<CardProps> {
     const args = {
       eventType: event.type,
       card: this.props.card,
-      cardElement: getPublicElement($(this.containerRef.current!)),
+      cardElement: getPublicElement($(this.containerRef.current)),
       event,
     };
 
@@ -270,7 +270,7 @@ export class Card extends Component<CardProps> {
   onClick = (event: MouseEvent): void => {
     const args = {
       card: this.props.card,
-      cardElement: getPublicElement($(this.containerRef.current!)),
+      cardElement: getPublicElement($(this.containerRef.current)),
       event,
     };
 
@@ -289,7 +289,7 @@ export class Card extends Component<CardProps> {
   onDblClick = (event: MouseEvent): void => {
     const args = {
       card: this.props.card,
-      cardElement: getPublicElement($(this.containerRef.current!)),
+      cardElement: getPublicElement($(this.containerRef.current)),
       event,
     };
 
diff --git a/packages/devextreme/js/__internal/grids/new/card_view/content_view/content/card/value_text.tsx b/packages/devextreme/js/__internal/grids/new/card_view/content_view/content/card/value_text.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { getPublicElement } from '@js/core/element';
 import $ from '@js/core/renderer';
 import type { FieldInfo } from '@ts/grids/new/grid_core/columns_controller/types';
@@ -27,7 +26,7 @@ export class ValueText extends Component<ValueTextProps> {
   private readonly onClick = (e): void => {
     const args = {
       event: e,
-      fieldValueElement: getPublicElement($(this.ref.current!)),
+      fieldValueElement: getPublicElement($(this.ref.current)),
       field: this.props.field,
     };
 
@@ -37,7 +36,7 @@ export class ValueText extends Component<ValueTextProps> {
   private readonly onDblClick = (e): void => {
     const args = {
       event: e,
-      fieldValueElement: getPublicElement($(this.ref.current!)),
+      fieldValueElement: getPublicElement($(this.ref.current)),
       field: this.props.field,
     };
 
@@ -75,7 +74,7 @@ export class ValueText extends Component<ValueTextProps> {
 
   componentDidMount(): void {
     const args = {
-      fieldValueElement: getPublicElement($(this.ref.current!)),
+      fieldValueElement: getPublicElement($(this.ref.current)),
       field: this.props.field,
     };
 
diff --git a/packages/devextreme/js/__internal/grids/new/grid_core/filtering/filter_panel/filter_panel.tsx b/packages/devextreme/js/__internal/grids/new/grid_core/filtering/filter_panel/filter_panel.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import type { FilterPanel } from '@js/common/grids';
 import $ from '@js/core/renderer';
 import type { Properties as FilterBuilderProperties } from '@js/ui/filter_builder';
@@ -34,12 +33,12 @@ export class FilterPanelComponent extends Component<FilterPanelProps> {
   }
 
   public componentDidMount(): void {
-    this.props.oldFilterPanelView.render($(this.filterPanelRef.current!));
-    this.props.oldFilterBuilderView.render($(this.filterBuilderRef.current!));
+    this.props.oldFilterPanelView.render($(this.filterPanelRef.current));
+    this.props.oldFilterBuilderView.render($(this.filterBuilderRef.current));
   }
 
   public componentDidUpdate(): void {
-    this.props.oldFilterPanelView.render($(this.filterPanelRef.current!));
-    this.props.oldFilterBuilderView.render($(this.filterBuilderRef.current!));
+    this.props.oldFilterPanelView.render($(this.filterPanelRef.current));
+    this.props.oldFilterBuilderView.render($(this.filterBuilderRef.current));
   }
 }
diff --git a/packages/devextreme/js/__internal/grids/new/grid_core/inferno_wrappers/template_wrapper.tsx b/packages/devextreme/js/__internal/grids/new/grid_core/inferno_wrappers/template_wrapper.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import type { dxElementWrapper } from '@js/core/renderer';
 import $ from '@js/core/renderer';
 import { BaseInfernoComponent } from '@ts/core/r1/runtime/inferno/base_component';
@@ -15,10 +14,10 @@ export function TemplateWrapper<TProps = {}>(template: TemplateType<TProps>) {
     private readonly ref = createRef<HTMLDivElement>();
 
     private renderTemplate(): void {
-      $(this.ref.current!).empty();
+      $(this.ref.current).empty();
 
       template.render({
-        container: $(this.ref.current!),
+        container: $(this.ref.current),
         model: this.props,
       });
     }
diff --git a/packages/devextreme/js/__internal/ui/check_box/editor_base/wrapper.ts b/packages/devextreme/js/__internal/ui/check_box/editor_base/wrapper.ts
@@ -28,7 +28,6 @@ export default class Editor extends ComponentWrapper {
     props.onFocusIn = (): void => {
       const isValidationMessageShownOnFocus = this.option('validationMessageMode') === 'auto';
       if (isValidationMessageShownOnFocus) {
-        // @ts-expect-error
         const $validationMessageWrapper = $(querySelectorInSameDocument(this.element(), '.dx-invalid-message.dx-overlay-wrapper'));
         $validationMessageWrapper?.removeClass(INVALID_MESSAGE_AUTO);
         const timeToWaitBeforeShow = 150;
diff --git a/packages/devextreme/js/__internal/ui/context_menu/context_menu.ts b/packages/devextreme/js/__internal/ui/context_menu/context_menu.ts
@@ -555,7 +555,6 @@ class ContextMenu<
         this._showContextMenuEventHandler,
       );
     } else {
-      // @ts-expect-error ts-error
       eventsEngine.off($(target), eventName, this._showContextMenuEventHandler);
     }
   }
@@ -1212,7 +1211,6 @@ class ContextMenu<
   _getTarget(): ContextMenuTarget {
     const { target, position } = this.option();
 
-    // @ts-expect-error ts-error
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     return target || position?.of || $(domAdapter.getDocument());
   }
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
@@ -515,7 +515,6 @@ class DropDownEditor<
   }
 
   _isTargetOutOfComponent(newTarget): boolean {
-    // @ts-expect-error ts-error
     const popupWrapper = this.content ? $(this.content()).closest(`.${DROP_DOWN_EDITOR_OVERLAY}`) : this._$popup;
     // @ts-expect-error
     const isTargetOutsidePopup = $(newTarget).closest(`.${DROP_DOWN_EDITOR_OVERLAY}`, popupWrapper).length === 0;
diff --git a/packages/devextreme/js/__internal/ui/m_drop_down_box.ts b/packages/devextreme/js/__internal/ui/m_drop_down_box.ts
@@ -65,7 +65,6 @@ class DropDownBox<
   }
 
   _getElements(): dxElementWrapper {
-    // @ts-expect-error ts-error
     return $(this.content()).find('*');
   }
 
diff --git a/packages/devextreme/js/__internal/ui/m_lookup.ts b/packages/devextreme/js/__internal/ui/m_lookup.ts
@@ -532,7 +532,6 @@ class Lookup extends DropDownList<LookupProperties> {
       });
     });
 
-    // @ts-expect-error
     return $(items);
   }
 
diff --git a/packages/devextreme/js/__internal/ui/menu/submenu.ts b/packages/devextreme/js/__internal/ui/menu/submenu.ts
@@ -173,7 +173,7 @@ class Submenu extends ContextMenu<SubmenuProperties> {
     const { position: positionOption } = this.option();
 
     const $submenu = this._itemContainer().children(`.${DX_SUBMENU_CLASS}`).eq(0);
-    // @ts-expect-error ts-error
+
     const $rootItem = $(positionOption?.of).find('.dx-context-menu-container-border');
     const position: PositionConfig = {
       // @ts-expect-error ts-error
diff --git a/packages/devextreme/js/__internal/ui/tree_view/m_tree_view.base.ts b/packages/devextreme/js/__internal/ui/tree_view/m_tree_view.base.ts
@@ -240,7 +240,7 @@ class TreeViewBase extends HierarchicalCollectionWidget<TreeViewBaseProperties,
     }
     const element = this.$element().get(0).querySelector(`[${DATA_ITEM_ID}="${key}"]`);
 
-    return $(element ?? undefined);
+    return $(element);
   }
 
   // eslint-disable-next-line class-methods-use-this
diff --git a/packages/devextreme/js/core/renderer.d.ts b/packages/devextreme/js/core/renderer.d.ts
@@ -131,6 +131,6 @@ export interface dxElementWrapper {
   length: number;
 }
 
-declare function renderer(selector?: string | Element | dxElementWrapper): dxElementWrapper;
+declare function renderer(selector?: string | Element | Element[] | dxElementWrapper | null | Document | Window): dxElementWrapper;
 
 export default renderer;

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,6 @@ class Devices {`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`_changeOrientation() {`
`358`		`- // @ts-expect-error`
`359`	`358`	`const $window = $(this._window);`
`360`	`359`	`const orientation = getHeight($window) > getWidth($window) ? 'portrait' : 'landscape';`
`361`	`360`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-/* eslint-disable @typescript-eslint/no-non-null-assertion */`
`2`	`1`	`import type { FilterPanel } from '@js/common/grids';`
`3`	`2`	`import $ from '@js/core/renderer';`
`4`	`3`	`import type { Properties as FilterBuilderProperties } from '@js/ui/filter_builder';`
`@@ -34,12 +33,12 @@ export class FilterPanelComponent extends Component<FilterPanelProps> {`
`34`	`33`	`}`
`35`	`34`
`36`	`35`	`public componentDidMount(): void {`
`37`		`- this.props.oldFilterPanelView.render($(this.filterPanelRef.current!));`
`38`		`- this.props.oldFilterBuilderView.render($(this.filterBuilderRef.current!));`
	`36`	`+ this.props.oldFilterPanelView.render($(this.filterPanelRef.current));`
	`37`	`+ this.props.oldFilterBuilderView.render($(this.filterBuilderRef.current));`
`39`	`38`	`}`
`40`	`39`
`41`	`40`	`public componentDidUpdate(): void {`
`42`		`- this.props.oldFilterPanelView.render($(this.filterPanelRef.current!));`
`43`		`- this.props.oldFilterBuilderView.render($(this.filterBuilderRef.current!));`
	`41`	`+ this.props.oldFilterPanelView.render($(this.filterPanelRef.current));`
	`42`	`+ this.props.oldFilterBuilderView.render($(this.filterBuilderRef.current));`
`44`	`43`	`}`
`45`	`44`	`}`