@carbon/ibm-products 2.42.1-canary.23 → 2.42.1-canary.26

package/es/components/Datagrid/Datagrid/DatagridVirtualBody.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright IBM Corp. 2020, 2023
+ * Copyright IBM Corp. 2020, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.

package/es/components/Datagrid/Datagrid/DatagridVirtualBody.js

@@ -11,7 +11,6 @@ import { VariableSizeList } from 'react-window';
 import { TableBody } from '@carbon/react';
 import { pkg } from '../../../settings.js';
 import DatagridHead from './DatagridHead.js';
-import { px } from '@carbon/layout';
 import { useResizeObserver } from '../../../global/js/hooks/useResizeObserver.js';
 
 var blockClass = "".concat(pkg.prefix, "--datagrid");
@@ -72,10 +71,6 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
       if (headWrapEl) {
         headWrapEl.scrollLeft = virtualBody === null || virtualBody === void 0 ? void 0 : virtualBody.scrollLeft;
       }
-      var spacerColumn = document.querySelector("#".concat(tableId, " .").concat(blockClass, "__head-wrap thead th:last-child"));
-      if (spacerColumn) {
-        spacerColumn.style.width = px(32 + (virtualBody.offsetWidth - virtualBody.clientWidth)); // scrollbar width to header column to fix header alignment
-      }
     }
     var testRefValue = testRef === null || testRef === void 0 ? void 0 : testRef.current;
     testRefValue === null || testRefValue === void 0 || testRefValue.addEventListener('scroll', handleScroll);

package/es/components/Datagrid/useFlexResize.d.ts

