@carbon/ibm-products 2.30.0-alpha.9 → 2.30.0

package/es/components/Datagrid/Datagrid/addons/CustomizeColumns/DraggableItemsList.js

@@ -12,9 +12,10 @@ import { Checkbox } from '@carbon/react';
 import { isColumnVisible } from './common.js';
 import DraggableElement from '../../DraggableElement.js';
 import { pkg } from '../../../../../settings.js';
+import { getNodeTextContent } from '../../../../../global/js/utils/getNodeTextContent.js';
 import { useSensor, PointerSensor, KeyboardSensor, useSensors, DndContext, closestCenter } from '@dnd-kit/core';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
-import { getNodeTextContent } from '../../../../../global/js/utils/getNodeTextContent.js';
+import { restrictToParentElement, restrictToVerticalAxis } from '@dnd-kit/modifiers';
 
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var matchedColsById = function matchedColsById(col1, col2) {
@@ -144,7 +145,8 @@ var DraggableItemsList = function DraggableItemsList(_ref) {
     onDragEnd: handleDragEnd,
     onDragStart: handleDragStart,
     onDragMove: handleDragUpdate,
-    sensors: sensors
+    sensors: sensors,
+    modifiers: [restrictToParentElement, restrictToVerticalAxis]
   }, /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__draggable-underlay"),
     "aria-hidden": "true",

package/lib/components/Datagrid/Datagrid/addons/CustomizeColumns/DraggableItemsList.js

@@ -16,9 +16,10 @@ var react = require('@carbon/react');
 var common = require('./common.js');
 var DraggableElement = require('../../DraggableElement.js');
 var settings = require('../../../../../settings.js');
+var getNodeTextContent = require('../../../../../global/js/utils/getNodeTextContent.js');
 var core = require('@dnd-kit/core');
 var sortable = require('@dnd-kit/sortable');
-var getNodeTextContent = require('../../../../../global/js/utils/getNodeTextContent.js');
+var modifiers = require('@dnd-kit/modifiers');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -152,7 +153,8 @@ var DraggableItemsList = function DraggableItemsList(_ref) {
     onDragEnd: handleDragEnd,
     onDragStart: handleDragStart,
     onDragMove: handleDragUpdate,
-    sensors: sensors
+    sensors: sensors,
+    modifiers: [modifiers.restrictToParentElement, modifiers.restrictToVerticalAxis]
   }, /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(blockClass, "__draggable-underlay"),
     "aria-hidden": "true",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "2.30.0-alpha.9+c0cf58a1e",
+  "version": "2.30.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -90,9 +90,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.9",
-    "@carbon/ibm-products-styles": "^2.29.0-alpha.9+c0cf58a1e",
+    "@carbon/ibm-products-styles": "^2.29.0",
     "@carbon/telemetry": "^0.1.0",
     "@dnd-kit/core": "^6.0.8",
+    "@dnd-kit/modifiers": "^7.0.0",
     "@dnd-kit/sortable": "^8.0.0",
     "@dnd-kit/utilities": "^3.2.2",
     "@ibm/telemetry-js": "^1.2.0",
@@ -107,11 +108,11 @@
     "@carbon/grid": "^11.21.1",
     "@carbon/layout": "^11.20.1",
     "@carbon/motion": "^11.16.1",
-    "@carbon/react": "^1.51.1",
+    "@carbon/react": "^1.52.0",
     "@carbon/themes": "^11.32.0",
     "@carbon/type": "^11.25.1",
     "react": "^16.8.6 || ^17.0.1 || ^18.2.0",
     "react-dom": "^16.8.6 || ^17.0.1 || ^18.2.0"
   },
-  "gitHead": "c0cf58a1e78a4ee8f66b551d39b5705fecd4674e"
+  "gitHead": "22c6158e668aae407dd00a771029beadd4e30779"
 }

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

@@ -46,7 +46,6 @@
         position: sticky;
         z-index: 1;
         left: 0;
-        background-color: $layer-01;
       }
     }
 
@@ -70,7 +69,6 @@
       &.#{$block-class}__checkbox-cell-sticky-left {
         position: sticky;
         left: 0;
-        background-color: $layer-01;
       }
     }
 
@@ -339,6 +337,21 @@
     }
   }
 
+  .#{$block-class}__carbon-row td {
+    /* stylelint-disable-next-line declaration-no-important */
+    background-color: $layer-01;
+  }
+
+  .#{$block-class}__carbon-row:hover td {
+    /* stylelint-disable-next-line declaration-no-important */
+    background-color: $layer-hover-01;
+  }
+
+  .#{c4p-settings.$carbon-prefix}--data-table--selected td {
+    /* stylelint-disable-next-line declaration-no-important */
+    background-color: $layer-selected-01;
+  }
+
   .#{c4p-settings.$carbon-prefix}--select-input {
     -webkit-appearance: none; // could be fixed by post-css plugin
   }
@@ -432,8 +445,6 @@
 }
 
 .#{$block-class}__resizableColumn:hover {
-  background-color: $layer-selected-hover;
-
   .#{$block-class}__resizer {
     border-right: $spacing-01 solid $border-strong-01;
     background-color: $background-selected-hover;

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

@@ -17,7 +17,6 @@
   display: flex;
   align-items: center;
   border-left: 1px solid $layer-active-02;
-  background-color: $layer-01;
 }
 
 .#{variables.$block-class}__right-sticky-column-header {
@@ -33,7 +32,6 @@
   display: flex;
   align-items: center;
   border-right: 1px solid $layer-active-02;
-  background-color: $layer-01;
 }
 
 .#{variables.$block-class}__left-sticky-column-header {
@@ -41,6 +39,11 @@
   position: sticky !important;
   z-index: 1;
   left: 0;
+  border-right: 1px solid $layer-active-02;
+}
+
+.#{variables.$block-class}__right-sticky-column-header {
+  border-left: 1px solid $layer-active-02;
 }
 
 .#{variables.$block-class}__left-sticky-column-cell.#{variables.$block-class}__left-sticky-column-cell--with-extra-select-column,