@carbon/ibm-products 2.0.0-rc.7 → 2.0.0-rc.9

package/lib/components/InlineEditV2/InlineEditV2.js

@@ -0,0 +1,309 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.InlineEditV2 = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _react2 = require("@carbon/react");
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _icons = require("@carbon/react/icons");
+
+var _settings = require("../../settings");
+
+var _devtools = require("../../global/js/utils/devtools");
+
+var _excluded = ["cancelLabel", "editLabel", "id", "invalid", "invalidLabel", "labelText", "onCancel", "onChange", "onSave", "saveLabel", "value"];
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var componentName = 'InlineEditV2';
+var blockClass = "".concat(_settings.pkg.prefix, "--inline-edit-v2");
+var InlineEditV2 = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+  var cancelLabel = _ref.cancelLabel,
+      editLabel = _ref.editLabel,
+      id = _ref.id,
+      invalid = _ref.invalid,
+      invalidLabel = _ref.invalidLabel,
+      labelText = _ref.labelText,
+      onCancel = _ref.onCancel,
+      onChange = _ref.onChange,
+      onSave = _ref.onSave,
+      saveLabel = _ref.saveLabel,
+      value = _ref.value,
+      rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+
+  var _useState = (0, _react.useState)(false),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      focused = _useState2[0],
+      setFocused = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(''),
+      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+      initialValue = _useState4[0],
+      setInitialValue = _useState4[1];
+
+  var _useState5 = (0, _react.useState)(false),
+      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+      dirtyInput = _useState6[0],
+      setDirtyInput = _useState6[1];
+
+  var inputRef = (0, _react.useRef)(null);
+  var canSave = value !== initialValue && !invalid;
+  var escaping = (0, _react.useRef)(false);
+  (0, _react.useEffect)(function () {
+    if (!initialValue && !dirtyInput) {
+      setInitialValue(value);
+    }
+  }, [initialValue, dirtyInput, value]);
+
+  var isTargetingChild = function isTargetingChild(_ref2) {
+    var currentTarget = _ref2.currentTarget,
+        relatedTarget = _ref2.relatedTarget;
+    return currentTarget.contains(relatedTarget);
+  };
+
+  var onChangeHandler = function onChangeHandler(_ref3) {
+    var target = _ref3.target;
+
+    if (!dirtyInput) {
+      setDirtyInput(true);
+    }
+
+    onChange(target.value);
+  };
+
+  var onFocusHandler = function onFocusHandler(e) {
+    // if (readOnly) {
+    //   return;
+    // }
+    if (!isTargetingChild(e)) {
+      inputRef.current.focus();
+      setFocused(true);
+    }
+  };
+
+  var onSaveHandler = function onSaveHandler() {
+    setInitialValue(value);
+    setFocused(false);
+    setDirtyInput(false);
+    onSave();
+  };
+
+  var onCancelHandler = function onCancelHandler() {
+    setFocused(false);
+    setDirtyInput(false);
+    onCancel(initialValue);
+  };
+
+  var onBlurHandler = function onBlurHandler(e) {
+    // if (readOnly || escaping.current) {
+    if (escaping.current) {
+      return;
+    }
+
+    if (!isTargetingChild(e)) {
+      if (canSave) {
+        onSaveHandler();
+      } else {
+        onCancelHandler();
+      }
+    }
+  };
+
+  var returnHandler = function returnHandler() {
+    if (canSave) {
+      onSaveHandler();
+    }
+  };
+
+  var escapeHandler = function escapeHandler() {
+    onCancelHandler();
+  };
+
+  var onKeyHandler = function onKeyHandler(e) {
+    // to prevent blur handler from being called twice add additional state to check if escape is being used
+    escaping.current = true;
+
+    switch (e.key) {
+      case 'Escape':
+        inputRef.current.blur();
+        escapeHandler();
+        break;
+
+      case 'Enter':
+        inputRef.current.blur();
+        returnHandler();
+        break;
+
+      default:
+        break;
+    }
+
+    escaping.current = false;
+  };
+
+  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, rest, {
+    ref: ref
+  }, (0, _devtools.getDevtoolsProps)(componentName)), /*#__PURE__*/_react.default.createElement("div", {
+    className: (0, _classnames.default)(blockClass, (0, _defineProperty2.default)({}, "".concat(blockClass, "-focused"), focused)),
+    onFocus: onFocusHandler,
+    onBlur: onBlurHandler
+  }, /*#__PURE__*/_react.default.createElement("label", {
+    className: "".concat(blockClass, "__text-input-label"),
+    htmlFor: id
+  }, labelText), /*#__PURE__*/_react.default.createElement("input", {
+    id: id,
+    className: (0, _classnames.default)("".concat(blockClass, "__text-input"), "".concat(_settings.carbon.prefix, "--text-input"), "".concat(_settings.carbon.prefix, "--text-input--sm")),
+    type: "text",
+    value: value,
+    onChange: onChangeHandler,
+    ref: inputRef // readOnly={readOnly}
+    ,
+    onKeyDown: onKeyHandler
+  }), focused ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, invalid && /*#__PURE__*/_react.default.createElement(_icons.WarningFilled, {
+    size: 16,
+    className: "".concat(blockClass, "__warning-icon")
+  }), /*#__PURE__*/_react.default.createElement(_react2.Button, {
+    hasIconOnly: true,
+    renderIcon: function renderIcon() {
+      return /*#__PURE__*/_react.default.createElement(_icons.Close, {
+        size: 24
+      });
+    },
+    size: "sm",
+    iconDescription: cancelLabel,
+    onClick: onCancelHandler,
+    kind: "ghost",
+    tabIndex: 0,
+    key: "cancel",
+    className: "".concat(blockClass, "__btn ").concat(blockClass, "__btn-cancel")
+  }), /*#__PURE__*/_react.default.createElement(_react2.Button, {
+    hasIconOnly: true,
+    renderIcon: function renderIcon() {
+      return /*#__PURE__*/_react.default.createElement(_icons.Checkmark, {
+        size: 24
+      });
+    },
+    size: "sm",
+    iconDescription: saveLabel,
+    onClick: onSaveHandler,
+    kind: "ghost",
+    tabIndex: 0,
+    key: "save",
+    className: "".concat(blockClass, "__btn ").concat(blockClass, "__btn-save"),
+    disabled: !canSave
+  })) : /*#__PURE__*/_react.default.createElement(_react2.Button, {
+    className: "".concat(blockClass, "__btn ").concat(blockClass, "__btn-edit"),
+    hasIconOnly: true // renderIcon={readOnly ? EditOff24 : Edit24}
+    ,
+    renderIcon: function renderIcon() {
+      return /*#__PURE__*/_react.default.createElement(_icons.Edit, {
+        size: 24
+      });
+    },
+    size: "sm" // iconDescription={readOnly ? readOnlyLabel : editLabel}
+    ,
+    iconDescription: editLabel,
+    onClick: onFocusHandler,
+    kind: "ghost",
+    tabIndex: 0,
+    key: "edit"
+  })), focused && invalid && /*#__PURE__*/_react.default.createElement("p", {
+    className: "".concat(blockClass, "__warning-text")
+  }, invalidLabel));
+});
+exports.InlineEditV2 = InlineEditV2;
+exports.InlineEditV2 = InlineEditV2 = _settings.pkg.checkComponentEnabled(InlineEditV2, componentName);
+InlineEditV2.displayName = componentName;
+InlineEditV2.propTypes = {
+  /**
+   * label for cancel button
+   */
+  cancelLabel: _propTypes.default.string.isRequired,
+
+  /**
+   * label for edit button
+   */
+  editLabel: _propTypes.default.string.isRequired,
+
+  /**
+   * Specify a custom id for the input
+   */
+  id: _propTypes.default.string.isRequired,
+
+  /**
+   * determines if the input is invalid
+   */
+  invalid: _propTypes.default.bool,
+
+  /**
+   * text that is displayed if the input is invalid
+   */
+  invalidLabel: _propTypes.default.string,
+
+  /**
+   * Provide the text that will be read by a screen reader when visiting this control
+   */
+  labelText: _propTypes.default.string.isRequired,
+
+  /**
+   * handler that is called when the cancel button is pressed or when the user removes focus from the input and there is no new value
+   */
+  onCancel: _propTypes.default.func.isRequired,
+
+  /**
+   * handler that is called when the input is updated
+   */
+  onChange: _propTypes.default.func.isRequired,
+
+  /**
+   * handler that is called when the save button is pressed or when the user removes focus from the input if it has a new value
+   */
+  onSave: _propTypes.default.func.isRequired,
+
+  /**
+   * determines if the input is in readOnly mode
+   */
+  // readOnly: PropTypes.bool,
+
+  /**
+   * label for the edit button that displays when in read only mode
+   */
+  // readOnlyLabel: PropTypes.string,
+
+  /**
+   * label for save button
+   */
+  saveLabel: _propTypes.default.string.isRequired,
+
+  /**
+   * current value of the input
+   */
+  value: _propTypes.default.string.isRequired
+};
+InlineEditV2.defaultProps = {
+  invalid: false,
+  invalidLabel: '' // readOnly: false,
+
+};

