@synerise/ds-table 0.49.6 → 0.49.8

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.49.8](https://github.com/synerise/synerise-design/compare/@synerise/ds-table@0.49.7...@synerise/ds-table@0.49.8) (2024-04-29)
+
+
+### Bug Fixes
+
+* **table:** fixes table height in infinite scrolling mode ([58f9f96](https://github.com/synerise/synerise-design/commit/58f9f96c5dd22f5ebec47477da0bd05ca62d818b))
+
+
+
+
+
+## [0.49.7](https://github.com/synerise/synerise-design/compare/@synerise/ds-table@0.49.6...@synerise/ds-table@0.49.7) (2024-04-26)
+
+**Note:** Version bump only for package @synerise/ds-table
+
+
+
+
+
 ## [0.49.6](https://github.com/synerise/synerise-design/compare/@synerise/ds-table@0.49.5...@synerise/ds-table@0.49.6) (2024-04-26)
 
 **Note:** Version bump only for package @synerise/ds-table

package/dist/VirtualTable/VirtualTable.js

@@ -31,7 +31,7 @@ var relativeInlineStyle = {
 };
 
 var VirtualTable = function VirtualTable(props, forwardedRef) {
-  var _infiniteScroll$prevP2;
+  var _infiniteScroll$prevP2, _infiniteScroll$prevP4;
 
   var _props$columns = props.columns,
       columns = _props$columns === void 0 ? [] : _props$columns,
@@ -314,6 +314,15 @@ var VirtualTable = function VirtualTable(props, forwardedRef) {
 
     return [].concat(fixedLeft, remaining, fixedRight);
   }, [virtualColumns, tableWidth]);
+  var infiniteLoaderOffset = useMemo(function () {
+    var _infiniteScroll$prevP3;
+
+    if (isSticky && infiniteScroll != null && (_infiniteScroll$prevP3 = infiniteScroll.prevPage) != null && _infiniteScroll$prevP3.hasMore) {
+      return infiniteLoaderItemHeight * 2;
+    }
+
+    return infiniteLoaderItemHeight;
+  }, [isSticky, infiniteScroll == null || (_infiniteScroll$prevP4 = infiniteScroll.prevPage) == null ? void 0 : _infiniteScroll$prevP4.hasMore]);
   var listInnerElementType = forwardRef(function (_ref6, innerElementRef) {
     var style = _ref6.style,
         rest = _objectWithoutPropertiesLoose(_ref6, _excluded);
@@ -321,7 +330,7 @@ var VirtualTable = function VirtualTable(props, forwardedRef) {
     return /*#__PURE__*/React.createElement(S.InnerListElement, _extends({
       ref: innerElementRef,
       style: _objectSpread({}, style, {
-        height: Number(style == null ? void 0 : style.height) + infiniteLoaderItemHeight + "px"
+        height: Number(style == null ? void 0 : style.height) + infiniteLoaderOffset + "px"
       })
     }, rest));
   });
@@ -397,9 +406,9 @@ var VirtualTable = function VirtualTable(props, forwardedRef) {
     }
 
     var renderVirtualList = function renderVirtualList(data) {
-      var _infiniteScroll$nextP, _infiniteScroll$prevP3;
+      var _infiniteScroll$nextP, _infiniteScroll$prevP5;
 
-      var listHeight = data.length * cellHeight - scroll.y + infiniteLoaderItemHeight;
+      var listHeight = data.length * cellHeight - scroll.y + infiniteLoaderOffset;
       var listMaxScroll = stickyScrollThreshold && infiniteScroll != null && infiniteScroll.maxScroll ? (infiniteScroll == null ? void 0 : infiniteScroll.maxScroll) - stickyScrollThreshold : listHeight;
 
       var handleListScroll = function handleListScroll(_ref7) {
@@ -424,7 +433,7 @@ var VirtualTable = function VirtualTable(props, forwardedRef) {
       var itemData = createItemData(data, defaultTableProps);
       var scrollableHeight = isSticky ? scroll.y - HEADER_ROW_HEIGHT : scroll.y;
 
-      if (infiniteScroll != null && (_infiniteScroll$nextP = infiniteScroll.nextPage) != null && _infiniteScroll$nextP.hasMore && (_infiniteScroll$prevP3 = infiniteScroll.prevPage) != null && _infiniteScroll$prevP3.hasMore) {
+      if (infiniteScroll != null && (_infiniteScroll$nextP = infiniteScroll.nextPage) != null && _infiniteScroll$nextP.hasMore && (_infiniteScroll$prevP5 = infiniteScroll.prevPage) != null && _infiniteScroll$prevP5.hasMore) {
         scrollableHeight += cellHeight;
       }
 
@@ -498,7 +507,7 @@ var VirtualTable = function VirtualTable(props, forwardedRef) {
     }
 
     return renderVirtualList(rawData);
-  }, [connectObject, expandable == null ? void 0 : expandable.expandedRowKeys, cellHeight, scroll.y, isSticky, stickyScrollThreshold, infiniteScroll, createItemData, tableWidth, onItemsRendered, outerElement, listInnerElementType, loading, offsetScroll, getRowKey]);
+  }, [connectObject, expandable == null ? void 0 : expandable.expandedRowKeys, cellHeight, scroll.y, isSticky, stickyScrollThreshold, infiniteScroll, createItemData, tableWidth, onItemsRendered, outerElement, listInnerElementType, loading, offsetScroll, getRowKey, infiniteLoaderOffset]);
   var columnsSliceStartIndex = Number(!!selection) + Number(!!rowStar);
   var scrollValue = !dataSource || (dataSource == null ? void 0 : dataSource.length) === 0 ? undefined : scroll;
   var classNames = React.useMemo(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@synerise/ds-table",
-  "version": "0.49.6",
+  "version": "0.49.8",
   "description": "Table UI Component for the Synerise Design System",
   "license": "ISC",
   "repository": "synerise/synerise-design",
@@ -34,29 +34,29 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "@synerise/ds-alert": "^0.8.10",
-    "@synerise/ds-badge": "^0.6.56",
+    "@synerise/ds-badge": "^0.6.57",
     "@synerise/ds-button": "^0.19.7",
     "@synerise/ds-button-group": "^0.6.47",
-    "@synerise/ds-checkbox": "^0.11.63",
-    "@synerise/ds-column-manager": "^0.11.46",
+    "@synerise/ds-checkbox": "^0.11.64",
+    "@synerise/ds-column-manager": "^0.11.48",
     "@synerise/ds-data-format": "^0.4.8",
-    "@synerise/ds-dropdown": "^0.17.105",
+    "@synerise/ds-dropdown": "^0.17.106",
     "@synerise/ds-flag": "^0.4.3",
     "@synerise/ds-icon": "^0.60.7",
-    "@synerise/ds-input": "^0.20.6",
+    "@synerise/ds-input": "^0.20.7",
     "@synerise/ds-loader": "^0.3.5",
     "@synerise/ds-menu": "^0.18.20",
-    "@synerise/ds-modal": "^0.17.25",
+    "@synerise/ds-modal": "^0.17.26",
     "@synerise/ds-pagination": "^0.7.47",
-    "@synerise/ds-result": "^0.6.51",
+    "@synerise/ds-result": "^0.6.52",
     "@synerise/ds-scrollbar": "^0.10.2",
     "@synerise/ds-search": "^0.8.88",
-    "@synerise/ds-select": "^0.15.45",
-    "@synerise/ds-skeleton": "^0.5.5",
-    "@synerise/ds-status": "^0.6.0",
-    "@synerise/ds-tags": "^0.8.39",
+    "@synerise/ds-select": "^0.15.47",
+    "@synerise/ds-skeleton": "^0.5.6",
+    "@synerise/ds-status": "^0.6.1",
+    "@synerise/ds-tags": "^0.8.40",
     "@synerise/ds-tooltip": "^0.14.25",
-    "@synerise/ds-typography": "^0.14.3",
+    "@synerise/ds-typography": "^0.15.0",
     "@synerise/ds-utils": "^0.26.3",
     "@types/react-window": "^1.8.5",
     "classnames": "2.3.2",
@@ -79,5 +79,5 @@
   "devDependencies": {
     "@testing-library/react": "10.0.1"
   },
-  "gitHead": "699165b47ce5f01b01dcaad48fdcc427034bb95b"
+  "gitHead": "6f0dc42ae79cea009e60fdb1f91ef72dcc82998e"
 }