ods-component-lib 1.18.15 → 1.18.17

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

@@ -1,7 +1,6 @@
 import React from 'react';
 import { IDataGridOptions, IButtonProps, ISelectionProps, IEditingProps, ISummaryProps } from 'devextreme-react/data-grid';
 interface IOdsDataGridProps extends IDataGridOptions {
-    isApplyButtonClicked?: boolean;
     language: string;
     exportFileName: string;
     filterEnabledShow: boolean;

package/dist/index.js

@@ -17176,6 +17176,11 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
       setColumns(newColumns);
     }
   }, [props.columns]);
+  React.useEffect(function () {
+    if (Array.isArray(props.dataSource) && props.dataSource.length > 0) {
+      setData(props.dataSource);
+    }
+  }, [props.dataSource]);
   React.useEffect(function () {
     localization.locale(localStorage.getItem("locale"));
     localization.loadMessages(JSON.parse(localStorage.getItem("localTranslation")));
@@ -17233,9 +17238,14 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
             return _catch(function () {
               return Promise.resolve(fetch(apiUrl, requestOptions)).then(function (response) {
                 return Promise.resolve(response.json()).then(function (newData) {
-                  setData(function (prevData) {
-                    return [].concat(prevData, newData.Data);
-                  });
+                  if (loadedPageCount == 1) {
+                    setData(newData.Data);
+                    loadedPageCount = 1;
+                  } else if (totalPageCount >= loadedPageCount) {
+                    setData(function (prevData) {
+                      return [].concat(prevData, newData.Data);
+                    });
+                  }
                   totalPageCount = newData.PageCount;
                   totalRecordCount = newData.RowCount;
                 });
@@ -17432,7 +17442,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   }, [data.length]);
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(DataGrid__default, {
     keyExpr: props.keyExpr,
-    dataSource: props.isServerSide ? data : props.dataSource,
+    dataSource: data,
     showBorders: true,
     columnAutoWidth: false,
     onEditorPreparing: onEditorPreparing,