package/lib/components/InlineEditV2/index.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "InlineEditV2", {
+  enumerable: true,
+  get: function get() {
+    return _InlineEditV.InlineEditV2;
+  }
+});
+
+var _InlineEditV = require("./InlineEditV2");

package/lib/components/MultiAddSelect/MultiAddSelect.js

@@ -25,6 +25,12 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+//
+// 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.
+//
 var componentName = 'MultiAddSelect';
 var MultiAddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   return /*#__PURE__*/_react.default.createElement(_AddSelect.AddSelect, (0, _extends2.default)({}, props, {
@@ -86,6 +92,11 @@ MultiAddSelect.propTypes = {
    */
   globalSearchPlaceholder: _propTypes.default.string,
 
+  /**
+   * the theme for the empty state illustration
+   */
+  illustrationTheme: _propTypes.default.oneOf(['light', 'dark']),
+
   /**
    * title that displays in the sidebar / influencer
    */
@@ -106,7 +117,8 @@ MultiAddSelect.propTypes = {
       avatar: _propTypes.default.shape({
         alt: _propTypes.default.string,
         icon: _propTypes.default.func,
-        src: _propTypes.default.string
+        src: _propTypes.default.string,
+        theme: _propTypes.default.oneOf(['light', 'dark'])
       }),
       children: _propTypes.default.object,
       icon: _propTypes.default.func,
@@ -167,15 +179,10 @@ MultiAddSelect.propTypes = {
    */
   open: _propTypes.default.bool,
 
-  /**
-   * description for the remove item icon
-   */
-  removeIconDescription: _propTypes.default.string,
-
   /**
    * text that displays when displaying filtered items
    */
-  searchResultsLabel: _propTypes.default.string,
+  searchResultsTitle: _propTypes.default.string,
 
   /**
    * header text

package/lib/components/PageHeader/PageHeaderTitle.js

@@ -81,12 +81,10 @@ var PageHeaderTitle = function PageHeaderTitle(_ref) {
     titleText = asText;
   }
 
-  return /*#__PURE__*/_react.default.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement("h1", {
     className: (0, _classnames.default)("".concat(blockClass, "__title"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__title--editable"), isEditable), (0, _defineProperty2.default)({}, "".concat(blockClass, "__title--fades"), hasBreadcrumbRow)),
     title: titleText
-  }, /*#__PURE__*/_react.default.createElement("h1", {
-    className: "".concat(blockClass, "__title-wrapper")
-  }, titleInnards));
+  }, titleInnards);
 };
 
 exports.PageHeaderTitle = PageHeaderTitle;

package/lib/components/SingleAddSelect/SingleAddSelect.js

@@ -27,6 +27,12 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+//
+// Copyright IBM Corp. 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.
+//
 var componentName = 'SingleAddSelect';
 var SingleAddSelect = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   // remove multi add select specific props

package/lib/global/js/package-settings.js

@@ -40,6 +40,7 @@ var defaults = {
     HTTPErrorOther: true,
     ImportModal: true,
     InlineEdit: true,
+    InlineEditV1: true,
     NotificationsPanel: true,
     NoDataEmptyState: true,
     NoTagsEmptyState: true,
@@ -74,7 +75,8 @@ var defaults = {
     EditTearsheet: false,
     EditTearsheetNarrow: false,
     EditFullPage: false,
-    EditUpdateCards: false
+    EditUpdateCards: false,
+    InlineEditV2: false
     /* new component flags here - comment used by generate CLI */
 
   },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "2.0.0-rc.7",
+  "version": "2.0.0-rc.9",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -94,5 +94,5 @@
     "react": "^16.8.6 || ^17.0.1",
     "react-dom": "^16.8.6 || ^17.0.1"
   },
-  "gitHead": "85f73a55da546c111f110732a27921769d970c03"
+  "gitHead": "c3b38e1f910de3ae5691557fc340ab43cccf1108"
 }

package/scss/components/AddSelect/_add-select.scss

@@ -1,5 +1,5 @@
 //
-// Copyright IBM Corp. 2021
+// 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.
@@ -64,7 +64,9 @@ $tearsheet-class: #{$pkg-prefix}--tearsheet;
     justify-content: center;
   }
 
-  &-cell:hover .#{$block-class}__selections-hidden-hover {
+  &-cell:hover .#{$block-class}__selections-hidden-hover,
+  .#{$carbon-prefix}--structured-list-row:focus-within
+    .#{$block-class}__selections-hidden-hover {
     visibility: visible;
   }
 
@@ -72,7 +74,7 @@ $tearsheet-class: #{$pkg-prefix}--tearsheet;
     visibility: hidden;
   }
 
-  &-row-selected#{$carbon-prefix}--structured-list-row {
+  &-row--selected.#{$carbon-prefix}--structured-list-row {
     border-bottom: 1px solid $layer-selected-01;
     background-color: $layer-selected-01;
   }
