Skip to content

Commit 4d33793

Browse files
julearijuleari
authored
Selection: remove m_ prefix from file names (#30869) (#30881)
1 parent 2adf24c commit 4d33793

File tree

10 files changed

+40
-50
lines changed

10 files changed

+40
-50
lines changed

‎packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import type { ContextMenuController } from '@ts/grids/grid_core/context_menu/m_c
2121
import type { ModuleType } from '@ts/grids/grid_core/m_types';
2222
import type { StateStoringController } from '@ts/grids/grid_core/state_storing/m_state_storing_core';
2323
import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view';
24-
import Selection from '@ts/ui/selection/m_selection';
24+
import Selection from '@ts/ui/selection/selection';
2525

2626
import type { DataController } from '../data_controller/m_data_controller';
2727
import modules from '../m_modules';

‎packages/devextreme/js/__internal/grids/new/grid_core/selection/controller.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { computed, effect, signal } from '@preact/signals-core';
88
import { DataController } from '@ts/grids/new/grid_core/data_controller/index';
99
import { OptionsValidationController } from '@ts/grids/new/grid_core/options_validation/index';
1010
import { ShowCheckBoxesMode } from '@ts/grids/new/grid_core/selection/const';
11-
import Selection from '@ts/ui/selection/m_selection';
11+
import Selection from '@ts/ui/selection/selection';
1212

1313
import type { CardInfo } from '../columns_controller/types';
1414
import type { DataObject, Key } from '../data_controller/types';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import type {
2929
import BaseCollectionWidget from '@ts/ui/collection/collection_widget.base';
3030
import PlainEditStrategy from '@ts/ui/collection/collection_widget.edit.strategy.plain';
3131
import type DataController from '@ts/ui/collection/m_data_controller';
32-
import Selection from '@ts/ui/selection/m_selection';
32+
import Selection from '@ts/ui/selection/selection';
3333

3434
import type { CollectionItemIndex } from './collection_widget.edit.strategy';
3535

packages/devextreme/js/__internal/ui/selection/m_selection.strategy.deferred.ts renamed to packages/devextreme/js/__internal/ui/selection/selection.strategy.deferred.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { DeferredObj } from '@js/core/utils/deferred';
33
import { Deferred } from '@js/core/utils/deferred';
44
import { isString } from '@js/core/utils/type';
55
import errors from '@js/ui/widget/ui.errors';
6-
import SelectionStrategy from '@ts/ui/selection/m_selection.strategy';
6+
import SelectionStrategy from '@ts/ui/selection/selection.strategy';
77
import type { KeyExpr, SelectionFilter, SelectionItem } from '@ts/ui/selection/types';
88

99
export default class DeferredStrategy<
@@ -147,7 +147,6 @@ export default class DeferredStrategy<
147147
}
148148
}
149149

150-
// eslint-disable-next-line class-methods-use-this
151150
_findSubFilter(
152151
selectionFilter: SelectionFilter | undefined,
153152
filter: SelectionFilter | undefined,
@@ -176,7 +175,6 @@ export default class DeferredStrategy<
176175
return false;
177176
}
178177