@@ -1,6 +1,6 @@
 export default useFlexResize;
 /**
- * Copyright IBM Corp. 2020, 2023
+ * Copyright IBM Corp. 2020, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.

package/es/components/Datagrid/useFlexResize.js

@@ -7,31 +7,31 @@
 
 import { toConsumableArray as _toConsumableArray } from '../../_virtual/_rollupPluginBabelHelpers.js';
 
+/* eslint-disable no-unreachable */
 /**
- * Copyright IBM Corp. 2020, 2023
+ * Copyright IBM Corp. 2020, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
 var useFlexResize = function useFlexResize(hooks) {
-  var spacer = {
-    id: 'spacer',
-    width: 0,
-    disableSortBy: true,
-    disableResizing: true
-  };
   hooks.visibleColumns.push(function (columns) {
-    // always move actions and spacer to the end
+    // always move actions to the end
     var actionsIdx = columns.findIndex(function (col) {
       return col.isAction;
     });
     if (actionsIdx === -1) {
-      return [].concat(_toConsumableArray(columns), [spacer]);
+      var _lastCol = columns.at(-1);
+      _lastCol.isFlexCol = true;
+      return _toConsumableArray(columns);
     }
     var cols = _toConsumableArray(columns);
     var actions = cols.splice(actionsIdx, 1)[0];
-    cols.splice(columns.length, 0, spacer, actions);
+    cols.splice(columns.length, 0, actions);
+    // the last non-action action column should flex remaining space
+    var lastCol = columns.at(-2);
+    lastCol.isFlexCol = true;
     return cols;
   });
   var changeProps = function changeProps(props, data) {
@@ -39,7 +39,7 @@ var useFlexResize = function useFlexResize(hooks) {
     if (!column && data.cell) {
       column = data.cell.column;
     }
-    if (column.id === spacer.id) {
+    if (column.isFlexCol) {
       return [props, {
         style: {
           flex: '1 1 0'

package/es/components/SidePanel/SidePanel.js

@@ -95,7 +95,8 @@ var SidePanel = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
   var subtitleRef = useRef(null);
   var previousState = usePreviousValue({
     size: size,
-    open: open
+    open: open,
+    currentStep: currentStep
   });
   var _useState3 = useState(-1),
     _useState4 = _slicedToArray(_useState3, 2),
@@ -162,9 +163,10 @@ var SidePanel = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
     if (sidePanelRef && panelRefValue) {
       var _animatedScrollRef$cu;
       var scrollableSection = (_animatedScrollRef$cu = animatedScrollRef.current) !== null && _animatedScrollRef$cu !== void 0 ? _animatedScrollRef$cu : innerContentRef.current;
-      if (scrollableSection) {
+      if (previousState && previousState['currentStep'] !== currentStep && scrollableSection) {
         scrollableSection.scrollTop = 0;
       }
+
       // The size of the panel has changed while it is still opened
       // so we need to scroll it to the top and reset the header
       // height css custom property

package/lib/components/Datagrid/Datagrid/DatagridVirtualBody.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright IBM Corp. 2020, 2023
+ * Copyright IBM Corp. 2020, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.

package/lib/components/Datagrid/Datagrid/DatagridVirtualBody.js

@@ -15,7 +15,6 @@ var reactWindow = require('react-window');
 var react = require('@carbon/react');
 var settings = require('../../../settings.js');
 var DatagridHead = require('./DatagridHead.js');
-var layout = require('@carbon/layout');
 var useResizeObserver = require('../../../global/js/hooks/useResizeObserver.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -80,10 +79,6 @@ var DatagridVirtualBody = function DatagridVirtualBody(datagridState) {
       if (headWrapEl) {
         headWrapEl.scrollLeft = virtualBody === null || virtualBody === void 0 ? void 0 : virtualBody.scrollLeft;
       }
-      var spacerColumn = document.querySelector("#".concat(tableId, " .").concat(blockClass, "__head-wrap thead th:last-child"));
-      if (spacerColumn) {
-        spacerColumn.style.width = layout.px(32 + (virtualBody.offsetWidth - virtualBody.clientWidth)); // scrollbar width to header column to fix header alignment
-      }
     }
     var testRefValue = testRef === null || testRef === void 0 ? void 0 : testRef.current;
     testRefValue === null || testRefValue === void 0 || testRefValue.addEventListener('scroll', handleScroll);

package/lib/components/Datagrid/useFlexResize.d.ts

@@ -1,6 +1,6 @@
 export default useFlexResize;
 /**
- * Copyright IBM Corp. 2020, 2023
+ * Copyright IBM Corp. 2020, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.

package/lib/components/Datagrid/useFlexResize.js

@@ -11,31 +11,31 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _rollupPluginBabelHelpers = require('../../_virtual/_rollupPluginBabelHelpers.js');
 
+/* eslint-disable no-unreachable */
 /**
- * Copyright IBM Corp. 2020, 2023
+ * Copyright IBM Corp. 2020, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
 var useFlexResize = function useFlexResize(hooks) {
-  var spacer = {
-    id: 'spacer',
-    width: 0,
-    disableSortBy: true,
-    disableResizing: true
-  };
   hooks.visibleColumns.push(function (columns) {
-    // always move actions and spacer to the end
+    // always move actions to the end
     var actionsIdx = columns.findIndex(function (col) {
       return col.isAction;
     });
     if (actionsIdx === -1) {
-      return [].concat(_rollupPluginBabelHelpers.toConsumableArray(columns), [spacer]);
+      var _lastCol = columns.at(-1);
+      _lastCol.isFlexCol = true;
+      return _rollupPluginBabelHelpers.toConsumableArray(columns);
     }
     var cols = _rollupPluginBabelHelpers.toConsumableArray(columns);
     var actions = cols.splice(actionsIdx, 1)[0];
-    cols.splice(columns.length, 0, spacer, actions);
+    cols.splice(columns.length, 0, actions);
+    // the last non-action action column should flex remaining space
+    var lastCol = columns.at(-2);
+    lastCol.isFlexCol = true;
     return cols;
   });
   var changeProps = function changeProps(props, data) {
@@ -43,7 +43,7 @@ var useFlexResize = function useFlexResize(hooks) {
     if (!column && data.cell) {
       column = data.cell.column;
     }
-    if (column.id === spacer.id) {
+    if (column.isFlexCol) {
       return [props, {
         style: {
           flex: '1 1 0'

package/lib/components/SidePanel/SidePanel.js

@@ -104,7 +104,8 @@ exports.SidePanel = /*#__PURE__*/React__default["default"].forwardRef(function (
   var subtitleRef = React.useRef(null);
   var previousState = usePreviousValue.usePreviousValue({
     size: size,
-    open: open
+    open: open,
+    currentStep: currentStep
   });
   var _useState3 = React.useState(-1),
     _useState4 = _rollupPluginBabelHelpers.slicedToArray(_useState3, 2),
@@ -171,9 +172,10 @@ exports.SidePanel = /*#__PURE__*/React__default["default"].forwardRef(function (
     if (sidePanelRef && panelRefValue) {
       var _animatedScrollRef$cu;
       var scrollableSection = (_animatedScrollRef$cu = animatedScrollRef.current) !== null && _animatedScrollRef$cu !== void 0 ? _animatedScrollRef$cu : innerContentRef.current;
-      if (scrollableSection) {
+      if (previousState && previousState['currentStep'] !== currentStep && scrollableSection) {
         scrollableSection.scrollTop = 0;
       }
+
       // The size of the panel has changed while it is still opened
       // so we need to scroll it to the top and reset the header
       // height css custom property

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "2.42.1-canary.23+21c921e30",
+  "version": "2.42.1-canary.26+ee2897af4",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -121,5 +121,5 @@
     "react": "^16.8.6 || ^17.0.1 || ^18.2.0",
     "react-dom": "^16.8.6 || ^17.0.1 || ^18.2.0"
   },
-  "gitHead": "21c921e30c1f0164ad93d214cd310480a29222ab"
+  "gitHead": "ee2897af4ca2e921bbfa915bb553f816f8b9a233"
 }