@@ -112,7 +114,7 @@ $tearsheet-class: #{$pkg-prefix}--tearsheet;
     border-left: 0.125rem solid transparent;
   }
 
-  &-row-meta-selected {
+  &-row-meta--selected {
     border-left: 0.125rem solid $interactive;
     background-color: $layer-hover-01;
   }
@@ -134,13 +136,6 @@ $tearsheet-class: #{$pkg-prefix}--tearsheet;
   }
 }
 
-.#{$block-class}
-  #{$carbon-prefix}--structured-list--selection
-  .#{$block-class}__selections-row-selected#{$carbon-prefix}--structured-list-row:hover:not(#{$carbon-prefix}--structured-list-row--header-row):not(#{$carbon-prefix}--structured-list-row--selected) {
-  border-bottom: 1px solid $layer-accent-hover-01;
-  background-color: $layer-selected-hover-01;
-}
-
 .#{$block-class}__sub-header {
   display: flex;
   align-items: flex-end;
@@ -151,13 +146,13 @@ $tearsheet-class: #{$pkg-prefix}--tearsheet;
   }
 }
 
-.#{$block-class} #{$carbon-prefix}--structured-list-row {
+.#{$block-class} .#{$carbon-prefix}--structured-list-row {
   border-bottom: 0;
 }
 
 .#{$block-class}
