diff --git a/packages/devextreme/testing/tests/DevExpress.knockout/scheduler.tests.js b/packages/devextreme/testing/tests/DevExpress.knockout/scheduler.tests.js index ec66e2de6adf..7f152fe86251 100644 --- a/packages/devextreme/testing/tests/DevExpress.knockout/scheduler.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.knockout/scheduler.tests.js @@ -5,7 +5,7 @@ require('integration/knockout'); const Scheduler = require('ui/scheduler'); const { waitAsync } = require('../../helpers/scheduler/waitForAsync.js'); -require('generic_light.css!'); +require('fluent_blue_light.css!'); if(QUnit.urlParams['nocsp']) { QUnit.module('scheduler'); @@ -115,6 +115,16 @@ QUnit.test('T1282055: appointment collector renders correct', async function(ass startDate: ko.observable('2021-06-01T16:30:00.000Z'), endDate: ko.observable('2021-06-01T18:30:00.000Z') }, + { + text: 'Install New Router in Dev Room', + startDate: ko.observable('2021-06-01T16:30:00.000Z'), + endDate: ko.observable('2021-06-01T18:30:00.000Z') + }, + { + text: 'Install New Router in Dev Room', + startDate: ko.observable('2021-06-01T16:30:00.000Z'), + endDate: ko.observable('2021-06-01T18:30:00.000Z') + }, { text: 'Install New Router in Dev Room', startDate: ko.observable('2021-06-01T16:30:00.000Z'), @@ -124,7 +134,6 @@ QUnit.test('T1282055: appointment collector renders correct', async function(ass views: ['month'], currentView: 'month', currentDate: new Date('2021-06-01T16:30:00'), - height: 300 }; } diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/export.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/export.tests.js index 9d573c939658..59b0b29295c3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/export.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/export.tests.js @@ -3,10 +3,20 @@ import { DataProvider } from '__internal/grids/pivot_grid/export/m_export'; import dateLocalization from 'common/core/localization/date'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; -import { checkDxFontIcon, DX_ICON_XLSX_FILE_CONTENT_CODE } from '../../helpers/checkDxFontIconHelper.js'; +import { DX_ICON_XLSX_FILE_CONTENT_CODE } from '../../helpers/checkDxFontIconHelper.js'; import 'ui/pivot_grid/ui.pivot_grid'; -import 'generic_light.css!'; +import 'fluent_blue_light.css!'; + +function checkDxFontIcon(assert, dxIconSelector, expectedIconCode) { + const FLUENT_BASE_ICON_SIZE = 20; + + const iconBeforeElementStyle = getComputedStyle($(dxIconSelector).get(0), ':before'); + assert.strictEqual(iconBeforeElementStyle.content.charCodeAt(1), expectedIconCode, `icon code (${dxIconSelector})`); + const iconElementStyle = getComputedStyle($(dxIconSelector).get(0)); + assert.strictEqual(iconElementStyle.width, FLUENT_BASE_ICON_SIZE + 'px', `icon element width (${dxIconSelector})`); + assert.strictEqual(iconElementStyle.height, FLUENT_BASE_ICON_SIZE + 'px', `icon element height (${dxIconSelector})`); +} QUnit.testStart(function() { const markup = diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js index a70a1c2138e6..9aadc4105510 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js @@ -30,7 +30,7 @@ import { import { isRenderer } from 'core/utils/type'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; import { triggerShownEvent } from 'common/core/events/visibility_change'; -import 'generic_light.css!'; +import 'fluent_blue_light.css!'; import $ from 'jquery'; import dateLocalization from 'common/core/localization/date'; import { PivotGridDataSource } from '__internal/grids/pivot_grid/data_source/m_data_source'; @@ -40,7 +40,6 @@ import DataAreaModule from '__internal/grids/pivot_grid/data_area/m_data_area'; import DataControllerModule from '__internal/grids/pivot_grid/data_controller/m_data_controller'; import HeadersAreaModule from '__internal/grids/pivot_grid/headers_area/m_headers_area'; import pivotGridUtils, { getScrollbarWidth } from '__internal/grids/pivot_grid/m_widget_utils'; -import Scrollable from 'ui/scroll_view/ui.scrollable'; import pointerMock from '../../helpers/pointerMock.js'; @@ -2452,7 +2451,7 @@ QUnit.module('dxPivotGrid', { const $pivotGridElement = $('#pivotGrid').width(1200); const pivotGrid = createPivotGrid(this.testOptions); - $pivotGridElement.width(1100); + $pivotGridElement.width(1150); pivotGrid.resize(); assert.ok(pivotGrid, 'pivotGrid container is rendered'); @@ -2461,7 +2460,7 @@ QUnit.module('dxPivotGrid', { QUnit.test('no scroll after drawing data', function(assert) { const pivotGrid = createPivotGrid({ - width: 400, + width: 600, dataSource: { rows: [], @@ -2547,7 +2546,7 @@ QUnit.module('dxPivotGrid', { }); const tableElement = pivotGrid.$element().find('table').first(); - assert.strictEqual(Math.round(getHeight(tableElement)), 150); + assert.strictEqual(Math.round(getHeight(tableElement)), 151); }); QUnit.test('T317921: dxPivotGrid - Scrollbar overlaps the last column when the document height slightly exceeds the window height. Without columns scroll', function(assert) { @@ -2667,7 +2666,7 @@ QUnit.module('dxPivotGrid', { }); QUnit.test('resize when width changed to no scroll', function(assert) { - const $pivotGridElement = $('#pivotGrid').width(150); + const $pivotGridElement = $('#pivotGrid').width(200); const pivotGrid = createPivotGrid(this.testOptions); const scrollable = pivotGrid._dataArea.groupElement().dxScrollable('instance'); @@ -2694,6 +2693,8 @@ QUnit.module('dxPivotGrid', { if(!devices.real().ios) { QUnit.test('bottom border and not vertical scroll when big height', function(assert) { $('#pivotGrid').height(1000); + $('#pivotGrid').width(1200); + const pivotGrid = createPivotGrid(this.testOptions); assert.ok(!pivotGrid._rowsArea.hasScroll(), 'has vertical scroll'); @@ -3106,7 +3107,7 @@ QUnit.module('dxPivotGrid', { const pivotGrid = createPivotGrid({ rtlEnabled: true, width: 500, - height: 150, + height: 200, fieldChooser: { enabled: false }, @@ -3121,7 +3122,7 @@ QUnit.module('dxPivotGrid', { const assertFunction = function(e) { if(e.scrollOffset.top === 10) { - assert.equal(dataAreaScrollable.scrollLeft(), 100); + assert.roughEqual(dataAreaScrollable.scrollLeft(), 100, 1); dataAreaScrollable.off('scroll', assertFunction); done(); } @@ -3132,7 +3133,7 @@ QUnit.module('dxPivotGrid', { dataAreaScrollable.on('scroll', assertFunction); dataAreaScrollable.scrollTo({ top: 10 }); - assert.equal(dataAreaScrollable.scrollLeft(), 100); + assert.roughEqual(dataAreaScrollable.scrollLeft(), 100, 1); }; dataAreaScrollable.on('scroll', scrollAssert); @@ -3414,7 +3415,7 @@ QUnit.module('dxPivotGrid', { return pivotGridOptions; }; - const pivotGrid = createPivotGrid(createPivotGridOptions({ width: 1005, height: 250 })); + const pivotGrid = createPivotGrid(createPivotGridOptions({ width: 1205, height: 250 })); this.clock.tick(10); @@ -3433,7 +3434,7 @@ QUnit.module('dxPivotGrid', { const table = pivotGrid.$element().find('table').first(); - assert.strictEqual(getWidth(table), 1005, 'table width'); + assert.strictEqual(getWidth(table), 1205, 'table width'); }); QUnit.test('Stretch columns when scrolling has size', function(assert) { @@ -3491,7 +3492,7 @@ QUnit.module('dxPivotGrid', { return pivotGridOptions; }; - const pivotGrid = createPivotGrid(createPivotGridOptions({ width: 1020, height: 250 })); + const pivotGrid = createPivotGrid(createPivotGridOptions({ width: 1220, height: 250 })); this.clock.tick(10); @@ -3511,7 +3512,7 @@ QUnit.module('dxPivotGrid', { const table = pivotGrid.$element().find('table').first(); - assert.strictEqual(getWidth(table), 1020, 'table width'); + assert.strictEqual(getWidth(table), 1220, 'table width'); }); @@ -3617,7 +3618,7 @@ QUnit.module('dxPivotGrid', { return pivotGridOptions; }; - const pivotGrid = createPivotGrid(createPivotGridOptions({ width: 1020, height: 250 })); + const pivotGrid = createPivotGrid(createPivotGridOptions({ width: 1220, height: 250 })); this.clock.tick(10); @@ -3681,7 +3682,7 @@ QUnit.module('dxPivotGrid', { return pivotGridOptions; }; - const pivotGrid = createPivotGrid(createPivotGridOptions({ width: 1050, height: 250 })); + const pivotGrid = createPivotGrid(createPivotGridOptions({ width: 1250, height: 250 })); this.clock.tick(10); @@ -3704,7 +3705,7 @@ QUnit.module('dxPivotGrid', { const table = pivotGrid.$element().find('table').first(); - assert.strictEqual(getWidth(table), 1050, 'table width'); + assert.strictEqual(getWidth(table), 1250, 'table width'); }); QUnit.test('B253995 - dxPivotGrid height is wrong when rows area has text wrapped to another line', function(assert) { @@ -3744,7 +3745,7 @@ QUnit.module('dxPivotGrid', { enabled: false }, width: 500, - height: 250, + height: 300, dataSource: { fields: [ { area: 'row' }, @@ -3763,11 +3764,11 @@ QUnit.module('dxPivotGrid', { const getRealHeight = function(element) { return window.getComputedStyle ? parseFloat(window.getComputedStyle(element).height) : element.clientHeight; }; - assert.ok(Math.abs(getRealHeight(pivotGrid.$element().children()[0]) - 250) <= 1); + assert.ok(Math.abs(getRealHeight(pivotGrid.$element().children()[0]) - 303) <= 1); const tableElement = pivotGrid.$element().find('table').first(); assert.strictEqual(getOuterWidth(tableElement), 500); - assert.strictEqual(Math.round(getOuterHeight(tableElement)), 250); + assert.strictEqual(Math.round(getOuterHeight(tableElement)), 303); }); QUnit.test('T510943. Row area width is higher than a container\'s width', function(assert) { @@ -3845,7 +3846,7 @@ QUnit.module('dxPivotGrid', { }, width: 500, showBorders: true, - height: 250, + height: 300, dataSource: { fields: [ { area: 'row' }, @@ -3869,7 +3870,7 @@ QUnit.module('dxPivotGrid', { const tableElement = pivotGrid.$element().find('table').first(); assert.strictEqual(getOuterWidth(tableElement), 500); - assert.ok(Math.abs(getRealHeight(pivotGrid.$element().children()[0]) - 250) <= 1); + assert.ok(Math.abs(getRealHeight(pivotGrid.$element().children()[0]) - 303) <= 1); assert.ok(tableElement.hasClass('dx-pivotgrid-border')); }); @@ -3910,7 +3911,7 @@ QUnit.module('dxPivotGrid', { enabled: false }, width: 500, - height: 250, + height: 300, dataSource: { fields: [ { area: 'row' }, @@ -3936,7 +3937,7 @@ QUnit.module('dxPivotGrid', { const tableElement = pivotGrid.$element().find('table').first(); assert.strictEqual(getOuterWidth(tableElement), 500); - assert.ok(Math.abs(getRealHeight(pivotGrid.$element().children()[0]) - 250) <= 1); + assert.ok(Math.abs(getRealHeight(pivotGrid.$element().children()[0]) - 303) <= 1); assert.ok(tableElement.hasClass('dx-pivotgrid-border')); }); @@ -4195,8 +4196,8 @@ QUnit.module('T984139, T1010175', { } const pivotGrid = createPivotGrid({ - width: 1000, - height: 1000, + width: 2000, + height: 2000, scrolling: { mode: 'virtual', useNative }, dataSource: { store: store, @@ -4212,14 +4213,14 @@ QUnit.module('T984139, T1010175', { const scrollable = pivotGrid._dataArea._getScrollable(); scrollable.scrollTo({ - left: getHorizontalOffset(pivotGrid, '1', '60'), - top: getVerticalOffset(pivotGrid, '1', '60') + left: getHorizontalOffset(pivotGrid, '1', '40'), + top: getVerticalOffset(pivotGrid, '1', '40') }); useNative && triggerScrollEvent(scrollable, this.clock); this.clock.tick(100); - const expectedRowHeaderCellText = '60'; - const expectedColHeaderCellText = '60'; + const expectedRowHeaderCellText = '40'; + const expectedColHeaderCellText = '40'; checkLeftTopVisibleHeaderCellTexts(pivotGrid, expectedRowHeaderCellText, expectedColHeaderCellText, 'after scrolling'); }); @@ -4248,18 +4249,18 @@ QUnit.module('T984139, T1010175', { const scrollable = pivotGrid._dataArea.groupElement().dxScrollable('instance'); scrollable.scrollTo({ - left: getHorizontalOffset(pivotGrid, '1', '60'), - top: getVerticalOffset(pivotGrid, '1', '60') + left: getHorizontalOffset(pivotGrid, '1', '40'), + top: getVerticalOffset(pivotGrid, '1', '40') }); useNative && triggerScrollEvent(scrollable, this.clock); this.clock.tick(100); - const pathToExpand = [65]; + const pathToExpand = [45]; pivotGrid.getDataSource().expandHeaderItem(area, pathToExpand); useNative && triggerScrollEvent(scrollable, this.clock); this.clock.tick(100); - const expectedRowHeaderCellText = '60'; - const expectedColHeaderCellText = '60'; + const expectedRowHeaderCellText = '40'; + const expectedColHeaderCellText = '40'; checkLeftTopVisibleHeaderCellTexts(pivotGrid, expectedRowHeaderCellText, expectedColHeaderCellText, 'after expanding'); const getExpandedCells = () => pivotGrid.$element().find('.dx-pivotgrid-expanded'); @@ -4290,13 +4291,13 @@ QUnit.module('T984139, T1010175', { const scrollable = pivotGrid._dataArea.groupElement().dxScrollable('instance'); scrollable.scrollTo({ - left: getHorizontalOffset(pivotGrid, '1', '60'), - top: getVerticalOffset(pivotGrid, '1', '60') + left: getHorizontalOffset(pivotGrid, '1', '40'), + top: getVerticalOffset(pivotGrid, '1', '40') }); useNative && triggerScrollEvent(scrollable, this.clock); this.clock.tick(100); - const pathToExpand = [65]; + const pathToExpand = [45]; pivotGrid.getDataSource().expandHeaderItem(area, pathToExpand); useNative && triggerScrollEvent(scrollable, this.clock); this.clock.tick(100); @@ -4305,8 +4306,8 @@ QUnit.module('T984139, T1010175', { useNative && triggerScrollEvent(scrollable, this.clock); this.clock.tick(100); - const expectedRowHeaderCellText = '60'; - const expectedColHeaderCellText = '60'; + const expectedRowHeaderCellText = '40'; + const expectedColHeaderCellText = '40'; checkLeftTopVisibleHeaderCellTexts(pivotGrid, expectedRowHeaderCellText, expectedColHeaderCellText, 'after collapsing'); const getExpandedCells = () => pivotGrid.$element().find('.dx-pivotgrid-expanded'); assert.strictEqual(getExpandedCells().length, 0); @@ -4337,8 +4338,8 @@ QUnit.module('T984139, T1010175', { const scrollable = pivotGrid._dataArea.groupElement().dxScrollable('instance'); scrollable.scrollTo({ - left: getHorizontalOffset(pivotGrid, '1', '60'), - top: getVerticalOffset(pivotGrid, '1', '60') + left: getHorizontalOffset(pivotGrid, '1', '40'), + top: getVerticalOffset(pivotGrid, '1', '40') }); useNative && triggerScrollEvent(scrollable, this.clock); this.clock.tick(100); @@ -4349,8 +4350,8 @@ QUnit.module('T984139, T1010175', { useNative && triggerScrollEvent(scrollable, this.clock); this.clock.tick(100); - const expectedRowHeaderCellText = '60'; - const expectedColHeaderCellText = '60'; + const expectedRowHeaderCellText = '40'; + const expectedColHeaderCellText = '40'; checkLeftTopVisibleHeaderCellTexts(pivotGrid, expectedRowHeaderCellText, expectedColHeaderCellText, 'after changing visible to a false value'); }); @@ -4379,8 +4380,8 @@ QUnit.module('T984139, T1010175', { const scrollable = pivotGrid._dataArea.groupElement().dxScrollable('instance'); scrollable.scrollTo({ - left: getHorizontalOffset(pivotGrid, '1', '60'), - top: getVerticalOffset(pivotGrid, '1', '60') + left: getHorizontalOffset(pivotGrid, '1', '40'), + top: getVerticalOffset(pivotGrid, '1', '40') }); useNative && triggerScrollEvent(scrollable, this.clock); this.clock.tick(100); @@ -4395,8 +4396,8 @@ QUnit.module('T984139, T1010175', { dataSource.load(); useNative && triggerScrollEvent(scrollable, this.clock); this.clock.tick(100); - const expectedRowHeaderCellText = '60'; - const expectedColHeaderCellText = '60'; + const expectedRowHeaderCellText = '40'; + const expectedColHeaderCellText = '40'; checkLeftTopVisibleHeaderCellTexts(pivotGrid, expectedRowHeaderCellText, expectedColHeaderCellText, 'after changing visible to a true value'); }); @@ -4424,8 +4425,8 @@ QUnit.module('T984139, T1010175', { const scrollable = pivotGrid._dataArea.groupElement().dxScrollable('instance'); scrollable.scrollTo({ - left: getHorizontalOffset(pivotGrid, '1', '60'), - top: getVerticalOffset(pivotGrid, '1', '60') + left: getHorizontalOffset(pivotGrid, '1', '40'), + top: getVerticalOffset(pivotGrid, '1', '40') }); useNative && triggerScrollEvent(scrollable, this.clock); this.clock.tick(100); @@ -4459,14 +4460,14 @@ QUnit.module('T984139, T1010175', { const scrollable = pivotGrid._dataArea.groupElement().dxScrollable('instance'); scrollable.scrollTo({ - left: getHorizontalOffset(pivotGrid, '1', '60'), - top: getVerticalOffset(pivotGrid, '1', '60') + left: getHorizontalOffset(pivotGrid, '1', '40'), + top: getVerticalOffset(pivotGrid, '1', '40') }); useNative && triggerScrollEvent(scrollable, this.clock); this.clock.tick(100); - const expectedRowHeaderCellText = '60'; - const expectedColHeaderCellText = '60'; + const expectedRowHeaderCellText = '40'; + const expectedColHeaderCellText = '40'; filterPivotGrid(pivotGrid, [11], area); this.clock.tick(100); @@ -4512,8 +4513,8 @@ QUnit.module('Field Panel', { QUnit.test('pivot grid has correct size', function(assert) { const pivotGrid = createPivotGrid($.extend(true, this.testOptions, { - height: 250, - width: 1200, + height: 350, + width: 1400, fieldPanel: { allowFieldDragging: false } @@ -4521,8 +4522,8 @@ QUnit.module('Field Panel', { const tableElement = pivotGrid.$element().find('table').first(); - assert.ok(250 - getOuterHeight(tableElement) <= 1 && 250 - getOuterHeight(tableElement) >= 0, 'height'); - assert.strictEqual(getWidth(tableElement), 1200, 'width'); + assert.roughEqual(getOuterHeight(pivotGrid.$element().children()[0]), 353, 1); + assert.strictEqual(getWidth(tableElement), 1400, 'width'); assert.ok(!pivotGrid.hasScroll('column'), 'stretch to all width'); assert.ok(pivotGrid.hasScroll('row')); @@ -4654,8 +4655,8 @@ QUnit.module('Field Panel', { 'export': { enabled: true }, - width: 1200, - height: 250 + width: 1400, + height: 350 })); const tableElement = pivotGrid.$element().find('table').first(); @@ -4668,8 +4669,8 @@ QUnit.module('Field Panel', { } }); - assert.ok(250 - getOuterHeight(tableElement) <= 1 && 250 - getOuterHeight(tableElement) >= 0, 'height'); - assert.strictEqual(getWidth(tableElement), 1200, 'width'); + assert.roughEqual(getOuterHeight(tableElement), 353, 1); + assert.strictEqual(getWidth(tableElement), 1400, 'width'); assert.ok(!pivotGrid.hasScroll('column'), 'stretch to all width'); assert.ok(pivotGrid.hasScroll('row')); @@ -4722,12 +4723,12 @@ QUnit.module('Field Panel', { { caption: 'Sum2', format: 'percent', area: 'data', areaIndex: 1 } ] }, - width: 400, - height: 300 + width: 1500, + height: 550 })); const container = pivotGrid.$element().find('.dx-pivotgrid-container').first(); - assert.roughEqual(getHeight(container), 300, 1.01, 'height'); + assert.roughEqual(getHeight(container), 551, 1.01, 'height'); }); QUnit.test('PivotGrid should have correct height if filter fields take several lines and pivot has not vertical scroll', function(assert) { @@ -4764,12 +4765,12 @@ QUnit.module('Field Panel', { { caption: 'Sum2', format: 'percent', area: 'data', areaIndex: 1 } ] }, - width: 400, - height: 600 + width: 1500, + height: 550 })); const container = pivotGrid.$element().find('.dx-pivotgrid-container').first(); - assert.ok(getHeight(container) < 600, 'height'); + assert.roughEqual(getHeight(container), 551, 1); assert.ok(!pivotGrid.hasScroll('row'), 'rows area has not scroll'); }); @@ -4808,7 +4809,7 @@ QUnit.module('Field Panel', { ] }, width: 400, - height: 600 + height: 800 })); const dataAreaHeight = getHeight(pivotGrid.$element().find('.dx-pivotgrid-area-data')); @@ -4850,14 +4851,14 @@ QUnit.module('Field Panel', { QUnit.test('show borders', function(assert) { const pivotGrid = createPivotGrid($.extend(this.testOptions, { - width: 1200, - height: 250, + width: 1500, + height: 350, showBorders: true })); const tableElement = pivotGrid.$element().find('table').first(); - assert.ok(250 - getOuterHeight(tableElement) <= 1 && 250 - getOuterHeight(tableElement) >= 0, 'height'); - assert.strictEqual(getOuterWidth(tableElement), 1200, 'width'); + assert.roughEqual(getOuterHeight(tableElement), 353, 1, 'height'); + assert.strictEqual(getOuterWidth(tableElement), 1500, 'width'); assert.ok(!pivotGrid.hasScroll('column'), 'stretch to all width'); assert.ok(pivotGrid.hasScroll('row')); @@ -4913,7 +4914,7 @@ QUnit.module('Field Panel', { eventsEngine.trigger(pivotGrid.element(), 'dxresize'); const $dataAreaCell = pivotGrid.$element().find(`.${DATA_AREA_CELL_CLASS}`).first(); - const expectedHeight = fieldPanelVisible ? 31 : 86; + const expectedHeight = fieldPanelVisible ? 23 : 101; assert.roughEqual(getHeight($dataAreaCell), expectedHeight, 1.1, 'data area has correct height'); clock.restore(); }); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-0.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-0.tests.js index da70c10bc010..d67f3050f0f9 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-0.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-0.tests.js @@ -17,7 +17,7 @@ import { } from '../../helpers/scheduler/helpers.js'; import { waitAsync, waitForAsync } from '../../helpers/scheduler/waitForAsync.js'; -import 'generic_light.css!'; +import 'fluent_blue_light.css!'; const { module, test, testStart } = QUnit; @@ -83,7 +83,8 @@ module('All day appointments common', config, () => { currentDate: new Date(2015, 2, 16), dataSource: dataSource, startDayHour: 6, - currentView: 'week' + currentView: 'week', + maxAppointmentsPerCell: 'unlimited' }); const $appointments = $(scheduler.instance.$element()).find('.dx-scheduler-appointment'); @@ -261,9 +262,9 @@ module('All day appointments common', config, () => { maxAppointmentsPerCell: 2 }); - assert.roughEqual(scheduler.appointments.getAppointmentHeight(0), 25, 1.5, 'Appointment has correct height'); - assert.roughEqual(scheduler.appointments.getAppointmentHeight(1), 25, 1.5, 'Appointment has correct height'); - assert.roughEqual(scheduler.appointments.getAppointmentPosition(0).top, 25, 1.5, 'Appointment has correct top'); + assert.roughEqual(scheduler.appointments.getAppointmentHeight(0), 13.5, 1.5, 'Appointment has correct height'); + assert.roughEqual(scheduler.appointments.getAppointmentHeight(1), 13.5, 1.5, 'Appointment has correct height'); + assert.roughEqual(scheduler.appointments.getAppointmentPosition(0).top, 30, 1.5, 'Appointment has correct top'); assert.equal(scheduler.appointments.compact.getButtonCount(), 1, 'Appointment collector is rendered'); }); @@ -494,17 +495,18 @@ module('All day appointments common', config, () => { await waitForAsync(() => scheduler.appointments.getAppointments().length === 10); scheduler.appointments.compact.click(); - assert.equal(scheduler.tooltip.getItemCount(), 3, 'There are 3 drop down appts in 1st group'); + assert.equal(scheduler.tooltip.getItemCount(), 4, 'There are 4 drop down appts in 1st group'); scheduler.appointments.compact.click(1); - assert.equal(scheduler.tooltip.getItemCount(), 3, 'There are 3 drop down appts in 2d group'); + assert.equal(scheduler.tooltip.getItemCount(), 4, 'There are 4 drop down appts in 2d group'); }); test('DropDown appointment should be removed correctly when needed', async function(assert) { const scheduler = await createInstance({ currentDate: new Date(2015, 4, 25), views: ['week'], - currentView: 'week' + currentView: 'week', + maxAppointmentsPerCell: 2, }); const items = [ @@ -515,6 +517,7 @@ module('All day appointments common', config, () => { scheduler.instance.option('dataSource', items); await waitForAsync(() => scheduler.appointments.getAppointments().length === 3); + // moveSchedulerToMainBlock(); let $dropDown = scheduler.instance.$element().find('.dx-scheduler-appointment-collector'); assert.equal($dropDown.length, 1, 'Dropdown appointment was rendered'); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-1.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-1.tests.js index b7f043bd46d4..25742b889a70 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-1.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-1.tests.js @@ -12,7 +12,7 @@ import { } from '../../helpers/scheduler/helpers.js'; import { waitAsync, waitForAsync } from '../../helpers/scheduler/waitForAsync.js'; -import 'generic_light.css!'; +import 'fluent_blue_light.css!'; import '__internal/scheduler/m_scheduler'; const { module, test, testStart } = QUnit; @@ -292,8 +292,8 @@ module('All day appointments common', config, () => { assert.equal(scheduler.appointments.getTitleText(3), 'Simple appointment', 'Text is right'); assert.roughEqual(scheduler.appointments.getAppointmentPosition(3).left, 0, 1.001, 'Appointment position is OK'); - assert.roughEqual(scheduler.appointments.getAppointmentPosition(3).top, 100, 1.001, 'Appointment position is OK'); - assert.roughEqual(scheduler.appointments.getAppointmentWidth(3), cellWidth - APPOINTMENT_DEFAULT_LEFT_OFFSET, 1.001, 'Appointment size is OK'); + assert.roughEqual(scheduler.appointments.getAppointmentPosition(3).top, 76, 1.001, 'Appointment position is OK'); + assert.roughEqual(scheduler.appointments.getAppointmentWidth(3), cellWidth - APPOINTMENT_DEFAULT_LEFT_OFFSET, 5, 'Appointment size is OK'); }); test('dropDown appointment should have correct container & position', async function(assert) { @@ -325,7 +325,7 @@ module('All day appointments common', config, () => { const $dropDown = $(scheduler.instance.$element()).find('.dx-scheduler-appointment-collector').eq(0); assert.equal($dropDown.parent().get(0), $(scheduler.instance.$element()).find('.dx-scheduler-all-day-appointments').get(0), 'Container is OK'); - assert.roughEqual(translator.locate($dropDown).left, 128, 1.001, 'Appointment position is OK'); + assert.roughEqual(translator.locate($dropDown).left, 133.28125, 1.001, 'Appointment position is OK'); assert.roughEqual(translator.locate($dropDown).top, 0, 1.001, 'Appointment position is OK'); }); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.monthView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.monthView.tests.js index 4b76186b1c0d..d22ff6a91496 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.monthView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.monthView.tests.js @@ -17,7 +17,8 @@ import { waitAsync } from '../../helpers/scheduler/waitForAsync.js'; import '__internal/scheduler/m_scheduler'; import 'ui/switch'; -import 'generic_light.css!'; + +import 'fluent_blue_light.css!'; const { module, @@ -30,7 +31,7 @@ testStart(() => initTestMarkup()); const DATE_TABLE_CELL_CLASS = 'dx-scheduler-date-table-cell'; const APPOINTMENT_CLASS = 'dx-scheduler-appointment'; -const APPOINTMENT_DEFAULT_TOP_OFFSET = 26; +const APPOINTMENT_DEFAULT_TOP_OFFSET = 30; const getAppointmentColor = ($task, checkedProperty) => { checkedProperty = checkedProperty || 'backgroundColor'; @@ -509,28 +510,28 @@ module('Integration: Appointments in Month view', { assert.deepEqual(parts, [ { level: 0, - maxLevel: 2, + maxLevel: 3, partIndex: 0, partTotalCount: 2, reduced: 'head', }, { level: 1, - maxLevel: 2, + maxLevel: 3, partIndex: 0, partTotalCount: 0, reduced: undefined, }, { level: 0, - maxLevel: 2, + maxLevel: 3, partIndex: 1, partTotalCount: 2, reduced: 'tail', }, { level: 1, - maxLevel: 2, + maxLevel: 3, partIndex: 0, partTotalCount: 0, reduced: undefined, @@ -579,7 +580,7 @@ module('Integration: Appointments in Month view', { }], currentView: 'month', firstDayOfWeek: 1, - height: 800 + height: 1200, }); const $appointments = scheduler.instance.$element().find('.' + APPOINTMENT_CLASS); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.scroll.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.scroll.tests.js index f4913bf948a2..ce15cfcd6b57 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.scroll.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.scroll.tests.js @@ -8,7 +8,7 @@ import { import '__internal/scheduler/m_scheduler'; import 'ui/switch'; -import 'generic_light.css!'; +import 'fluent_blue_light.css!'; const { module, @@ -225,9 +225,9 @@ module('Integration: Appointment scroll', { store: [] }), currentView: 'week', - height: 500, + height: 400, showAllDayPanel: false, - width: 600 + width: 400 }); scheduler.instance.getWorkSpaceScrollable().scrollBy(140); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.templates.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.templates.tests.js index 79ed5c749848..d376eadcb96e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.templates.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.templates.tests.js @@ -8,7 +8,7 @@ import { import '__internal/scheduler/m_scheduler'; import 'ui/switch'; -import 'generic_light.css!'; +import 'fluent_blue_light.css!'; QUnit.testStart(() => initTestMarkup()); @@ -310,7 +310,10 @@ QUnit.module('Integration: Appointment templates', { data: recurrenceAndCompactData, appointmentTooltip: createTestForRecurrenceData, name: 'recurrence in collector', - testCollector: true + testCollector: true, + options: { + maxAppointmentsPerCell: 2 + } }, { data: hourlyRecurrenceData, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.timeLines.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.timeLines.tests.js index 408eb137bd5b..2ef73f37db74 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.timeLines.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.timeLines.tests.js @@ -9,7 +9,7 @@ import { import '__internal/scheduler/m_scheduler'; import 'ui/switch'; -import 'generic_light.css!'; +import 'fluent_blue_light.css!'; const { module, @@ -22,7 +22,7 @@ QUnit.testStart(() => initTestMarkup()); const DATE_TABLE_CELL_CLASS = 'dx-scheduler-date-table-cell'; const APPOINTMENT_CLASS = 'dx-scheduler-appointment'; -const APPOINTMENT_DEFAULT_TOP_OFFSET = 26; +const APPOINTMENT_DEFAULT_TOP_OFFSET = 30; const createInstanceBase = async(options) => { const scheduler = await createWrapper({ diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.week.based.views.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.week.based.views.tests.js index f45deb620cb8..612e8d781616 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.week.based.views.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.week.based.views.tests.js @@ -21,7 +21,7 @@ import { waitAsync, waitForAsync } from '../../helpers/scheduler/waitForAsync.js import '__internal/scheduler/m_scheduler'; import 'ui/switch'; -import 'generic_light.css!'; +import 'fluent_blue_light.css!'; const { module, @@ -1097,11 +1097,11 @@ module('Integration: Appointment Day, Week views', { translator.locate(scheduler.appointments.compact.getButton(1)), ].sort((a, b) => a.left - b.left); - assert.strictEqual(coords[0].top, 600, 'Appointment top is correct'); - assert.roughEqual(coords[0].left, 124, 2, 'Appointment left is correct'); + assert.strictEqual(coords[0].top, 456, 'Appointment top is correct'); + assert.roughEqual(coords[0].left, 120, 2, 'Appointment left is correct'); assert.strictEqual(coords[1].top, 0, 'Appointment top is correct'); - assert.roughEqual(coords[1].left, 199, 2, 'Appointment left is correct'); + assert.roughEqual(coords[1].left, 195, 2, 'Appointment left is correct'); }); test('targetedAppointmentData should have valid targeted resource on onAppointmentClick event', async function(assert) { @@ -1214,10 +1214,10 @@ module('Integration: Appointment Day, Week views', { assert.equal(appointments.length, 2, 'Correct number of appointments'); assert.equal(appointments[0].position.top, 0, 'Correct top coordinate'); - assert.roughEqual(appointments[0].position.left, 224, 2, 'Correct left coordinate'); + assert.roughEqual(appointments[0].position.left, 233.25, 2, 'Correct left coordinate'); assert.equal(appointments[1].position.top, 0, 'Correct top coordinate'); - assert.roughEqual(appointments[1].position.left, 448, 2, 'Correct left coordinate'); + assert.roughEqual(appointments[1].position.left, 466.5, 2, 'Correct left coordinate'); }); test('Appointments should be rendered correctly when groupByDate is true in Week view', async function(assert) { @@ -1260,10 +1260,10 @@ module('Integration: Appointment Day, Week views', { assert.equal(appointments.length, 2, 'Correct number of appointments'); - assert.equal(appointments[0].position.top, 100, 'Correct top coordinate'); - assert.roughEqual(appointments[0].position.left, 320, 2, 'Correct left coordinate'); + assert.equal(appointments[0].position.top, 76, 'Correct top coordinate'); + assert.roughEqual(appointments[0].position.left, 333.203125, 2, 'Correct left coordinate'); - assert.equal(appointments[1].position.top, 200, 'Correct top coordinate'); - assert.roughEqual(appointments[1].position.left, 640, 2, 'Correct left coordinate'); + assert.equal(appointments[1].position.top, 152, 'Correct top coordinate'); + assert.roughEqual(appointments[1].position.left, 667, 2, 'Correct left coordinate'); }); }); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.initialization.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.initialization.tests.js index 86bd53aad25f..d7854522e060 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.initialization.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.initialization.tests.js @@ -9,7 +9,7 @@ import { AppointmentDataSource } from '__internal/scheduler/view_model/m_appoint import { createWrapper, initTestMarkup, SchedulerTestWrapper } from '../../helpers/scheduler/helpers.js'; import { waitForAsync, waitGlobalFailure } from '../../helpers/scheduler/waitForAsync.js'; -import 'generic_light.css!'; +import 'fluent_blue_light.css!'; QUnit.testStart(() => initTestMarkup()); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js index 57a1993f8ae6..a6407a7678e1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js @@ -6,11 +6,11 @@ import { isRenderer } from 'core/utils/type'; import { CustomStore } from 'common/data/custom_store'; import { DataSource } from 'common/data/data_source/data_source'; import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/visibility_change'; -import 'generic_light.css!'; +import 'fluent_blue_light.css!'; import $ from 'jquery'; import { getTimeZones } from 'time_zone_utils'; -import { createWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; +import { createWrapper, initTestMarkup, moveSchedulerToMainBlock } from '../../helpers/scheduler/helpers.js'; import { waitAsync, waitForAsync } from '../../helpers/scheduler/waitForAsync.js'; QUnit.testStart(() => initTestMarkup()); @@ -590,7 +590,8 @@ QUnit.module('View with configuration', () => { appointmentTooltipTemplate: function() { countCallTemplate1++; }, - currentView: 'month' + currentView: 'month', + maxAppointmentsPerCell: 1 }); $(scheduler.instance.$element().find('.dx-scheduler-appointment-collector').eq(0)).trigger('dxclick'); @@ -630,7 +631,8 @@ QUnit.module('View with configuration', () => { appointmentCollectorTemplate: function() { countCallTemplate1++; }, - currentView: 'month' + currentView: 'month', + maxAppointmentsPerCell: 1 }); $(scheduler.instance.$element().find('.dx-scheduler-appointment-collector').eq(0)).trigger('dxclick'); @@ -706,7 +708,7 @@ QUnit.module('View with configuration', () => { ['day', 'week', 'month'].forEach(viewName => { QUnit.test(`Cell should have default height if view: '${viewName}'`, async function(assert) { - const DEFAULT_CELL_HEIGHT = 50; + const DEFAULT_CELL_HEIGHT = viewName === 'month' ? 100 : 38; const scheduler = await createWrapper({ views: [viewName], diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.tests.js index 4c2738914840..9fcc01a1bbc0 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.tests.js @@ -2,7 +2,7 @@ import { getOuterWidth, getOuterHeight } from 'core/utils/size'; import dateUtils from 'core/utils/date'; import resizeCallbacks from 'core/utils/resize_callbacks'; import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/visibility_change'; -import 'generic_light.css!'; +import 'fluent_blue_light.css!'; import $ from 'jquery'; import '__internal/scheduler/workspaces/m_timeline'; import '__internal/scheduler/workspaces/m_timeline_day'; @@ -118,7 +118,7 @@ QUnit.test('Date table should have a correct width if cell is less than 75px', a dateTableScrollable.scrollTo({ top: 102 }); setTimeout(() => { - assert.equal(groupPanelScrollable.scrollTop(), 102, 'Scroll position is OK'); + assert.equal(groupPanelScrollable.scrollTop(), 87, 'Scroll position is OK'); done(); }, 100); }); @@ -146,7 +146,7 @@ QUnit.test('Date table should have a correct width if cell is less than 75px', a groupPanelScrollable.scrollTo({ top: 102 }); - assert.equal(dateTableScrollable.scrollTop(), 102, 'Scroll position is OK'); + assert.equal(dateTableScrollable.scrollTop(), 87, 'Scroll position is OK'); }); }); @@ -311,7 +311,7 @@ QUnit.test('Ensure cell min height is equal to cell height(T389468)', async func try { this.instance.option('currentDate', new Date(2010, 10, 10)); const height = getOuterHeight(this.instance.$element().find('.dx-scheduler-group-header').eq(0)); - const expectedHeight = getOuterHeight(this.instance.$element().find('.dx-scheduler-date-table-cell').first()) - 1; + const expectedHeight = getOuterHeight(this.instance.$element().find('.dx-scheduler-date-table-cell').first()) + 8; assert.roughEqual(height, expectedHeight, 2.001, 'Group cell height is OK'); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timezones.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timezones.tests.js index b63f1c9b0a48..34f423f315b1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timezones.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timezones.tests.js @@ -18,7 +18,7 @@ import ArrayStore from 'common/data/array_store'; import dragEvents from 'common/core/events/drag'; import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; -import 'generic_light.css!'; +import 'fluent_blue_light.css!'; const { testStart, test, module } = QUnit; @@ -105,7 +105,7 @@ module('Common', moduleConfig, () => { }, expectedContent: `${dateLocalization.format(new Date(2020, 1, 4, 5), 'shorttime')} - ${dateLocalization.format(new Date(2020, 1, 4, 6), 'shorttime')}`, expectedPosition: { - top: 500, + top: 380, left: 0 }, expectedPopupDates: { @@ -125,7 +125,7 @@ module('Common', moduleConfig, () => { }, expectedContent: `${dateLocalization.format(new Date(2020, 1, 4, 5), 'shorttime')} - ${dateLocalization.format(new Date(2020, 1, 4, 6), 'shorttime')}`, expectedPosition: { - top: 500, + top: 380, left: 0 }, expectedPopupDates: { @@ -146,7 +146,7 @@ module('Common', moduleConfig, () => { schedulerTimeZone: timeZones.Yekaterinburg, expectedContent: '7:00 PM - 8:00 PM', expectedPosition: { - top: 1900, + top: 1444, left: 0 }, expectedPopupDates: { @@ -167,7 +167,7 @@ module('Common', moduleConfig, () => { schedulerTimeZone: timeZones.Yekaterinburg, expectedContent: '7:00 PM - 8:00 PM', expectedPosition: { - top: 1900, + top: 1444, left: 0 }, expectedPopupDates: { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.integration.tests.js index 240e7ee43f94..b5f721fcbdf1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.integration.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import { getWindow } from 'core/utils/window'; -import 'generic_light.css!'; +import 'fluent_blue_light.css!'; import { DataSource } from 'common/data/data_source/data_source'; import { @@ -224,24 +224,24 @@ module('Virtual scrolling integration', () => { { y: 0, appointmentRects: [ - { left: -9824, top: -9689, height: 500 }, - { left: -9749, top: -9839, height: 50 }, - { left: -9299, top: -9689, height: 500 }, - { left: -9224, top: -9839, height: 50 } + { left: -9859, top: -9683, height: 570 }, + { left: -9784, top: -9797, height: 38 }, + { left: -9334, top: -9683, height: 570 }, + { left: -9259, top: -9797, height: 38 } ] }, { y: 1000, appointmentRects: [ - { left: -9824, top: -10039, height: 850 }, - { left: -9299, top: -10039, height: 850 }, + { left: -9859, top: -10039, height: 912 }, + { left: -9334, top: -10039, height: 912 }, ] }, { y: 2200, appointmentRects: [ - { left: -9824, top: -10151, height: 650 }, - { left: -9299, top: -10151, height: 650 }, + { left: -9859, top: -10145, height: 684 }, + { left: -9334, top: -10145, height: 684 }, ] }] }, @@ -250,22 +250,22 @@ module('Virtual scrolling integration', () => { steps: [{ y: 0, appointmentRects: [ - { left: -9824, top: -9712, height: 500 }, - { left: -9749, top: -9862, height: 50 }, - { left: -9299, top: -9712, height: 500 }, - { left: -9224, top: -9862, height: 50 } + { left: -9859, top: -9714, height: 570 }, + { left: -9784, top: -9828, height: 38 }, + { left: -9334, top: -9714, height: 570 }, + { left: -9259, top: -9828, height: 38 } ] }, { y: 1000, appointmentRects: [ - { left: -9824, top: -10062, height: 850 }, - { left: -9299, top: -10062, height: 850 }, + { left: -9859, top: -10068, height: 912 }, + { left: -9334, top: -10068, height: 912 }, ] }, { y: 2200, appointmentRects: [ - { left: -9824, top: -10149, height: 650 }, - { left: -9299, top: -10149, height: 650 }, + { left: -9859, top: -10145, height: 684 }, + { left: -9334, top: -10145, height: 684 }, ] }] } @@ -342,24 +342,24 @@ module('Virtual scrolling integration', () => { { y: 0, appointmentRects: [ - { left: -9749, top: -9839, height: 650 }, - { left: -9224, top: -9839, height: 650 } + { left: -9784, top: -9797, height: 684 }, + { left: -9259, top: -9797, height: 684 } ] }, { y: 1000, appointmentRects: [ - { left: -9824, top: -9689, height: 500 }, - { left: -9749, top: -10039, height: 250 }, - { left: -9299, top: -9689, height: 500 }, - { left: -9224, top: -10039, height: 250 } + { left: -9859, top: -9923, height: 798 }, + { left: -9784, top: -10039, height: 38 }, + { left: -9334, top: -9923, height: 798 }, + { left: -9259, top: -10039, height: 38 } ] }, { y: 2200, appointmentRects: [ - { left: -9824, top: -10151, height: 650 }, - { left: -9299, top: -10151, height: 650 }, + { left: -9859, top: -10145, height: 684 }, + { left: -9334, top: -10145, height: 684 }, ] } ], @@ -368,24 +368,24 @@ module('Virtual scrolling integration', () => { steps: [{ y: 0, appointmentRects: [ - { left: -9749, top: -9862, height: 650 }, - { left: -9224, top: -9862, height: 650 } + { left: -9784, top: -9828, height: 684 }, + { left: -9259, top: -9828, height: 684 } ] }, { y: 1000, appointmentRects: [ - { left: -9824, top: -9712, height: 500 }, - { left: -9749, top: -10062, height: 250 }, - { left: -9299, top: -9712, height: 500 }, - { left: -9224, top: -10062, height: 250 } + { left: -9859, top: -9954, height: 798 }, + { left: -9784, top: -10068, height: 38 }, + { left: -9334, top: -9954, height: 798 }, + { left: -9259, top: -10068, height: 38 } ] }, { y: 2200, appointmentRects: [ - { left: -9824, top: -10149, height: 650 }, - { left: -9299, top: -10149, height: 650 }, + { left: -9859, top: -10145, height: 684 }, + { left: -9334, top: -10145, height: 684 }, ] } ] @@ -493,26 +493,25 @@ module('Virtual scrolling integration', () => { { y: 0, appointmentRects: [ - { left: -9713, top: -9692, height: 450 } + { left: -9773, top: -9694, height: 532 } ] }, { y: 1000, appointmentRects: [ - { left: -9713, top: -10092, height: 850 } + { left: -9773, top: -10098, height: 912 } ] }, { y: 2500, appointmentRects: [ - { left: -9713, top: -10093, height: 4 }, - { left: -9713, top: -9742, height: 500 } + { left: -9773, top: -10116, height: 912 } ] }, { y: 4500, appointmentRects: [ - { left: -9713, top: -10142, height: 500 } + { left: -9773, top: -10157, height: 570 } ] } ].forEach(option => { @@ -578,22 +577,22 @@ module('Virtual scrolling integration', () => { { y: 0, appointmentRects: [ - { left: -9824, top: -9689, height: 500 }, - { left: -9299, top: -9689, height: 500 } + { left: -9859, top: -9683, height: 570 }, + { left: -9334, top: -9683, height: 570 } ] }, { y: 1000, appointmentRects: [ - { left: -9824, top: -10039, height: 850 }, - { left: -9299, top: -10039, height: 850 } + { left: -9859, top: -10039, height: 912 }, + { left: -9334, top: -10039, height: 912 } ] }, { y: 2100, appointmentRects: [ - { left: -9824, top: -10151, height: 500 }, - { left: -9299, top: -10151, height: 500 } + { left: -9859, top: -10145, height: 570 }, + { left: -9334, top: -10145, height: 570 } ] } ].forEach(option => { @@ -657,16 +656,14 @@ module('Virtual scrolling integration', () => { steps: [ { offset: { x: 0, y: 0 }, appointmentRects: [ - { left: -9714, top: -9693, height: 450 }, - { left: -9629, top: -9843, height: 50 } + { left: -9775, top: -9695, height: 532 }, + { left: -9682, top: -9809, height: 38 } ] }, { offset: { x: 0, y: 2300 }, appointmentRects: [ - { left: -9714, top: -10093, height: 350 }, - { left: -9714, top: -9543, height: 300 }, - { left: -9629, top: -9693, height: 50 }, + { left: -9776, top: -10107, height: 912 } ] }] }, @@ -676,16 +673,14 @@ module('Virtual scrolling integration', () => { { offset: { x: 0, y: 0 }, appointmentRects: [ - { left: -9714, top: -9741, height: 500 }, - { left: -9629, top: -9891, height: 50 } + { left: -9776, top: -9744, height: 570 }, + { left: -9682, top: -9858, height: 38 } ] }, { offset: { x: 0, y: 2300 }, appointmentRects: [ - { left: -9714, top: -10091, height: 300 }, - { left: -9714, top: -9641, height: 400 }, - { left: -9629, top: -9791, height: 50 }, + { left: -9776, top: -10106, height: 912 } ] } ] @@ -773,21 +768,21 @@ module('Virtual scrolling integration', () => { { y: 0, appointmentRects: [ - { left: -9628, top: -9843, height: 600 }, + { left: -9677.4375, top: -9808.171875, height: 646 }, ] }, { y: 1000, appointmentRects: [ - { left: -9713, top: -9693, height: 450 }, - { left: -9628, top: -10093, height: 300 } + { left: -9773.71875, top: -9946.171875, height: 760 }, + { left: -9677.4375, top: -10098.171875, height: 76 } ] }, { y: 2200, appointmentRects: [ - { left: -9713, top: -10093, height: 450 }, - { left: -9628, top: -9593, height: 350 }, + { left: -9773.71875, top: -9284.171875, height: 76 }, + { left: -9677.4375, top: -10120.171875, height: 760 } ] } ] @@ -797,21 +792,21 @@ module('Virtual scrolling integration', () => { { y: 0, appointmentRects: [ - { left: -9628, top: -9891, height: 650 } + { left: -9678.15625, top: -9858.171875, height: 684 } ] }, { y: 1000, appointmentRects: [ - { left: -9713, top: -9741, height: 500 }, - { left: -9628, top: -10093, height: 250 } + { left: -9773.578125, top: -9984.171875, height: 798 }, + { left: -9678.15625, top: -10098.171875, height: 38 } ] }, { y: 2200, appointmentRects: [ - { left: -9713, top: -10091, height: 400 }, - { left: -9628, top: -9691, height: 450 } + { left: -9773.578125, top: -9360.171875, height: 152 }, + { left: -9678.15625, top: -10120.171875, height: 684 } ] } ] @@ -896,34 +891,34 @@ module('Virtual scrolling integration', () => { steps: [{ offset: { x: 0, y: 0 }, appointmentRects: [ - { left: -9874, top: -9689, height: 500 }, - { left: -9799, top: -9839, height: 50 }, + { left: -9891.5, top: -9643.1875, height: 570 }, + { left: -9816.5, top: -9757.1875, height: 38 }, ] }, { offset: { x: 0, y: 1000 }, appointmentRects: [ - { left: -9874, top: -10039, height: 850 }, + { left: -9891.5, top: -9997.1875, height: 912 }, ] }, { offset: { x: 0, y: 2200 }, appointmentRects: [ - { left: -9874, top: -10150, height: 650 }, + { left: -9891.5, top: -10105.1875, height: 684 }, ] }, { offset: { x: 520, y: 0 }, appointmentRects: [ - { left: -9869, top: -9689, height: 500 }, - { left: -9794, top: -9839, height: 50 }, + { left: -9886.5, top: -9643.1875, height: 570 }, + { left: -9811.5, top: -9757.1875, height: 38 }, ] }, { offset: { x: 520, y: 1000 }, appointmentRects: [ - { left: -9869, top: -10038, height: 850 }, + { left: -9886.5, top: -9997.1875, height: 912 }, ] }, { offset: { x: 520, y: 2200 }, appointmentRects: [ - { left: -9869, top: -10150, height: 650 }, + { left: -9886.5, top: -10105.1875, height: 684 }, ] }] }, { @@ -931,34 +926,34 @@ module('Virtual scrolling integration', () => { steps: [{ offset: { x: 0, y: 0 }, appointmentRects: [ - { left: -9874, top: -9712, height: 500 }, - { left: -9799, top: -9862, height: 50 }, + { left: -9891.5, top: -9674.1875, height: 570 }, + { left: -9816.5, top: -9788.1875, height: 38 }, ] }, { offset: { x: 0, y: 1000 }, appointmentRects: [ - { left: -9874, top: -10062, height: 850 }, + { left: -9891.5, top: -10028.1875, height: 912 }, ] }, { offset: { x: 0, y: 2200 }, appointmentRects: [ - { left: -9874, top: -10149, height: 650 }, + { left: -9891.5, top: -10105.1875, height: 684 }, ] }, { offset: { x: 520, y: 0 }, appointmentRects: [ - { left: -9869, top: -9712, height: 500 }, - { left: -9794, top: -9862, height: 50 }, + { left: -9886.5, top: -9674.1875, height: 570 }, + { left: -9811.5, top: -9788.1875, height: 38 }, ] }, { offset: { x: 520, y: 1000 }, appointmentRects: [ - { left: -9869, top: -10062, height: 850 }, + { left: -9886.5, top: -10028.1875, height: 912 }, ] }, { offset: { x: 520, y: 2200 }, appointmentRects: [ - { left: -9869, top: -10149, height: 650 }, + { left: -9886.5, top: -10105.1875, height: 684 }, ] }] } @@ -1067,37 +1062,37 @@ module('Virtual scrolling integration', () => { { offset: { x: 0, y: 0 }, appointmentRects: [ - { left: -9874, top: -9689, height: 500 } + { left: -9891.5, top: -9643.1875, height: 570 } ] }, { offset: { x: 0, y: 1000 }, appointmentRects: [ - { left: -9874, top: -10039, height: 850 } + { left: -9891.5, top: -9997.1875, height: 912 } ] }, { offset: { x: 0, y: 2100 }, appointmentRects: [ - { left: -9874, top: -10151, height: 500 } + { left: -9891.5, top: -10105.1875, height: 570 } ] }, { offset: { x: 520, y: 0 }, appointmentRects: [ - { left: -9869, top: -9689, height: 500 } + { left: -9886.5, top: -9643.1875, height: 570 } ] }, { offset: { x: 520, y: 1000 }, appointmentRects: [ - { left: -9869, top: -10039, height: 850 } + { left: -9886.5, top: -9997.1875, height: 912 } ] }, { offset: { x: 520, y: 2100 }, appointmentRects: [ - { left: -9869, top: -10151, height: 500 } + { left: -9886.5, top: -10105.1875, height: 570 } ] } ].forEach(({ offset, appointmentRects }) => { @@ -1283,7 +1278,7 @@ module('Virtual scrolling integration', () => { expectedSettings: [ { groupIndex: 0, - topPositions: [50, 150, 250, 350, 450, 550, 650, 750] + topPositions: [50, 126, 202, 278, 354, 430, 506, 582, 658, 734, 810] } ] }, @@ -1292,22 +1287,13 @@ module('Virtual scrolling integration', () => { expectedSettings: [ { groupIndex: 0, - topPositions: [1750, 1850, 1950, 2050, 2150, 2250, 2350] - }, - { - groupIndex: 1, - topPositions: [2500, 2600, 2700] - }, + topPositions: [1710, 1786] + } ] }, { offset: { y: 4000 }, - expectedSettings: [ - { - groupIndex: 1, - topPositions: [3750, 3800, 3900, 4000, 4100, 4200, 4300, 4400, 4500, 4600, 4700] - } - ] + expectedSettings: [] }, ].forEach(({ offset, expectedSettings }) => { promise = asyncScrollTest( @@ -1386,23 +1372,43 @@ module('Virtual scrolling integration', () => { { groupIndex: 0, left: 0, - top: 100, - height: 450 + top: 76, + height: 342 + }, { + groupIndex: 0, + left: 0, + top: 684, + height: 152 + }, { + groupIndex: 0, + left: 183.25, + top: 76, + height: 342 }, { groupIndex: 0, - left: 175, - top: 100, - height: 450 + left: 183.25, + top: 684, + height: 152 }, { groupIndex: 1, - left: 350, - top: 100, - height: 450 + left: 366.5, + top: 76, + height: 342 }, { groupIndex: 1, - left: 523, - top: 100, - height: 450 + left: 366.5, + top: 684, + height: 152 + }, { + groupIndex: 1, + left: 549.75, + top: 76, + height: 342 + }, { + groupIndex: 1, + left: 549.75, + top: 684, + height: 152 } ] }, @@ -1412,43 +1418,43 @@ module('Virtual scrolling integration', () => { { groupIndex: 0, left: 0, - top: 250, - height: 300 + top: 228, + height: 190 }, { groupIndex: 0, left: 0, - top: 900, - height: 400 + top: 684, + height: 494 }, { groupIndex: 0, - left: 175, - top: 250, - height: 300 + left: 183.25, + top: 228, + height: 190 }, { groupIndex: 0, - left: 175, - top: 900, - height: 400 + left: 183.25, + top: 684, + height: 494 }, { groupIndex: 1, - left: 350, - top: 250, - height: 300 + left: 366.5, + top: 228, + height: 190 }, { groupIndex: 1, - left: 350, - top: 900, - height: 400 + left: 366.5, + top: 684, + height: 494 }, { groupIndex: 1, - left: 523, - top: 250, - height: 300 + left: 549.75, + top: 228, + height: 190 }, { groupIndex: 1, - left: 523, - top: 900, - height: 400 + left: 549.75, + top: 684, + height: 494 } ] }, @@ -1458,23 +1464,23 @@ module('Virtual scrolling integration', () => { { groupIndex: 0, left: 0, - top: 900, - height: 650 + top: 684, + height: 494 }, { groupIndex: 0, - left: 175, - top: 900, - height: 650 + left: 183.25, + top: 684, + height: 494 }, { groupIndex: 1, - left: 350, - top: 900, - height: 650 + left: 366.5, + top: 684, + height: 494 }, { groupIndex: 1, - left: 523, - top: 900, - height: 650 + left: 549.75, + top: 684, + height: 494 } ] }, @@ -1484,43 +1490,43 @@ module('Virtual scrolling integration', () => { { groupIndex: 0, left: 0, - top: 250, - height: 300 + top: 228, + height: 190 }, { groupIndex: 0, left: 0, - top: 900, - height: 400 + top: 684, + height: 494 }, { groupIndex: 0, - left: 175, - top: 250, - height: 300 + left: 183.25, + top: 228, + height: 190 }, { groupIndex: 0, - left: 175, - top: 900, - height: 400 + left: 183.25, + top: 684, + height: 494 }, { groupIndex: 1, - left: 350, - top: 250, - height: 300 + left: 366.5, + top: 228, + height: 190 }, { groupIndex: 1, - left: 350, - top: 900, - height: 400 + left: 366.5, + top: 684, + height: 494 }, { groupIndex: 1, - left: 523, - top: 250, - height: 300 + left: 549.75, + top: 228, + height: 190 }, { groupIndex: 1, - left: 523, - top: 900, - height: 400 + left: 549.75, + top: 684, + height: 494 } ] } @@ -1599,93 +1605,93 @@ module('Virtual scrolling integration', () => { { offset: { x: 0 }, appointmentRects: [ - { left: -9824, top: -9864, height: 25, width: 75 }, - { left: -9749, top: -9864, height: 25, width: 75 }, - { left: -9674, top: -9864, height: 25, width: 75 }, - { left: -9599, top: -9864, height: 25, width: 75 }, - { left: -9524, top: -9864, height: 25, width: 75 }, - { left: -9449, top: -9864, height: 25, width: 75 }, - { left: -8774, top: -9864, height: 25, width: 75 }, - { left: -8699, top: -9864, height: 25, width: 5 }, + { left: -9859, top: -9829.171875, height: 25, width: 75 }, + { left: -9784, top: -9829.171875, height: 25, width: 75 }, + { left: -9709, top: -9829.171875, height: 25, width: 75 }, + { left: -9634, top: -9829.171875, height: 25, width: 75 }, + { left: -9559, top: -9829.171875, height: 25, width: 75 }, + { left: -9484, top: -9829.171875, height: 25, width: 75 }, + { left: -8809, top: -9829.171875, height: 25, width: 75 }, + { left: -8734, top: -9829.171875, height: 25, width: 5 }, ] }, { offset: { x: 500 }, appointmentRects: [ - { left: -10324, top: -9864, height: 25, width: 75 }, - { left: -10249, top: -9864, height: 25, width: 75 }, - { left: -10174, top: -9864, height: 25, width: 75 }, - { left: -10099, top: -9864, height: 25, width: 75 }, - { left: -10024, top: -9864, height: 25, width: 75 }, - { left: -9949, top: -9864, height: 25, width: 75 }, - { left: -9274, top: -9864, height: 25, width: 75 }, - { left: -9199, top: -9864, height: 25, width: 75 }, - { left: -9124, top: -9864, height: 25, width: 75 }, - { left: -9049, top: -9864, height: 25, width: 75 }, - { left: -8974, top: -9864, height: 25, width: 75 }, - { left: -8899, top: -9864, height: 25, width: 75 } + { left: -10359, top: -9829.171875, height: 25, width: 75 }, + { left: -10284, top: -9829.171875, height: 25, width: 75 }, + { left: -10209, top: -9829.171875, height: 25, width: 75 }, + { left: -10134, top: -9829.171875, height: 25, width: 75 }, + { left: -10059, top: -9829.171875, height: 25, width: 75 }, + { left: -9984, top: -9829.171875, height: 25, width: 75 }, + { left: -9309, top: -9829.171875, height: 25, width: 75 }, + { left: -9234, top: -9829.171875, height: 25, width: 75 }, + { left: -9159, top: -9829.171875, height: 25, width: 75 }, + { left: -9084, top: -9829.171875, height: 25, width: 75 }, + { left: -9009, top: -9829.171875, height: 25, width: 75 }, + { left: -8934, top: -9829.171875, height: 25, width: 75 } ] }, { offset: { x: 1000 }, appointmentRects: [ - { left: -9774, top: -9864, height: 25, width: 75 }, - { left: -9699, top: -9864, height: 25, width: 75 }, - { left: -9624, top: -9864, height: 25, width: 75 }, - { left: -9549, top: -9864, height: 25, width: 75 }, - { left: -9474, top: -9864, height: 25, width: 75 }, - { left: -9399, top: -9864, height: 25, width: 75 }, - { left: -8724, top: -9864, height: 25, width: 5 }, + { left: -9809, top: -9829.171875, height: 25, width: 75 }, + { left: -9734, top: -9829.171875, height: 25, width: 75 }, + { left: -9659, top: -9829.171875, height: 25, width: 75 }, + { left: -9584, top: -9829.171875, height: 25, width: 75 }, + { left: -9509, top: -9829.171875, height: 25, width: 75 }, + { left: -9434, top: -9829.171875, height: 25, width: 75 }, + { left: -8759, top: -9829.171875, height: 25, width: 5 }, ] }, { offset: { x: 1500 }, appointmentRects: [ - { left: -10274, top: -9864, height: 25, width: 75 }, - { left: -10199, top: -9864, height: 25, width: 75 }, - { left: -10124, top: -9864, height: 25, width: 75 }, - { left: -10049, top: -9864, height: 25, width: 75 }, - { left: -9974, top: -9864, height: 25, width: 75 }, - { left: -9899, top: -9864, height: 25, width: 75 }, - { left: -9224, top: -9864, height: 25, width: 75 }, - { left: -9149, top: -9864, height: 25, width: 75 }, - { left: -9074, top: -9864, height: 25, width: 75 }, - { left: -8999, top: -9864, height: 25, width: 75 }, - { left: -8924, top: -9864, height: 25, width: 75 }, - { left: -8849, top: -9864, height: 25, width: 75 } + { left: -10309, top: -9829.171875, height: 25, width: 75 }, + { left: -10234, top: -9829.171875, height: 25, width: 75 }, + { left: -10159, top: -9829.171875, height: 25, width: 75 }, + { left: -10084, top: -9829.171875, height: 25, width: 75 }, + { left: -10009, top: -9829.171875, height: 25, width: 75 }, + { left: -9934, top: -9829.171875, height: 25, width: 75 }, + { left: -9259, top: -9829.171875, height: 25, width: 75 }, + { left: -9184, top: -9829.171875, height: 25, width: 75 }, + { left: -9109, top: -9829.171875, height: 25, width: 75 }, + { left: -9034, top: -9829.171875, height: 25, width: 75 }, + { left: -8959, top: -9829.171875, height: 25, width: 75 }, + { left: -8884, top: -9829.171875, height: 25, width: 75 } ] }, { offset: { x: 2000 }, appointmentRects: [ - { left: -9724, top: -9864, height: 25, width: 75 }, - { left: -9649, top: -9864, height: 25, width: 75 }, - { left: -9574, top: -9864, height: 25, width: 75 }, - { left: -9499, top: -9864, height: 25, width: 75 }, - { left: -9424, top: -9864, height: 25, width: 75 }, - { left: -9349, top: -9864, height: 25, width: 75 } + { left: -9759, top: -9829.171875, height: 25, width: 75 }, + { left: -9684, top: -9829.171875, height: 25, width: 75 }, + { left: -9609, top: -9829.171875, height: 25, width: 75 }, + { left: -9534, top: -9829.171875, height: 25, width: 75 }, + { left: -9459, top: -9829.171875, height: 25, width: 75 }, + { left: -9384, top: -9829.171875, height: 25, width: 75 } ] }, { offset: { x: 4200 }, appointmentRects: [ - { left: -9824, top: -9864, height: 25, width: 75 }, - { left: -9749, top: -9864, height: 25, width: 75 }, - { left: -9674, top: -9864, height: 25, width: 75 }, - { left: -9599, top: -9864, height: 25, width: 75 }, - { left: -9524, top: -9864, height: 25, width: 75 }, - { left: -9449, top: -9864, height: 25, width: 75 } + { left: -9859, top: -9829.171875, height: 25, width: 75 }, + { left: -9784, top: -9829.171875, height: 25, width: 75 }, + { left: -9709, top: -9829.171875, height: 25, width: 75 }, + { left: -9634, top: -9829.171875, height: 25, width: 75 }, + { left: -9559, top: -9829.171875, height: 25, width: 75 }, + { left: -9484, top: -9829.171875, height: 25, width: 75 } ] }, { offset: { x: 5700 }, appointmentRects: [ - { left: -9749, top: -9864, height: 25, width: 75 }, - { left: -9674, top: -9864, height: 25, width: 75 }, - { left: -9599, top: -9864, height: 25, width: 75 }, - { left: -9524, top: -9864, height: 25, width: 75 }, - { left: -9449, top: -9864, height: 25, width: 75 }, - { left: -9374, top: -9864, height: 25, width: 75 } + { left: -9784, top: -9829.171875, height: 25, width: 75 }, + { left: -9709, top: -9829.171875, height: 25, width: 75 }, + { left: -9634, top: -9829.171875, height: 25, width: 75 }, + { left: -9559, top: -9829.171875, height: 25, width: 75 }, + { left: -9484, top: -9829.171875, height: 25, width: 75 }, + { left: -9409, top: -9829.171875, height: 25, width: 75 } ] }, { @@ -1770,64 +1776,72 @@ module('Virtual scrolling integration', () => { offsetY: 0, expected: [{ groupIndex: 0, - top: 150, - height: 450 + top: 126, + height: 342 }, { groupIndex: 0, - top: 150, - height: 450 + top: 126, + height: 342 + }, { + groupIndex: 1, + top: 784, + height: 76 + }, { + groupIndex: 1, + top: 784, + height: 76 }] }, { offsetY: 550, expected: [{ groupIndex: 0, - top: 300, - height: 300 + top: 266, + height: 190 }, { groupIndex: 0, - top: 300, - height: 300 + top: 266, + height: 190 }, { groupIndex: 1, - top: 1000, - height: 350 + top: 760, + height: 342 }, { groupIndex: 1, - top: 1000, - height: 350 + top: 760, + height: 342 }] }, { offsetY: 950, expected: [{ + groupIndex: 0, + top: 456, + height: 0 + }, { groupIndex: 1, - top: 1000, - height: 450 + top: 760, + height: 342 }, { groupIndex: 1, - top: 1000, - height: 450 + top: 760, + height: 342 }] }, { offsetY: 590, expected: [{ groupIndex: 0, - top: 300, - height: 300 - }, { - groupIndex: 0, - top: 300, - height: 300 + top: 456, + height: 0 }, { groupIndex: 1, - top: 1000, - height: 350 + top: 760, + height: 342 }, { groupIndex: 1, - top: 1000, - height: 350 + top: 760, + height: 342 }] } ].forEach(option => { @@ -2160,13 +2174,13 @@ module('Virtual scrolling integration', () => { return asyncWrapper(assert, promise => { [ - { offsetY: 0, expectedDataIndices: [0, 0, 0, 0, 0, 0, 0, 0] }, - { offsetY: 500, expectedDataIndices: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] }, - { offsetY: 1000, expectedDataIndices: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] }, - { offsetY: 2000, expectedDataIndices: [0, 0, 0, 0, 0, 0, 0, 1, 1, 1] }, - { offsetY: 2500, expectedDataIndices: [0, 0, 1, 1, 1, 1, 1, 1, 1, 1] }, - { offsetY: 4000, expectedDataIndices: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] }, - { offsetY: 4500, expectedDataIndices: [1, 1, 1, 1, 1, 1, 1, 1, 1] }, + { offsetY: 0, expectedDataIndices: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] }, + { offsetY: 500, expectedDataIndices: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] }, + { offsetY: 1000, expectedDataIndices: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] }, + { offsetY: 2000, expectedDataIndices: [0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] }, + { offsetY: 2500, expectedDataIndices: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] }, + { offsetY: 4000, expectedDataIndices: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] }, + { offsetY: 4500, expectedDataIndices: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] }, ].forEach(option => { promise = asyncScrollTest( assert, @@ -2270,7 +2284,7 @@ module('Virtual scrolling integration', () => { [ { offset: { y: 0 }, expectedIndices: [0, 1, 2] }, { offset: { y: 300 }, expectedIndices: [1, 2] }, - { offset: { y: 900 }, expectedIndices: [3, 5] }, + { offset: { y: 900 }, expectedIndices: [3, 5, 4] }, { offset: { y: 1700 }, expectedIndices: [5, 4] }, { offset: { y: 2400 }, expectedIndices: [5, 4] } ].forEach(({ offset, expectedIndices }) => { @@ -2307,7 +2321,7 @@ module('Virtual scrolling integration', () => { [ { y: 2400, expectedIndices: [5, 4] }, { y: 1700, expectedIndices: [5, 4] }, - { y: 900, expectedIndices: [3, 5] }, + { y: 900, expectedIndices: [3, 5, 4] }, { y: 300, expectedIndices: [1, 2] }, { y: 0, expectedIndices: [0, 1, 2] } ].forEach(option => { @@ -2356,12 +2370,12 @@ module('Virtual scrolling integration', () => { [ { y: 0, expectedIndices: [0, 2] }, { y: 300, expectedIndices: [2] }, - { y: 900, expectedIndices: [5] }, - { y: 1700, expectedIndices: [5, 4] }, - { y: 2400, expectedIndices: [5, 1] }, - { y: 2700, expectedIndices: [1] }, - { y: 3000, expectedIndices: [] }, - { y: 3300, expectedIndices: [3] }, + { y: 900, expectedIndices: [5, 4] }, + { y: 1700, expectedIndices: [5, 4, 1] }, + { y: 2400, expectedIndices: [3] }, + { y: 2700, expectedIndices: [3] }, + { y: 3000, expectedIndices: [3] }, + { y: 3300, expectedIndices: [] }, { y: 4300, expectedIndices: [] }, ].forEach(option => { const { expectedIndices } = option; @@ -2620,16 +2634,16 @@ module('Virtual scrolling integration', () => { offset: { x: 0, y: 0 }, expectedIndices: [0, 2], appointmentRects: [ - { left: -9899, top: -9889, height: 50 }, - { left: -9499, top: -9739, height: 100 } + { left: -9934, top: -9850.015625, height: 38 }, + { left: -9534, top: -9736.015625, height: 76 } ] }, { offset: { x: 300, y: 0 }, expectedIndices: [0, 2], appointmentRects: [ - { left: -10199, top: -9889, height: 50 }, - { left: -9799, top: -9739, height: 100 } + { left: -10234, top: -9850.015625, height: 38 }, + { left: -9834, top: -9736.015625, height: 76 } ] }, { @@ -2641,26 +2655,27 @@ module('Virtual scrolling integration', () => { offset: { x: 0, y: 1100 }, expectedIndices: [1, 3], appointmentRects: [ - { left: -9699, top: -9889, height: 100 }, - { left: -9299, top: -9839, height: 100 } + { left: -9734, top: -10076.015625, height: 38 }, + { left: -9334, top: -10076.015625, height: 76 } ] }, { offset: { x: 300, y: 1100 }, - expectedIndices: [1, 3], + expectedIndices: [1, 3, 4], appointmentRects: [ - { left: -9999, top: -9889, height: 100 }, - { left: -9599, top: -9839, height: 100 } + { left: -10034, top: -10076.015625, height: 38 }, + { left: -9634, top: -10076.015625, height: 76 }, + { left: -9816, top: -9962.015625, height: 76 } ] }, { offset: { x: 1700, y: 1100 }, expectedIndices: [7, 8, 9, 10], appointmentRects: [ - { left: -10199, top: -9689, height: 300 }, - { left: -9999, top: -9689, height: 300 }, - { left: -9799, top: -9689, height: 300 }, - { left: -9599, top: -9689, height: 300 } + { left: -10216, top: -9962.015625, height: 646 }, + { left: -10016, top: -9962.015625, height: 646 }, + { left: -9816, top: -9962.015625, height: 646 }, + { left: -9616, top: -9962.015625, height: 646 } ] }, ].forEach(({ offset, expectedIndices, appointmentRects }) => { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.monthView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.monthView.tests.js index 8dcabb1bc0b8..32d953c8c69f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.monthView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.monthView.tests.js @@ -1,4 +1,4 @@ -import 'generic_light.css!'; +import 'fluent_blue_light.css!'; import $ from 'jquery'; import { @@ -71,7 +71,7 @@ module('Virtual scrolling Month View', () => { offset: { x: 0 }, expectedRects: [{ left: -9999, - top: -9837, + top: -9819, width: 300 }] }, @@ -79,15 +79,15 @@ module('Virtual scrolling Month View', () => { offset: { x: 1050 }, expectedRects: [{ left: -9999, - top: -9837, + top: -9819, width: 300 }] }, { offset: { x: 2100 }, expectedRects: [{ - left: -10371, - top: -9837, + left: -10386, + top: -9819, width: 150 }] } @@ -163,26 +163,22 @@ module('Virtual scrolling Month View', () => { { offset: { y: 0 }, expectedRects: [{ - left: -9899, - top: -9866, + left: -9934, + top: -9849, width: 300 }] }, { offset: { y: 900 }, expectedRects: [{ - left: -9899, - top: -9866, + left: -9934, + top: -9549, width: 300 }] }, { offset: { y: 1800 }, - expectedRects: [{ - left: -9899, - top: -10274, - width: 300 - }] + expectedRects: [] } ].forEach(({ offset, expectedRects }) => { promise = asyncScrollTest( @@ -258,19 +254,19 @@ module('Virtual scrolling Month View', () => { offset: { x: 0 }, expectedRects: [{ left: -9924, - top: -9837, + top: -9819, width: 450 }, { left: -9999, - top: -9762, + top: -9719, width: 525 }, { left: -9999, - top: -9687, + top: -9619, width: 525 }, { left: -9999, - top: -9612, + top: -9519, width: 450 }] }, @@ -278,35 +274,35 @@ module('Virtual scrolling Month View', () => { offset: { x: 700 }, expectedRects: [{ left: -10324, - top: -9837, + top: -9819, width: 150 }, { left: -10324, - top: -9762, + top: -9719, width: 150 }, { left: -10324, - top: -9687, + top: -9619, width: 150 }, { left: -10324, - top: -9612, + top: -9519, width: 75 }, { left: -9574, - top: -9837, + top: -9819, width: 450 }, { left: -9649, - top: -9762, + top: -9719, width: 525 }, { left: -9649, - top: -9687, + top: -9619, width: 525 }, { left: -9649, - top: -9612, + top: -9519, width: 450 }] }, @@ -314,19 +310,19 @@ module('Virtual scrolling Month View', () => { offset: { x: 1050 }, expectedRects: [{ left: -9924, - top: -9837, + top: -9819, width: 450 }, { left: -9999, - top: -9762, + top: -9719, width: 525 }, { left: -9999, - top: -9687, + top: -9619, width: 525 }, { left: -9999, - top: -9612, + top: -9519, width: 450 }] }, @@ -334,19 +330,19 @@ module('Virtual scrolling Month View', () => { offset: { x: 1400 }, expectedRects: [{ left: -10274, - top: -9837, + top: -9819, width: 450 }, { left: -10349, - top: -9762, + top: -9719, width: 525 }, { left: -10349, - top: -9687, + top: -9619, width: 525 }, { left: -10349, - top: -9612, + top: -9519, width: 450 }] } @@ -423,61 +419,61 @@ module('Virtual scrolling Month View', () => { { offset: { y: 0 }, expectedRects: [{ - left: -9674, - top: -9716, - width: 303 + left: -9693, + top: -9649, + width: 322 }, { - left: -9899, - top: -9641, - width: 528 + left: -9934, + top: -9549, + width: 563 }, { - left: -9899, - top: -9566, - width: 528 + left: -9934, + top: -9449, + width: 563 }, { - left: -9899, - top: -9491, - width: 300 + left: -9934, + top: -9349, + width: 322 }] }, { offset: { y: 350 }, expectedRects: [{ - left: -9674, - top: -10066, - width: 303 + left: -9693, + top: -9999, + width: 322 }, { - left: -9899, - top: -9991, - width: 528 + left: -9934, + top: -9899, + width: 563 }, { - left: -9899, - top: -9916, - width: 528 + left: -9934, + top: -9799, + width: 563 }, { - left: -9899, - top: -9841, - width: 300 + left: -9934, + top: -9699, + width: 322 }] }, { offset: { y: 1000 }, expectedRects: [{ - left: -9674, - top: -9816, - width: 303 + left: -9693, + top: -9449, + width: 322 }, { - left: -9899, - top: -9741, - width: 528 + left: -9934, + top: -9349, + width: 563 }, { - left: -9899, - top: -9666, - width: 528 + left: -9934, + top: -9249, + width: 563 }, { - left: -9899, - top: -9591, - width: 300 + left: -9934, + top: -9149, + width: 322 }] } ].forEach(({ offset, expectedRects }) => { @@ -564,14 +560,14 @@ module('Virtual scrolling Month View', () => { scrollX: 1066, expectedSettings: { left: -9490, - top: -9687, + top: -9499, width: 75, } }, { scrollX: 1300, expectedSettings: { left: -9724, - top: -9687, + top: -9499, width: 75, } }].forEach(({ scrollX, expectedSettings }) => { @@ -643,15 +639,15 @@ module('Virtual scrolling Month View', () => { offset: { x: 0 }, expectedRects: [{ left: -9924, - top: -9837, + top: -9819, width: 75 }, { left: -9924, - top: -9681, + top: -9619, width: 75 }, { left: -9924, - top: -9527, + top: -9419, width: 75 }] }, @@ -659,15 +655,15 @@ module('Virtual scrolling Month View', () => { offset: { x: 1050 }, expectedRects: [{ left: -9924, - top: -9837, + top: -9819, width: 75 }, { left: -9924, - top: -9681, + top: -9619, width: 75 }, { left: -9924, - top: -9527, + top: -9419, width: 75 }] }, @@ -749,32 +745,32 @@ module('Virtual scrolling Month View', () => { { offset: { y: 0 }, expectedRects: [{ - left: -9824, - top: -9866, + left: -9859, + top: -9849, width: 75 }, { - left: -9824, - top: -9716, + left: -9859, + top: -9649, width: 75 }, { - left: -9824, - top: -9566, + left: -9859, + top: -9449, width: 75 }] }, { offset: { y: 900 }, expectedRects: [{ - left: -9824, - top: -9866, + left: -9859, + top: -9549, width: 75 }, { - left: -9824, - top: -9716, + left: -9859, + top: -9349, width: 75 }, { - left: -9824, - top: -9566, + left: -9859, + top: -9149, width: 75 }] } @@ -852,60 +848,60 @@ module('Virtual scrolling Month View', () => { offset: { x: 0 }, expectedRects: [{ left: -9924, - top: -9837, + top: -9819, width: 450 }, { left: -9999, - top: -9766, + top: -9719, width: 525 }, { left: -9999, - top: -9695, + top: -9619, width: 525 }, { left: -9999, - top: -9625, - width: 301 + top: -9519, + width: 300 }] }, { offset: { x: 1050 }, expectedRects: [{ left: -9924, - top: -9837, + top: -9819, width: 450 }, { left: -9999, - top: -9766, + top: -9719, width: 525 }, { left: -9999, - top: -9695, + top: -9619, width: 525 }, { left: -9999, - top: -9625, - width: 301 + top: -9519, + width: 300 }] }, { offset: { x: 1300 }, expectedRects: [{ left: -10174, - top: -9837, + top: -9819, width: 450 }, { left: -10249, - top: -9766, + top: -9719, width: 525 }, { left: -10249, - top: -9695, + top: -9619, width: 525 }, { left: -10249, - top: -9625, - width: 301 + top: -9519, + width: 300 }] } ].forEach(({ offset, expectedRects }) => { @@ -982,61 +978,61 @@ module('Virtual scrolling Month View', () => { { offset: { y: 0 }, expectedRects: [{ - left: -9824, - top: -9866, - width: 453 + left: -9853, + top: -9849, + width: 482 }, { - left: -9899, - top: -9791, - width: 528 + left: -9934, + top: -9749, + width: 562 }, { - left: -9899, - top: -9716, - width: 528 + left: -9934, + top: -9649, + width: 562 }, { - left: -9899, - top: -9641, - width: 301 + left: -9934, + top: -9549, + width: 321 }] }, { offset: { y: 900 }, expectedRects: [{ - left: -9824, - top: -9866, - width: 453 + left: -9853, + top: -9549, + width: 482 }, { - left: -9899, - top: -9791, - width: 528 + left: -9934, + top: -9449, + width: 562 }, { - left: -9899, - top: -9716, - width: 528 + left: -9934, + top: -9349, + width: 562 }, { - left: -9899, - top: -9641, - width: 301 + left: -9934, + top: -9249, + width: 321 }] }, { offset: { y: 1100 }, expectedRects: [{ - left: -9824, - top: -10066, - width: 453 + left: -9853, + top: -9749, + width: 482 }, { - left: -9899, - top: -9991, - width: 528 + left: -9934, + top: -9649, + width: 562 }, { - left: -9899, - top: -9916, - width: 528 + left: -9934, + top: -9549, + width: 562 }, { - left: -9899, - top: -9841, - width: 301 + left: -9934, + top: -9449, + width: 321 }] } ].forEach(({ offset, expectedRects }) => { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.timeline.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.timeline.tests.js index b65c8964e5df..8d0512fa5a58 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.timeline.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.timeline.tests.js @@ -1,4 +1,4 @@ -import 'generic_light.css!'; +import 'fluent_blue_light.css!'; import { createWrapper, @@ -69,7 +69,7 @@ module('Virtual scrolling timelines', () => { offset: { x: 2200 }, expectedRects: [{ left: -9099, - top: -9817, + top: -9793, width: 300 }] }, @@ -77,7 +77,7 @@ module('Virtual scrolling timelines', () => { offset: { x: 3200 }, expectedRects: [{ left: -10099, - top: -9817, + top: -9793, width: 1300 }] }, @@ -85,7 +85,7 @@ module('Virtual scrolling timelines', () => { offset: { x: 4200 }, expectedRects: [{ left: -10399, - top: -9817, + top: -9793, width: 1600 }] }, @@ -93,7 +93,7 @@ module('Virtual scrolling timelines', () => { offset: { x: 5200 }, expectedRects: [{ left: -10399, - top: -9817, + top: -9793, width: 900 }] }, @@ -210,7 +210,7 @@ module('Virtual scrolling timelines', () => { offset: { x: 5200 }, expectedRects: [{ left: -9099, - top: -9522, + top: -9485, width: 400 }] }, @@ -218,11 +218,11 @@ module('Virtual scrolling timelines', () => { offset: { x: 6200 }, expectedRects: [{ left: -8899, - top: -9669, + top: -9639, width: 200 }, { left: -10099, - top: -9522, + top: -9485, width: 1400 }] }, @@ -230,11 +230,11 @@ module('Virtual scrolling timelines', () => { offset: { x: 7200 }, expectedRects: [{ left: -9899, - top: -9669, + top: -9639, width: 1200 }, { left: -10299, - top: -9522, + top: -9485, width: 1000 }] }, @@ -242,7 +242,7 @@ module('Virtual scrolling timelines', () => { offset: { x: 8200 }, expectedRects: [{ left: -10299, - top: -9669, + top: -9639, width: 1600 }] }, @@ -250,11 +250,11 @@ module('Virtual scrolling timelines', () => { offset: { x: 9200 }, expectedRects: [{ left: -10299, - top: -9669, + top: -9639, width: 650 }, { left: -9649, - top: -9522, + top: -9485, width: 950 }] }, @@ -262,7 +262,7 @@ module('Virtual scrolling timelines', () => { offset: { x: 10200 }, expectedRects: [{ left: -10299, - top: -9522, + top: -9485, width: 1600 }] }, @@ -270,15 +270,15 @@ module('Virtual scrolling timelines', () => { offset: { x: 12000 }, expectedRects: [{ left: -9899, - top: -9817, + top: -9793, width: 1200 }, { left: -9899, - top: -9669, + top: -9639, width: 1200 }, { left: -10299, - top: -9522, + top: -9485, width: 1600 }] }, @@ -286,15 +286,15 @@ module('Virtual scrolling timelines', () => { offset: { x: 13000 }, expectedRects: [{ left: -10299, - top: -9817, + top: -9793, width: 1600 }, { left: -10299, - top: -9669, + top: -9639, width: 1600 }, { left: -10299, - top: -9522, + top: -9485, width: 1600 }] }, @@ -302,15 +302,15 @@ module('Virtual scrolling timelines', () => { offset: { x: 14000 }, expectedRects: [{ left: -10299, - top: -9817, + top: -9793, width: 1600 }, { left: -10299, - top: -9669, + top: -9639, width: 1600 }, { left: -10299, - top: -9522, + top: -9485, width: 1600 }] }, @@ -318,15 +318,15 @@ module('Virtual scrolling timelines', () => { offset: { x: 15000 }, expectedRects: [{ left: -10299, - top: -9817, + top: -9793, width: 1600 }, { left: -10299, - top: -9669, + top: -9639, width: 1600 }, { left: -10299, - top: -9522, + top: -9485, width: 1600 }] }, @@ -334,15 +334,15 @@ module('Virtual scrolling timelines', () => { offset: { x: 17000 }, expectedRects: [{ left: -10299, - top: -9817, + top: -9793, width: 1400 }, { left: -10299, - top: -9669, + top: -9639, width: 1400 }, { left: -10299, - top: -9522, + top: -9485, width: 1600 }] }, @@ -350,15 +350,15 @@ module('Virtual scrolling timelines', () => { offset: { x: 17500 }, expectedRects: [{ left: -10399, - top: -9817, + top: -9793, width: 1000 }, { left: -10399, - top: -9669, + top: -9639, width: 1000 }, { left: -10399, - top: -9522, + top: -9485, width: 1600 }] }, @@ -366,15 +366,15 @@ module('Virtual scrolling timelines', () => { offset: { x: 18000 }, expectedRects: [{ left: -10299, - top: -9817, + top: -9793, width: 400 }, { left: -10299, - top: -9669, + top: -9639, width: 400 }, { left: -10299, - top: -9522, + top: -9485, width: 1600 }] }, @@ -382,7 +382,7 @@ module('Virtual scrolling timelines', () => { offset: { x: 19000 }, expectedRects: [{ left: -10299, - top: -9522, + top: -9485, width: 1600 }] }, @@ -390,7 +390,7 @@ module('Virtual scrolling timelines', () => { offset: { x: 20000 }, expectedRects: [{ left: -10299, - top: -9522, + top: -9485, width: 950 }] }, @@ -398,7 +398,7 @@ module('Virtual scrolling timelines', () => { offset: { x: 20500 }, expectedRects: [{ left: -10399, - top: -9522, + top: -9485, width: 550 }] }, @@ -406,7 +406,7 @@ module('Virtual scrolling timelines', () => { offset: { x: 20800 }, expectedRects: [{ left: -10299, - top: -9522, + top: -9485, width: 150 }] }, @@ -487,7 +487,7 @@ module('Virtual scrolling timelines', () => { offset: { x: 0 }, expectedRects: [{ left: -9899, - top: -9596, + top: -9569, width: 1200 }] }, @@ -495,7 +495,7 @@ module('Virtual scrolling timelines', () => { offset: { x: 10000 }, expectedRects: [{ left: -10299, - top: -9596, + top: -9569, width: 1600 }] }, @@ -503,7 +503,7 @@ module('Virtual scrolling timelines', () => { offset: { x: 20000 }, expectedRects: [{ left: -10299, - top: -9596, + top: -9569, width: 1600 }] }, @@ -511,7 +511,7 @@ module('Virtual scrolling timelines', () => { offset: { x: 21700 }, expectedRects: [{ left: -10399, - top: -9596, + top: -9569, width: 800 }] }, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.api.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.api.tests.js index d4736ae8cb24..ec10187bebe3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.api.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.api.tests.js @@ -1,4 +1,4 @@ -import 'generic_light.css!'; +import 'fluent_blue_light.css!'; import $ from 'jquery'; import '__internal/scheduler/workspaces/m_work_space_month'; @@ -55,14 +55,14 @@ module('API', () => { test('All day row', async function(assert) { this.createInstance('Week', { width: 800, height: 800 }); - let index = this.instance.getCellIndexByCoordinates({ left: 298, top: 0 }); + let index = this.instance.getCellIndexByCoordinates({ left: 350, top: 0 }); assert.equal(index, 3, 'Index is OK'); - index = this.instance.getCellIndexByCoordinates({ left: 298, top: 45 }); + index = this.instance.getCellIndexByCoordinates({ left: 350, top: 25 }); assert.equal(index, 3, 'Index is OK'); - index = this.instance.getCellIndexByCoordinates({ left: 298, top: 77 }); + index = this.instance.getCellIndexByCoordinates({ left: 350, top: 45 }); assert.equal(index, 10, 'Index is OK'); }); @@ -105,7 +105,7 @@ module('API', () => { width: 800, height: 500 }); - const index = this.instance.getCellIndexByCoordinates({ left: 228, top: 91 }); + const index = this.instance.getCellIndexByCoordinates({ left: 320, top: 100 }); assert.equal(index, 9, 'Index is OK'); }); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.base.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.base.tests.js index ed2bbc97de93..3f674c4d3532 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.base.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.base.tests.js @@ -1,6 +1,6 @@ import dateUtils from 'core/utils/date'; import resizeCallbacks from 'core/utils/resize_callbacks'; -import 'generic_light.css!'; +import 'fluent_blue_light.css!'; import $ from 'jquery'; import dateLocalization from 'common/core/localization/date'; @@ -97,10 +97,10 @@ module('Work Space Base', { this.instance.option('crossScrollingEnabled', true); this.instance.option('width', 400); - assert.equal(this.instance.getWorkSpaceMinWidth(), 298, 'minWidth is ok'); + assert.equal(this.instance.getWorkSpaceMinWidth(), 333, 'minWidth is ok'); this.instance.option('width', 900); - assert.equal(this.instance.getWorkSpaceMinWidth(), 798, 'minWidth is ok'); + assert.equal(this.instance.getWorkSpaceMinWidth(), 833, 'minWidth is ok'); }); } diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.month.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.month.tests.js index bcac8339b598..e1e7a96b638a 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.month.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.month.tests.js @@ -1,6 +1,6 @@ import { getOuterWidth, getOuterHeight } from 'core/utils/size'; import resizeCallbacks from 'core/utils/resize_callbacks'; -import 'generic_light.css!'; +import 'fluent_blue_light.css!'; import $ from 'jquery'; import '__internal/scheduler/workspaces/m_work_space_month'; @@ -335,8 +335,8 @@ module('Work Space Month', () => { test('Group table content should have right height', async function(assert) { const $groupHeaderContents = this.instance.$element().find('.dx-scheduler-group-header'); resizeCallbacks.fire(); - assert.roughEqual(getOuterHeight($groupHeaderContents.eq(0)), 449, 5, 'Group header content height is OK'); - assert.roughEqual(getOuterHeight($groupHeaderContents.eq(1)), 449, 5, 'Group header content height is OK'); + assert.roughEqual(getOuterHeight($groupHeaderContents.eq(0)), 599, 5, 'Group header content height is OK'); + assert.roughEqual(getOuterHeight($groupHeaderContents.eq(1)), 599, 5, 'Group header content height is OK'); }); test('Group width calculation', async function(assert) { @@ -365,7 +365,7 @@ module('Work Space Month', () => { } ); - assert.equal(groupWidth, 525, 'Group width is OK'); + assert.roughEqual(groupWidth, 532, 3, 'Group width is OK'); }); test('Tables should not be rerendered if dimension was changed and horizontal scrolling is disabled', async function(assert) { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.week.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.week.tests.js index dddc38eb4613..59b8c3390b21 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.week.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.week.tests.js @@ -1,6 +1,6 @@ import dateUtils from 'core/utils/date'; import { triggerShownEvent } from 'common/core/events/visibility_change'; -import 'generic_light.css!'; +import 'fluent_blue_light.css!'; import $ from 'jquery'; import '__internal/scheduler/workspaces/m_work_space_week'; @@ -330,7 +330,7 @@ module('Work Space Week', () => { const bounds = this.instance.getVisibleBounds(); assert.deepEqual(bounds.top, { hours: 1, minutes: 0 }, 'Top bound is OK'); - assert.deepEqual(bounds.bottom, { hours: 3, minutes: 30 }, 'Bottom bound is OK'); + assert.deepEqual(bounds.bottom, { hours: 4, minutes: 30 }, 'Bottom bound is OK'); }); test('Get visible bounds if scroll position is not null', async function(assert) { @@ -352,7 +352,7 @@ module('Work Space Week', () => { const bounds = this.instance.getVisibleBounds(); assert.deepEqual(bounds.top, { hours: 3, minutes: 30 }, 'Top bound is OK'); - assert.deepEqual(bounds.bottom, { hours: 8, minutes: 30 }, 'Bottom bound is OK'); + assert.deepEqual(bounds.bottom, { hours: 11, minutes: 30 }, 'Bottom bound is OK'); }); test('Get visible bounds if hoursInterval is set', async function(assert) { @@ -376,8 +376,8 @@ module('Work Space Week', () => { bounds = this.instance.getVisibleBounds(); - assert.deepEqual(bounds.top, { hours: 6, minutes: 0 }, 'Top bound is OK'); - assert.deepEqual(bounds.bottom, { hours: 23, minutes: 30 }, 'Bottom bound is OK'); + assert.deepEqual(bounds.top, { hours: 0, minutes: 30 }, 'Top bound is OK'); + assert.deepEqual(bounds.bottom, { hours: 24, minutes: 0 }, 'Bottom bound is OK'); }); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpaceWithHorizontalScroll.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpaceWithHorizontalScroll.tests.js index 26c114f91d7f..0f6388dee5b2 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpaceWithHorizontalScroll.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpaceWithHorizontalScroll.tests.js @@ -1,7 +1,7 @@ import { getOuterWidth } from 'core/utils/size'; import devices from '__internal/core/m_devices'; import { triggerHidingEvent, triggerResizeEvent, triggerShownEvent } from 'common/core/events/visibility_change'; -import 'generic_light.css!'; +import 'fluent_blue_light.css!'; import $ from 'jquery'; import '__internal/scheduler/m_scheduler'; @@ -154,9 +154,9 @@ QUnit.module('Vertical Workspace with horizontal scrollbar', { const allDayTableWidth = getOuterWidth($element.find('.dx-scheduler-all-day-table')); const dateTableWidth = getOuterWidth($element.find('.dx-scheduler-date-table')); - assert.roughEqual(headerPanelWidth, 896, 5, 'Width of the header panel is OK'); - assert.roughEqual(allDayTableWidth, 896, 5, 'Width of the allDay table is OK'); - assert.roughEqual(dateTableWidth, 896, 5, 'Width of the date table is OK'); + assert.roughEqual(headerPanelWidth, 932, 5, 'Width of the header panel is OK'); + assert.roughEqual(allDayTableWidth, 932, 5, 'Width of the allDay table is OK'); + assert.roughEqual(dateTableWidth, 932, 5, 'Width of the date table is OK'); }); QUnit.test('Workspace tables width should not be less than element width', async function(assert) { @@ -243,7 +243,7 @@ QUnit.module('Vertical Workspace with horizontal scrollbar, groupOrientation = v const headerPanelWidth = getOuterWidth($element.find('.dx-scheduler-header-panel'), true); const dateTableWidth = getOuterWidth($element.find('.dx-scheduler-date-table'), true); - assert.roughEqual(headerPanelWidth, 797, 1.01, 'Width is OK'); - assert.roughEqual(dateTableWidth, 797, 1.01, 'Width is OK'); + assert.roughEqual(headerPanelWidth, 867, 1.01, 'Width is OK'); + assert.roughEqual(dateTableWidth, 867, 1.01, 'Width is OK'); }); });