Drawer, Scrollbar, Scrollable, DateViewRollers, Scroller, Strategies(native, simulated): convert into ES6 class (DevExpress#29226)

Author: EugeniyKiyashko

packages/devextreme/js/__internal/ui/date_box/m_date_view.ts

@@ -245,6 +245,7 @@ const DateView = (Editor as any).inherit({
     if (roller) {
       this._createRollerConfig(rollerType);
       const rollerConfig = this._rollerConfigs[rollerType];
+      // eslint-disable-next-line @typescript-eslint/no-base-to-string
       if (rollerType === ROLLER_TYPE.day || rollerConfig.displayItems.toString() !== roller.option('items').toString()) {
         roller.option({
           items: rollerConfig.displayItems,

packages/devextreme/js/__internal/ui/date_box/m_date_view_roller.ts

@@ -5,12 +5,13 @@ import eventsEngine from '@js/common/core/events/core/events_engine';
 import { addNamespace } from '@js/common/core/events/utils/index';
 import registerComponent from '@js/core/component_registrator';
 import devices from '@js/core/devices';
+import type { dxElementWrapper } from '@js/core/renderer';
 import $ from '@js/core/renderer';
-import { extend } from '@js/core/utils/extend';
 import { each } from '@js/core/utils/iterator';
 import { getHeight } from '@js/core/utils/size';
 import { convertToLocation } from '@ts/ui/scroll_view/utils/convert_location';
 
+import type { ScrollableProperties } from '../scroll_view/m_scrollable';
 import Scrollable from '../scroll_view/m_scrollable';
 
 const DATEVIEW_ROLLER_CLASS = 'dx-dateviewroller';
@@ -22,19 +23,41 @@ const DATEVIEW_ROLLER_ITEM_SELECTED_CLASS = 'dx-dateview-item-selected';
 const DATEVIEW_ROLLER_ITEM_SELECTED_FRAME_CLASS = 'dx-dateview-item-selected-frame';
 const DATEVIEW_ROLLER_ITEM_SELECTED_BORDER_CLASS = 'dx-dateview-item-selected-border';
 
+export interface DateViewRollerProperties extends ScrollableProperties {
+  selectedIndex?: number;
+
+  items?: any[];
+
+  showOnClick?: boolean;
+
+  onClick?: () => void;
+}
+
 class DateViewRoller extends Scrollable {
-  _getDefaultOptions() {
-    return extend(super._getDefaultOptions(), {
+  _visibilityTimer?: ReturnType<typeof setTimeout>;
+
+  _selectedIndexChanged?: (e?: Record<string, unknown>) => void;
+
+  _isWheelScrolled?: boolean;
+
+  _$items!: dxElementWrapper;
+
+  _animation?: boolean;
+
+  _getDefaultOptions(): DateViewRollerProperties {
+    return {
+      ...super._getDefaultOptions(),
       showScrollbar: 'never',
       useNative: false,
       selectedIndex: 0,
       bounceEnabled: false,
       items: [],
       showOnClick: false,
+      // @ts-expect-error ts-error
       onClick: null,
       onSelectedIndexChanged: null,
       scrollByContent: true,
-    });
+    };
   }
 
   _init(): void {
@@ -53,7 +76,7 @@ class DateViewRoller extends Scrollable {
 
     this._renderContainerClick();
     this._renderItems();
-    // @ts-expect-error
+    // @ts-expect-error ts-error
     this._renderSelectedValue();
     this._renderItemsClick();
     this._renderWheelEvent();
@@ -76,7 +99,7 @@ class DateViewRoller extends Scrollable {
     if (!this.option('showOnClick')) {
       return;
     }
-
+    // @ts-expect-error ts-error
     const eventName = addNamespace(clickEventName, this.NAME);
 
     const clickAction = this._createActionByOption('onClick');
@@ -93,6 +116,7 @@ class DateViewRoller extends Scrollable {
 
     $(this.content()).empty();
     // NOTE: rendering ~166+30+12+24+60 <div>s >> 50mc
+    // @ts-expect-error ts-error
     items.forEach((item) => {
       $items = $items.add(
         // @ts-expect-error
@@ -123,6 +147,7 @@ class DateViewRoller extends Scrollable {
 
   _fitIndex(index) {
     const items = this.option('items') || [];
+    // @ts-expect-error ts-error
     const itemCount = items.length;
 
     if (index >= itemCount) {
@@ -136,23 +161,24 @@ class DateViewRoller extends Scrollable {
     return index;
   }
 
-  _getItemPosition(index) {
+  _getItemPosition(index): number {
     return Math.round(this._itemHeight() * index);
   }
 
-  _renderItemsClick() {
+  _renderItemsClick(): void {
     const itemSelector = this._getItemSelector();
+    // @ts-expect-error ts-error
     const eventName = addNamespace(clickEventName, this.NAME);
 
     eventsEngine.off(this.$element(), eventName, itemSelector);
     eventsEngine.on(this.$element(), eventName, itemSelector, this._itemClickHandler.bind(this));
   }
 
-  _getItemSelector() {
+  _getItemSelector(): string {
     return `.${DATEVIEW_ROLLER_ITEM_CLASS}`;
   }
 
-  _itemClickHandler(e) {
+  _itemClickHandler(e): void {
     this.option('selectedIndex', this._itemElementIndex(e.currentTarget));
   }
 
@@ -218,6 +244,7 @@ class DateViewRoller extends Scrollable {
   }
 
   _fitSelectedIndexInRange(index) {
+    // @ts-expect-error ts-error
     const itemsCount = this.option('items').length;
     return Math.max(Math.min(index, itemsCount - 1), 0);
   }
@@ -266,7 +293,7 @@ class DateViewRoller extends Scrollable {
     this._isWheelScrolled = false;
   }
 
-  _itemHeight() {
+  _itemHeight(): number {
     const $item = this._$items.first();
 
     return getHeight($item);
@@ -281,7 +308,7 @@ class DateViewRoller extends Scrollable {
   }
 
   _fireSelectedIndexChanged(value, previousValue): void {
-    this._selectedIndexChanged({
+    this._selectedIndexChanged?.({
       value,
       previousValue,
       event: undefined,
@@ -345,7 +372,7 @@ class DateViewRoller extends Scrollable {
     super._dispose();
   }
 }
-// @ts-expect-error ts-error
+
 registerComponent('dxDateViewRoller', DateViewRoller);
 
 export default DateViewRoller;

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

@@ -3,7 +3,7 @@ import $ from '@js/core/renderer';
 import { ensureDefined } from '@js/core/utils/common';
 import { camelize } from '@js/core/utils/inflector';
 import { getWidth } from '@js/core/utils/size';
-import Overlay from '@js/ui/overlay/ui.overlay';
+import Overlay from '@ts/ui/overlay/m_overlay';
 
 import { animation } from './m_drawer.animation';
 import DrawerStrategy from './m_drawer.rendering.strategy';