Skip to content

Commit b020779

Browse files
Scheduler - Release cell selection on popup close to preserve animation (T1330691)
1 parent a3a5d26 commit b020779

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

packages/devextreme/js/__internal/scheduler/appointment_popup/m_popup.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,10 @@ export class AppointmentPopup {
113113
private createPopupConfig() {
114114
return {
115115
...POPUP_CONFIG,
116-
onHiding: () => this.scheduler.focus(),
116+
onHiding: (): void => {
117+
this.scheduler.focus();
118+
this.scheduler.releaseWorkspaceCellSelection?.();
119+
},
117120
contentTemplate: () => this.createPopupContent(),
118121
onShowing: (e) => this.onShowing(e),
119122
wrapperAttr: { class: APPOINTMENT_POPUP_CLASS },

packages/devextreme/js/__internal/scheduler/m_scheduler.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,6 +1072,10 @@ class Scheduler extends SchedulerOptionsBaseWidget {
10721072
// @ts-expect-error
10731073
createComponent: (element, component, options) => this._createComponent(element, component, options),
10741074
focus: () => this.focus(),
1075+
releaseWorkspaceCellSelection: (): void => {
1076+
this._workSpace?.cellsSelectionState?.releaseSelectedAndFocusedCells();
1077+
this._workSpace?.updateCellsSelection();
1078+
},
10751079

10761080
getResourceManager: () => this.resourceManager,
10771081

packages/devextreme/js/__internal/ui/overlay/overlay.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -447,10 +447,6 @@ class Overlay<
447447
}
448448

449449
_documentDownHandler(e: DxEvent<PointerInteractionEvent>): boolean {
450-
if (this._showAnimationProcessing) {
451-
this._stopAnimation();
452-
}
453-
454450
const { target } = e;
455451
const $target = $(target);
456452

0 commit comments

Comments
 (0)