Skip to content

Commit af2577d

Browse files
Merge branch '26_1' into issue-4222_26_1
2 parents 1a57e4f + 4d0ef9c commit af2577d

17 files changed

Lines changed: 931 additions & 107 deletions

File tree

apps/react/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"tsconfig-paths-webpack-plugin": "4.1.0",
2525
"webpack": "5.105.4",
2626
"webpack-cli": "5.1.4",
27-
"webpack-dev-server": "5.2.3"
27+
"webpack-dev-server": "5.2.4"
2828
},
2929
"scripts": {
3030
"test": "node runner.js",

apps/vue/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"vue-router": "4.2.5",
3131
"webpack": "5.105.4",
3232
"webpack-cli": "5.1.4",
33-
"webpack-dev-server": "5.2.3"
33+
"webpack-dev-server": "5.2.4"
3434
},
3535
"scripts": {
3636
"test": "node runner.js",

packages/devextreme/js/__internal/scheduler/__tests__/__mock__/model/scheduler.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,10 @@ export class SchedulerModel {
146146
return this.getPopups().length > 0;
147147
}
148148

149+
isRecurrenceDialogVisible(): boolean {
150+
return !!document.querySelector(`.dx-overlay-wrapper.${POPUP_DIALOG_CLASS}`);
151+
}
152+
149153
getPopups = (): NodeListOf<Element> => document.querySelectorAll(`.dx-overlay-wrapper.${APPOINTMENT_POPUP_CLASS}, .dx-overlay-wrapper.${POPUP_DIALOG_CLASS}`);
150154

151155
getLoadPanel = (): HTMLElement | null => document.querySelector('.dx-loadpanel');

0 commit comments

Comments
 (0)