Release 21.1.6

DevExpress · Oct 1, 2021 · 36994da · 36994da
1 parent 879834b
commit 36994da
Show file tree

Hide file tree

Showing 29 changed files with 164 additions and 124 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/js/data/abstract_store.d.ts b/js/data/abstract_store.d.ts
@@ -6,6 +6,8 @@ import {
     LoadOptions,
 } from './load_options';
 
+export type Options = StoreOptions;
+
 /** @namespace DevExpress.data */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export interface StoreOptions<T = Store> {
@@ -101,7 +103,7 @@ export interface StoreOptions<T = Store> {
  * @namespace DevExpress.data
  */
 export default class Store {
-    constructor(options?: StoreOptions)
+    constructor(options?: Options)
     /**
      * @docid
      * @publicName byKey(key)

diff --git a/js/data/array_store.d.ts b/js/data/array_store.d.ts
@@ -1,9 +1,15 @@
 import Store, {
-    StoreOptions,
+    Options as StoreOptions,
 } from './abstract_store';
 
-/** @namespace DevExpress.data */
-export interface ArrayStoreOptions<T = ArrayStore> extends StoreOptions<T> {
+/** @public */
+export type Options = ArrayStoreOptions;
+
+/**
+ * @namespace DevExpress.data
+ * @deprecated Use Options instead
+ */
+export interface ArrayStoreOptions<T = ArrayStore> extends StoreOptions { // eslint-disable-line @typescript-eslint/no-unused-vars
     /**
      * @docid
      * @public
@@ -16,7 +22,7 @@ export interface ArrayStoreOptions<T = ArrayStore> extends StoreOptions<T> {
  * @public
  */
 export default class ArrayStore extends Store {
-    constructor(options?: ArrayStoreOptions)
+    constructor(options?: Options)
     /**
      * @docid
      * @publicName clear()

diff --git a/js/data/custom_store.d.ts b/js/data/custom_store.d.ts
@@ -1,13 +1,19 @@
 import Store, {
-    StoreOptions,
+    Options as StoreOptions,
 } from './abstract_store';
 
 import {
     LoadOptions,
 } from './load_options';
 
-/** @namespace DevExpress.data */
-export interface CustomStoreOptions extends StoreOptions<CustomStore> {
+/** @public */
+export type Options = CustomStoreOptions;
+
+/**
+ * @namespace DevExpress.data
+ * @deprecated Use Options instead
+ */
+export interface CustomStoreOptions extends StoreOptions {
     /**
      * @docid
      * @type_function_param1 key:object|string|number
@@ -76,7 +82,7 @@ export interface CustomStoreOptions extends StoreOptions<CustomStore> {
  * @public
  */
 export default class CustomStore extends Store {
-    constructor(options?: CustomStoreOptions)
+    constructor(options?: Options)
     /**
      * @docid
      * @publicName clearRawDataCache()

diff --git a/js/data/data_source.d.ts b/js/data/data_source.d.ts
@@ -3,14 +3,20 @@ import {
 } from '../core/utils/deferred';
 
 import Store, {
-    StoreOptions,
+    Options as StoreOptions,
 } from './abstract_store';
 
 import {
-    CustomStoreOptions,
+    Options as CustomStoreOptions,
 } from './custom_store';
 
-/** @namespace DevExpress.data */
+/** @public */
+export type Options = DataSourceOptions;
+
+/**
+ * @namespace DevExpress.data
+ * @deprecated Use Options instead
+ */
 export interface DataSourceOptions {
     /**
      * @docid
@@ -137,7 +143,7 @@ export interface DataSourceOptions {
  */
 export default class DataSource {
     constructor(data: Array<any>);
-    constructor(options: CustomStoreOptions | DataSourceOptions);
+    constructor(options: CustomStoreOptions | Options);
     constructor(store: Store);
     constructor(url: string);
     /**

diff --git a/js/renovation/ui/grids/data_grid/common/data_grid_props.tsx b/js/renovation/ui/grids/data_grid/common/data_grid_props.tsx
@@ -75,7 +75,7 @@ import { DxPromise } from '../../../../../core/utils/deferred'; // eslint-disabl
 import type { UserDefinedElement, DxElement } from '../../../../../core/element'; // eslint-disable-line import/named
 import type { template } from '../../../../../core/templates/template';
 import DataSource from '../../../../../data/data_source';
-import type { DataSourceOptions } from '../../../../../data/data_source';
+import type { Options as DataSourceOptions } from '../../../../../data/data_source';
 import type { dxPopupOptions } from '../../../../../ui/popup';
 import type {
   RequiredRule,

diff --git a/js/renovation/ui/list.tsx b/js/renovation/ui/list.tsx
@@ -2,7 +2,7 @@ import {
   Component, ComponentBindings, JSXComponent, OneWay, Event,
 } from '@devextreme-generator/declarations';
 /* eslint-disable import/named */
-import DataSource, { DataSourceOptions } from '../../data/data_source';
+import DataSource, { Options as DataSourceOptions } from '../../data/data_source';
 import type Store from '../../data/abstract_store';
 import { WidgetProps } from './common/widget';
 import LegacyList, { dxListItem } from '../../ui/list';

diff --git a/js/renovation/ui/select_box.tsx b/js/renovation/ui/select_box.tsx
@@ -4,7 +4,7 @@ import {
 import { WidgetProps } from './common/widget';
 // https://github.com/benmosher/eslint-plugin-import/issues/1699
 /* eslint-disable-next-line import/named */
-import DataSource, { DataSourceOptions } from '../../data/data_source';
+import DataSource, { Options as DataSourceOptions } from '../../data/data_source';
 import type Store from '../../data/abstract_store';
 /* eslint-disable-next-line import/named */
 import LegacySelectBox from '../../ui/select_box';

diff --git a/js/ui/collection/ui.collection_widget.base.d.ts b/js/ui/collection/ui.collection_widget.base.d.ts
@@ -8,7 +8,7 @@ import {
 } from '../../core/templates/template';
 
 import DataSource, {
-    DataSourceOptions,
+    Options as DataSourceOptions,
 } from '../../data/data_source';
 
 import Store from '../../data/abstract_store';

diff --git a/js/ui/context_menu.d.ts b/js/ui/context_menu.d.ts
@@ -11,7 +11,7 @@ import {
 } from '../core/utils/deferred';
 
 import DataSource, {
-    DataSourceOptions,
+    Options as DataSourceOptions,
 } from '../data/data_source';
 
 import Store from '../data/abstract_store';

diff --git a/js/ui/context_menu/ui.menu_base.d.ts b/js/ui/context_menu/ui.menu_base.d.ts
@@ -7,7 +7,7 @@ import {
 } from '../../core/element';
 
 import DataSource, {
-    DataSourceOptions,
+    Options as DataSourceOptions,
 } from '../../data/data_source';
 
 import Store from '../../data/abstract_store';

diff --git a/js/ui/data_grid.d.ts b/js/ui/data_grid.d.ts
@@ -15,7 +15,7 @@ import {
 import Store from '../data/abstract_store';
 
 import DataSource, {
-    DataSourceOptions,
+    Options as DataSourceOptions,
 } from '../data/data_source';
 
 import {

diff --git a/js/ui/editor/ui.data_expression.d.ts b/js/ui/editor/ui.data_expression.d.ts
@@ -8,7 +8,7 @@ import {
 } from '../../core/templates/template';
 
 import DataSource, {
-    DataSourceOptions,
+    Options as DataSourceOptions,
 } from '../../data/data_source';
 
 import Store from '../../data/abstract_store';

diff --git a/js/ui/file_manager/ui.file_manager.notification.js b/js/ui/file_manager/ui.file_manager.notification.js
@@ -167,18 +167,20 @@ export default class FileManagerNotificationControl extends Widget {
     }
 
     _dimensionChanged(dimension) {
-        const notificationManager = this._getNotificationManager();
-        if(!(dimension && dimension === 'height') && notificationManager.handleDimensionChanged()) {
+        if(!(dimension && dimension === 'height')) {
             this._checkAdaptiveState();
         }
     }
 
     _checkAdaptiveState() {
         const oldState = this._isInAdaptiveState;
         this._isInAdaptiveState = this._isSmallScreen();
-        if(this._progressDrawer && oldState !== this._isInAdaptiveState) {
-            const options = this._getProgressDrawerAdaptiveOptions();
-            this._progressDrawer.option(options);
+        if(oldState !== this._isInAdaptiveState && this._progressDrawer) {
+            const notificationManager = this._getNotificationManager();
+            if(notificationManager.handleDimensionChanged()) {
+                const options = this._getProgressDrawerAdaptiveOptions();
+                this._progressDrawer.option(options);
+            }
         }
     }
 

diff --git a/js/ui/filter_builder.d.ts b/js/ui/filter_builder.d.ts
@@ -10,7 +10,7 @@ import {
 import Store from '../data/abstract_store';
 
 import {
-    DataSourceOptions,
+    Options as DataSourceOptions,
 } from '../data/data_source';
 
 import {

diff --git a/js/ui/list.d.ts b/js/ui/list.d.ts
@@ -12,7 +12,7 @@ import {
 } from '../core/utils/deferred';
 
 import DataSource, {
-    DataSourceOptions,
+    Options as DataSourceOptions,
 } from '../data/data_source';
 
 import Store from '../data/abstract_store';

diff --git a/js/ui/menu.d.ts b/js/ui/menu.d.ts
@@ -4,7 +4,7 @@ import {
 } from '../core/element';
 
 import DataSource, {
-    DataSourceOptions,
+    Options as DataSourceOptions,
 } from '../data/data_source';
 
 import Store from '../data/abstract_store';

diff --git a/js/ui/multi_view.d.ts b/js/ui/multi_view.d.ts
@@ -3,7 +3,7 @@ import {
 } from '../core/element';
 
 import DataSource, {
-    DataSourceOptions,
+    Options as DataSourceOptions,
 } from '../data/data_source';
 
 import Store from '../data/abstract_store';

diff --git a/js/ui/pivot_grid.d.ts b/js/ui/pivot_grid.d.ts
@@ -13,7 +13,7 @@ import {
 
 import PivotGridDataSource, {
     Field,
-    PivotGridDataSourceOptions,
+    Options as PivotGridDataSourceOptions,
     dxPivotGridSummaryCell as SummaryCell,
 } from './pivot_grid/data_source';
 

diff --git a/js/ui/pivot_grid/data_source.d.ts b/js/ui/pivot_grid/data_source.d.ts
@@ -3,7 +3,7 @@ import {
 } from '../../core/utils/deferred';
 
 import Store, {
-    StoreOptions,
+    Options as StoreOptions,
 } from '../../data/abstract_store';
 
 import DataSource from '../../data/data_source';
@@ -155,7 +155,13 @@ interface dxPivotGridSummaryCell {
     value(postProcessed: boolean): any;
 }
 
-/** @namespace DevExpress.data */
+/** @public */
+export type Options = PivotGridDataSourceOptions;
+
+/**
+ * @namespace DevExpress.data
+ * @deprecated Use Options instead
+ */
 export interface PivotGridDataSourceOptions {
     /**
      * @docid
@@ -494,7 +500,7 @@ export interface PivotGridDataSourceField {
  * @public
  */
 export default class PivotGridDataSource {
-    constructor(options?: PivotGridDataSourceOptions)
+    constructor(options?: Options)
     /**
      * @docid
      * @publicName collapseAll(id)

diff --git a/js/ui/scheduler.d.ts b/js/ui/scheduler.d.ts
@@ -10,7 +10,7 @@ import {
 } from '../core/templates/template';
 
 import DataSource, {
-    DataSourceOptions,
+    Options as DataSourceOptions,
 } from '../data/data_source';
 
 import Store from '../data/abstract_store';

diff --git a/js/ui/tab_panel.d.ts b/js/ui/tab_panel.d.ts
@@ -8,7 +8,7 @@ import {
 } from '../core/templates/template';
 
 import DataSource, {
-    DataSourceOptions,
+    Options as DataSourceOptions,
 } from '../data/data_source';
 
 import Store from '../data/abstract_store';

diff --git a/js/ui/toolbar.d.ts b/js/ui/toolbar.d.ts
@@ -8,7 +8,7 @@ import {
 } from '../core/templates/template';
 
 import DataSource, {
-    DataSourceOptions,
+    Options as DataSourceOptions,
 } from '../data/data_source';
 
 import Store from '../data/abstract_store';

diff --git a/js/ui/tree_view.d.ts b/js/ui/tree_view.d.ts
@@ -8,7 +8,7 @@ import {
 } from '../core/utils/deferred';
 
 import DataSource, {
-    DataSourceOptions,
+    Options as DataSourceOptions,
 } from '../data/data_source';
 
 import Store from '../data/abstract_store';