@carbon/ibm-products 2.42.1-canary.7 → 2.43.0

package/lib/components/Datagrid/Datagrid/DatagridHeaderRow.js

@@ -194,7 +194,7 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
       headerProps = _rollupPluginBabelHelpers["extends"]({}, (_rollupPluginBabelHelpers.objectDestructuringEmpty(_header$getHeaderProp), _header$getHeaderProp));
     var resizerProps = header === null || header === void 0 || (_header$getResizerPro = header.getResizerProps) === null || _header$getResizerPro === void 0 ? void 0 : _header$getResizerPro.call(header);
     return /*#__PURE__*/React__default["default"].createElement(react.TableHeader, _rollupPluginBabelHelpers["extends"]({}, headerProps, {
-      className: cx__default["default"](header === null || header === void 0 ? void 0 : header.className, _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__resizableColumn"), resizerProps), "".concat(blockClass, "__isResizing"), header === null || header === void 0 ? void 0 : header.isResizing), "".concat(blockClass, "__sortableColumn"), datagridState.isTableSortable && header.id !== 'spacer'), "".concat(blockClass, "__isSorted"), header === null || header === void 0 ? void 0 : header.isSorted), "".concat(blockClass, "__header-actions-column"), header === null || header === void 0 ? void 0 : header.isAction), "".concat(blockClass, "__with-slug"), header.slug && /*#__PURE__*/React__default["default"].isValidElement(header === null || header === void 0 ? void 0 : header.slug))),
+      className: cx__default["default"](header === null || header === void 0 ? void 0 : header.className, _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__resizableColumn"), resizerProps), "".concat(blockClass, "__isResizing"), header === null || header === void 0 ? void 0 : header.isResizing), "".concat(blockClass, "__sortableColumn"), datagridState.isTableSortable && header.id !== 'spacer'), "".concat(blockClass, "__isSorted"), header === null || header === void 0 ? void 0 : header.isSorted), "".concat(blockClass, "__header-actions-column"), header === null || header === void 0 ? void 0 : header.isAction), "".concat(blockClass, "__with-slug"), header.slug && /*#__PURE__*/React__default["default"].isValidElement(header === null || header === void 0 ? void 0 : header.slug)), headerProps.className),
       key: header.id,
       "aria-hidden": header.id === 'spacer' && 'true'
     }, getAccessibilityProps(header)), header.render('Header'), renderSlug(header.slug), resizerProps && !header.isAction && /*#__PURE__*/React__default["default"].createElement(ResizeHeader, {

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/Datagrid/addons/CustomizeColumns/CustomizeColumnsTearsheet.js

@@ -82,7 +82,7 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
   };
   var onCheckboxCheck = function onCheckboxCheck(col, value) {
     var changedDefinitions = columnObjects.map(function (definition) {
-      if (Array.isArray(col) && col.indexOf(definition) != -1 || definition.id === col.id) {
+      if ((Array.isArray(col) && col.indexOf(definition) != -1 || definition.id === col.id) && definition.canFilter && !definition.disabled) {
         return _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, definition), {}, {
           isVisible: value
         });
@@ -106,9 +106,12 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
   React.useEffect(function () {
     var notFilterableCount = columnObjects.filter(function (col) {
       return !col.canFilter;
-    });
-    setVisibleColumnsCount(getVisibleColumnsCount() - notFilterableCount.length);
-    setTotalColumns(columnObjects.length - notFilterableCount.length);
+    }).length;
+    var actionCount = columnObjects.filter(function (col) {
+      return col.id === 'actions';
+    }).length;
+    setVisibleColumnsCount(getVisibleColumnsCount() - notFilterableCount - actionCount);
+    setTotalColumns(columnObjects.length - notFilterableCount - actionCount);
   }, [getVisibleColumnsCount, columnObjects]);
   return /*#__PURE__*/React__default["default"].createElement(TearsheetNarrow.TearsheetNarrow, {
     className: "".concat(blockClass, "__customize-columns-tearsheet"),

package/lib/components/Datagrid/Datagrid/addons/Filtering/hooks/useFilterContext.d.ts

@@ -1,2 +1,8 @@
+/**
+ * Copyright IBM Corp. 2023, 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.
+ */
+declare const useFilterContext: () => any;
 export default useFilterContext;
-declare function useFilterContext(): any;

package/lib/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditCell/InlineEditCell.d.ts

@@ -20,6 +20,7 @@ export namespace InlineEditCell {
             rows: PropTypes.Requireable<(object | null | undefined)[]>;
             rowSize: PropTypes.Requireable<string>;
             tableId: PropTypes.Requireable<string>;
+            cellEditing: PropTypes.Requireable<object>;
         }>>;
         let nonEditCell: PropTypes.Requireable<boolean>;
         let placeholder: PropTypes.Requireable<string>;

package/lib/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditCell/InlineEditCell.js

@@ -45,7 +45,8 @@ var InlineEditCell = function InlineEditCell(_ref) {
   var columnIndex = instance.columns.findIndex(function (col) {
     return col.id === columnId;
   });
-  var cellId = "column-".concat(columnIndex, "-row-").concat(cell.row.index);
+  var rowIndex = cell.row.index;
+  var cellId = "column-".concat(columnIndex, "-row-").concat(rowIndex);
   var _useContext = React.useContext(InlineEditContext.InlineEditContext),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
@@ -81,6 +82,14 @@ var InlineEditCell = function InlineEditCell(_ref) {
   var rowSize = instance.rowSize,
     onDataUpdate = instance.onDataUpdate;
   var saveCellData;
+  if (inEditMode) {
+    instance.cellEditing = {
+      cellId: cellId,
+      columnIndex: columnIndex,
+      rowIndex: rowIndex,
+      curCellValue: cellValue
+    };
+  }
   React.useEffect(function () {
     setInitialValue(value);
     var columnId = cell.column.id;
@@ -478,7 +487,8 @@ InlineEditCell.propTypes = {
     onDataUpdate: index["default"].func,
     rows: index["default"].arrayOf(index["default"].object),
     rowSize: index["default"].string,
-    tableId: index["default"].string
+    tableId: index["default"].string,
+    cellEditing: index["default"].object
   }),
   nonEditCell: index["default"].bool,
   placeholder: index["default"].string,

package/lib/components/Datagrid/types/index.d.ts

@@ -192,6 +192,8 @@ export interface DataGridState<T extends object = any> extends TableCommonProps,
     onVirtualScroll?: (evt?: boolean) => void;
     fetchMoreData?: () => void;
     loadMoreThreshold?: number;
+    onRowClick?: (row: any, event: any) => void;
+    onSort?: boolean;
 }
 export interface ResizeHeaderProps {
     resizerProps?: ResizerProps;

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

@@ -1,2 +1,8 @@
-export default useColumnOrder;
+/**
+ * Copyright IBM Corp. 2022, 2022
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 import { useColumnOrder } from 'react-table';
+export default useColumnOrder;

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

@@ -1,2 +1,9 @@
+/**
+ * Copyright IBM Corp. 2022, 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.
+ */
+import { Hooks } from 'react-table';
+declare const useFiltering: (hooks: Hooks) => void;
 export default useFiltering;
-declare function useFiltering(hooks: any): void;

package/lib/components/Datagrid/useFiltering.js

@@ -67,12 +67,13 @@ var useFiltering = function useFiltering(hooks) {
     });
   }, []);
   hooks.useInstance.push(function (instance) {
-    var filterProps = instance.filterProps,
-      setAllFilters = instance.setAllFilters,
-      setFilter = instance.setFilter,
-      headers = instance.headers,
-      data = instance.data,
-      state = instance.state;
+    var _ref4 = instance,
+      filterProps = _ref4.filterProps,
+      setAllFilters = _ref4.setAllFilters,
+      setFilter = _ref4.setFilter,
+      headers = _ref4.headers,
+      data = _ref4.data,
+      state = _ref4.state;
     var defaultProps = {
       variation: 'flyout',
       updateMethod: constants.BATCH,
@@ -88,7 +89,7 @@ var useFiltering = function useFiltering(hooks) {
       });
     };
     Object.assign(instance, {
-      filterProps: _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, defaultProps), instance.filterProps),
+      filterProps: _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, defaultProps), instance === null || instance === void 0 ? void 0 : instance.filterProps),
       filterTypes: filterTypes,
       getFilterFlyoutProps: getFilterFlyoutProps,
       FilterFlyout: FilterFlyout["default"]

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/Datagrid/useNestedRows.js

@@ -23,6 +23,23 @@ var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
 var useNestedRows = function useNestedRows(hooks) {
   useNestedRowExpander["default"](hooks);
   var useInstance = function useInstance(instance) {
+    React.useEffect(function () {
+      var rows = instance.rows;
+      var defaultExpandedRows = rows.filter(function (row) {
+        var _row$original;
+        return row === null || row === void 0 || (_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.defaultExpanded;
+      });
+      if (defaultExpandedRows !== null && defaultExpandedRows !== void 0 && defaultExpandedRows.length) {
+        defaultExpandedRows.map(function (defaultExpandedRow) {
+          if (!defaultExpandedRow.isExpanded && !defaultExpandedRow.hasExpanded) {
+            var _defaultExpandedRow$t;
+            defaultExpandedRow === null || defaultExpandedRow === void 0 || (_defaultExpandedRow$t = defaultExpandedRow.toggleRowExpanded) === null || _defaultExpandedRow$t === void 0 || _defaultExpandedRow$t.call(defaultExpandedRow);
+            defaultExpandedRow.hasExpanded = true;
+            return;
+          }
+        });
+      }
+    }, [instance, instance.rows]);
     // This useEffect will expand rows if they exist in the initialState obj
     React.useEffect(function () {
       var rows = instance.rows,
@@ -54,16 +71,21 @@ var useNestedRows = function useNestedRows(hooks) {
         }
       }];
     };
+    var getIndentation = function getIndentation(depth) {
+      return 32 * depth + 16;
+    }; // row indentation padding
     var getCellProps = function getCellProps(props, _ref3) {
       var cell = _ref3.cell,
         instance = _ref3.instance;
-      // reduce the "first cell"s width to compensate added (left) margin
+      // we add a dynamic -ve margin right only if the cell is resized below minimum width i.e 50px, else we set the width based on indentation at different levels
       var isFirstCell = instance.columns.findIndex(function (c) {
         return c.id === cell.column.id;
       }) === 0;
       return [props, {
         style: {
-          marginRight: "".concat(isFirstCell && cell.row.depth > 0 ? "".concat(-32 * cell.row.depth - 18, "px") : '')
+          marginRight: isFirstCell && cell.row.depth > 0 && parseInt(props.style.width, 10) <= getIndentation(cell.row.depth) + 50 // indentation padding + expander cell or empty cell width
+          ? "".concat(parseInt(props.style.width, 10) - (getIndentation(cell.row.depth) + 50), "px") : '',
+          width: isFirstCell && cell.row.depth > 0 ? parseInt(props.style.width, 10) - getIndentation(cell.row.depth) : props.style.width
         }
       }];
     };

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

@@ -1,2 +1,9 @@
+/**
+ * Copyright IBM Corp. 2020, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+import { Hooks } from 'react-table';
+declare const useOnRowClick: (hooks: Hooks) => void;
 export default useOnRowClick;
-declare function useOnRowClick(hooks: any): void;

package/lib/components/Datagrid/useOnRowClick.js

@@ -13,7 +13,8 @@ var settings = require('../../settings.js');
 
 var useOnRowClick = function useOnRowClick(hooks) {
   var useInstance = function useInstance(rowInstance) {
-    var onRowClick = rowInstance.onRowClick;
+    var _ref = rowInstance,
+      onRowClick = _ref.onRowClick;
     var getRowProps = function getRowProps(props, datagridState) {
       var isFetching = datagridState.isFetching,
         row = datagridState.row,

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

@@ -1,2 +1,3 @@
+import { Hooks } from 'react-table';
+declare const useRowIsMouseOver: (hooks: Hooks) => void;
 export default useRowIsMouseOver;
-declare function useRowIsMouseOver(hooks: any): void;

package/lib/components/Datagrid/useRowIsMouseOver.js

@@ -25,7 +25,7 @@ var useRowIsMouseOver = function useRowIsMouseOver(hooks) {
       setMouseOverRowIndex = _useState2[1];
     var onMouseChange = useDebounce(function (datagridState) {
       var row = datagridState.row;
-      setMouseOverRowIndex(row.index);
+      setMouseOverRowIndex(row === null || row === void 0 ? void 0 : row.index);
     }, 100);
     var getRowProps = function getRowProps(props, datagridState) {
       var onMouseOver = function onMouseOver() {

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

@@ -1,2 +1,9 @@
+/**
+ * Copyright IBM Corp. 2020, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+import { Hooks } from 'react-table';
+declare const useSelectRows: (hooks: Hooks) => void;
 export default useSelectRows;
-declare function useSelectRows(hooks: any): void;

package/lib/components/Datagrid/useSelectRows.js

@@ -117,7 +117,8 @@ var SelectRow = function SelectRow(datagridState) {
       dispatch: dispatch,
       rowData: row,
       isChecked: event.target.checked,
-      getRowId: getRowId
+      getRowId: getRowId,
+      selectAll: null
     });
   };
   var selectDisabled = isFetching || row.getRowProps().disabled;
@@ -137,7 +138,7 @@ var SelectRow = function SelectRow(datagridState) {
     onSelect: onSelectHandler,
     id: rowId,
     name: "".concat(rowId, "-name"),
-    className: cx__default["default"]([checkboxClass, cellProps.className, _rollupPluginBabelHelpers.defineProperty({}, "".concat(checkboxClass, "-sticky-left"), isFirstColumnStickyLeft && windowSize > 671)]),
+    className: cx__default["default"]([checkboxClass, cellProps.className, _rollupPluginBabelHelpers.defineProperty({}, "".concat(checkboxClass, "-sticky-left"), isFirstColumnStickyLeft && Number(windowSize) > 671)]),
     ariaLabel: title,
     disabled: selectDisabled
   }));

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

@@ -1,6 +1,13 @@
-export function getNewSortOrder(sortOrder: any): {
-    newSortDesc: undefined;
+/**
+ * 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.
+ */
+import { Hooks } from 'react-table';
+export declare const getNewSortOrder: (sortOrder?: boolean | string) => {
+    newSortDesc: boolean;
     newOrder: string;
 };
+declare const useSortableColumns: (hooks: Hooks) => void;
 export default useSortableColumns;
-declare function useSortableColumns(hooks: any): void;

package/lib/components/Datagrid/useSortableColumns.js

@@ -31,7 +31,7 @@ var ordering = {
 };
 var getNewSortOrder = function getNewSortOrder(sortOrder) {
   var order = {
-    newSortDesc: undefined,
+    newSortDesc: false,
     newOrder: ordering.NONE
   };
   if (sortOrder === false || sortOrder === ordering.DESC) {
@@ -146,7 +146,8 @@ var useSortableColumns = function useSortableColumns(hooks) {
     return (_instance$customizeCo = instance.customizeColumnsProps) !== null && _instance$customizeCo !== void 0 && _instance$customizeCo.isTearsheetOpen ? visibleColumns : _rollupPluginBabelHelpers.toConsumableArray(sortableColumns);
   };
   var sortInstanceProps = function sortInstanceProps(instance) {
-    var onSort = instance.onSort;
+    var _ref3 = instance,
+      onSort = _ref3.onSort;
     Object.assign(instance, {
       manualSortBy: !!onSort,
       isTableSortable: true

package/lib/components/Datagrid/utils/getAutoSizedColumnWidth.d.ts

@@ -1 +1,8 @@
-export function getAutoSizedColumnWidth(rows: Array<object>, accessor: string, headerText: string): number;
+/**
+ * Copyright IBM Corp. 2023, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+import { Row } from 'react-table';
+export declare const getAutoSizedColumnWidth: (rows: Array<Row<object>>, accessor: string, headerText: string) => number;

package/lib/components/Datagrid/utils/getAutoSizedColumnWidth.js

@@ -18,13 +18,6 @@ var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHel
  * LICENSE file in the root directory of this source tree.
  */
 
-/**
- * Calculates the auto sized width of a column
- * @param {Array<object>} rows - The datagrid rows
- * @param {string} accessor - The accessor for the column
- * @param {string} headerText - The header text for the column
- */
-
 var getAutoSizedColumnWidth = function getAutoSizedColumnWidth(rows, accessor, headerText) {
   var maxWidth = 400;
   var minWidth = 58;

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.7+793b7d211",
+  "version": "2.43.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -97,7 +97,7 @@
   "dependencies": {
     "@babel/runtime": "^7.23.9",
     "@carbon/feature-flags": "^0.20.0",
-    "@carbon/ibm-products-styles": "^2.38.1",
+    "@carbon/ibm-products-styles": "^2.39.0",
     "@carbon/telemetry": "^0.1.0",
     "@dnd-kit/core": "^6.0.8",
     "@dnd-kit/modifiers": "^7.0.0",
@@ -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": "793b7d211624906e2dea5e39fa5995572b3c1628"
+  "gitHead": "4deacf2fbc44a543db6141a63a0f4d988900a0c5"
 }

package/scss/components/ConditionBuilder/_condition-builder.scss

@@ -27,7 +27,9 @@ $block-class: #{c4p-settings.$pkg-prefix}--condition-builder;
 // .#{$block-class} {
 //   // TODO: Styles.
 // }
-
+.#{$block-class} {
+  padding: $spacing-06;
+}
 .#{$block-class}__condition-builder__group {
   display: flex;
 }
@@ -47,5 +49,23 @@ $block-class: #{c4p-settings.$pkg-prefix}--condition-builder;
 }
 .#{$block-class}__condition-block {
   display: flex;
+  width: max-content;
   flex-direction: row;
 }
+.#{$block-class}__content-container {
+  display: flex;
+  flex-direction: column;
+  row-gap: $spacing-02;
+}
+.#{$block-class}__heading {
+  margin-top: $spacing-03;
+  margin-bottom: $spacing-03;
+}
+.#{$block-class}__tree
+  .#{$block-class}__actions-container
+  .#{$block-class}__condition-wrapper {
+  flex-direction: column;
+}
+.#{$block-class}__group-separator {
+  margin-top: $spacing-02;
+}

package/scss/components/ConditionBuilder/styles/_conditionBuilderCondition.scss

@@ -1,3 +1,4 @@
+@use '@carbon/react/scss/theme' as *;
 @use '@carbon/react/scss/spacing' as *;
 @use '@carbon/react/scss/motion';
 @use '@carbon/styles/scss/components/tag' as *;
@@ -5,6 +6,7 @@
 @use '../../../global/styles/project-settings' as c4p-settings;
 @use '@carbon/styles/scss/type';
 @use '@carbon/styles/scss/type' as *;
+@use '@carbon/react/scss/utilities';
 
 $block-class: #{c4p-settings.$pkg-prefix}--condition-builder;
 
@@ -14,12 +16,17 @@ $block-class: #{c4p-settings.$pkg-prefix}--condition-builder;
   display: inline-flex;
 }
 
-[role='row']:focus {
+.#{$block-class} [role='row'] {
+  position: relative;
+  outline: none;
+}
+.#{$block-class} [role='row']:focus::after {
   @include focus-outline.focus-outline('outline');
 
-  outline-offset: 0;
+  position: absolute;
+  content: '';
+  inset: 0;
 }
-
 .#{$block-class}__condition__deletion-preview
   .#{$block-class}__button:not(
     .#{$block-class}__statement-button,
@@ -44,3 +51,15 @@ $block-class: #{c4p-settings.$pkg-prefix}--condition-builder;
   text-overflow: ellipsis;
   text-wrap: nowrap;
 }
+.#{$block-class}__group-preview {
+  opacity: 0.5;
+  pointer-events: none;
+}
+.#{$block-class}__connector-disabled {
+  display: flex;
+  min-width: $spacing-10;
+  align-items: center;
+  background-color: $layer;
+  color: $text-helper;
+  padding-inline: $spacing-03;
+}