qbs-react-grid 1.1.8 → 1.1.9

package/es/Table.js

@@ -620,7 +620,8 @@ var Table = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var bodyStyles = {
       top: headerHeight,
       height: bodyHeight,
-      maxHeight: tableBodyHeight,
+      //height: tableBodyHeight
+      // maxHeight: tableBodyHeight,
       minHeight: tableBodyHeight
     };
     var contentHeight = 0;
@@ -722,7 +723,8 @@ var Table = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var wheelStyles = {
       position: 'absolute',
       height: contentHeight,
-      minHeight: height,
+      minHeight: tableBodyHeight,
+      maxHeight: tableBodyHeight,
       pointerEvents: isScrolling ? 'none' : undefined
     };
     var topRowStyles = {
@@ -752,7 +754,7 @@ var Table = /*#__PURE__*/React.forwardRef(function (props, ref) {
       renderEmpty: renderEmpty,
       addPrefix: prefix,
       loading: !!((_visibleRows$current = visibleRows.current) !== null && _visibleRows$current !== void 0 && _visibleRows$current.length) || loading
-    }), renderScrollbar(), /*#__PURE__*/React.createElement(Loader, {
+    }), /*#__PURE__*/React.createElement(Loader, {
       locale: locale,
       loadAnimation: loadAnimation,
       loading: loading,
@@ -783,7 +785,7 @@ var Table = /*#__PURE__*/React.forwardRef(function (props, ref) {
     className: classes,
     style: styles,
     ref: tableRef
-  }), showHeader && renderTableHeader(headerCells, rowWidth), children && renderTableBody(bodyCells, rowWidth), showHeader && /*#__PURE__*/React.createElement(MouseArea, {
+  }), showHeader && renderTableHeader(headerCells, rowWidth), children && renderTableBody(bodyCells, rowWidth), renderScrollbar(), showHeader && /*#__PURE__*/React.createElement(MouseArea, {
     ref: mouseAreaRef,
     addPrefix: prefix,
     headerHeight: headerHeight,

package/lib/Table.js

@@ -627,7 +627,8 @@ var Table = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
     var bodyStyles = {
       top: headerHeight,
       height: bodyHeight,
-      maxHeight: tableBodyHeight,
+      //height: tableBodyHeight
+      // maxHeight: tableBodyHeight,
       minHeight: tableBodyHeight
     };
     var contentHeight = 0;
@@ -729,7 +730,8 @@ var Table = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
     var wheelStyles = {
       position: 'absolute',
       height: contentHeight,
-      minHeight: height,
+      minHeight: tableBodyHeight,
+      maxHeight: tableBodyHeight,
       pointerEvents: isScrolling ? 'none' : undefined
     };
     var topRowStyles = {
@@ -759,7 +761,7 @@ var Table = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
       renderEmpty: renderEmpty,
       addPrefix: prefix,
       loading: !!((_visibleRows$current = visibleRows.current) !== null && _visibleRows$current !== void 0 && _visibleRows$current.length) || loading
-    }), renderScrollbar(), /*#__PURE__*/_react["default"].createElement(_Loader["default"], {
+    }), /*#__PURE__*/_react["default"].createElement(_Loader["default"], {
       locale: locale,
       loadAnimation: loadAnimation,
       loading: loading,
@@ -790,7 +792,7 @@ var Table = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
     className: classes,
     style: styles,
     ref: tableRef
-  }), showHeader && renderTableHeader(headerCells, rowWidth), children && renderTableBody(bodyCells, rowWidth), showHeader && /*#__PURE__*/_react["default"].createElement(_MouseArea["default"], {
+  }), showHeader && renderTableHeader(headerCells, rowWidth), children && renderTableBody(bodyCells, rowWidth), renderScrollbar(), showHeader && /*#__PURE__*/_react["default"].createElement(_MouseArea["default"], {
     ref: mouseAreaRef,
     addPrefix: prefix,
     headerHeight: headerHeight,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qbs-react-grid",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "A React table component",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

package/src/Table.tsx

@@ -922,7 +922,9 @@ const Table = React.forwardRef(<Row extends RowDataType, Key>(props: TableProps<
     const bodyStyles = {
       top: headerHeight,
       height: bodyHeight,
-      maxHeight: tableBodyHeight,
+
+      //height: tableBodyHeight
+      // maxHeight: tableBodyHeight,
       minHeight: tableBodyHeight
     };
 
@@ -1044,12 +1046,12 @@ const Table = React.forwardRef(<Row extends RowDataType, Key>(props: TableProps<
     const wheelStyles: React.CSSProperties = {
       position: 'absolute',
       height: contentHeight,
-      minHeight: height,
+      minHeight: tableBodyHeight,
+      maxHeight: tableBodyHeight,
       pointerEvents: isScrolling ? 'none' : undefined
     };
     const topRowStyles = { height: topHideHeight };
     const bottomRowStyles = { height: bottomHideHeight };
-
     return (
       <div
         ref={tableBodyRef}
@@ -1070,7 +1072,7 @@ const Table = React.forwardRef(<Row extends RowDataType, Key>(props: TableProps<
           addPrefix={prefix}
           loading={!!visibleRows.current?.length || loading}
         />
-        {renderScrollbar()}
+
         <Loader
           locale={locale}
           loadAnimation={loadAnimation}
@@ -1109,6 +1111,8 @@ const Table = React.forwardRef(<Row extends RowDataType, Key>(props: TableProps<
       >
         {showHeader && renderTableHeader(headerCells, rowWidth)}
         {children && renderTableBody(bodyCells, rowWidth)}
+        {renderScrollbar()}
+
         {showHeader && (
           <MouseArea
             ref={mouseAreaRef}
@@ -1118,7 +1122,6 @@ const Table = React.forwardRef(<Row extends RowDataType, Key>(props: TableProps<
           />
         )}
       </div>
-      {/* {pagination && <Pagination paginationProps={paginationProps} />} */}
     </TableContext.Provider>
   );
 });