Skip to content

Commit cdec4f5

Browse files
authored
Scheduler: In Adaptivity demo next button is hidden by view switcher (#31003)
1 parent 9f97def commit cdec4f5

File tree

3 files changed

+25
-1
lines changed

3 files changed

+25
-1
lines changed
-1.19 KB
Loading
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import {
2+
describe, expect, it,
3+
} from '@jest/globals';
4+
5+
import { createScheduler } from './__mock__/create_scheduler';
6+
import { setupSchedulerTestEnvironment } from './__mock__/m_mock_scheduler';
7+
8+
describe('Toolbar Adaptivity', () => {
9+
it('should have viewSwitcher with locateInMenu: "auto" by default', async () => {
10+
setupSchedulerTestEnvironment();
11+
const { scheduler } = await createScheduler({
12+
dataSource: [],
13+
currentView: 'day',
14+
currentDate: new Date(2021, 4, 24),
15+
});
16+
17+
const toolbarItems = scheduler.option('toolbar.items') as any[];
18+
const viewSwitcherItem = toolbarItems.find((item: any) => item.name === 'viewSwitcher');
19+
20+
expect(viewSwitcherItem).toBeDefined();
21+
expect(viewSwitcherItem.location).toBe('after');
22+
expect(viewSwitcherItem.locateInMenu).toBe('auto');
23+
});
24+
});

packages/devextreme/js/__internal/scheduler/utils/options/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export const DEFAULT_SCHEDULER_OPTIONS: Properties = {
103103
multiline: false,
104104
items: [
105105
{ location: 'before', name: 'dateNavigator' },
106-
{ location: 'after', name: 'viewSwitcher' },
106+
{ location: 'after', name: 'viewSwitcher', locateInMenu: 'auto' },
107107
],
108108
},
109109
};

0 commit comments

Comments
 (0)