Merge branch '25_1' into 25_1_demos_vue_ts_check

Author: GoodDayForSurf

packages/devextreme/js/__internal/scheduler/appointments/appointment/m_appointment.ts

@@ -24,6 +24,7 @@ import {
   REDUCED_APPOINTMENT_PARTS_CLASSES,
 } from '../../m_classes';
 import { getRecurrenceProcessor } from '../../m_recurrence';
+import type { SubscribeKey, SubscribeMethods } from '../../m_subscribes';
 import type { AppointmentDataAccessor } from '../../utils/data_accessor/appointment_data_accessor';
 import type { AppointmentProperties } from './m_types';
 import {
@@ -72,20 +73,24 @@ export class Appointment extends DOMComponent<AppointmentProperties> {
     });
   }
 
-  notifyObserver(subject, args) {
-    const observer = this.option('observer');
-    if (observer) {
-      observer.fire(subject, args);
-    }
+  notifyObserver<Subject extends SubscribeKey>(
+    funcName: Subject,
+    args: Parameters<SubscribeMethods[Subject]>,
+  ): void {
+    this.invoke(funcName, ...args);
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  invoke(funcName: string) {
-    const observer = this.option('observer');
+  invoke<Subject extends SubscribeKey>(
+    funcName: Subject,
+    ...args: Parameters<SubscribeMethods[Subject]>
+  ): ReturnType<SubscribeMethods[Subject]> | undefined {
+    const notifyScheduler = this.option('notifyScheduler');
 
-    if (observer) {
-      return observer.fire.apply(observer, arguments);
+    if (!notifyScheduler) {
+      return undefined;
     }
+
+    return notifyScheduler.invoke(funcName, ...args);
   }
 
   _optionChanged(args) {

packages/devextreme/js/__internal/scheduler/appointments/appointment/m_types.ts

@@ -1,4 +1,5 @@
 import type { Orientation } from '@js/common';
+import type NotifyScheduler from '@ts/scheduler/base/m_widget_notify_scheduler';
 import type { TimeZoneCalculator } from '@ts/scheduler/r1/timezone_calculator/calculator';
 import type { SafeAppointment } from '@ts/scheduler/types';
 import type { AppointmentDataAccessor } from '@ts/scheduler/utils/data_accessor/appointment_data_accessor';
@@ -8,7 +9,7 @@ export interface AppointmentProperties extends Record<string, unknown> {
   data: SafeAppointment;
   groupIndex?: number;
   groupTexts: string[];
-  observer: any;
+  notifyScheduler: NotifyScheduler | undefined;
   geometry: any;
   direction: Orientation;
   allowResize: boolean;

packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts

@@ -86,8 +86,8 @@ class SchedulerAppointments extends CollectionWidget {
     return this.invoke('isVirtualScrolling');
   }
 
-  get appointmentDataProvider() {
-    return this.option('getAppointmentDataProvider')();
+  get appointmentDataSource() {
+    return this.option('getAppointmentDataSource')();
   }
 
   get dataAccessors(): AppointmentDataAccessor {
@@ -104,18 +104,17 @@ class SchedulerAppointments extends CollectionWidget {
   }
 
   notifyObserver(subject, args) {
-    const observer: any = this.option('observer');
-    if (observer) {
-      observer.fire(subject, args);
+    const notifyScheduler: any = this.option('notifyScheduler');
+    if (notifyScheduler) {
+      notifyScheduler.invoke(subject, args);
     }
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   invoke(funcName: string, ...args) {
-    const observer: any = this.option('observer');
+    const notifyScheduler: any = this.option('notifyScheduler');
 
-    if (observer) {
-      return observer.fire.apply(observer, arguments);
+    if (notifyScheduler) {
+      return notifyScheduler.invoke(funcName, ...args);
     }
   }
 
@@ -247,7 +246,7 @@ class SchedulerAppointments extends CollectionWidget {
   ): ViewModelDiff[] {
     const elementsInRenderOrder = previousValue
       .map(({ sortedIndex }) => this.renderedElementsBySortedIndex[sortedIndex]);
-    const diff = getViewModelDiff(previousValue, value, this.appointmentDataProvider);
+    const diff = getViewModelDiff(previousValue, value, this.appointmentDataSource);
     diff
       .filter((item) => !isNeedToAdd(item))
       .forEach((item, index) => {
@@ -645,7 +644,7 @@ class SchedulerAppointments extends CollectionWidget {
       data: settings.itemData,
       groupIndex: settings.groupIndex,
       groupTexts: getGroupTexts(groups, groupsLeafs, resourceById, settings.groupIndex),
-      observer: this.option('observer'),
+      notifyScheduler: this.option('notifyScheduler'),
       geometry: settings,
       direction: settings.direction || 'vertical',
       allowResize: false,
@@ -675,7 +674,7 @@ class SchedulerAppointments extends CollectionWidget {
       data: settings.itemData,
       groupIndex: settings.groupIndex,
       groupTexts: getGroupTexts(groups, groupsLeafs, resourceById, settings.groupIndex),
-      observer: this.option('observer'),
+      notifyScheduler: this.option('notifyScheduler'),
       geometry: settings,
       direction: settings.direction || 'vertical',
       allowResize,

packages/devextreme/js/__internal/scheduler/appointments/utils/get_view_model_diff.ts

@@ -1,7 +1,7 @@
 import { equalByValue } from '@js/core/utils/common';
 
 import type { SafeAppointment } from '../../types';
-import type { AppointmentDataProvider } from '../../view_model/generate_view_model/data_provider/m_appointment_data_provider';
+import type { AppointmentDataSource } from '../../view_model/generate_view_model/data_provider/m_appointment_data_source';
 import type { AppointmentViewModelPlain } from '../../view_model/generate_view_model/types';
 import type { DiffItem } from './get_arrays_diff';
 import { getArraysDiff } from './get_arrays_diff';
@@ -41,28 +41,28 @@ const getObjectToCompare = (
 
 const isDataChanged = (
   data: SafeAppointment,
-  appointmentDataProvider: AppointmentDataProvider,
+  appointmentDataSource: AppointmentDataSource,
 ): boolean => {
-  const updatedData = appointmentDataProvider.getUpdatedAppointment();
+  const updatedData = appointmentDataSource.getUpdatedAppointment();
 
-  return updatedData === data || appointmentDataProvider
+  return updatedData === data || appointmentDataSource
     .getUpdatedAppointmentKeys()
     .some((item) => data[item.key] === item.value);
 };
 
-const compareViewModel = (appointmentDataProvider: AppointmentDataProvider) => (
+const compareViewModel = (appointmentDataSource: AppointmentDataSource) => (
   viewModelOld: AppointmentViewModelPlain,
   viewModelNext: AppointmentViewModelPlain,
 ): boolean => viewModelOld.itemData === viewModelNext.itemData
-  && !isDataChanged(viewModelNext.itemData, appointmentDataProvider)
+  && !isDataChanged(viewModelNext.itemData, appointmentDataSource)
   && equalByValue(getObjectToCompare(viewModelOld), getObjectToCompare(viewModelNext));
 
 export const getViewModelDiff = (
   viewModelOld: AppointmentViewModelPlain[],
   viewModelNext: AppointmentViewModelPlain[],
-  appointmentDataProvider: AppointmentDataProvider,
+  appointmentDataSource: AppointmentDataSource,
 ): DiffItem<AppointmentViewModelPlain, AppointmentViewModelPlain>[] => getArraysDiff(
   viewModelOld,
   viewModelNext,
-  compareViewModel(appointmentDataProvider),
+  compareViewModel(appointmentDataSource),
 );

packages/devextreme/js/__internal/scheduler/base/m_widget_notify_scheduler.ts

@@ -0,0 +1,19 @@
+import type Scheduler from '../m_scheduler';
+import type { SubscribeKey, SubscribeMethods } from '../m_subscribes';
+
+class NotifyScheduler {
+  scheduler: Scheduler;
+
+  constructor({ scheduler }: { scheduler: Scheduler }) {
+    this.scheduler = scheduler;
+  }
+
+  invoke<Subject extends SubscribeKey>(
+    funcName: Subject,
+    ...args: Parameters<SubscribeMethods[Subject]>
+  ): ReturnType<SubscribeMethods[Subject]> {
+    return this.scheduler.fire(funcName, ...args);
+  }
+}
+
+export default NotifyScheduler;