@carbon/ibm-products 2.11.0 → 2.11.1

package/lib/components/EditTearsheet/EditTearsheet.js

@@ -16,9 +16,9 @@ var _react2 = require("@carbon/react");
 var _settings = require("../../settings");
 var _devtools = require("../../global/js/utils/devtools");
 var _TearsheetShell = require("../Tearsheet/TearsheetShell");
-var _excluded = ["cancelButtonText", "children", "className", "description", "influencerWidth", "label", "onClose", "open", "submitButtonText", "title", "verticalPosition", "onHandleModalClick"];
+var _excluded = ["cancelButtonText", "children", "className", "description", "influencerWidth", "label", "onClose", "open", "submitButtonText", "title", "verticalPosition", "onHandleModalClick", "onFormChange", "sideNavAriaLabel"];
 /**
- * Copyright IBM Corp. 2022, 2022
+ * Copyright IBM Corp. 2022, 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.
@@ -42,7 +42,8 @@ var FormNumberContext = /*#__PURE__*/(0, _react.createContext)(0);
 exports.FormNumberContext = FormNumberContext;
 var defaults = {
   verticalPosition: 'normal',
-  influencerWidth: 'narrow'
+  influencerWidth: 'narrow',
+  sideNavAriaLabel: 'Side navigation'
 };
 
 /**
@@ -63,40 +64,43 @@ var EditTearsheet = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     _ref$verticalPosition = _ref.verticalPosition,
     verticalPosition = _ref$verticalPosition === void 0 ? defaults.verticalPosition : _ref$verticalPosition,
     onHandleModalClick = _ref.onHandleModalClick,
+    onFormChange = _ref.onFormChange,
+    _ref$sideNavAriaLabel = _ref.sideNavAriaLabel,
+    sideNavAriaLabel = _ref$sideNavAriaLabel === void 0 ? defaults.sideNavAriaLabel : _ref$sideNavAriaLabel,
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _useState = (0, _react.useState)(0),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     currentForm = _useState2[0],
     setCurrentForm = _useState2[1];
+  var _useState3 = (0, _react.useState)([]),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    formTitles = _useState4[0],
+    setFormTitles = _useState4[1];
   var contentRef = (0, _react.useRef)();
-  var handleCurrentForm = function handleCurrentForm(form) {
-    setCurrentForm(form);
+  var handleCurrentForm = function handleCurrentForm(formIndex) {
+    setCurrentForm(formIndex);
+    if (onFormChange) {
+      onFormChange(formIndex);
+    }
   };
-  var sideNavItems = [{
-    label: 'Topic Name'
-  }, {
-    label: 'Location'
-  }, {
-    label: 'Partitions'
-  }, {
-    label: 'Message retention'
-  }];
-  var influencer = /*#__PURE__*/_react.default.createElement("div", {
-    className: "tearsheet-stories__dummy-influencer-block"
-  }, /*#__PURE__*/_react.default.createElement(_react2.SideNav, {
-    "aria-label": "Side navigation",
-    className: "".concat(blockClass, "__side-nav"),
-    expanded: true,
-    isFixedNav: false
-  }, /*#__PURE__*/_react.default.createElement(_react2.SideNavItems, null, sideNavItems.map(function (item, index) {
-    return /*#__PURE__*/_react.default.createElement(_react2.SideNavMenuItem, {
-      key: index,
-      onClick: function onClick() {
-        return handleCurrentForm(index);
-      },
-      isActive: currentForm === index
-    }, item.label);
-  }))));
+  function defaultInfluencer() {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: "".concat(blockClass, "__side-nav-wrapper")
+    }, /*#__PURE__*/_react.default.createElement(_react2.SideNav, {
+      "aria-label": sideNavAriaLabel,
+      className: "".concat(blockClass, "__side-nav"),
+      expanded: true,
+      isFixedNav: false
+    }, /*#__PURE__*/_react.default.createElement(_react2.SideNavItems, null, formTitles.map(function (title, index) {
+      return /*#__PURE__*/_react.default.createElement(_react2.SideNavMenuItem, {
+        key: index,
+        onClick: function onClick() {
+          return handleCurrentForm(index);
+        },
+        isActive: currentForm === index
+      }, title);
+    }))));
+  }
   return /*#__PURE__*/_react.default.createElement(_TearsheetShell.TearsheetShell, (0, _extends2.default)({}, rest, (0, _devtools.getDevtoolsProps)(componentName), {
     actions: [{
       label: submitButtonText,
@@ -110,7 +114,7 @@ var EditTearsheet = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     className: (0, _classnames.default)(blockClass, className),
     description: description,
     hasCloseIcon: false,
-    influencer: influencer,
+    influencer: defaultInfluencer(),
     influencerPosition: "left",
     influencerWidth: influencerWidth,
     label: label,
@@ -126,7 +130,8 @@ var EditTearsheet = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     role: "main"
   }, /*#__PURE__*/_react.default.createElement(_react2.Form, null, /*#__PURE__*/_react.default.createElement(FormContext.Provider, {
     value: {
-      currentForm: currentForm
+      currentForm: currentForm,
+      setFormTitles: setFormTitles
     }
   }, _react.default.Children.map(children, function (child, index) {
     return /*#__PURE__*/_react.default.createElement(FormNumberContext.Provider, {
@@ -162,12 +167,6 @@ EditTearsheet.propTypes = {
    * A description of the flow, displayed in the header area of the tearsheet.
    */
   description: _propTypes.default.node,
-  /**
-   * The content for the influencer section of the tearsheet, displayed
-   * alongside the main content. This is typically a menu, or filter, or
-   * progress indicator, or similar.
-   */
-  influencer: _propTypes.default.element,
   /**
    * Used to set the size of the influencer
    */
@@ -184,6 +183,12 @@ EditTearsheet.propTypes = {
    * Returning `false` here prevents the modal from closing.
    */
   onClose: _propTypes.default.func,
+  /**
+   * An optional handler that is called when a user changes forms via clicking
+   * an influencer nav item.
+   * Returns the index of the selected form.
+   */
+  onFormChange: _propTypes.default.func,
   /**
    * Specifies whether the tearsheet is currently open.
    */
@@ -192,6 +197,10 @@ EditTearsheet.propTypes = {
    * Specifies whether the tearsheet is currently open.
    */
   open: _propTypes.default.bool,
+  /**
+   * Specifies the aria label for the SideNav from Carbon UIShell
+   */
+  sideNavAriaLabel: _propTypes.default.string,
   /**
    * The submit button text
    */

package/lib/components/EditTearsheet/EditTearsheetForm.js

@@ -16,6 +16,7 @@ var _react2 = require("@carbon/react");
 var _EditTearsheet = require("./EditTearsheet");
 var _settings = require("../../settings");
 var _pconsole = _interopRequireDefault(require("../../global/js/utils/pconsole"));
+var _useRetrieveFormTitles = require("../../global/js/hooks/useRetrieveFormTitles");
 var _excluded = ["children", "className", "description", "fieldsetLegendText", "hasFieldset", "subtitle", "title"];
 /**
  * Copyright IBM Corp. 2022, 2022
@@ -45,6 +46,11 @@ var EditTearsheetForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var formContext = (0, _react.useContext)(_EditTearsheet.FormContext);
   var formNumber = (0, _react.useContext)(_EditTearsheet.FormNumberContext);
+  (0, _useRetrieveFormTitles.useRetrieveFormTitles)({
+    formContext: formContext,
+    formNumber: formNumber,
+    title: title
+  });
   return formContext ? /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, rest, {
     className: (0, _classnames.default)(blockClass, className, (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__form--hidden-form"), formNumber !== (formContext === null || formContext === void 0 ? void 0 : formContext.currentForm)), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__form--visible-form"), formNumber === (formContext === null || formContext === void 0 ? void 0 : formContext.currentForm)), _cx)),
     ref: ref

package/lib/components/EditTearsheet/preview-components/MultiFormEditTearsheet.js

@@ -13,6 +13,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _settings = require("../../../settings");
 var _EditTearsheet = require("../EditTearsheet");
 var _EditTearsheetForm = require("../EditTearsheetForm");
+var _addonActions = require("@storybook/addon-actions");
 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; }
 /* eslint-disable react/prop-types */
@@ -82,6 +83,9 @@ var MultiFormEditTearsheet = function MultiFormEditTearsheet(_ref) {
   var handleModalClick = function handleModalClick() {
     setOpen(!open);
   };
+  var handleFormChange = function handleFormChange() {
+    (0, _addonActions.action)('handleFormChange')();
+  };
   return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("style", null, ".".concat(blockClass, " { opacity: 0 }"), ";"), /*#__PURE__*/_react.default.createElement(_react2.Button, {
     onClick: handleModalClick
   }, open ? 'Close EditTearsheet' : 'Open EditTearsheet'), /*#__PURE__*/_react.default.createElement(_EditTearsheet.EditTearsheet, {
@@ -94,7 +98,8 @@ var MultiFormEditTearsheet = function MultiFormEditTearsheet(_ref) {
     title: title,
     open: open,
     onHandleModalClick: handleModalClick,
-    onClose: clearCreateData
+    onClose: clearCreateData,
+    onFormChange: handleFormChange
   }, /*#__PURE__*/_react.default.createElement(_EditTearsheetForm.EditTearsheetForm, {
     title: "Topic name",
     fieldsetLegendText: "Topic information",

package/lib/components/Tearsheet/Tearsheet.js

@@ -182,9 +182,9 @@ Tearsheet.propTypes = _objectSpread({
    */
   open: _propTypes.default.bool,
   /**
-   * The DOM node the tearsheet should be rendered within. Defaults to document.body.
+   * The DOM element that the tearsheet should be rendered within. Defaults to document.body.
    */
-  portalTarget: _propTypes.default.node,
+  portalTarget: _propTypes.default.instanceOf(Element),
   /**
    * Specify a CSS selector that matches the DOM element that should be focused when the Modal opens
    */

package/lib/components/Tearsheet/TearsheetNarrow.js

@@ -148,9 +148,9 @@ TearsheetNarrow.propTypes = _objectSpread({
    */
   open: _propTypes.default.bool,
   /**
-   * The DOM node the tearsheet should be rendered within. Defaults to document.body.
+   * The DOM element that the tearsheet should be rendered within. Defaults to document.body.
    */
-  portalTarget: _propTypes.default.node,
+  portalTarget: _propTypes.default.instanceOf(Element),
   /**
    * The main title of the tearsheet, displayed in the header area.
    */

package/lib/components/Tearsheet/TearsheetShell.js

@@ -394,9 +394,9 @@ TearsheetShell.propTypes = _objectSpread({
    */
   open: _propTypes.default.bool,
   /**
-   * The DOM node the tearsheet should be rendered within. Defaults to document.body.
+   * The DOM element that the tearsheet should be rendered within. Defaults to document.body.
    */
-  portalTarget: _propTypes.default.node,
+  portalTarget: _propTypes.default.instanceOf(Element),
   /**
    * Specifies the width of the tearsheet, 'narrow' or 'wide'.
    */

package/lib/global/js/hooks/useRetrieveFormTitles.js

@@ -0,0 +1,28 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useRetrieveFormTitles = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _react = require("react");
+var useRetrieveFormTitles = function useRetrieveFormTitles(_ref) {
+  var formContext = _ref.formContext,
+    formNumber = _ref.formNumber,
+    title = _ref.title;
+  (0, _react.useEffect)(function () {
+    if (formContext) {
+      formContext.setFormTitles(function (prev) {
+        var prevTitle = prev[formNumber];
+        if (prevTitle !== title) {
+          var clone = (0, _toConsumableArray2.default)(prev);
+          clone[formNumber] = title;
+          return clone;
+        }
+        return prev;
+      });
+    }
+  }, [title, formContext, formNumber]);
+};
+exports.useRetrieveFormTitles = useRetrieveFormTitles;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "2.11.0",
+  "version": "2.11.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -57,9 +57,6 @@
   "devDependencies": {
     "@babel/cli": "^7.22.10",
     "@babel/core": "^7.22.10",
-    "@dnd-kit/core": "^6.0.8",
-    "@dnd-kit/sortable": "^7.0.2",
-    "@dnd-kit/utilities": "^3.2.1",
     "babel-preset-ibm-cloud-cognitive": "^0.14.39",
     "chalk": "^4.1.2",
     "change-case": "^4.1.2",
@@ -80,6 +77,9 @@
   "dependencies": {
     "@babel/runtime": "^7.22.10",
     "@carbon/telemetry": "^0.1.0",
+    "@dnd-kit/core": "^6.0.8",
+    "@dnd-kit/sortable": "^7.0.2",
+    "@dnd-kit/utilities": "^3.2.1",
     "framer-motion": "^6.5.1 < 7",
     "immutability-helper": "^3.1.1",
     "lodash": "^4.17.21",
@@ -96,5 +96,5 @@
     "react": "^16.8.6 || ^17.0.1 || ^18.2.0",
     "react-dom": "^16.8.6 || ^17.0.1 || ^18.2.0"
   },
-  "gitHead": "512f13bb07b7b8c7bdbd1ea97d2bc1e86de3fabf"
+  "gitHead": "7764b5a83d2878931c637c3a76e04c857f0aeb19"
 }

package/scss/components/Datagrid/_datagrid.scss

@@ -31,6 +31,7 @@ $block-class: #{c4p-settings.$pkg-prefix}--datagrid;
 .#{$block-class}__datagridWrap {
   display: block;
   width: 100%;
+
   :global(.#{c4p-settings.$carbon-prefix}--checkbox) {
     display: none;
   }
@@ -70,3 +71,11 @@ $block-class: #{c4p-settings.$pkg-prefix}--datagrid;
     }
   }
 }
+
+// firefox fix for issue mentioned in 3442
+.#{$block-class}
+  .#{c4p-settings.$carbon-prefix}--menu-button__trigger:not(
+    .#{c4p-settings.$carbon-prefix}--btn--ghost
+  ) {
+  min-width: auto;
+}

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

@@ -6,6 +6,7 @@
 //
 
 @use '@carbon/styles/scss/theme' as *;
+@use '@carbon/layout/scss/convert' as *;
 @use '@carbon/styles/scss/spacing' as *;
 @use '@carbon/react/scss/components/button/tokens' as *;
 @use '../../../global/styles/project-settings' as c4p-settings;

package/scss/components/Datagrid/styles/addons/_FilterFlyout.scss

@@ -9,6 +9,7 @@
 // stylelint-disable carbon/layout-token-use
 
 @use '@carbon/styles/scss/theme' as *;
+@use '@carbon/layout/scss/convert' as *;
 @use '@carbon/styles/scss/spacing' as *;
 @use '@carbon/styles/scss/type' as *;
 @use '@carbon/layout' as *;

package/scss/components/Datagrid/styles/addons/_FilterPanel.scss

@@ -8,6 +8,7 @@
 
 @use '../variables' as *;
 @use '@carbon/styles/scss/theme' as *;
+@use '@carbon/layout/scss/convert' as *;
 @use '@carbon/styles/scss/spacing' as *;
 @use '@carbon/styles/scss/type' as *;
 @use '../../../../global/styles/project-settings' as c4p-settings;

package/scss/components/FilterSummary/_filter-summary.scss

@@ -5,6 +5,7 @@
 // LICENSE file in the root directory of this source tree.
 //
 @use '../../global/styles/project-settings' as *;
+@use '@carbon/layout/scss/convert' as *;
 @use '@carbon/styles/scss/spacing' as *;
 @use '@carbon/styles/scss/theme' as *;