Skip to content

Commit 6f41c14

Browse files
Collection.Base: convert to ES6 Class
1 parent c3ae57e commit 6f41c14

File tree

26 files changed

+607
-489
lines changed

26 files changed

+607
-489
lines changed

packages/devextreme/js/__internal/core/widget/widget.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ export interface Properties<TComponent = any> extends WidgetOptions<TComponent>
4747
class Widget<
4848
TProperties extends Properties = Properties,
4949
> extends DOMComponent<Widget<TProperties>, TProperties> {
50-
private readonly _feedbackHideTimeout = 400;
50+
public _activeStateUnit!: string;
51+
52+
public _feedbackHideTimeout = 400;
5153

5254
private readonly _feedbackShowTimeout = 30;
5355

5456
private _contentReadyAction?: ((event?: Record<string, unknown>) => void) | null;
5557

56-
private readonly _activeStateUnit!: string;
57-
5858
private _keyboardListenerId?: string | null;
5959

6060
private _isReady?: boolean;

packages/devextreme/js/__internal/ui/calendar/m_calendar.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ const SELECTION_STRATEGIES = {
7474

7575
// @ts-expect-error
7676
const Calendar = Editor.inherit({
77-
_activeStateUnit: `.${CALENDAR_CELL_CLASS}`,
78-
7977
_getDefaultOptions() {
8078
return extend(this.callBase(), {
8179

@@ -442,6 +440,8 @@ const Calendar = Editor.inherit({
442440

443441
_init() {
444442
this.callBase();
443+
444+
this._activeStateUnit = `.${CALENDAR_CELL_CLASS}`;
445445
this._initSelectionStrategy();
446446
this._correctZoomLevel();
447447
this._initCurrentDate();

packages/devextreme/js/__internal/ui/collection/async.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import CollectionWidgetAsync from '@js/ui/collection/ui.collection_widget.async';
2-
import type { CollectionWidgetOptions, ItemLike } from '@js/ui/collection/ui.collection_widget.base';
2+
import type { ItemLike } from '@js/ui/collection/ui.collection_widget.base';
3+
import type { CollectionWidgetBaseProperties } from '@ts/ui/collection/m_collection_widget.base';
34

45
import CollectionWidgetEdit from './edit';
56

67
declare class Async<
78
// eslint-disable-next-line @typescript-eslint/no-explicit-any
8-
TProperties extends CollectionWidgetOptions<any, TItem, TKey>,
9+
TProperties extends CollectionWidgetBaseProperties<any, TItem, TKey>,
910
// eslint-disable-next-line @typescript-eslint/no-explicit-any
1011
TItem extends ItemLike = any,
1112
// eslint-disable-next-line @typescript-eslint/no-explicit-any

packages/devextreme/js/__internal/ui/collection/base.ts

Lines changed: 0 additions & 97 deletions
This file was deleted.

packages/devextreme/js/__internal/ui/collection/edit.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import type { dxElementWrapper } from '@js/core/renderer';
2-
import type { CollectionWidgetOptions, ItemLike } from '@js/ui/collection/ui.collection_widget.base';
2+
import type { ItemLike } from '@js/ui/collection/ui.collection_widget.base';
33
import CollectionWidgetEdit from '@js/ui/collection/ui.collection_widget.edit';
4-
5-
import CollectionWidgetBase from './base';
4+
import type { CollectionWidgetBaseProperties } from '@ts/ui/collection/m_collection_widget.base';
5+
import CollectionWidgetBase from '@ts/ui/collection/m_collection_widget.base';
66

77
declare class Edit<
88
// eslint-disable-next-line @typescript-eslint/no-explicit-any
9-
TProperties extends CollectionWidgetOptions<any, TItem, TKey>,
9+
TProperties extends CollectionWidgetBaseProperties<any, TItem, TKey>,
1010
// eslint-disable-next-line @typescript-eslint/no-explicit-any
1111
TItem extends ItemLike = any,
1212
// eslint-disable-next-line @typescript-eslint/no-explicit-any

packages/devextreme/js/__internal/ui/collection/live_update.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import type { CollectionWidgetOptions, ItemLike } from '@js/ui/collection/ui.collection_widget.base';
1+
import type { ItemLike } from '@js/ui/collection/ui.collection_widget.base';
22
import CollectionWidgetLiveUpdate from '@js/ui/collection/ui.collection_widget.live_update';
3+
import type { CollectionWidgetBaseProperties } from '@ts/ui/collection/m_collection_widget.base';
34

45
import CollectionWidgetAsync from './async';
56

67
declare class LiveUpdate<
78
// eslint-disable-next-line @typescript-eslint/no-explicit-any
8-
TProperties extends CollectionWidgetOptions<any, TItem, TKey>,
9+
TProperties extends CollectionWidgetBaseProperties<any, TItem, TKey>,
910
// eslint-disable-next-line @typescript-eslint/no-explicit-any
1011
TItem extends ItemLike = any,
1112
// eslint-disable-next-line @typescript-eslint/no-explicit-any

0 commit comments

Comments
 (0)