ods-component-lib 1.18.17 → 1.18.19

package/dist/components/devextreme/OdsRemoteDataGrid.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import { IDataGridOptions, IButtonProps, ISelectionProps, IEditingProps, ISummaryProps } from 'devextreme-react/data-grid';
 interface IOdsDataGridProps extends IDataGridOptions {
+    dataGridPageName: string;
     language: string;
     exportFileName: string;
     filterEnabledShow: boolean;
@@ -18,7 +19,6 @@ interface IOdsDataGridProps extends IDataGridOptions {
     isServerSide: boolean;
     axiosRequest?: IAxiosProps;
     customSummary?: ISummaryRowOptions;
-    onCancelEdit?: any;
 }
 interface ISummaryRowOptions {
     summaryLoadedDataLabel?: string;

package/dist/index.js

@@ -17129,12 +17129,12 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     isLoading = _useState2[0],
     setIsLoading = _useState2[1];
   var fileName = props.exportFileName ? props.exportFileName + moment().format("YYYYMMDD") : "DatagridExportFile" + moment().format("YYYYMMDD");
-  var gridRef = React.useRef(null);
   var _useState3 = React.useState(0),
     filteredRowCount = _useState3[0];
   var _useState4 = React.useState(props.columns),
     columns = _useState4[0],
     setColumns = _useState4[1];
+  var gridRef = React.useRef(null);
   var onCancelEditEvent = new CustomEvent('cancelEdit', {
     bubbles: true,
     detail: {
@@ -17146,6 +17146,11 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     'Authorization': 'Bearer ' + (props.axiosRequest ? props.axiosRequest.token : ""),
     "Accept-Language": props.language != "" ? props.language : 'EN'
   });
+  React.useEffect(function () {
+    totalPageCount = 1;
+    loadedPageCount = 1;
+    totalRecordCount = 0;
+  }, [props.dataGridPageName]);
   React.useEffect(function () {
     var _props$axiosRequest;
     if (props.axiosRequest !== undefined && Object.keys((_props$axiosRequest = props.axiosRequest) === null || _props$axiosRequest === void 0 ? void 0 : _props$axiosRequest.requestData).length > 0) {
@@ -17210,11 +17215,6 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
       return [];
     }
   }, [props.actionButtonGroup]);
-  var handleRef = function handleRef(instance) {
-    if (instance) {
-      gridRef.current = instance;
-    }
-  };
   var fetchData = React.useCallback(function () {
     try {
       if (props.axiosRequest == undefined) return Promise.resolve();
@@ -17277,6 +17277,9 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
         e.editorOptions.onFocusIn = disableScrolling;
         e.editorOptions.onFocusOut = enableScrolling;
       }
+      if (props.onEditorPreparing) {
+        props.onEditorPreparing(e);
+      }
     }
     if (e.editorOptions && e.rowType === 'data' && e.parentType === 'dataRow') {
       e.editorOptions.onValueChanged = function (args) {
@@ -17375,7 +17378,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   }, []);
   var renderTotal = React.useCallback(function () {
     var totalloaded = 0;
-    if (data.length < 50) {
+    if (data.length < 50 || !props.isServerSide || loadedPageCount == totalPageCount) {
       totalloaded = data.length;
     } else {
       totalloaded = loadedPageCount * props.pageSize;
@@ -17383,6 +17386,8 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     var result = "";
     if (filteredRowCount > 0) {
       result = "" + totalloaded + props.customSummary.summaryFilteredDataLabel + (totalRecordCount > 0 ? totalloaded + " " + props.customSummary.summaryLoadedDataLabel + ("- " + totalRecordCount) + props.customSummary.summaryTotalDataLabel : " ");
+    } else if (!props.isServerSide && totalloaded > 0) {
+      result = totalloaded + " " + props.customSummary.summaryLoadedDataLabel + ("- " + totalloaded) + props.customSummary.summaryTotalDataLabel;
     } else {
       result = totalRecordCount > 0 ? totalloaded + " " + props.customSummary.summaryLoadedDataLabel + ("- " + totalRecordCount) + props.customSummary.summaryTotalDataLabel : "";
     }
@@ -17417,6 +17422,9 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
       var height = (_scrollable$clientHei = scrollable === null || scrollable === void 0 ? void 0 : scrollable.clientHeight) != null ? _scrollable$clientHei : 0;
       var scrollHeight = (_scrollable$scrollHei = scrollable === null || scrollable === void 0 ? void 0 : scrollable.scrollHeight) != null ? _scrollable$scrollHei : 0;
       var maxHeight = Math.max(top, height, scrollHeight) - 1;
+      if (scrollHeight <= height) {
+        return;
+      }
       var reachedBottom = Math.ceil(top + height) >= maxHeight;
       var lastScrollTop = 0;
       if (top < lastScrollTop) {
@@ -17446,7 +17454,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     showBorders: true,
     columnAutoWidth: false,
     onEditorPreparing: onEditorPreparing,
-    ref: handleRef,
+    ref: gridRef,
     onExporting: onExporting,
     height: props.height == undefined ? window.innerHeight - 164 : props.height,
     allowColumnResizing: true,
@@ -17471,7 +17479,9 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     },
     onSelectionChanged: props.onSelectionChanged,
     noDataText: props.noDataText,
-    onSaved: props.onSaved
+    onSaved: props.onSaved,
+    onSaving: props.onSaving,
+    onEditCanceling: props.onEditCanceling
   }, columns.map(function (col) {
     return React__default.createElement(DataGrid.Column, Object.assign({
       key: col.dataField