ods-component-lib 1.18.18 → 1.18.19

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

@@ -1,7 +1,7 @@
-import React, { MutableRefObject } from 'react';
+import React from 'react';
 import { IDataGridOptions, IButtonProps, ISelectionProps, IEditingProps, ISummaryProps } from 'devextreme-react/data-grid';
 interface IOdsDataGridProps extends IDataGridOptions {
-    dataGridRef: MutableRefObject<any>;
+    dataGridPageName: string;
     language: string;
     exportFileName: string;
     filterEnabledShow: boolean;

package/dist/index.js

@@ -17134,6 +17134,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   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: {
@@ -17149,7 +17150,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     totalPageCount = 1;
     loadedPageCount = 1;
     totalRecordCount = 0;
-  }, [props.dataGridRef.current]);
+  }, [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) {
@@ -17188,6 +17189,9 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
   React.useEffect(function () {
     localization.locale(localStorage.getItem("locale"));
     localization.loadMessages(JSON.parse(localStorage.getItem("localTranslation")));
+    if (gridRef.current) {
+      gridRef.current.instance.updateDimensions();
+    }
   }, []);
   var actionButtons = React.useMemo(function () {
     if (props.actionButtonGroup) {
@@ -17265,10 +17269,10 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     if (e.row !== undefined && e.parentType === 'dataRow') {
       if (props.isServerSide) {
         var disableScrolling = function disableScrolling() {
-          props.dataGridRef.current.instance.option('scrolling.mode', 'none');
+          gridRef.current.instance.option('scrolling.mode', 'none');
         };
         var enableScrolling = function enableScrolling() {
-          props.dataGridRef.current.instance.option('scrolling.mode', 'virtual');
+          gridRef.current.instance.option('scrolling.mode', 'virtual');
         };
         e.editorOptions.onFocusIn = disableScrolling;
         e.editorOptions.onFocusOut = enableScrolling;
@@ -17418,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) {
@@ -17447,7 +17454,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
     showBorders: true,
     columnAutoWidth: false,
     onEditorPreparing: onEditorPreparing,
-    ref: props.dataGridRef,
+    ref: gridRef,
     onExporting: onExporting,
     height: props.height == undefined ? window.innerHeight - 164 : props.height,
     allowColumnResizing: true,