@carbon/ibm-products 2.0.0-rc.21 → 2.0.0-rc.22

package/lib/components/Datagrid/useStickyColumn.js

@@ -9,6 +9,8 @@ exports.default = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _react = require("react");
 
 var _debounce = _interopRequireDefault(require("lodash/debounce"));
@@ -29,8 +31,24 @@ var OFFSET_SCROLL_CLASS = "".concat(styleClassPrefix, "-offset-scroll");
 var useStickyColumn = function useStickyColumn(hooks) {
   var tableBodyRef = (0, _react.useRef)();
   var stickyHeaderCellRef = (0, _react.useRef)();
-  hooks.getCellProps.push(changeProps.bind(null, 'cell', null));
-  hooks.getHeaderProps.push(changeProps.bind(null, 'header', stickyHeaderCellRef));
+
+  var _useState = (0, _react.useState)(window.innerWidth),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      windowSize = _useState2[0],
+      setWindowSize = _useState2[1];
+
+  (0, _react.useLayoutEffect)(function () {
+    function updateSize() {
+      setWindowSize(window.innerWidth);
+    }
+
+    window.addEventListener('resize', updateSize);
+    return function () {
+      return window.removeEventListener('resize', updateSize);
+    };
+  }, []);
+  hooks.getCellProps.push(changeProps.bind(null, 'cell', null, windowSize));
+  hooks.getHeaderProps.push(changeProps.bind(null, 'header', stickyHeaderCellRef, windowSize));
   hooks.getTableBodyProps.push(addTableBodyProps.bind(null, tableBodyRef));
   hooks.getHeaderGroupProps.push(function (props) {
     return [props, {
@@ -138,7 +156,7 @@ var addTableBodyProps = function addTableBodyProps(tableBodyRef, props) {
   }];
 };
 
-var changeProps = function changeProps(elementName, headerCellRef, props, data) {
+var changeProps = function changeProps(elementName, headerCellRef, windowSize, props, data) {
   var column = data.column || data.cell.column;
 
   if (column.sticky === 'right') {
@@ -155,7 +173,7 @@ var changeProps = function changeProps(elementName, headerCellRef, props, data)
     var _data$instance, _cx2;
 
     return [props, _objectSpread({
-      className: (0, _classnames.default)((_cx2 = {}, (0, _defineProperty2.default)(_cx2, "".concat(leftStickyStyleClassPrefix, "-").concat(elementName), true), (0, _defineProperty2.default)(_cx2, "".concat(leftStickyStyleClassPrefix, "-").concat(elementName, "--with-extra-select-column"), data === null || data === void 0 ? void 0 : (_data$instance = data.instance) === null || _data$instance === void 0 ? void 0 : _data$instance.withSelectRows), _cx2))
+      className: (0, _classnames.default)((_cx2 = {}, (0, _defineProperty2.default)(_cx2, "".concat(leftStickyStyleClassPrefix, "-").concat(elementName), true && windowSize > 671), (0, _defineProperty2.default)(_cx2, "".concat(leftStickyStyleClassPrefix, "-").concat(elementName, "--with-extra-select-column"), (data === null || data === void 0 ? void 0 : (_data$instance = data.instance) === null || _data$instance === void 0 ? void 0 : _data$instance.withSelectRows) && windowSize > 671), _cx2))
     }, headerCellRef && {
       ref: headerCellRef
     })];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "2.0.0-rc.21",
+  "version": "2.0.0-rc.22",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -85,14 +85,14 @@
     "react-window": "^1.8.7"
   },
   "peerDependencies": {
-    "@carbon/grid": "^11.3.0",
-    "@carbon/layout": "^11.3.0",
-    "@carbon/motion": "^11.2.0",
-    "@carbon/react": "^1.13.0",
-    "@carbon/themes": "^11.4.0",
-    "@carbon/type": "^11.4.0",
+    "@carbon/grid": "^11.12.0",
+    "@carbon/layout": "^11.12.0",
+    "@carbon/motion": "^11.10.0",
+    "@carbon/react": "~1.15.0",
+    "@carbon/themes": "^11.17.0",
+    "@carbon/type": "^11.16.0",
     "react": "^16.8.6 || ^17.0.1",
     "react-dom": "^16.8.6 || ^17.0.1"
   },
-  "gitHead": "18e39051d3cdcf186d14a87665f958dd14429927"
+  "gitHead": "e8bca836f1a602f6288a9d3bcb29cd524a497000"
 }

package/scss/components/Datagrid/styles/_datagrid.scss

@@ -39,6 +39,7 @@
         align-items: center;
         color: $text-primary;
       }
+
       .#{$block-class}__head-select-all.#{$block-class}__checkbox-cell.#{$block-class}__checkbox-cell-sticky-left {
         position: sticky;
         z-index: 1;
@@ -62,6 +63,7 @@
         align-items: center;
         padding-top: 0;
       }
+
       &.#{$block-class}__checkbox-cell-sticky-left {
         position: sticky;
         left: 0;
@@ -147,6 +149,7 @@
     }
   }
 }
+
 .#{$block-class}__grid-container::-webkit-scrollbar-thumb {
   background-color: $text-placeholder;
 }
@@ -155,6 +158,7 @@
   width: 6px;
   background-color: $background;
 }
+
 .#{$block-class}__grid-container {
   display: block;
   width: 100%;
@@ -247,7 +251,9 @@
   td.#{c4p-settings.$carbon-prefix}--table-column-checkbox,
   th.#{c4p-settings.$carbon-prefix}--table-column-checkbox {
     /* stylelint-disable-next-line declaration-no-important */