-  #{$carbon-prefix}--structured-list--selection
-  #{$carbon-prefix}--structured-list-row:hover:not(#{$carbon-prefix}--structured-list-row--header-row):not(#{$carbon-prefix}--structured-list-row--selected) {
+  .#{$carbon-prefix}--structured-list--selection
+  .#{$carbon-prefix}--structured-list-row:hover:not(.#{$carbon-prefix}--structured-list-row--header-row):not(.#{$carbon-prefix}--structured-list-row--selected) {
   border-bottom: 0;
 }
 
@@ -228,7 +223,7 @@ $tearsheet-class: #{$pkg-prefix}--tearsheet;
     margin-left: $spacing-03;
   }
 
-  .#{$block-class}__selections-row#{$carbon-prefix}--structured-list-row {
+  .#{$block-class}__selections-row.#{$carbon-prefix}--structured-list-row {
     border-left: 0;
   }
 
@@ -241,7 +236,7 @@ $tearsheet-class: #{$pkg-prefix}--tearsheet;
     padding: 0 $spacing-03;
   }
 
-  .#{$block-class}__tag-container {
+  .#{$block-class}__tags {
     padding: 0 $spacing-03;
     margin-bottom: 0;
   }
@@ -250,7 +245,7 @@ $tearsheet-class: #{$pkg-prefix}--tearsheet;
     padding: 0;
   }
 
-  .#{$block-class}__selections#{$carbon-prefix}--structured-list {
+  .#{$block-class}__selections.#{$carbon-prefix}--structured-list {
     border-top: 0;
   }
 }
@@ -288,7 +283,7 @@ $tearsheet-class: #{$pkg-prefix}--tearsheet;
   }
 }
 
-.#{$block-class}__tag-container {
+.#{$block-class}__tags {
   display: flex;
   align-items: center;
   margin-top: $spacing-05;
@@ -379,7 +374,11 @@ button.#{$block-class}__global-filter-toggle {
 
 // overrides
 
-.#{$block-class}__tag-container .#{$carbon-prefix}--tag {
+.#{$block-class}__selections .#{$carbon-prefix}--list-box__menu {
+  left: auto;
+}
+
+.#{$block-class}__tags .#{$carbon-prefix}--tag {
   margin: 0;
 }
 
@@ -465,20 +464,20 @@ button.#{$block-class}__global-filter-toggle {
 }
 
 .#{$block-class}
-  #{$carbon-prefix}--accordion--start
-  #{$carbon-prefix}--accordion__arrow {
+  .#{$carbon-prefix}--accordion--start
+  .#{$carbon-prefix}--accordion__arrow {
   margin: 0 0 0 $spacing-05;
 }
 
 .#{$block-class}