179-
// eslint-disable-next-line class-methods-use-this
180178
_addFilterOperator(selectionFilter: SelectionFilter, filterOperator: 'and' | 'or'): SelectionFilter {
181179
let filter = selectionFilter;
182180
if (
@@ -194,7 +192,6 @@ export default class DeferredStrategy<
194192
return filter;
195193
}
196194

197-
// eslint-disable-next-line class-methods-use-this
198195
_denormalizeFilter(filter: SelectionFilter): SelectionFilter {
199196
let resultFilter = filter;
200197
if (resultFilter && isString(resultFilter[0])) {
@@ -203,7 +200,6 @@ export default class DeferredStrategy<
203200
return resultFilter;
204201
}
205202

206-
// eslint-disable-next-line class-methods-use-this
207203
_isOnlyNegativeFiltersLeft(filters: SelectionFilter): boolean {
208204
return filters.every((filterItem, i) => {
209205
if (i % 2 === 0) {
@@ -255,7 +251,6 @@ export default class DeferredStrategy<
255251
this._setOption('selectionFilter', !isDeselect && !selectionFilter.length ? null : selectionFilter);
256252
}
257253

258-
// eslint-disable-next-line class-methods-use-this
259254
_normalizeFilter(filter: SelectionFilter): SelectionFilter {
260255
let resultFilter = filter;
261256
if (resultFilter && resultFilter.length === 1) {
@@ -264,7 +259,6 @@ export default class DeferredStrategy<
264259
return resultFilter;
265260
}
266261

267-
// eslint-disable-next-line class-methods-use-this
268262
_removeFilterByIndex(filter: SelectionFilter, filterIndex: number, isSelectAll?: boolean): void {
269263
const operation = filter[1];
270264

@@ -279,7 +273,6 @@ export default class DeferredStrategy<
279273
}
280274
}
281275

282-
// eslint-disable-next-line class-methods-use-this
283276
_isSimpleKeyFilter(
284277
filter: SelectionFilter | undefined,
285278
key: string | Function | undefined,
@@ -357,6 +350,7 @@ export default class DeferredStrategy<
357350
isSelectAll,
358351
);
359352
if (innerFilterIndex >= 0) {
353+
// eslint-disable-next-line max-depth
360354
if (!selectionFilter[i].length) {
361355
this._removeFilterByIndex(selectionFilter, i, isSelectAll);
362356
} else if (selectionFilter[i].length === 1) {
@@ -376,7 +370,7 @@ export default class DeferredStrategy<
376370

377371
if (!selectionFilter) return true;
378372
if (!selectionFilter.length) return false;
379-
if (!filter || !filter.length) return undefined;
373+
if (!filter?.length) return undefined;
380374

381375
selectionFilter = this._denormalizeFilter(selectionFilter);
382376

packages/devextreme/js/__internal/ui/selection/m_selection.strategy.standard.ts renamed to packages/devextreme/js/__internal/ui/selection/selection.strategy.standard.ts

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { Deferred, when } from '@js/core/utils/deferred';
77
import { SelectionFilterCreator } from '@js/core/utils/selection_filter';
88
import { isDefined, isNumeric, isObject } from '@js/core/utils/type';
99
import errors from '@js/ui/widget/ui.errors';
10-
import SelectionStrategy from '@ts/ui/selection/m_selection.strategy';
10+
import SelectionStrategy from '@ts/ui/selection/selection.strategy';
1111
import type {
1212
PendingOptions,
1313
RequestData,
@@ -241,33 +241,34 @@ export default class StandardStrategy<
241241
removedItems: [],
242242
keys: [],
243243
};
244-
let lastRequestData: RequestData<TItem, TKey> = multiSelectEnabled
245-
? this._lastRequestData ?? emptyData
246-
: emptyData;
247244

248-
if (multiSelectEnabled) {
249-
if (this._shouldMergeWithLastRequest) {
250-
if (isDeselectAll) {
245+
if (!multiSelectEnabled) {
246+
return emptyData;
247+
}
248+
249+
let lastRequestData: RequestData<TItem, TKey> = this._lastRequestData ?? emptyData;
250+
251+
if (this._shouldMergeWithLastRequest) {
252+
if (isDeselectAll) {
253+
this._lastLoadDeferred?.reject();
254+
lastRequestData = {} as RequestData<TItem, TKey>;
255+
} else if (!isKeysEqual(keys, this.options.selectedItemKeys)) {
256+
oldRequestItems.added = lastRequestData?.addedItems;
257+
oldRequestItems.removed = lastRequestData?.removedItems;
258+
259+
if (!isDeselect) {
251260
this._lastLoadDeferred?.reject();
252-
lastRequestData = {} as RequestData<TItem, TKey>;
253-
} else if (!isKeysEqual(keys, this.options.selectedItemKeys)) {
254-
oldRequestItems.added = lastRequestData?.addedItems;
255-
oldRequestItems.removed = lastRequestData?.removedItems;
256-
257-
if (!isDeselect) {
258-
this._lastLoadDeferred?.reject();
259-
}
260261
}
261262
}
262-
263-
lastRequestData = this._concatRequestsItems(
264-
keys,
265-
oldRequestItems,
266-
isDeselect,
267-
this._shouldMergeWithLastRequest ? undefined : updatedKeys,
268-
);
269263
}
270264

265+
lastRequestData = this._concatRequestsItems(
266+
keys,
267+
oldRequestItems,
268+
isDeselect,
269+
this._shouldMergeWithLastRequest ? undefined : updatedKeys,
270+
);
271+
271272
return lastRequestData;
272273
}
273274

@@ -415,8 +416,7 @@ export default class StandardStrategy<
415416

416417
return selectedItemKeys
417418
.findIndex(
418-
(_, index) => (!ignoreIndicesMap || !ignoreIndicesMap[index])
419-
&& this.equalKeys(selectedItemKeys[index], key),
419+
(_, index) => !ignoreIndicesMap?.[index] && this.equalKeys(selectedItemKeys[index], key),
420420
);
421421
}
422422

packages/devextreme/js/__internal/ui/selection/m_selection.strategy.ts renamed to packages/devextreme/js/__internal/ui/selection/selection.strategy.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ export default class SelectionStrategy<
3939
this._setOption('addedItems', []);
4040
}
4141

42-
// eslint-disable-next-line class-methods-use-this
4342
validate(): void {}
4443

4544
_setOption(name: string, value: unknown): void {
@@ -125,7 +124,6 @@ export default class SelectionStrategy<
125124
return equalByValue(key1, key2);
126125
}
127126

128-
// eslint-disable-next-line class-methods-use-this
129127
getSelectableItems(items: TItem[]): TItem[] {
130128
return items.filter((item) => !item?.disabled);
131129
}
@@ -287,7 +285,6 @@ export default class SelectionStrategy<
287285
return false;
288286
}
289287

290-
// eslint-disable-next-line class-methods-use-this
291288
selectedItemKeys(
292289
// eslint-disable-next-line @typescript-eslint/no-unused-vars
293290
keys: TKey[],
@@ -306,23 +303,23 @@ export default class SelectionStrategy<
306303
}
307304

308305
isItemKeySelected(itemKey: TKey | TItem): boolean;
309-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
306+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
310307
isItemKeySelected(itemKey: TKey | TItem, options: { checkPending?: boolean } = {}): boolean {
311308
throw new Error('isItemKeySelected method should be overriden');
312309
}
313310

314311
isItemDataSelected(itemKey: TKey | TItem): boolean;
315-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
312+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
316313
isItemDataSelected(itemKey: TKey | TItem, options: { checkPending?: boolean } = {}): boolean {
317314
throw new Error('isItemKeySelected method should be overriden');
318315
}
319316

320-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
317+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
321318
addSelectedItem(itemKey: TKey, dataOrIsSelectAll?: TItem | boolean, skipFilter?: boolean): void {
322319
throw new Error('addSelectedItem method should be overriden');
323320
}
324321

325-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
322+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
326323
removeSelectedItem(itemKey: TKey): void {
327324
throw new Error('removeSelectedItem method should be overriden');
328325
}

packages/devextreme/js/__internal/ui/selection/m_selection.ts renamed to packages/devextreme/js/__internal/ui/selection/selection.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { noop } from '@js/core/utils/common';
22
import { Deferred, type DeferredObj, when } from '@js/core/utils/deferred';
33
import { extend } from '@js/core/utils/extend';
44
import { isDefined, isPlainObject } from '@js/core/utils/type';
5-
import DeferredStrategy from '@ts/ui/selection/m_selection.strategy.deferred';
6-
import StandardStrategy from '@ts/ui/selection/m_selection.strategy.standard';
5+
import DeferredStrategy from '@ts/ui/selection/selection.strategy.deferred';
6+
import StandardStrategy from '@ts/ui/selection/selection.strategy.standard';
77
import type {
88
DefaultOptions,
99
PendingOptions,
@@ -45,7 +45,6 @@ export default class Selection<
4545
}
4646
}
4747

48-
// eslint-disable-next-line class-methods-use-this
4948
_getDefaultOptions(): DefaultOptions<TItem, TKey, false> {
5049
const defaultOptions: DefaultOptions<TItem, TKey, false> = {
5150
allowNullValue: false,

‎packages/devextreme/js/__internal/ui/selection/types.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import type { LoadResult } from '@js/common/data';
22
import type { FilterDescriptor, LoadOptions, SelectDescriptor } from '@js/common/data.types';
33
import type { DeferredObj } from '@js/core/utils/deferred';
44
import type { Cancelable } from '@js/events';
5-
import type DeferredStrategy from '@ts/ui/selection/m_selection.strategy.deferred';
6-
import type StandardStrategy from '@ts/ui/selection/m_selection.strategy.standard';
5+
import type DeferredStrategy from '@ts/ui/selection/selection.strategy.deferred';
6+
import type StandardStrategy from '@ts/ui/selection/selection.strategy.standard';
77

88
export type SelectionFilter = FilterDescriptor[];
99

‎packages/devextreme/js/ui/file_manager/ui.file_manager.items_list.thumbnails.list_box.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { BindableTemplate } from '../../core/templates/bindable_template';
1212

1313
import ScrollView from '../scroll_view';
1414
import CollectionWidget from '../collection/ui.collection_widget.edit';
15-
import Selection from '../../__internal/ui/selection/m_selection';
15+
import Selection from '../../__internal/ui/selection/selection';
1616

1717
const FILE_MANAGER_THUMBNAILS_VIEW_PORT_CLASS = 'dx-filemanager-thumbnails-view-port';
1818
const FILE_MANAGER_THUMBNAILS_ITEM_LIST_CONTAINER_CLASS = 'dx-filemanager-thumbnails-container';

‎packages/devextreme/testing/tests/DevExpress.ui.widgets/selection.test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import $ from 'jquery';
22
import errors from 'ui/widget/ui.errors';
3-
import Selection from '__internal/ui/selection/m_selection';
3+
import Selection from '__internal/ui/selection/selection';
44
import Guid from 'core/guid';
55
import { DataSource } from 'common/data/data_source/data_source';
66
import { CustomStore } from 'common/data/custom_store';

0 commit comments

Comments
 (0)