qbs-react-grid 1.2.4 → 1.2.6

package/es/qbsTable/QbsTable.js

@@ -8,6 +8,7 @@ import Pagination from '../Pagination';
 import Table from '../Table';
 import { ActionCell, CheckCell, CustomRowStatus, CustomTableCell, ExpandCell } from './CustomTableCell';
 import ToolBar from './Toolbar';
+import CardComponent from './utilities/CardComponent';
 import ColumToggle from './utilities/ColumShowHide';
 import debounce from './utilities/debounce';
 import { deepEqual } from './utilities/deepEqual';
@@ -17,7 +18,6 @@ import { SettingsIcon } from './utilities/icons';
 // import 'qbs-react-table/dist/css/qbs-react-grid.css';
 
 import '../../dist/css/qbs-react-grid.css';
-import CardComponent from './utilities/CardComponent';
 var CHECKBOX_LINE_HEIGHT = '36px';
 var COLUMN_WIDTH = 250;
 var QbsTable = function QbsTable(_ref) {
@@ -422,7 +422,12 @@ var QbsTable = function QbsTable(_ref) {
     className: "qbs-table " + classes.tableContainerClass,
     "data-theme": dataTheme
   }, toolbar && /*#__PURE__*/React.createElement(ToolBar, toolbarProps), /*#__PURE__*/React.createElement("div", {
-    className: "qbs-table-border-wrap"
+    className: "qbs-table-border-wrap",
+    style: {
+      overflow: !tableViewToggle ? 'auto' : '',
+      maxHeight: !tableViewToggle ? height : '',
+      minHeight: !tableViewToggle ? height : ''
+    }
   }, tableViewToggle ? /*#__PURE__*/React.createElement(Table, {
     height: autoHeight ? undefined : height,
     key: tableKey,

package/lib/qbsTable/QbsTable.js

@@ -13,13 +13,13 @@ var _Pagination = _interopRequireDefault(require("../Pagination"));
 var _Table = _interopRequireDefault(require("../Table"));
 var _CustomTableCell = require("./CustomTableCell");
 var _Toolbar = _interopRequireDefault(require("./Toolbar"));
+var _CardComponent = _interopRequireDefault(require("./utilities/CardComponent"));
 var _ColumShowHide = _interopRequireDefault(require("./utilities/ColumShowHide"));
 var _debounce = _interopRequireDefault(require("./utilities/debounce"));
 var _deepEqual = require("./utilities/deepEqual");
 var _empty = _interopRequireDefault(require("./utilities/empty"));
 var _icons = require("./utilities/icons");
 require("../../dist/css/qbs-react-grid.css");
-var _CardComponent = _interopRequireDefault(require("./utilities/CardComponent"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 // import 'qbs-react-table/dist/css/qbs-react-grid.css';
@@ -428,7 +428,12 @@ var QbsTable = function QbsTable(_ref) {
     className: "qbs-table " + classes.tableContainerClass,
     "data-theme": dataTheme
   }, toolbar && /*#__PURE__*/_react["default"].createElement(_Toolbar["default"], toolbarProps), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "qbs-table-border-wrap"
+    className: "qbs-table-border-wrap",
+    style: {
+      overflow: !tableViewToggle ? 'auto' : '',
+      maxHeight: !tableViewToggle ? height : '',
+      minHeight: !tableViewToggle ? height : ''
+    }
   }, tableViewToggle ? /*#__PURE__*/_react["default"].createElement(_Table["default"], {
     height: autoHeight ? undefined : height,
     key: tableKey,

package/package.json

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

package/src/qbsTable/QbsTable.tsx

@@ -15,6 +15,7 @@ import {
   ExpandCell
 } from './CustomTableCell';
 import ToolBar from './Toolbar';
+import CardComponent from './utilities/CardComponent';
 import ColumToggle from './utilities/ColumShowHide';
 import debounce from './utilities/debounce';
 import { deepEqual } from './utilities/deepEqual';
@@ -24,7 +25,6 @@ import { SettingsIcon } from './utilities/icons';
 // import 'qbs-react-table/dist/css/qbs-react-grid.css';
 
 import '../../dist/css/qbs-react-grid.css';
-import CardComponent from './utilities/CardComponent';
 
 const CHECKBOX_LINE_HEIGHT = '36px';
 const COLUMN_WIDTH = 250;
@@ -449,7 +449,14 @@ const QbsTable: React.FC<QbsTableProps> = ({
   return (
     <div className={`qbs-table ${classes.tableContainerClass}`} data-theme={dataTheme}>
       {toolbar && <ToolBar {...toolbarProps} />}
-      <div className="qbs-table-border-wrap">
+      <div
+        className="qbs-table-border-wrap"
+        style={{
+          overflow: !tableViewToggle ? 'auto' : '',
+          maxHeight: !tableViewToggle ? height : '',
+          minHeight: !tableViewToggle ? height : ''
+        }}
+      >
         {tableViewToggle ? (
           <Table
             height={autoHeight ? undefined : height}