Merge branch '24_1' of https://github.com/DevExpress/DevExtreme into …

…24_1
DevExpress · Feb 27, 2024 · 65f65df · 65f65df
2 parents 5599d1f + a867800
commit 65f65df
Show file tree

Hide file tree

Showing 36 changed files with 744 additions and 548 deletions.
diff --git a/.github/workflows/testcafe_tests.yml b/.github/workflows/testcafe_tests.yml
@@ -90,6 +90,8 @@ jobs:
           { componentFolder: "scheduler", name: "scheduler (3/5)", indices: "3/5" },
           { componentFolder: "scheduler", name: "scheduler (4/5)", indices: "4/5" },
           { componentFolder: "scheduler", name: "scheduler (5/5)", indices: "5/5" },
+          { componentFolder: "scheduler/timezones", name: "scheduler (Europe/Berlin)", timezone: "Europe/Berlin" },
+          { componentFolder: "scheduler/timezones", name: "scheduler (America/Los_Angeles)", timezone: "America/Los_Angeles" },
           { componentFolder: "form", name: "form (1/2)", indices: "1/2" },
           { componentFolder: "form", name: "form (2/2)", indices: "2/2" },
           { componentFolder: "form", name: "form - material (1/2)", theme: 'material.blue.light', indices: "1/2" },
@@ -119,6 +121,11 @@ jobs:
     timeout-minutes: 90
 
     steps:
+    - name: Set machine timezone
+      run: |
+        sudo ln -sf "/usr/share/zoneinfo/$([ "${{ matrix.ARGS.timezone }}" != "" ] && echo "${{ matrix.ARGS.timezone }}" || echo "GMT")" /etc/localtime
+        date
+
     - name: Get sources
       uses: actions/checkout@v4
 

diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts
@@ -1965,7 +1965,7 @@ class EditingControllerImpl extends modules.ViewController {
     }
   }
 
-  _needUpdateRow(column) {
+  _needUpdateRow(column?) {
     const visibleColumns = this._columnsController.getVisibleColumns();
 
     if (!column) {

diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_form_based.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_form_based.ts
@@ -181,7 +181,6 @@ const editingControllerExtender = (Base: ModuleType<EditingController>) => class
         .appendTo(this.component.$element())
         .addClass(editPopupClass);
 
-      // @ts-expect-error
       this._editPopup = this._createComponent($popupContainer, Popup);
       this._editPopup.on('hiding', this._getEditPopupHiddenHandler());
       this._editPopup.on('shown', (e) => {
@@ -214,7 +213,6 @@ const editingControllerExtender = (Base: ModuleType<EditingController>) => class
 
     return (container) => {
       const formTemplate = this.getEditFormTemplate();
-      // @ts-expect-error
       const scrollable = this._createComponent($('<div>').appendTo(container), Scrollable);
 
       this._$popupContent = $((scrollable as any).content());

diff --git a/packages/devextreme/js/__internal/grids/grid_core/header_panel/m_header_panel.ts b/packages/devextreme/js/__internal/grids/grid_core/header_panel/m_header_panel.ts
@@ -119,7 +119,7 @@ export class HeaderPanel extends ColumnsView {
       $headerPanel.addClass(this.addWidgetPrefix(HEADER_PANEL_CLASS));
       const label = messageLocalization.format(this.component.NAME + TOOLBAR_ARIA_LABEL);
       const $toolbar = $('<div>').attr('aria-label', label).appendTo($headerPanel);
-      this._toolbar = this._createComponent($toolbar, Toolbar, this._toolbarOptions!);
+      this._toolbar = this._createComponent($toolbar, Toolbar, this._toolbarOptions);
     } else {
       this._toolbar.option(this._toolbarOptions!);
     }

diff --git a/packages/devextreme/js/__internal/grids/grid_core/m_types.ts b/packages/devextreme/js/__internal/grids/grid_core/m_types.ts
@@ -62,7 +62,7 @@ export interface InternalGrid extends GridBaseType {
   _createComponent: <TComponent extends Component<any>>(
     $container: dxElementWrapper,
     component: new (...args) => TComponent,
-    options: TComponent extends Component<infer TOptions> ? TOptions : never
+    options?: TComponent extends Component<infer TOptions> ? TOptions : never
   ) => TComponent;
 }