-  #{$carbon-prefix}--accordion--start
-  #{$carbon-prefix}--accordion__title {
+  .#{$carbon-prefix}--accordion--start
+  .#{$carbon-prefix}--accordion__title {
   margin: 0 $spacing-05 0 $spacing-03;
 }
 
 .#{$block-class}
-  #{$carbon-prefix}--accordion__item--active
-  #{$carbon-prefix}--accordion__content {
+  .#{$carbon-prefix}--accordion__item--active
+  .#{$carbon-prefix}--accordion__content {
   padding-top: 0;
   padding-bottom: 0;
   margin-top: $spacing-03;

package/scss/components/AddSelect/_index.scss

@@ -1,5 +1,5 @@
 //
-// Copyright IBM Corp. 2021
+// 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.

package/scss/components/AddSelect/_storybook-styles.scss

@@ -1,5 +1,5 @@
 //
-// Copyright IBM Corp. 2021
+// 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.

package/scss/components/Datagrid/_storybook-styles.scss

@@ -97,3 +97,8 @@ $block-class: #{c4p-settings.$pkg-prefix}--datagrid;
 .#{$block-class}-story__hidden-column-id-snippet {
   padding-top: $spacing-07;
 }
+
+.#{$block-class}__mobile-toolbar-modal
+  .#{c4p-settings.$carbon-prefix}--dropdown__wrapper {
+  margin-bottom: $spacing-07;
+}

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

@@ -416,10 +416,20 @@
 }
 
 .#{$block-class}__carbon-row-expanded {
-  // Border applied to nested rows only on open chevron hover
-  &.#{$block-class}__carbon-row-expanded-hover-active
-    ~ .#{$block-class}__carbon-nested-row {
-    border-left: 1px solid $button-primary;
+  position: relative;
+  &.#{$block-class}__carbon-row-expanded-hover-active::before {
+    position: absolute;
+    z-index: 2;
+    /* stylelint-disable-next-line carbon/layout-token-use */
+    top: var(--#{$block-class}--row-height);
+    /* stylelint-disable-next-line carbon/layout-token-use */
+    left: calc(
+      var(--#{$block-class}--indicator-offset-amount) + #{$spacing-05}
+    );
+    width: 1px;
+    height: var(--#{$block-class}--indicator-height);
+    border-left: 1px solid $background-brand;
+    content: '';
   }
 }
 
@@ -530,3 +540,38 @@
   height: $spacing-09;
   justify-content: center;
 }
+
+.#{c4p-settings.$carbon-prefix}--body--with-modal-open
+  .#{$block-class}__grid-container {
+  overflow: hidden;
+  height: 100vh;
+}
+
+.#{$block-class} .#{c4p-settings.$carbon-prefix}--modal {
+  width: 100%;
+}
+
+.#{c4p-settings.$carbon-prefix}--overflow-menu.#{$block-class}__toolbar-menu__trigger {
+  flex-shrink: 0;
+  background-color: $interactive;
+}
+
+.#{c4p-settings.$carbon-prefix}--overflow-menu.#{$block-class}__toolbar-menu__trigger
+  svg {
+  fill: $background;
+}
+
+.#{c4p-settings.$carbon-prefix}--overflow-menu.#{$block-class}__toolbar-menu__trigger:hover,
+.#{c4p-settings.$carbon-prefix}--overflow-menu.#{$block-class}__toolbar-menu__trigger.#{c4p-settings.$carbon-prefix}--overflow-menu--open:hover,
+.#{c4p-settings.$carbon-prefix}--overflow-menu.#{$block-class}__toolbar-menu__trigger.#{c4p-settings.$carbon-prefix}--overflow-menu--open {
+  background-color: $button-primary-hover;
+}
+
+.#{$block-class}__toolbar-options.#{c4p-settings.$carbon-prefix}--overflow-menu-options::after {
+  background-color: transparent;
+}
+
+.#{$block-class}__mobile-toolbar-modal
+  .#{c4p-settings.$carbon-prefix}--modal-container {
+  position: absolute;
+}

package/scss/components/{InlineEdit → InlineEditV1}/_index-with-carbon.scss

@@ -6,4 +6,4 @@
 //
 
 @use './carbon-imports';
-@use './inline-edit';
+@use './inline-edit-v1';

package/scss/components/{InlineEdit → InlineEditV1}/_index.scss

@@ -5,4 +5,4 @@
 // LICENSE file in the root directory of this source tree.
 //
 
-@use './inline-edit';
+@use './inline-edit-v1';