Skip to content

Scheduler — Replace underscore-prefixed: Scheduler core (m_scheduler, m_recurrence_editor) #32793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
aleksei-semikozov wants to merge 1 commit into
base: 26_1
Choose a base branch
from
+660 −656
Draft

Scheduler — Replace underscore-prefixed: Scheduler core (m_scheduler, m_recurrence_editor) #32793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/devextreme/js/__internal/scheduler/m_appointment_drag_behavior.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import type { AppointmentViewModelPlain } from './view_model/types';
const APPOINTMENT_ITEM_CLASS = 'dx-scheduler-appointment';

export default class AppointmentDragBehavior {
workspace = this.scheduler._workSpace;
workspace = this.scheduler.workSpace;

appointments = this.scheduler._appointments;
appointments = this.scheduler.appointments;

initialPosition = {
left: 0,
Expand Down Expand Up @@ -96,7 +96,7 @@ export default class AppointmentDragBehavior {
e.itemData = this.getItemData(e.itemElement);
e.itemSettings = this.getItemSettings(e.itemElement);

if (this.scheduler._isAppointmentBeingUpdated(e.itemData)) {
if (this.scheduler.isAppointmentBeingUpdated(e.itemData)) {
e.cancel = true;
return;
}
Expand All @@ -116,7 +116,7 @@ export default class AppointmentDragBehavior {
return;
}

if (this.scheduler._isAppointmentBeingUpdated(this.appointmentInfo.appointment)) {
if (this.scheduler.isAppointmentBeingUpdated(this.appointmentInfo.appointment)) {
e.cancel = true;
return;
}
Expand Down Expand Up @@ -156,7 +156,7 @@ export default class AppointmentDragBehavior {
}

if (e.cancel !== true && isSchedulerComponent(e.toComponent)) {
const targetDragBehavior = e.toComponent._getDragBehavior();
const targetDragBehavior = e.toComponent.getDragBehavior();
// @ts-expect-error
targetDragBehavior.dragBetweenComponentsPromise = new Deferred();
}
Expand Down
6 changes: 4 additions & 2 deletions packages/devextreme/js/__internal/scheduler/m_compact_appointments_helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ export class CompactAppointmentsHelper {

_clickEvent(onAppointmentClick) {
return (e) => {
const clickEventArgs = this.instance._createEventArgs(e);
// @ts-expect-error - TODO: architectural debt — CompactAppointmentsHelper directly accesses private Scheduler.createEventArgs
const clickEventArgs = this.instance.createEventArgs(e);
onAppointmentClick(clickEventArgs);
};
}
Expand Down Expand Up @@ -164,7 +165,8 @@ export class CompactAppointmentsHelper {

_createTemplate(count, isCompact) {
this._initButtonTemplate(count, isCompact);
return this.instance._getAppointmentTemplate('appointmentCollectorTemplate');
// @ts-expect-error - TODO: architectural debt — CompactAppointmentsHelper directly accesses private Scheduler.getAppointmentTemplate
return this.instance.getAppointmentTemplate('appointmentCollectorTemplate');
}

_initButtonTemplate(count, isCompact) {
Expand Down
Loading
Loading