From 3532b099fc5b60341874926d70951978b76bb0e2 Mon Sep 17 00:00:00 2001 From: EugeniyKiyashko Date: Thu, 19 Nov 2026 22:15:53 +0400 Subject: [PATCH 1/3] DOMComponent: type the template getters, drop the declare in Scheduler --- .../__internal/core/widget/dom_component.ts | 24 +++++++------------ .../js/__internal/scheduler/scheduler.ts | 3 --- .../ui/calendar/calendar.base_view.ts | 7 ++---- .../js/__internal/ui/calendar/calendar.ts | 2 +- .../js/__internal/ui/drawer/drawer.ts | 3 ++- .../ui/drop_down_editor/drop_down_button.ts | 2 +- .../ui/drop_down_editor/drop_down_editor.ts | 6 ++--- .../js/__internal/ui/form/components/label.ts | 2 +- .../ui/form/form.layout_manager.utils.ts | 8 +++---- .../devextreme/js/__internal/ui/form/form.ts | 2 +- .../ui/html_editor/formats/mention.ts | 6 ++--- .../__internal/ui/html_editor/html_editor.ts | 3 ++- .../ui/html_editor/utils/templates_storage.ts | 8 +++---- .../devextreme/js/__internal/ui/lookup.ts | 4 ++-- .../js/__internal/ui/overlay/overlay.ts | 3 ++- .../js/__internal/ui/popup/popup.ts | 4 ++-- .../js/__internal/ui/responsive_box.ts | 2 +- .../js/__internal/ui/tab_panel/tab_panel.ts | 2 +- .../devextreme/js/__internal/ui/tag_box.ts | 4 ++-- .../ui/toolbar/strategy/toolbar.singleline.ts | 1 - .../js/__internal/ui/toolbar/toolbar.base.ts | 3 ++- 21 files changed, 45 insertions(+), 54 deletions(-) diff --git a/packages/devextreme/js/__internal/core/widget/dom_component.ts b/packages/devextreme/js/__internal/core/widget/dom_component.ts index a7408dbedc0c..969e22f42e56 100644 --- a/packages/devextreme/js/__internal/core/widget/dom_component.ts +++ b/packages/devextreme/js/__internal/core/widget/dom_component.ts @@ -6,6 +6,7 @@ import { cleanDataRecursive } from '@js/core/element_data'; import errors from '@js/core/errors'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; +import type { FunctionTemplate } from '@js/core/templates/function_template'; import { noop } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; @@ -15,7 +16,7 @@ import { addShadowDomStyles } from '@js/core/utils/shadow_dom'; import { isDefined, isFunction, isString } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; import license, { peekValidationPerformed } from '@ts/core/license/license_validation'; -import type { IntegrationOptions } from '@ts/core/template_manager'; +import type { IntegrationOptions, TemplateManager } from '@ts/core/template_manager'; import TemplateManagerModule from '@ts/core/template_manager'; import { uiLayerInitialized } from '@ts/core/utils/common'; import type { ComponentProperties, DefaultActionArgs, DefaultActionConfig } from '@ts/core/widget/component'; @@ -62,8 +63,7 @@ class DOMComponent< private _requireRefresh?: boolean; - // eslint-disable-next-line @typescript-eslint/no-explicit-any - _templateManager!: any; + _templateManager!: TemplateManager; // eslint-disable-next-line @typescript-eslint/no-useless-constructor constructor(element: Element | dxElementWrapper, options?: unknown) { @@ -581,21 +581,15 @@ class DOMComponent< } } - // eslint-disable-next-line @stylistic/max-len - // eslint-disable-next-line @typescript-eslint/explicit-function-return-type, @typescript-eslint/explicit-module-boundary-types - _getTemplateByOption(optionName) { - // eslint-disable-next-line @typescript-eslint/no-unsafe-return + _getTemplateByOption(optionName: string): FunctionTemplate { return this._getTemplate(this.option(optionName)); } - // eslint-disable-next-line @stylistic/max-len - // eslint-disable-next-line @typescript-eslint/explicit-function-return-type, @typescript-eslint/explicit-module-boundary-types - _getTemplate(templateSource) { - const templates = this.option('integrationOptions.templates'); - const isAsyncTemplate = this.option('templatesRenderAsynchronously'); - const skipTemplates = this.option('integrationOptions.skipTemplates'); + _getTemplate(templateSource: unknown): FunctionTemplate { + const templates = this.option('integrationOptions.templates') as Record; + const isAsyncTemplate = this.option('templatesRenderAsynchronously') as boolean | undefined; + const skipTemplates = this.option('integrationOptions.skipTemplates') as string[] | undefined; - // eslint-disable-next-line @typescript-eslint/no-unsafe-return return this._templateManager.getTemplate( templateSource, templates, @@ -604,7 +598,7 @@ class DOMComponent< skipTemplates, }, this, - ); + ) as FunctionTemplate; } // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types diff --git a/packages/devextreme/js/__internal/scheduler/scheduler.ts b/packages/devextreme/js/__internal/scheduler/scheduler.ts index 88ee7b42a247..bdb5c04a777f 100644 --- a/packages/devextreme/js/__internal/scheduler/scheduler.ts +++ b/packages/devextreme/js/__internal/scheduler/scheduler.ts @@ -380,9 +380,6 @@ class Scheduler extends SchedulerOptionsBaseWidget { declare _dataSource: DataSource | undefined; - // eslint-disable-next-line @typescript-eslint/naming-convention -- inherited Widget API - declare _getTemplate: (template: unknown) => FunctionTemplate; - // TODO: used externally in m_subscribes.ts, // view_model/preparation/prepare_appointments.ts, // view_model/filtration/utils/get_filter_options/get_filter_options.ts diff --git a/packages/devextreme/js/__internal/ui/calendar/calendar.base_view.ts b/packages/devextreme/js/__internal/ui/calendar/calendar.base_view.ts index ffe861a66b50..9c9c3b56bdf7 100644 --- a/packages/devextreme/js/__internal/ui/calendar/calendar.base_view.ts +++ b/packages/devextreme/js/__internal/ui/calendar/calendar.base_view.ts @@ -1,4 +1,3 @@ -import type { template } from '@js/common'; import { name as clickEventName } from '@js/common/core/events/click'; import { start as hoverStartEventName } from '@js/common/core/events/hover'; import { addNamespace } from '@js/common/core/events/utils/index'; @@ -9,6 +8,7 @@ import { getPublicElement } from '@js/core/element'; import { data as elementData } from '@js/core/element_data'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; +import type { FunctionTemplate } from '@js/core/templates/function_template'; import coreDateUtils from '@js/core/utils/date'; import dateSerialization from '@js/core/utils/date_serialization'; import type { DxEvent } from '@js/events'; @@ -101,9 +101,7 @@ export interface BaseViewProperties extends WidgetProperties { hoveredRange: Date[]; - cellTemplate?: template | ( - (itemData: CellTemplateData, itemIndex: number, itemElement: Element) => dxElementWrapper - ); + cellTemplate?: FunctionTemplate; onCellClick?: (e: CellEvent) => void; onCellHover?: (e: CellEvent) => void; @@ -365,7 +363,6 @@ class BaseView< $(row).append(cell); if (cellTemplate) { - // @ts-expect-error ts-error cellTemplate.render(this._prepareCellTemplateData(cellDate, cellIndex, $cell)); } else { cell.innerHTML = this._getCellText(cellDate); diff --git a/packages/devextreme/js/__internal/ui/calendar/calendar.ts b/packages/devextreme/js/__internal/ui/calendar/calendar.ts index d2d448bfbe91..999915913cb4 100644 --- a/packages/devextreme/js/__internal/ui/calendar/calendar.ts +++ b/packages/devextreme/js/__internal/ui/calendar/calendar.ts @@ -11,7 +11,6 @@ import Guid from '@js/core/guid'; import type { DefaultOptionsRule } from '@js/core/options/utils'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; -import { FunctionTemplate } from '@js/core/templates/function_template'; import dateUtils from '@js/core/utils/date'; import dateSerialization from '@js/core/utils/date_serialization'; import { inRange, sign } from '@js/core/utils/math'; @@ -29,6 +28,7 @@ import type { CalendarZoomLevel, DateLike, Properties, } from '@js/ui/calendar'; import { current, isFluent } from '@js/ui/themes'; +import { FunctionTemplate } from '@ts/core/templates/function_template'; import type { OptionChanged } from '@ts/core/widget/types'; import type { SupportedKeys } from '@ts/core/widget/widget'; import eventsEngine from '@ts/events/core/events_engine'; diff --git a/packages/devextreme/js/__internal/ui/drawer/drawer.ts b/packages/devextreme/js/__internal/ui/drawer/drawer.ts index 5f9ccba9bf20..884da5bd29ff 100644 --- a/packages/devextreme/js/__internal/ui/drawer/drawer.ts +++ b/packages/devextreme/js/__internal/ui/drawer/drawer.ts @@ -16,6 +16,7 @@ import type { PointerInteractionEvent, } from '@js/events'; import type { PanelLocation, Properties } from '@js/ui/drawer'; +import type { TemplateBase } from '@ts/core/templates/template_base'; import type { OptionChanged } from '@ts/core/widget/types'; import Widget from '@ts/core/widget/widget'; import eventsEngine from '@ts/events/core/events_engine'; @@ -304,7 +305,7 @@ class Drawer extends Widget { _renderViewContent(): void { const contentTemplateOption = this.option('contentTemplate'); - const contentTemplate = this._getTemplate(contentTemplateOption); + const contentTemplate = this._getTemplate(contentTemplateOption) as unknown as TemplateBase; if (contentTemplate) { const $viewTemplate = contentTemplate.render({ diff --git a/packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_button.ts b/packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_button.ts index d8fd3e950e5d..a9a9ccea53bd 100644 --- a/packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_button.ts +++ b/packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_button.ts @@ -160,7 +160,7 @@ export default class DropDownButton< const { editor } = this; const { dropDownButtonTemplate } = editor?.option() ?? {}; - options.template = this.editor?._getTemplateByOption('dropDownButtonTemplate'); + options.template = this.editor?._getTemplateByOption('dropDownButtonTemplate') as unknown as DropDownButtonOptions['template']; this.currentTemplate = dropDownButtonTemplate; } diff --git a/packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_editor.ts b/packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_editor.ts index 09cdb2de94b2..65a3fc6760ac 100644 --- a/packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_editor.ts +++ b/packages/devextreme/js/__internal/ui/drop_down_editor/drop_down_editor.ts @@ -106,8 +106,8 @@ export interface FieldTemplate { } interface FieldAddonsTemplates { - beforeTemplate?: FieldTemplate; - afterTemplate?: FieldTemplate; + beforeTemplate: FieldTemplate | null; + afterTemplate: FieldTemplate | null; } type PopupToolbarItemConfig = ToolbarItem & { shortcut?: string }; @@ -414,7 +414,7 @@ class DropDownEditor< return; } - // eslint-disable-next-line @typescript-eslint/no-unsafe-return, consistent-return + // eslint-disable-next-line consistent-return return this._getTemplate(fieldTemplate); } diff --git a/packages/devextreme/js/__internal/ui/form/components/label.ts b/packages/devextreme/js/__internal/ui/form/components/label.ts index af792bf6a609..78f9a36a93ce 100644 --- a/packages/devextreme/js/__internal/ui/form/components/label.ts +++ b/packages/devextreme/js/__internal/ui/form/components/label.ts @@ -34,7 +34,7 @@ export type LabelOptions = SimpleItem['label'] & { isRequired: boolean; markOptions: LabelMarkOptions; - labelTemplate: FunctionTemplate; + labelTemplate: FunctionTemplate | null; labelTemplateData?: SimpleItemLabelTemplateData; onLabelTemplateRendered: () => void; diff --git a/packages/devextreme/js/__internal/ui/form/form.layout_manager.utils.ts b/packages/devextreme/js/__internal/ui/form/form.layout_manager.utils.ts index c3aa0efb6d2d..72fd916f2230 100644 --- a/packages/devextreme/js/__internal/ui/form/form.layout_manager.utils.ts +++ b/packages/devextreme/js/__internal/ui/form/form.layout_manager.utils.ts @@ -72,8 +72,8 @@ export interface ConvertToRenderFieldItemOptions { ) => Editor); item: Required; - template: FunctionTemplate; - labelTemplate: FunctionTemplate; + template: FunctionTemplate | null; + labelTemplate: FunctionTemplate | null; name: string; formLabelLocation: LabelLocation | undefined; requiredMessageTemplate: FunctionTemplate; @@ -109,7 +109,7 @@ export interface FieldItemOptions { item: Required; isSimpleItem: boolean; isRequired: boolean; - template: FunctionTemplate; + template: FunctionTemplate | null; helpID: string | null; labelID?: string | null; name: string; @@ -127,7 +127,7 @@ export interface ConvertToLabelOptions { managerMarkOptions: LabelMarkOptions; showColonAfterLabel: boolean; labelLocation: LabelLocation | undefined; - labelTemplate: FunctionTemplate; + labelTemplate: FunctionTemplate | null; formLabelMode?: FormLabelMode; onLabelTemplateRendered: () => void; } diff --git a/packages/devextreme/js/__internal/ui/form/form.ts b/packages/devextreme/js/__internal/ui/form/form.ts index 6e32dc3f5f86..6d1d3d2d5029 100644 --- a/packages/devextreme/js/__internal/ui/form/form.ts +++ b/packages/devextreme/js/__internal/ui/form/form.ts @@ -687,7 +687,7 @@ class Form extends Widget { item: PreparedItem, ): void { if (item.template) { - item.template = this._getTemplate(item.template); + item.template = this._getTemplate(item.template) as unknown as PreparedItem['template']; } } diff --git a/packages/devextreme/js/__internal/ui/html_editor/formats/mention.ts b/packages/devextreme/js/__internal/ui/html_editor/formats/mention.ts index cf87327ae3cb..1ea8f0c98989 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/formats/mention.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/formats/mention.ts @@ -1,5 +1,5 @@ import $ from '@js/core/renderer'; -import type { TemplateBase } from '@ts/core/templates/template_base'; +import type { FunctionTemplate } from '@js/core/templates/function_template'; import Quill from 'devextreme-quill'; import type { @@ -15,7 +15,7 @@ import TemplatesStorage from '../utils/templates_storage'; interface MentionBlotConstructor extends EmbedBlotConstructor { create: (data: MentionData) => HTMLElement; value: (node: HTMLElement) => MentionData; - addTemplate: (data: MentionTemplateKey, template: TemplateBase) => void; + addTemplate: (data: MentionTemplateKey, template: FunctionTemplate) => void; removeTemplate: (data: MentionTemplateKey) => void; _templatesStorage: TemplatesStorage; } @@ -80,7 +80,7 @@ if (Quill) { .append(data.value); } - static addTemplate(data: MentionTemplateKey, template: TemplateBase): void { + static addTemplate(data: MentionTemplateKey, template: FunctionTemplate): void { this._templatesStorage.set(data, template); } diff --git a/packages/devextreme/js/__internal/ui/html_editor/html_editor.ts b/packages/devextreme/js/__internal/ui/html_editor/html_editor.ts index de19e0bca0b9..9e5226e583ad 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/html_editor.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/html_editor.ts @@ -28,6 +28,7 @@ import type { DxEvent } from '@js/events'; import type { Properties as FormProperties } from '@js/ui/form'; import type { Converter, HtmlEditorFormat, Properties } from '@js/ui/html_editor'; import type { Properties as PopupProperties } from '@js/ui/popup'; +import type { TemplateBase } from '@ts/core/templates/template_base'; import { getNextFocusableElement, getPreviousFocusableElement } from '@ts/core/utils/focus'; import type { OptionChanged } from '@ts/core/widget/types'; import { Event as dxEvent } from '@ts/events/core/events'; @@ -221,7 +222,7 @@ class HtmlEditor extends Editor { this._renderStylingMode(); - const template = this._getTemplate(ANONYMOUS_TEMPLATE_NAME); + const template = this._getTemplate(ANONYMOUS_TEMPLATE_NAME) as unknown as TemplateBase; const transclude = true; this._$templateResult = template?.render({ diff --git a/packages/devextreme/js/__internal/ui/html_editor/utils/templates_storage.ts b/packages/devextreme/js/__internal/ui/html_editor/utils/templates_storage.ts index 38258f4d20d7..0f8f89b4e0d9 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/utils/templates_storage.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/utils/templates_storage.ts @@ -1,21 +1,21 @@ +import type { FunctionTemplate } from '@js/core/templates/function_template'; import { isDefined, isEmptyObject } from '@js/core/utils/type'; -import type { TemplateBase } from '@ts/core/templates/template_base'; import type { MentionTemplateKey, MentionTemplateLookupKey } from '../types'; export default class TemplatesStorage { - _storage: Record>; + _storage: Record>; constructor() { this._storage = {}; } - set({ editorKey, marker }: MentionTemplateKey, value: TemplateBase): void { + set({ editorKey, marker }: MentionTemplateKey, value: FunctionTemplate): void { this._storage[editorKey] ??= {}; this._storage[editorKey][marker] = value; } - get({ editorKey, marker }: MentionTemplateLookupKey): TemplateBase | undefined { + get({ editorKey, marker }: MentionTemplateLookupKey): FunctionTemplate | undefined { const isQuillFormatCall = !isDefined(editorKey); // NOTE: If anonymous templates are used, mentions are parsed from the markup. diff --git a/packages/devextreme/js/__internal/ui/lookup.ts b/packages/devextreme/js/__internal/ui/lookup.ts index 3155f7e104c6..09e82d960aa2 100644 --- a/packages/devextreme/js/__internal/ui/lookup.ts +++ b/packages/devextreme/js/__internal/ui/lookup.ts @@ -772,7 +772,7 @@ class Lookup extends DropDownList { maxHeight: dropDownOptions.maxHeight, showTitle: dropDownOptions.showTitle, title: dropDownOptions.title, - titleTemplate: this._getTemplateByOption('dropDownOptions.titleTemplate'), + titleTemplate: this._getTemplateByOption('dropDownOptions.titleTemplate') as unknown as PopupProperties['titleTemplate'], // @ts-expect-error fix on PopoverProperties level onTitleRendered: dropDownOptions.onTitleRendered, fullScreen: dropDownOptions.fullScreen, @@ -1053,7 +1053,7 @@ class Lookup extends DropDownList { ...{ tabIndex: searchEnabled ? -1 : 0, grouped, - groupTemplate: this._getTemplateByOption('groupTemplate'), + groupTemplate: this._getTemplateByOption('groupTemplate') as unknown as ListBaseProperties['groupTemplate'], pullRefreshEnabled, useNativeScrolling, pullingDownText, diff --git a/packages/devextreme/js/__internal/ui/overlay/overlay.ts b/packages/devextreme/js/__internal/ui/overlay/overlay.ts index 6802e814697a..872874319fd8 100644 --- a/packages/devextreme/js/__internal/ui/overlay/overlay.ts +++ b/packages/devextreme/js/__internal/ui/overlay/overlay.ts @@ -39,6 +39,7 @@ import type { import type dxOverlay from '@js/ui/overlay'; import type { dxOverlayAnimation, dxOverlayOptions, Properties } from '@js/ui/overlay'; import uiErrors from '@js/ui/widget/ui.errors'; +import type { TemplateBase } from '@ts/core/templates/template_base'; import documentSizeCallbacks from '@ts/core/utils/document_size_callbacks'; import domUtils from '@ts/core/utils/dom'; import selectors from '@ts/core/utils/selectors'; @@ -1302,7 +1303,7 @@ class Overlay< const { contentTemplate: contentTemplateOption } = this.option(); const whenContentRendered = Deferred(); - const contentTemplate = this._getTemplate(contentTemplateOption); + const contentTemplate = this._getTemplate(contentTemplateOption) as unknown as TemplateBase; const transclude = this._templateManager.anonymousTemplateName === contentTemplateOption; contentTemplate?.render({ diff --git a/packages/devextreme/js/__internal/ui/popup/popup.ts b/packages/devextreme/js/__internal/ui/popup/popup.ts index 7a32e6c906bf..b5a0f7679ea2 100644 --- a/packages/devextreme/js/__internal/ui/popup/popup.ts +++ b/packages/devextreme/js/__internal/ui/popup/popup.ts @@ -13,7 +13,7 @@ import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import resizeObserverSingleton from '@js/core/resize_observer'; import { EmptyTemplate } from '@js/core/templates/empty_template'; -import type { TemplateBase } from '@js/core/templates/template_base'; +import type { FunctionTemplate } from '@js/core/templates/function_template'; import { noop } from '@js/core/utils/common'; import type { DeferredObj } from '@js/core/utils/deferred'; import { contains } from '@js/core/utils/dom'; @@ -770,7 +770,7 @@ class Popup< } _renderByTemplate( - template: TemplateBase, + template: FunctionTemplate, $container: dxElementWrapper, ): dxElementWrapper { const $result = $(template.render({ container: getPublicElement($container) })); diff --git a/packages/devextreme/js/__internal/ui/responsive_box.ts b/packages/devextreme/js/__internal/ui/responsive_box.ts index a3d648b81228..e34d31308cf3 100644 --- a/packages/devextreme/js/__internal/ui/responsive_box.ts +++ b/packages/devextreme/js/__internal/ui/responsive_box.ts @@ -446,7 +446,7 @@ class ResponsiveBox extends CollectionWidget { width: '100%', height: '100%', items: rootItems, - itemTemplate: this._getTemplateByOption('itemTemplate'), + itemTemplate: this._getTemplateByOption('itemTemplate') as unknown as BoxOptions['itemTemplate'], itemHoldTimeout, onItemHold: this._createActionByOption('onItemHold'), onItemClick: this._createActionByOption('onItemClick'), diff --git a/packages/devextreme/js/__internal/ui/tab_panel/tab_panel.ts b/packages/devextreme/js/__internal/ui/tab_panel/tab_panel.ts index 53afdae81d01..e0a06ae9b212 100644 --- a/packages/devextreme/js/__internal/ui/tab_panel/tab_panel.ts +++ b/packages/devextreme/js/__internal/ui/tab_panel/tab_panel.ts @@ -357,7 +357,7 @@ class TabPanel extends MultiView { this._refreshActiveDescendant(); }, onItemRendered: this._titleRenderedAction.bind(this), - itemTemplate: this._getTemplateByOption('itemTitleTemplate'), + itemTemplate: this._getTemplateByOption('itemTitleTemplate') as unknown as TabsProperties['itemTemplate'], items, // @ts-expect-error ts-error noDataText: null, diff --git a/packages/devextreme/js/__internal/ui/tag_box.ts b/packages/devextreme/js/__internal/ui/tag_box.ts index a397edfe65f3..9b40b107c89b 100644 --- a/packages/devextreme/js/__internal/ui/tag_box.ts +++ b/packages/devextreme/js/__internal/ui/tag_box.ts @@ -12,7 +12,7 @@ import Guid from '@js/core/guid'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { BindableTemplate } from '@js/core/templates/bindable_template'; -import type { TemplateBase } from '@js/core/templates/template_base'; +import type { FunctionTemplate } from '@js/core/templates/function_template'; import { getIntersection, removeDuplicates } from '@js/core/utils/array'; import { ensureDefined, equalByValue } from '@js/core/utils/common'; import type { DeferredObj } from '@js/core/utils/deferred'; @@ -109,7 +109,7 @@ class TagBox< _isDataSourceChanged?: boolean; - _tagTemplate?: TemplateBase; + _tagTemplate?: FunctionTemplate; _isDataSourceOptionChanged?: boolean; diff --git a/packages/devextreme/js/__internal/ui/toolbar/strategy/toolbar.singleline.ts b/packages/devextreme/js/__internal/ui/toolbar/strategy/toolbar.singleline.ts index ec0fc43be7c8..03dbc3a43603 100644 --- a/packages/devextreme/js/__internal/ui/toolbar/strategy/toolbar.singleline.ts +++ b/packages/devextreme/js/__internal/ui/toolbar/strategy/toolbar.singleline.ts @@ -64,7 +64,6 @@ export class SingleLineStrategy { this._menu = this._toolbar._createComponent($menu, DropDownMenu, { disabled, allowKeyboardNavigation, - // eslint-disable-next-line @typescript-eslint/no-unsafe-return itemTemplate: () => menuItemTemplate, onItemClick: (e) => { itemClickAction(e); }, container: menuContainer, diff --git a/packages/devextreme/js/__internal/ui/toolbar/toolbar.base.ts b/packages/devextreme/js/__internal/ui/toolbar/toolbar.base.ts index 3286038fb446..2799f5036773 100644 --- a/packages/devextreme/js/__internal/ui/toolbar/toolbar.base.ts +++ b/packages/devextreme/js/__internal/ui/toolbar/toolbar.base.ts @@ -16,6 +16,7 @@ import { } from '@js/ui/themes'; import type { Item, Properties } from '@js/ui/toolbar'; import { BindableTemplate } from '@ts/core/templates/bindable_template'; +import type { TemplateBase } from '@ts/core/templates/template_base'; import type { OptionChanged } from '@ts/core/widget/types'; import type { SupportedKeys } from '@ts/core/widget/widget'; import CollectionWidgetAsync from '@ts/ui/collection/collection_widget.async'; @@ -144,7 +145,7 @@ class ToolbarBase< $container.text(String(data)); } - this._getTemplate('dx-polymorph-widget').render({ + (this._getTemplate('dx-polymorph-widget') as unknown as TemplateBase).render({ container: $container, model: rawModel, parent: this, From ddcd7363f7afdbfae095513b7767242f2619ea04 Mon Sep 17 00:00:00 2001 From: EugeniyKiyashko Date: Thu, 19 Nov 2026 23:02:53 +0400 Subject: [PATCH 2/3] DOMComponent: read the template options by destructuring --- .../devextreme/js/__internal/core/widget/dom_component.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/devextreme/js/__internal/core/widget/dom_component.ts b/packages/devextreme/js/__internal/core/widget/dom_component.ts index 969e22f42e56..94e70d7db06b 100644 --- a/packages/devextreme/js/__internal/core/widget/dom_component.ts +++ b/packages/devextreme/js/__internal/core/widget/dom_component.ts @@ -586,9 +586,9 @@ class DOMComponent< } _getTemplate(templateSource: unknown): FunctionTemplate { - const templates = this.option('integrationOptions.templates') as Record; - const isAsyncTemplate = this.option('templatesRenderAsynchronously') as boolean | undefined; - const skipTemplates = this.option('integrationOptions.skipTemplates') as string[] | undefined; + const { integrationOptions, templatesRenderAsynchronously: isAsyncTemplate } = this.option(); + const templates = integrationOptions?.templates as Record; + const skipTemplates = integrationOptions?.skipTemplates; return this._templateManager.getTemplate( templateSource, From c63b99593ee38046ab8007ff04688eff6f2ca2ba Mon Sep 17 00:00:00 2001 From: EugeniyKiyashko Date: Fri, 20 Nov 2026 00:17:01 +0400 Subject: [PATCH 3/3] DOMComponent: read templatesRenderAsynchronously through the option getter --- packages/devextreme/js/__internal/core/widget/dom_component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/devextreme/js/__internal/core/widget/dom_component.ts b/packages/devextreme/js/__internal/core/widget/dom_component.ts index 94e70d7db06b..a8e11971651f 100644 --- a/packages/devextreme/js/__internal/core/widget/dom_component.ts +++ b/packages/devextreme/js/__internal/core/widget/dom_component.ts @@ -586,9 +586,10 @@ class DOMComponent< } _getTemplate(templateSource: unknown): FunctionTemplate { - const { integrationOptions, templatesRenderAsynchronously: isAsyncTemplate } = this.option(); + const { integrationOptions } = this.option(); const templates = integrationOptions?.templates as Record; const skipTemplates = integrationOptions?.skipTemplates; + const isAsyncTemplate = Boolean(this.option('templatesRenderAsynchronously')); return this._templateManager.getTemplate( templateSource,