fix

DevExpress · Mar 5, 2025 · 61ad56c · 61ad56c
1 parent 8ba9760
commit 61ad56c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/packages/devextreme-angular/src/ui/scheduler/nested/toolbar.ts b/packages/devextreme-angular/src/ui/scheduler/nested/toolbar.ts
@@ -17,7 +17,7 @@ import {
 
 
 
-import { Item, SchedulerPredefinedToolbarItem } from 'devextreme/ui/scheduler';
+import { SchedulerPredefinedToolbarItem, ToolbarItem } from 'devextreme/ui/scheduler';
 
 import {
     NestedOptionHost,
@@ -43,10 +43,10 @@ export class DxoSchedulerToolbarComponent extends NestedOption implements OnDest
     }
 
     @Input()
-    get items(): Array<Item | SchedulerPredefinedToolbarItem> {
+    get items(): Array<SchedulerPredefinedToolbarItem | ToolbarItem> {
         return this._getOption('items');
     }
-    set items(value: Array<Item | SchedulerPredefinedToolbarItem>) {
+    set items(value: Array<SchedulerPredefinedToolbarItem | ToolbarItem>) {
         this._setOption('items', value);
     }
 

diff --git a/packages/devextreme-react/src/scheduler.ts b/packages/devextreme-react/src/scheduler.ts
@@ -8,7 +8,7 @@ import dxScheduler, {
 import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponentMeta } from "./core/component";
 import NestedOption from "./core/nested-option";
 
-import type { ViewType, AppointmentAddedEvent, AppointmentAddingEvent, AppointmentClickEvent, AppointmentContextMenuEvent, AppointmentDblClickEvent, AppointmentDeletedEvent, AppointmentDeletingEvent, AppointmentFormOpeningEvent, AppointmentRenderedEvent, AppointmentTooltipShowingEvent, AppointmentUpdatedEvent, AppointmentUpdatingEvent, CellClickEvent, CellContextMenuEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, SchedulerPredefinedToolbarItem, DateNavigatorItemProperties, SchedulerPredefinedDateNavigatorItem, Item as SchedulerItem, AllDayPanelMode, AppointmentTemplateData, AppointmentTooltipTemplateData, CellAppointmentsLimit, dxSchedulerScrolling } from "devextreme/ui/scheduler";
+import type { ViewType, AppointmentAddedEvent, AppointmentAddingEvent, AppointmentClickEvent, AppointmentContextMenuEvent, AppointmentDblClickEvent, AppointmentDeletedEvent, AppointmentDeletingEvent, AppointmentFormOpeningEvent, AppointmentRenderedEvent, AppointmentTooltipShowingEvent, AppointmentUpdatedEvent, AppointmentUpdatingEvent, CellClickEvent, CellContextMenuEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, SchedulerPredefinedToolbarItem, DateNavigatorItemProperties, SchedulerPredefinedDateNavigatorItem, ToolbarItem as SchedulerToolbarItem, AllDayPanelMode, AppointmentTemplateData, AppointmentTooltipTemplateData, CellAppointmentsLimit, dxSchedulerScrolling } from "devextreme/ui/scheduler";
 import type { ContentReadyEvent as ButtonGroupContentReadyEvent, DisposingEvent as ButtonGroupDisposingEvent, InitializedEvent as ButtonGroupInitializedEvent, dxButtonGroupItem, ItemClickEvent, OptionChangedEvent, SelectionChangedEvent } from "devextreme/ui/button_group";
 import type { event } from "devextreme/events/events.types";
 import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar";
@@ -408,7 +408,7 @@ const Scrolling = Object.assign<typeof _componentScrolling, NestedComponentMeta>
 // Scheduler
 type IToolbarProps = React.PropsWithChildren<{
   disabled?: boolean;
-  items?: Array<SchedulerItem | SchedulerPredefinedToolbarItem>;
+  items?: Array<SchedulerPredefinedToolbarItem | SchedulerToolbarItem>;
   visible?: boolean | undefined;
 }>
 const _componentToolbar = (props: IToolbarProps) => {

diff --git a/packages/devextreme-vue/src/scheduler.ts b/packages/devextreme-vue/src/scheduler.ts
@@ -35,7 +35,7 @@ import {
  SchedulerPredefinedToolbarItem,
  DateNavigatorItemProperties,
  SchedulerPredefinedDateNavigatorItem,
- Item,
+ ToolbarItem,
 } from "devextreme/ui/scheduler";
 import {
  DataSourceOptions,
@@ -624,7 +624,7 @@ const DxToolbarConfig = {
   },
   props: {
     disabled: Boolean,
-    items: Array as PropType<Array<Item | SchedulerPredefinedToolbarItem>>,
+    items: Array as PropType<Array<SchedulerPredefinedToolbarItem | ToolbarItem>>,
     visible: Boolean
   }
 };

diff --git a/packages/devextreme/js/ui/scheduler_types.d.ts b/packages/devextreme/js/ui/scheduler_types.d.ts
@@ -37,7 +37,7 @@ export {
   AppointmentCollectorTemplateData,
   DateNavigatorTextInfo,
   DateNavigatorItemProperties,
-  Item,
+  ToolbarItem,
   Toolbar,
   Appointment,
   Properties,

diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts
@@ -31664,38 +31664,38 @@ declare module DevExpress.ui.dxScheduler {
     items: Array<dxButtonGroupItem | SchedulerPredefinedDateNavigatorItem>;
   };
   /**
-   * [descr:Item]
+   * [descr:Toolbar]
    */
-  export type Item = dxToolbarItem & {
+  export type Toolbar = {
     /**
-     * [descr:Item.name]
+     * [descr:Toolbar.items]
      */
-    name?: SchedulerPredefinedToolbarItem;
+    items?: Array<SchedulerPredefinedToolbarItem | ToolbarItem>;
     /**
-     * [descr:Item.options]
+     * [descr:Toolbar.visible]
      */
-    options?: DateNavigatorItemProperties | Object;
+    visible?: boolean | undefined;
     /**
-     * [descr:Item.location]
+     * [descr:Toolbar.disabled]
      */
-    location?: DevExpress.common.ToolbarItemLocation;
+    disabled?: boolean;
   };
   /**
-   * [descr:Toolbar]
+   * [descr:ToolbarItem]
    */
-  export type Toolbar = {
+  export type ToolbarItem = dxToolbarItem & {
     /**
-     * [descr:Toolbar.items]
+     * [descr:ToolbarItem.name]
      */
-    items?: Array<SchedulerPredefinedToolbarItem | Item>;
+    name?: SchedulerPredefinedToolbarItem;
     /**
-     * [descr:Toolbar.visible]
+     * [descr:ToolbarItem.options]
      */
-    visible?: boolean | undefined;
+    options?: DateNavigatorItemProperties | Object;
     /**
-     * [descr:Toolbar.disabled]
+     * [descr:ToolbarItem.location]
      */
-    disabled?: boolean;
+    location?: DevExpress.common.ToolbarItemLocation;
   };
 }
 declare module DevExpress.ui.dxSplitter {