Skip to content

Commit 409ce84

Browse files
authored
Overlay: Fix ESLint issues and improve typing
1 parent 9c1b023 commit 409ce84

File tree

12 files changed

+583
-340
lines changed

12 files changed

+583
-340
lines changed

packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,6 @@ export const validatingEditingExtender = (Base: ModuleType<EditingController>) =
841841
};
842842
}
843843

844-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
845844
protected _beforeSaveEditData(change, editIndex?) {
846845
let result: any = super._beforeSaveEditData.apply(this, arguments as any);
847846
const validationData = this._validatingController._getValidationData(change?.key, true);
@@ -1063,7 +1062,6 @@ const getBoundaryNonFixedColumnsInfo = function (fixedColumns) {
10631062
let firstNonFixedColumnIndex;
10641063
let lastNonFixedColumnIndex;
10651064

1066-
// eslint-disable-next-line array-callback-return
10671065
fixedColumns.some((column, index) => {
10681066
if (column.command === COMMAND_TRANSPARENT) {
10691067
firstNonFixedColumnIndex = index === 0 ? -1 : index;
@@ -1301,8 +1299,7 @@ export const validatingEditorFactoryExtender = (Base: ModuleType<EditorFactory>)
13011299
}
13021300

13031301
protected getOverlayBaseZIndex(): number {
1304-
// @ts-expect-error
1305-
return Overlay.baseZIndex() as number;
1302+
return Overlay.baseZIndex();
13061303
}
13071304

13081305
protected overlayPositionedHandler(e, isOverlayVisible) {
@@ -1479,7 +1476,6 @@ export const validatingDataControllerExtender = (Base: ModuleType<DataController
14791476
return validationStatus || VALIDATION_STATUS.valid;
14801477
}
14811478

1482-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
14831479
protected _isCellChanged(oldRow, newRow, visibleRowIndex, columnIndex, isLiveUpdate) {
14841480
const cell = oldRow.cells?.[columnIndex];
14851481
const oldValidationStatus = this._getValidationStatus({ status: cell?.validationStatus });

packages/devextreme/js/__internal/ui/drawer/drawer.rendering.strategy.overlap.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,13 @@ class OverlapStrategy extends DrawerStrategy {
2525
delete this._initialPosition;
2626

2727
const drawer = this.getDrawerInstance();
28-
const { opened, minSize, template: contentTemplate } = drawer.option();
28+
const {
29+
opened,
30+
minSize,
31+
template: contentTemplate,
32+
templatesRenderAsynchronously,
33+
} = drawer.option();
34+
2935
drawer._overlay = drawer._createComponent($(drawer.content()), Overlay, {
3036
shading: false,
3137
container: drawer.content(),
@@ -34,7 +40,7 @@ class OverlapStrategy extends DrawerStrategy {
3440
position: this._getOverlayPosition(),
3541
width: opened ? 'auto' : minSize ?? 0,
3642
height: '100%',
37-
templatesRenderAsynchronously: drawer.option('templatesRenderAsynchronously'),
43+
templatesRenderAsynchronously,
3844
animation: {
3945
show: {
4046
duration: 0,

packages/devextreme/js/__internal/ui/drawer/drawer.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ export interface DrawerProperties extends Properties {
4141
__debugWhenPanelContentRendered?: (e: { drawer: Drawer }) => boolean;
4242

4343
templateSize?: number;
44+
45+
templatesRenderAsynchronously?: boolean;
4446
}
4547

4648
class Drawer extends Widget<DrawerProperties> {

0 commit comments

Comments
 (0)