Scheduler: Additional fixes.

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

@@ -1,4 +1,4 @@
-import '@js/ui/scheduler/recurrence_editor';
+import '../m_recurrence_editor';
 import '@js/ui/text_area';
 import '@js/ui/tag_box';
 import '@js/ui/switch';

packages/devextreme/js/__internal/scheduler/workspaces/m_virtual_scrolling.ts

@@ -30,7 +30,7 @@ export class VirtualScrollingDispatcher {
 
   _onScrollHandler: any;
 
-  constructor(public options) {
+  constructor(public options?: any) {
     if (options) {
       this._rowHeight = this.getCellHeight();
       this._cellWidth = this.getCellWidth();

packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator.ts

@@ -22,7 +22,7 @@ export class ViewDataGenerator {
 
   readonly isWorkView: boolean = false;
 
-  readonly tableAllDay: boolean = false;
+  readonly tableAllDay = false;
 
   hiddenInterval: any;
 

packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_month.ts

@@ -20,8 +20,7 @@ export class ViewDataGeneratorMonth extends ViewDataGenerator {
 
   _maxVisibleDate: any;
 
-  // @ts-expect-error
-  get tableAllDay() { return undefined; }
+  readonly tableAllDay = false;
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   getCellData(rowIndex, columnIndex, options, allDay) {

packages/devextreme/js/renovation/ui/scheduler/__tests__/scheduler.test.tsx

@@ -6,7 +6,7 @@ import { Scheduler, viewFunction as ViewFunction } from '../scheduler';
 import { Widget, WidgetProps } from '../../common/widget';
 import * as viewsModel from '../model/views';
 import { ViewType } from '../types';
-import ViewDataProvider from '../../../../ui/scheduler/workspaces/view_model/view_data_provider';
+import ViewDataProvider from '../../../../__internal/scheduler/workspaces/view_model/m_view_data_provider';
 import { WorkSpace } from '../workspaces/base/work_space';
 import { SchedulerToolbar } from '../header/header';
 import * as resourceUtils from '../../../../__internal/scheduler/resources/m_utils';

packages/devextreme/js/renovation/ui/scheduler/appointment_edit_form/layout.tsx

@@ -18,7 +18,7 @@ import {
   getMaxWidth,
 } from './popup_config';
 // eslint-disable-next-line import/named
-import { dxSchedulerAppointment } from '../../../../ui/scheduler';
+import type { dxSchedulerAppointment } from '../../../../ui/scheduler';
 import { EditForm } from './edit_form/layout';
 import { DataAccessorType } from '../types';
 import { AppointmentData } from '../appointment/types';

packages/devextreme/js/renovation/ui/scheduler/appointment_tooltip/__tests__/item_layout.test.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 // https://github.com/benmosher/eslint-plugin-import/issues/1699
 /* eslint-disable-next-line import/named */
-import { dxSchedulerAppointment } from '../../../../../ui/scheduler';
+import type { dxSchedulerAppointment } from '../../../../../ui/scheduler';
 import {
   TooltipItemLayout,
   viewFunction as TooltipItemLayoutView,

packages/devextreme/js/renovation/ui/scheduler/appointment_tooltip/item_layout.tsx

@@ -3,7 +3,7 @@ import {
   OneWay, Template, Event, JSXTemplate,
 } from '@devextreme-generator/declarations';
 /* eslint-disable-next-line import/named */
-import { dxSchedulerAppointment } from '../../../../ui/scheduler';
+import type { dxSchedulerAppointment } from '../../../../ui/scheduler';
 import {
   AppointmentItem,
   FormattedContent,

packages/devextreme/js/renovation/ui/scheduler/appointment_tooltip/types.ts

@@ -1,6 +1,6 @@
 // https://github.com/benmosher/eslint-plugin-import/issues/1699
 // eslint-disable-next-line import/named
-import { dxSchedulerAppointment } from '../../../../ui/scheduler';
+import type { dxSchedulerAppointment } from '../../../../ui/scheduler';
 
 export type Color = string | undefined;
 

packages/devextreme/js/renovation/ui/scheduler/appointment_tooltip/utils/default_functions.tsx

@@ -1,6 +1,6 @@
 import { FormattedContent } from '../types';
 /* eslint-disable-next-line import/named */
-import { dxSchedulerAppointment } from '../../../../../ui/scheduler';
+import type { dxSchedulerAppointment } from '../../../../../ui/scheduler';
 
 export const defaultGetTextAndFormatDate = (): FormattedContent => ({ text: '', formatDate: '' });
 export const defaultGetSingleAppointment = (): dxSchedulerAppointment => ({});

packages/devextreme/js/renovation/ui/scheduler/appointment_tooltip/utils/get_current_appointment.tsx

@@ -1,6 +1,6 @@
 import { AppointmentItem } from '../types';
 /* eslint-disable-next-line import/named */
-import { dxSchedulerAppointment } from '../../../../../ui/scheduler';
+import type { dxSchedulerAppointment } from '../../../../../ui/scheduler';
 
 export default (appointmentItem: AppointmentItem): dxSchedulerAppointment => {
   const { settings, data, currentData } = appointmentItem;

packages/devextreme/js/renovation/ui/scheduler/common.ts

@@ -1,4 +1,4 @@
-import { utils } from '../../../ui/scheduler/utils';
+import { utils } from '../../../__internal/scheduler/m_utils';
 import { DataAccessorsProps } from './props';
 import { DataAccessorType } from './types';
 import { ViewDataProviderValidationOptions } from './workspaces/types';

packages/devextreme/js/renovation/ui/scheduler/model/__tests__/appointments.test.ts

@@ -1,4 +1,4 @@
-import ViewDataProvider from '../../../../../ui/scheduler/workspaces/view_model/view_data_provider';
+import ViewDataProvider from '../../../../../__internal/scheduler/workspaces/view_model/m_view_data_provider';
 import { SchedulerProps, ViewProps } from '../../props';
 import { ViewType } from '../../types';
 import { prepareGenerationOptions } from '../../workspaces/base/work_space';

packages/devextreme/js/renovation/ui/scheduler/scheduler.tsx

@@ -10,7 +10,7 @@ import {
 } from '@devextreme-generator/declarations';
 import { TimeZoneCalculator } from './timeZoneCalculator/utils';
 // eslint-disable-next-line import/named
-import { Appointment } from '../../../ui/scheduler';
+import type { Appointment } from '../../../ui/scheduler';
 import { ViewProps, SchedulerProps } from './props';
 
 import { Widget } from '../common/widget';

packages/devextreme/js/renovation/ui/scheduler/timeZoneCalculator/createTimeZoneCalculator.ts

@@ -1,5 +1,5 @@
 import { TimeZoneCalculator } from './utils';
-import timeZoneUtils from '../../../../ui/scheduler/utils.timeZone';
+import timeZoneUtils from '../../../../__internal/scheduler/m_utils_time_zone';
 
 export const createTimeZoneCalculator = (
   currentTimeZone: string,

packages/devextreme/js/renovation/ui/scheduler/view_model/appointments/__tests__/appointments.test.ts

@@ -1,4 +1,4 @@
-import ViewDataProvider from '../../../../../../ui/scheduler/workspaces/view_model/view_data_provider';
+import ViewDataProvider from '../../../../../../__internal/scheduler/workspaces/view_model/m_view_data_provider';
 import { SchedulerProps, ViewProps } from '../../../props';
 import { DataAccessorType, ViewType } from '../../../types';
 import { prepareGenerationOptions } from '../../../workspaces/base/work_space';
@@ -13,8 +13,8 @@ import { AppointmentsConfigType } from '../../../model/types';
 import { TimeZoneCalculator } from '../../../timeZoneCalculator/utils';
 import { getCurrentViewConfig } from '../../../model/views';
 
-jest.mock('../../../../../../ui/scheduler/workspaces/helpers/positionHelper', () => ({
-  ...jest.requireActual('../../../../../../ui/scheduler/workspaces/helpers/positionHelper'),
+jest.mock('../../../../../../__internal/scheduler/workspaces/helpers/m_position_helper', () => ({
+  ...jest.requireActual('../../../../../../__internal/scheduler/workspaces/helpers/m_position_helper'),
   PositionHelper: jest.fn(() => ({
     getHorizontalMax: (): number => 100,
     getResizableStep: (): number => 110,

packages/devextreme/js/renovation/ui/scheduler/view_model/to_test/views/utils/base.ts

@@ -2,7 +2,7 @@ import errors from '../../../../../../../ui/widget/ui.errors';
 import dateUtils from '../../../../../../../core/utils/date';
 import { isDefined } from '../../../../../../../core/utils/type';
 import dateLocalization from '../../../../../../../localization/date';
-import timeZoneUtils from '../../../../../../../ui/scheduler/utils.timeZone';
+import timeZoneUtils from '../../../../../../../__internal/scheduler/m_utils_time_zone';
 import { VERTICAL_GROUP_COUNT_CLASSES } from '../../../../../../../__internal/scheduler/m_classes';
 import { VIEWS } from '../../../../../../../__internal/scheduler/m_constants';
 import { getGroupCount } from '../../../../../../../__internal/scheduler/resources/m_utils';

packages/devextreme/js/renovation/ui/scheduler/view_model/to_test/views/utils/timeline_week.ts

@@ -1,4 +1,4 @@
-import timeZoneUtils from '../../../../../../../ui/scheduler/utils.timeZone';
+import timeZoneUtils from '../../../../../../../__internal/scheduler/m_utils_time_zone';
 import { GetDateForHeaderText } from '../types';
 import { getStartViewDateWithoutDST } from './base';
 

packages/devextreme/js/renovation/ui/scheduler/view_model/to_test/views/utils/week.ts

@@ -6,7 +6,7 @@ import {
   getViewStartByOptions,
   setOptionHour,
 } from './base';
-import timeZoneUtils from '../../../../../../../ui/scheduler/utils.timeZone';
+import timeZoneUtils from '../../../../../../../__internal/scheduler/m_utils_time_zone';
 import { CalculateStartViewDate } from '../types';
 
 export const getIntervalDuration = (