Skip to content

Commit b215557

Browse files
GoodDayForSurfGoodDayForSurf
committed
Merge branch '25_1' of https://github.com/DevExpress/DevExtreme into 25_1_demos_vue_ts_scheduler
2 parents e88c900 + fbce12e commit b215557

File tree

14 files changed

+95
-67
lines changed

14 files changed

+95
-67
lines changed

‎packages/devextreme-react/src/core/__tests__/template-wrapper.test.tsx‎

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ describe('Template Wrapper', () => {
7878
<>
7979
<div className='template-container' />
8080
<TemplateWrapper
81-
key={1}
81+
key='1'
82+
componentKey='1'
8283
templateFactory={templateFunction}
8384
data={{ text: 'My template' }}
8485
index={1}
@@ -103,7 +104,8 @@ describe('Template Wrapper', () => {
103104
<>
104105
<div className='template-container' />
105106
<TemplateWrapper
106-
key={2}
107+
key='2'
108+
componentKey='2'
107109
templateFactory={templateFunction}
108110
data={{ text: 'My template' }}
109111
index={1}
@@ -124,7 +126,8 @@ describe('Template Wrapper', () => {
124126
<>
125127
<div className='template-container' />
126128
<TemplateWrapper
127-
key={3}
129+
key='3'
130+
componentKey='3'
128131
templateFactory={templateFunction}
129132
data={{ text: 'My template' }}
130133
index={1}
@@ -145,7 +148,8 @@ describe('Template Wrapper', () => {
145148
<>
146149
<div className='template-container' />
147150
<TemplateWrapper
148-
key={4}
151+
key='4'
152+
componentKey='4'
149153
templateFactory={templateFunction}
150154
data={{ text: 'My template' }}
151155
index={1}
@@ -182,7 +186,8 @@ describe('Template Wrapper', () => {
182186
<>
183187
<div className='template-container' />
184188
<TemplateWrapper
185-
key={1}
189+
key='1'
190+
componentKey='1'
186191
templateFactory={templateFunction}
187192
data={{ text: 'My template' }}
188193
index={1}
@@ -202,7 +207,8 @@ describe('Template Wrapper', () => {
202207
<>
203208
<div className='template-container' />
204209
<TemplateWrapper
205-
key={2}
210+
key='2'
211+
componentKey='2'
206212
templateFactory={templateFunction}
207213
data={{ text: 'My template' }}
208214
index={1}
@@ -232,6 +238,8 @@ describe('Template Wrapper', () => {
232238
<>
233239
<div className='template-container' />
234240
<TemplateWrapper
241+
key='1'
242+
componentKey='1'
235243
templateFactory={templateFunction}
236244
data={{ text: 'My template' }}
237245
index={1}
@@ -309,6 +317,8 @@ describe('Template Wrapper', () => {
309317
<tbody className='tbody-container' />
310318
</table>
311319
<TemplateWrapper
320+
key='1'
321+
componentKey='1'
312322
templateFactory={templateFunction}
313323
data={{ text: 'My template' }}
314324
index={1}
@@ -317,6 +327,8 @@ describe('Template Wrapper', () => {
317327
onRemoved={() => undefined}
318328
/>
319329
<TemplateWrapper
330+
key='2'
331+
componentKey='2'
320332
templateFactory={tableBodyTemplateFunction}
321333
data={{ text: 'My template' }}
322334
index={1}
@@ -325,6 +337,8 @@ describe('Template Wrapper', () => {
325337
onRemoved={() => undefined}
326338
/>
327339
<TemplateWrapper
340+
key='3'
341+
componentKey='3'
328342
templateFactory={tableRowTemplateFunction}
329343
data={{ text: 'My template' }}
330344
index={1}
@@ -356,6 +370,8 @@ describe('Template Wrapper', () => {
356370
<>
357371
<div className='template-container' />
358372
<TemplateWrapper
373+
key='1'
374+
componentKey='1'
359375
templateFactory={templateFunction}
360376
data={{ text: 'My template' }}
361377
index={1}
@@ -389,6 +405,8 @@ describe('Template Wrapper', () => {
389405
<>
390406
<div className='template-container' />
391407
<TemplateWrapper
408+
key='1'
409+
componentKey='1'
392410
templateFactory={templateFunction}
393411
data={{ text: 'My template' }}
394412
index={1}
@@ -427,6 +445,8 @@ describe('Template Wrapper', () => {
427445
<>
428446
<div className='template-container' />
429447
<TemplateWrapper
448+
key='1'
449+
componentKey='1'
430450
templateFactory={templateFunction}
431451
data={{ text: 'My template' }}
432452
index={1}
@@ -463,6 +483,8 @@ describe('Template Wrapper', () => {
463483
<>
464484
<div className='template-container' />
465485
<TemplateWrapper
486+
key='1'
487+
componentKey='1'
466488
templateFactory={templateFunction}
467489
data={{ text: 'My template' }}
468490
index={1}
@@ -497,6 +519,8 @@ describe('Template Wrapper', () => {
497519
<>
498520
<div className='template-container' />
499521
<TemplateWrapper
522+
key='1'
523+
componentKey='1'
500524
templateFactory={templateFunction}
501525
data={{ text: 'My template' }}
502526
index={1}
@@ -531,6 +555,8 @@ describe('Template Wrapper', () => {
531555
<>
532556
<div className='template-container' />
533557
<TemplateWrapper
558+
key='1'
559+
componentKey='1'
534560
templateFactory={templateFunction}
535561
data={{ text: 'My template' }}
536562
index={1}

‎packages/devextreme-react/src/core/template-manager.tsx‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ function normalizeProps(props: ITemplateArgs): ITemplateArgs | ITemplateArgs['da
3838

3939
const createMapKey = (key1: any, key2: HTMLElement) => ({ key1, key2 });
4040

41-
const unsubscribeOnRemoval = (container: HTMLElement, onRemoved: () => void) => {
41+
const unsubscribeOnRemoval = (container: HTMLElement, onContainerRemoved: () => void) => {
4242
if (container.nodeType === Node.ELEMENT_NODE) {
43-
events.off(container, DX_REMOVE_EVENT, onRemoved);
43+
events.off(container, DX_REMOVE_EVENT, onContainerRemoved);
4444
}
4545
};
4646

47-
const subscribeOnRemoval = (container: HTMLElement, onRemoved: () => void) => {
47+
const subscribeOnRemoval = (container: HTMLElement, onContainerRemoved: () => void) => {
4848
if (container.nodeType === Node.ELEMENT_NODE) {
49-
events.on(container, DX_REMOVE_EVENT, onRemoved);
49+
events.on(container, DX_REMOVE_EVENT, onContainerRemoved);
5050
}
5151
};
5252

@@ -74,27 +74,34 @@ export const TemplateManager: FC<TemplateManagerProps> = ({ init, onTemplatesRen
7474
const containerElement = unwrapElement(container);
7575
const key = createMapKey(data, containerElement);
7676

77-
const onRemoved = (): void => {
78-
if (collection.get(key)) {
77+
const onRemoved = (componentKey?: string): void => {
78+
const model = collection.get(key);
79+
80+
if (model && (!componentKey || model.componentKey === componentKey)) {
7981
collection.delete(key);
8082
setInstantiationModels({ collection });
8183
}
8284
};
8385

86+
const onContainerRemoved = (): void => {
87+
onRemoved();
88+
};
89+
8490
const hostWidgetId = widgetId.current;
8591

8692
collection.set(key, {
8793
templateKey,
8894
index,
8995
componentKey: getRandomId(),
9096
onRendered: () => {
91-
unsubscribeOnRemoval(containerElement, onRemoved);
97+
unsubscribeOnRemoval(containerElement, onContainerRemoved);
9298

9399
if (hostWidgetId === widgetId.current) {
94100
onRendered?.();
95101
}
96102
},
97103
onRemoved,
104+
onContainerRemoved,
98105
});
99106

100107
setInstantiationModels({ collection });
@@ -185,14 +192,16 @@ export const TemplateManager: FC<TemplateManagerProps> = ({ init, onTemplatesRen
185192
componentKey,
186193
onRendered,
187194
onRemoved,
195+
onContainerRemoved,
188196
}]) => {
189-
subscribeOnRemoval(container, onRemoved);
197+
subscribeOnRemoval(container, onContainerRemoved);
190198

191199
const factory = templateFactories.current[templateKey];
192200

193201
if (factory) {
194202
return <TemplateWrapper
195203
key={componentKey}
204+
componentKey={componentKey}
196205
templateFactory={factory}
197206
data={data}
198207
index={index}

‎packages/devextreme-react/src/core/template-wrapper.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ const TemplateWrapperComponent: FC<TemplateWrapperProps> = ({
4040
container,
4141
onRemoved,
4242
onRendered,
43+
componentKey,
4344
}) => {
4445
const [removalListenerRequired, setRemovalListenerRequired] = useState(false);
4546
const isRemovalLocked = useRef(false);
@@ -64,7 +65,7 @@ const TemplateWrapperComponent: FC<TemplateWrapperProps> = ({
6465

6566
// In case of multiple root elements, letting the widget remove them all sync
6667
Promise.resolve().then(() => {
67-
onRemoved();
68+
onRemoved(componentKey);
6869
});
6970
}, [onRemoved]);
7071

‎packages/devextreme-react/src/core/types.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ export interface TemplateWrapperProps {
3636
data: any;
3737
index: number;
3838
container: HTMLElement;
39+
componentKey: string;
3940
onRendered: () => void;
40-
onRemoved: () => void;
41+
onRemoved: (componentKey: string) => void;
4142
}
4243

4344
export type TemplateFunc = (arg: TemplateArgs) => JSX.Element | ReactNode;
@@ -66,7 +67,8 @@ export interface TemplateInstantiationModel {
6667
componentKey: string;
6768
index: any;
6869
onRendered: () => void;
69-
onRemoved: () => void;
70+
onRemoved: (componentKey: string) => void;
71+
onContainerRemoved: () => void;
7072
}
7173

7274
export type GetRenderFuncFn = (templateKey: string) => RenderFunc;

‎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

0 commit comments

Comments
 (0)