-    padding-right: $spacing-06 !important;
+    width: $spacing-09 !important;
+    /* stylelint-disable-next-line declaration-no-important */
+    padding-right: $spacing-05 !important;
   }
 }
 
@@ -311,6 +317,7 @@
 
 .#{$block-class}__resizableColumn:hover {
   background-color: $background-selected-hover;
+
   .#{$block-class}__resizer {
     border-right: $spacing-01 solid $border-strong-01;
     background-color: $background-selected-hover;
@@ -318,7 +325,7 @@
 }
 
 .#{$block-class}__head-hidden-select-all {
-  padding-right: $spacing-08;
+  padding-right: $spacing-09;
   &.#{$block-class}__select-all-sticky-left {
     position: sticky;
     z-index: 1;
@@ -360,6 +367,14 @@
   width: 100% !important;
 }
 
+.#{$block-class}__sticky thead {
+  display: flex;
+
+  tr.#{$block-class}__sticky {
+    width: auto;
+  }
+}
+
 .#{$block-class}__displayFlex {
   position: relative;
   display: flex;
@@ -399,6 +414,10 @@
     border-bottom: 1px solid $layer-03;
   }
 
+  .#{$block-class}__table-container {
+    overflow: hidden;
+  }
+
   .#{c4p-settings.$pkg-prefix}--datagrid__table-simple {
     height: 100%;
   }
@@ -415,6 +434,7 @@
 
 .#{$block-class}__carbon-row-expanded {
   position: relative;
+
   &.#{$block-class}__carbon-row-expanded-hover-active::before {
     position: absolute;
     z-index: 2;
@@ -426,7 +446,7 @@
     );
     width: 1px;
     height: var(--#{$block-class}--indicator-height);
-    border-left: 1px solid $background-brand;
+    border-left: 1px solid $border-subtle-selected-01;
     content: '';
   }
 }
@@ -478,6 +498,7 @@
   .#{c4p-settings.$carbon-prefix}--data-table--selected:not(.#{$block-class}__active-row) {
   position: relative;
 }
+
 .#{$block-class}
   .#{c4p-settings.$carbon-prefix}--data-table--selected:not(.#{$block-class}__active-row)::before {
   position: absolute;
@@ -522,6 +543,7 @@
   justify-content: center;
   padding: 0;
   margin: 0;
+
   .#{c4p-settings.$carbon-prefix}--btn__icon {
     margin: 0;
   }

package/scss/components/Datagrid/styles/_useNestedRows.scss

@@ -7,6 +7,7 @@
 */
 
 @use '@carbon/styles/scss/theme' as *;
+@use '@carbon/styles/scss/spacing' as *;
 @use '../../../global/styles/project-settings' as c4p-settings;
 @use '@carbon/styles/scss/motion' as *;
 @use './variables' as *;
@@ -50,3 +51,21 @@
   background-color: $border-subtle;
   content: '';
 }
+
+.#{$block-class} tr.#{$block-class}__carbon-nested-row {
+  td:first-child:empty,
+  .#{$block-class}__expandable-row-cell {
+    border-bottom: none;
+  }
+}
+
+.#{c4p-settings.$carbon-prefix}--data-table
+  td.#{$block-class}__expandable-row-cell {
+  padding-left: $spacing-03;
+}
+
+.#{$block-class}__carbon-row-expanded {
+  .#{$block-class}__expandable-row-cell {
+    border-bottom: none;
+  }
+}

package/scss/components/Datagrid/styles/_useSelectAllToggle.scss

@@ -7,17 +7,21 @@
 */
 
 @use '@carbon/styles/scss/spacing' as *;
+@use '@carbon/styles/scss/theme' as *;
 @use './variables';
 
-th.#{variables.$block-class}__select-all-toggle-on,
-td.#{variables.$block-class}__select-all-toggle-on {
-  /* stylelint-disable-next-line declaration-no-important */
-  width: 4.5rem !important;
-  /* stylelint-disable-next-line declaration-no-important */
-  min-width: initial !important;
-  box-sizing: border-box;
-  flex: 0 0 auto;
+.#{variables.$block-class}__grid-container {
+  th.#{variables.$block-class}__select-all-toggle-on,
+  td.#{variables.$block-class}__select-all-toggle-on {
+    /* stylelint-disable-next-line declaration-no-important */
+    width: 4.5rem !important;
+    /* stylelint-disable-next-line declaration-no-important */
+    min-width: initial !important;
+    box-sizing: border-box;
+    flex: 0 0 auto;
+  }
 }
+
 th.#{variables.$block-class}__select-all-toggle-on {
   display: flex;
   align-items: center;

package/scss/components/Datagrid/styles/_useStickyColumn.scss

@@ -16,7 +16,7 @@
   right: 0;
   display: flex;
   align-items: center;
-  border-left: 1px solid $layer-accent-01;
+  border-left: 1px solid $layer-active-02;
 }
 
 .#{variables.$block-class}__right-sticky-column-header {
@@ -31,7 +31,7 @@
   left: 0;
   display: flex;
   align-items: center;
-  border-right: 1px solid $layer-accent-01;
+  border-right: 1px solid $layer-active-02;
 }
 
 .#{variables.$block-class}__left-sticky-column-header {
@@ -43,7 +43,7 @@
 
 .#{variables.$block-class}__left-sticky-column-cell.#{variables.$block-class}__left-sticky-column-cell--with-extra-select-column,
 .#{variables.$block-class}__left-sticky-column-header.#{variables.$block-class}__left-sticky-column-header--with-extra-select-column {
-  left: $spacing-08;
+  left: $spacing-09;
 }
 
 .#{variables.$block-class}__sticky-noShadow {