@carbon/ibm-products 1.2.4 → 1.5.0

package/es/global/js/hooks/useCreateComponentStepChange.js

@@ -2,20 +2,24 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 
 /**
- * Copyright IBM Corp. 2021, 2021
+ * Copyright IBM Corp. 2021, 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 { useCallback, useEffect } from 'react';
 export var useCreateComponentStepChange = function useCreateComponentStepChange(_ref) {
-  var setCurrentStep = _ref.setCurrentStep,
+  var firstIncludedStep = _ref.firstIncludedStep,
+      lastIncludedStep = _ref.lastIncludedStep,
+      stepData = _ref.stepData,
+      onNext = _ref.onNext,
+      isSubmitDisabled = _ref.isSubmitDisabled,
+      setCurrentStep = _ref.setCurrentStep,
       setIsSubmitting = _ref.setIsSubmitting,
       setShouldViewAll = _ref.setShouldViewAll,
       onClose = _ref.onClose,
       onRequestSubmit = _ref.onRequestSubmit,
       componentName = _ref.componentName,
-      getComponentSteps = _ref.getComponentSteps,
       currentStep = _ref.currentStep,
       shouldViewAll = _ref.shouldViewAll,
       backButtonText = _ref.backButtonText,
@@ -28,8 +32,6 @@ export var useCreateComponentStepChange = function useCreateComponentStepChange(
       setModalIsOpen = _ref.setModalIsOpen;
   // useEffect to handle multi step logic
   useEffect(function () {
-    var _getComponentSteps;
-
     var onUnmount = function onUnmount() {
       if (componentName !== 'CreateFullPage') {
         setCurrentStep(0);
@@ -74,73 +76,47 @@ export var useCreateComponentStepChange = function useCreateComponentStepChange(
       };
     }();
 
-    var isSubmitDisabled = function isSubmitDisabled() {
-      var step = 0;
-      var submitDisabled = false;
-      var viewAllSubmitDisabled = false;
-      var createComponentSteps = getComponentSteps();
-      createComponentSteps.forEach(function (child) {
-        step++;
-
-        if (currentStep === step) {
-          submitDisabled = child.props.disableSubmit;
-        }
-
-        if (shouldViewAll && child.props.disableSubmit) {
-          viewAllSubmitDisabled = true;
-        }
-      });
-
-      if (!shouldViewAll) {
-        return submitDisabled;
-      }
-
-      return viewAllSubmitDisabled;
-    };
-
     var handleNext = /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var createSteps;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
                 setIsSubmitting(true);
-                createSteps = getComponentSteps();
 
-                if (!createSteps[currentStep - 1].props.onNext) {
-                  _context2.next = 15;
+                if (!(typeof onNext === 'function')) {
+                  _context2.next = 14;
                   break;
                 }
 
-                _context2.prev = 3;
-                _context2.next = 6;
-                return createSteps[currentStep - 1].props.onNext();
+                _context2.prev = 2;
+                _context2.next = 5;
+                return onNext();
 
-              case 6:
+              case 5:
                 continueToNextStep();
-                _context2.next = 13;
+                _context2.next = 12;
                 break;
 
-              case 9:
-                _context2.prev = 9;
-                _context2.t0 = _context2["catch"](3);
+              case 8:
+                _context2.prev = 8;
+                _context2.t0 = _context2["catch"](2);
                 setIsSubmitting(false);
                 console.warn("".concat(componentName, " onNext error: ").concat(_context2.t0));
 
-              case 13:
-                _context2.next = 16;
+              case 12:
+                _context2.next = 15;
                 break;
 
-              case 15:
+              case 14:
                 continueToNextStep();
 
-              case 16:
+              case 15:
               case "end":
                 return _context2.stop();
             }
           }
-        }, _callee2, null, [[3, 9]]);
+        }, _callee2, null, [[2, 8]]);
       }));
 
       return function handleNext() {
@@ -150,51 +126,49 @@ export var useCreateComponentStepChange = function useCreateComponentStepChange(
 
     var handleSubmit = /*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-        var createSteps;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                setIsSubmitting(true);
-                createSteps = getComponentSteps(); // last step should have onNext as well
+                setIsSubmitting(true); // last step should have onNext as well
 
-                if (!createSteps[currentStep - 1].props.onNext) {
-                  _context3.next = 16;
+                if (!(typeof onNext === 'function')) {
+                  _context3.next = 15;
                   break;
                 }
 
-                _context3.prev = 3;
-                _context3.next = 6;
-                return createSteps[currentStep - 1].props.onNext();
+                _context3.prev = 2;
+                _context3.next = 5;
+                return onNext();
 
-              case 6:
-                _context3.next = 8;
+              case 5:
+                _context3.next = 7;
                 return handleOnRequestSubmit();
 
-              case 8:
-                _context3.next = 14;
+              case 7:
+                _context3.next = 13;
                 break;
 
-              case 10:
-                _context3.prev = 10;
-                _context3.t0 = _context3["catch"](3);
+              case 9:
+                _context3.prev = 9;
+                _context3.t0 = _context3["catch"](2);
                 setIsSubmitting(false);
                 console.warn("".concat(componentName, " onNext error: ").concat(_context3.t0));
 
-              case 14:
-                _context3.next = 18;
+              case 13:
+                _context3.next = 17;
                 break;
 
-              case 16:
-                _context3.next = 18;
+              case 15:
+                _context3.next = 17;
                 return handleOnRequestSubmit();
 
-              case 18:
+              case 17:
               case "end":
                 return _context3.stop();
             }
           }
-        }, _callee3, null, [[3, 10]]);
+        }, _callee3, null, [[2, 9]]);
       }));
 
       return function handleSubmit() {
@@ -202,22 +176,29 @@ export var useCreateComponentStepChange = function useCreateComponentStepChange(
       };
     }();
 
-    if ((_getComponentSteps = getComponentSteps()) !== null && _getComponentSteps !== void 0 && _getComponentSteps.length) {
-      var createSteps = getComponentSteps();
-      var total = createSteps.length;
+    if ((stepData === null || stepData === void 0 ? void 0 : stepData.length) > 0) {
       var buttons = [];
 
-      if (total > 1 && !shouldViewAll) {
+      if ((stepData === null || stepData === void 0 ? void 0 : stepData.length) > 1 && !shouldViewAll) {
         buttons.push({
           key: 'create-action-button-back',
           label: backButtonText,
           onClick: function onClick() {
             return setCurrentStep(function (prev) {
-              return prev - 1;
+              // Find previous included step to render
+              // There will always be a previous step otherwise we will
+              // have disabled the back button since we have reached the first visible step
+              do {
+                var _stepData;
+
+                prev--;
+              } while (!((_stepData = stepData[prev - 1]) !== null && _stepData !== void 0 && _stepData.shouldIncludeStep));
+
+              return prev;
             });
           },
           kind: 'secondary',
-          disabled: currentStep === 1
+          disabled: currentStep === firstIncludedStep
         });
       }
 
@@ -231,20 +212,29 @@ export var useCreateComponentStepChange = function useCreateComponentStepChange(
       });
       buttons.push({
         key: 'create-action-button-submit',
-        label: shouldViewAll ? submitButtonText : currentStep < total ? nextButtonText : submitButtonText,
-        onClick: shouldViewAll ? handleSubmit : currentStep < total ? handleNext : handleSubmit,
-        disabled: isSubmitDisabled(),
+        label: shouldViewAll ? submitButtonText : currentStep < lastIncludedStep ? nextButtonText : submitButtonText,
+        onClick: shouldViewAll ? handleSubmit : currentStep < lastIncludedStep ? handleNext : handleSubmit,
+        disabled: isSubmitDisabled,
         kind: 'primary',
         loading: isSubmitting,
         className: "".concat(componentBlockClass, "__create-button")
       });
       setCreateComponentActions(buttons);
     }
-  }, [getComponentSteps, backButtonText, cancelButtonText, currentStep, onClose, nextButtonText, submitButtonText, onRequestSubmit, isSubmitting, shouldViewAll, componentBlockClass, componentName, continueToNextStep, setCurrentStep, setCreateComponentActions, setIsSubmitting, setShouldViewAll, setModalIsOpen]);
+  }, [firstIncludedStep, lastIncludedStep, stepData, onNext, isSubmitDisabled, backButtonText, cancelButtonText, currentStep, onClose, nextButtonText, submitButtonText, onRequestSubmit, isSubmitting, shouldViewAll, componentBlockClass, componentName, continueToNextStep, setCurrentStep, setCreateComponentActions, setIsSubmitting, setShouldViewAll, setModalIsOpen]);
   var continueToNextStep = useCallback(function () {
     setIsSubmitting(false);
     setCurrentStep(function (prev) {
-      return prev + 1;
+      // Find next included step to render
+      // There will always be a next step otherwise we will
+      // have reach the onSubmit
+      do {
+        var _stepData2;
+
+        prev++;
+      } while (!((_stepData2 = stepData[prev - 1]) !== null && _stepData2 !== void 0 && _stepData2.shouldIncludeStep));
+
+      return prev;
     });
-  }, [setCurrentStep, setIsSubmitting]);
+  }, [setCurrentStep, setIsSubmitting, stepData]);
 };

package/es/global/js/hooks/useResetCreateComponent.js

@@ -1,5 +1,5 @@
 /**
- * Copyright IBM Corp. 2021, 2021
+ * Copyright IBM Corp. 2021, 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.
@@ -8,6 +8,7 @@ import { useEffect } from 'react';
 /**
  * Resets the current step of the create component if it has been closed.
  * @param {object} useResetCreateComponent - Create component that uses this custom hook
+ * @param {object} useResetCreateComponent.firstIncludedStep
  * @param {object} useResetCreateComponent.previousState
  * @param {boolean} useResetCreateComponent.open
  * @param {Function} useResetCreateComponent.setCurrentStep
@@ -17,7 +18,8 @@ import { useEffect } from 'react';
  */
 
 export var useResetCreateComponent = function useResetCreateComponent(_ref) {
-  var previousState = _ref.previousState,
+  var firstIncludedStep = _ref.firstIncludedStep,
+      previousState = _ref.previousState,
       open = _ref.open,
       setCurrentStep = _ref.setCurrentStep,
       initialStep = _ref.initialStep,
@@ -28,7 +30,8 @@ export var useResetCreateComponent = function useResetCreateComponent(_ref) {
       if (initialStep && totalSteps && Number(initialStep) <= Number(totalSteps) && Number(initialStep) > 0) {
         setCurrentStep(Number(initialStep));
       } else {
-        setCurrentStep(1);
+        // default should be fist includedStep instead of just 1
+        setCurrentStep(firstIncludedStep);
       } // An invalid initialStep value was provided, we'll default to rendering the first step in this scenario
 
 
@@ -36,5 +39,5 @@ export var useResetCreateComponent = function useResetCreateComponent(_ref) {
         console.warn("".concat(componentName, ": An invalid `initialStep` prop was supplied. The `initialStep` prop should be a number that is greater than 0 or less than or equal to the number of steps your ").concat(componentName, " has."));
       }
     }
-  }, [open, previousState, setCurrentStep, initialStep, totalSteps, componentName]);
+  }, [firstIncludedStep, open, previousState, setCurrentStep, initialStep, totalSteps, componentName]);
 };

package/es/global/js/hooks/useRetrieveStepData.js

@@ -0,0 +1,51 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+
+/**
+ * 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 { useEffect } from 'react';
+/**
+ * This useEffect makes sure that every CreateTearsheetStep/CreateFullPageStep reports back it's
+ * title, secondaryLabel, introStep, and shouldIncludeStep data so that it can be sent to the CreateInfluencer.
+ * @param {object} useResetCreateComponent
+ * @param {object} useResetCreateComponent.stepsContext
+ * @param {number} useResetCreateComponent.stepNumber
+ * @param {boolean} useResetCreateComponent.introStep
+ * @param {boolean} useResetCreateComponent.shouldIncludeStep
+ * @param {string} useResetCreateComponent.secondaryLabel
+ * @param {string} useResetCreateComponent.title
+ */
+
+export var useRetrieveStepData = function useRetrieveStepData(_ref) {
+  var stepsContext = _ref.stepsContext,
+      stepNumber = _ref.stepNumber,
+      introStep = _ref.introStep,
+      shouldIncludeStep = _ref.shouldIncludeStep,
+      secondaryLabel = _ref.secondaryLabel,
+      title = _ref.title;
+  useEffect(function () {
+    if (stepsContext) {
+      stepsContext.setStepData(function (prev) {
+        var stepItem = {
+          title: title,
+          secondaryLabel: secondaryLabel,
+          introStep: introStep,
+          shouldIncludeStep: shouldIncludeStep
+        };
+        var previousItem = prev[stepNumber - 1];
+
+        if ((previousItem === null || previousItem === void 0 ? void 0 : previousItem.title) !== stepItem.title || (previousItem === null || previousItem === void 0 ? void 0 : previousItem.secondaryLabel) !== stepItem.secondaryLabel || (previousItem === null || previousItem === void 0 ? void 0 : previousItem.introStep) !== stepItem.introStep || (previousItem === null || previousItem === void 0 ? void 0 : previousItem.shouldIncludeStep) !== stepItem.shouldIncludeStep) {
+          var clone = _toConsumableArray(prev);
+
+          clone[stepNumber - 1] = stepItem;
+          return clone;
+        }
+
+        return prev;
+      });
+    }
+  }, [shouldIncludeStep, title, secondaryLabel, introStep, stepsContext, stepNumber]);
+};

package/es/global/js/hooks/useValidCreateStepCount.js

@@ -7,17 +7,14 @@
 import { useEffect } from 'react';
 /**
  * Logs a warning to console if an invalid number of steps are used with the given CreateComponent
- * @param {Function} getCreateComponentSteps
+ * @param {number} stepCount
  * @param {string} componentName
  */
 
-export var useValidCreateStepCount = function useValidCreateStepCount(getCreateComponentSteps, componentName) {
+export var useValidCreateStepCount = function useValidCreateStepCount(stepCount, componentName) {
   useEffect(function () {
-    var createSteps = getCreateComponentSteps();
-    var total = createSteps.length;
-
-    if (total === 1) {
+    if (stepCount === 1) {
       console.warn("".concat(componentName, ": ").concat(componentName, "s with one step are not permitted. If you require only one step, please use either the CreateTearsheetNarrow, CreateSidePanel, or CreateModal components."));
     }
-  }, [getCreateComponentSteps, componentName]);
+  }, [stepCount, componentName]);
 };

package/es/global/js/package-settings.js

@@ -52,6 +52,8 @@ var defaults = {
     UnauthorizedEmptyState: true,
     UserProfileImage: true,
     // other public components not yet reviewed and released:
+    MultiAddSelect: false,
+    SingleAddSelect: false,
     LoadingBar: false,
     ModifiedTabs: false,
     Toolbar: false,
@@ -59,7 +61,9 @@ var defaults = {
     ToolbarGroup: false,
     WebTerminal: false,
     EditSidePanel: false,
-    OptionsTile: false
+    OptionsTile: false,
+    CancelableTextEdit: false,
+    InlineEdit: false
     /* new component flags here - comment used by generate CLI */
 
   },

package/es/global/js/utils/lastIndexInArray.js

@@ -0,0 +1,26 @@
+/**
+ * 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.
+ */
+
+/**
+ * This utility will return the index of the last instance of an
+ * item in the given array of objects whose key is equal to the value
+ * parameter. If there are no matches, -1 is returned as similar to findIndex
+ * @param {Array<Object.*>} array
+ * @param {string} key
+ * @param {string|boolean|number} value
+ */
+export var lastIndexInArray = function lastIndexInArray(array, key, value) {
+  for (var i = array.length - 1; i >= 0; i--) {
+    var _array$i;
+
+    if (((_array$i = array[i]) === null || _array$i === void 0 ? void 0 : _array$i[key]) === value) {
+      return i + 1;
+    }
+  }
+
+  return -1;
+};

package/es/global/js/utils/story-helper.js

@@ -17,7 +17,7 @@ import { getPathForComponent } from '../../../../../core/story-structure';
 
 export var getStoryTitle = function getStoryTitle(componentName) {
   var title = // if the component isn't in the master structure, put it in a lost+found section
-  getPathForComponent('c', componentName) || "Cloud & Cognitive/Lost + found/".concat(componentName); // add a canary tag if the component is public but not normally enabled
+  getPathForComponent('c', componentName) || "Carbon for IBM Products/Lost + found/".concat(componentName); // add a canary tag if the component is public but not normally enabled
 
   return !pkg.isComponentEnabled(componentName, true) && pkg.isComponentPublic(componentName, true) ? "".concat(title, "#canary") : title;
 };

package/lib/components/APIKeyModal/APIKeyModal.js

@@ -112,7 +112,6 @@ var APIKeyModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       currentStep = _useState6[0],
       setCurrentStep = _useState6[1];
 
-  var inputRef = (0, _react.useRef)();
   var copyRef = (0, _react.useRef)();
   var apiKeyInputId = (0, _react.useRef)((0, _uuidv.default)());
   var nameInputId = (0, _react.useRef)((0, _uuidv.default)());
@@ -126,11 +125,6 @@ var APIKeyModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     ref: copyRef
   };
   var blockClass = "".concat(_settings.pkg.prefix, "--apikey-modal");
-  (0, _react.useEffect)(function () {
-    if (inputRef.current && open) {
-      inputRef.current.focus();
-    }
-  }, [open]);
   (0, _react.useEffect)(function () {
     if (copyRef.current && open && apiKeyLoaded) {
       copyRef.current.focus();
@@ -204,70 +198,72 @@ var APIKeyModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   };
 
   var submitHandler = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(e) {
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
+              e.preventDefault();
+
               if (!hasNextStep) {
-                _context.next = 4;
+                _context.next = 5;
                 break;
               }
 
               setCurrentStep(currentStep + 1);
-              _context.next = 21;
+              _context.next = 22;
               break;
 
-            case 4:
+            case 5:
               if (!apiKeyLoaded) {
-                _context.next = 20;
+                _context.next = 21;
                 break;
               }
 
               if (!onCopy) {
-                _context.next = 9;
+                _context.next = 10;
                 break;
               }
 
               onCopy(apiKey);
-              _context.next = 18;
+              _context.next = 19;
               break;
 
-            case 9:
-              _context.prev = 9;
-              _context.next = 12;
+            case 10:
+              _context.prev = 10;
+              _context.next = 13;
               return navigator.clipboard.writeText(apiKey);
 
-            case 12:
-              _context.next = 18;
+            case 13:
+              _context.next = 19;
               break;
 
-            case 14:
-              _context.prev = 14;
-              _context.t0 = _context["catch"](9);
+            case 15:
+              _context.prev = 15;
+              _context.t0 = _context["catch"](10);
               console.error(_context.t0);
               setCopyError(true);
 
-            case 18:
-              _context.next = 21;
+            case 19:
+              _context.next = 22;
               break;
 
-            case 20:
+            case 21:
               if (editing) {
                 onRequestEdit(name);
               } else {
                 onRequestGenerate(name);
               }
 
-            case 21:
+            case 22:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[9, 14]]);
+      }, _callee, null, [[10, 15]]);
     }));
 
-    return function submitHandler() {
+    return function submitHandler(_x) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -318,8 +314,8 @@ var APIKeyModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     value: name,
     id: nameInputId.current,
     disabled: loading,
-    ref: inputRef,
-    required: nameRequired
+    required: nameRequired,
+    "data-modal-primary-focus": true
   })), loading && /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.InlineLoading, {
     description: loadingText,
     className: "".concat(blockClass, "__loader")

package/lib/components/ActionBar/ActionBar.js

@@ -38,7 +38,7 @@ var _ActionBarItem = require("./ActionBarItem");
 var _ActionBarOverflowItems = require("./ActionBarOverflowItems");
 
 var _excluded = ["actions", "className", "maxVisible", "menuOptionsClass", "onWidthChange", "overflowAriaLabel", "rightAlign"],
-    _excluded2 = ["key"],
+    _excluded2 = ["key", "id"],
     _excluded3 = ["key"];
 
 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); }
@@ -100,8 +100,11 @@ var ActionBar = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
       key: "hidden-overflow-menu"
     }), actions.map(function (_ref2) {
       var key = _ref2.key,
+          id = _ref2.id,
           rest = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
       return /*#__PURE__*/_react.default.createElement(_ActionBarItem.ActionBarItem, (0, _extends2.default)({}, rest, {
+        // ensure id is not duplicated
+        "data-original-id": id,
         key: "hidden-item-".concat(key),
         className: "".concat(blockClass, "__hidden-sizing-item")
       }));

package/lib/components/ActionSet/ActionSet.js

@@ -46,7 +46,7 @@ var ActionSetButton = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
       rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Button, (0, _extends2.default)({}, rest, {
     isExpressive: true,
-    className: (0, _classnames.default)(className, ["".concat(blockClass, "__action-button"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__action-button--ghost"), kind === 'ghost')]),
+    className: (0, _classnames.default)(className, ["".concat(blockClass, "__action-button"), (0, _defineProperty2.default)({}, "".concat(blockClass, "__action-button--ghost"), kind === 'ghost' || kind === 'danger--ghost')]),
     disabled: disabled || loading || false,
     kind: kind,
     onClick: onClick,
@@ -57,7 +57,7 @@ var ActionSetButton = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
 
 ActionSetButton.displayName = 'ActionSetButton';
 ActionSetButton.propTypes = _objectSpread(_objectSpread({}, _carbonComponentsReact.Button.PropTypes), {}, {
-  kind: _propTypes.default.oneOf(['ghost', 'secondary', 'primary']),
+  kind: _propTypes.default.oneOf(['ghost', 'danger--ghost', 'secondary', 'danger', 'primary']),
   label: _propTypes.default.string,
   loading: _propTypes.default.bool
 });
@@ -90,13 +90,24 @@ var ActionSet = /*#__PURE__*/_react.default.forwardRef(function (_ref3, ref) {
       rest = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
   var buttons = actions && ((_actions$slice = actions.slice) === null || _actions$slice === void 0 ? void 0 : _actions$slice.call(actions, 0)) || []; // We stack the buttons in a xs/sm set, or if there are three or more in a md set.
 
-  var stacking = willStack(size, buttons.length); // order the actions with ghost buttons first and primary buttons last
-  // (and the opposite way if we're stacking)
+  var stacking = willStack(size, buttons.length); // Order of button kinds: ghost first, then danger--ghost, then most other types,
+  // then danger, and finally primary
+
+  var buttonOrder = function buttonOrder(kind) {
+    var _ghost$dangerGhost$;
+
+    return (_ghost$dangerGhost$ = {
+      ghost: 1,
+      'danger--ghost': 2,
+      danger: 4,
+      primary: 5
+    }[kind]) !== null && _ghost$dangerGhost$ !== void 0 ? _ghost$dangerGhost$ : 3;
+  }; // order the actions with ghost/ghost-danger buttons first and primary/danger buttons last
+  // (or the opposite way if we're stacking)
+
 
   buttons.sort(function (action1, action2) {
-    var kind1 = action1.kind || defaultKind;
-    var kind2 = action2.kind || defaultKind;
-    return kind1 === 'ghost' || kind2 === 'primary' ? stacking ? 1 : -1 : kind1 === 'primary' || kind2 === 'ghost' ? stacking ? -1 : 1 : 0;
+    return (buttonOrder(action1.kind || defaultKind) - buttonOrder(action2.kind || defaultKind)) * (stacking ? -1 : 1);
   });
   return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.ButtonSet, (0, _extends2.default)({}, rest, {
     className: (0, _classnames.default)(blockClass, className, (_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--row-single"), !stacking && buttons.length === 1), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--row-double"), !stacking && buttons.length === 2), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--row-triple"), !stacking && buttons.length === 3), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--row-quadruple"), !stacking && buttons.length >= 4), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "--stacking"), stacking), _cx), "".concat(blockClass, "--").concat(size)),
@@ -147,13 +158,14 @@ ActionSet.validateActions = function (sizeFn) {
 
       var primaryActions = countActions('primary');
       var secondaryActions = countActions('secondary');
-      var ghostActions = countActions('ghost');
+      var dangerActions = countActions('danger');
+      var ghostActions = countActions('ghost') + countActions('danger--ghost');
       stacking && actions > 3 && problems.push("you cannot have more than three actions in this size of ".concat(componentName));
       actions > 4 && problems.push("you cannot have more than four actions in a ".concat(componentName));
       primaryActions > 1 && problems.push("you cannot have more than one 'primary' action in a ".concat(componentName));
       ghostActions > 1 && problems.push("you cannot have more than one 'ghost' action in a ".concat(componentName));
       stacking && actions > 1 && ghostActions > 0 && problems.push("you cannot have a 'ghost' button in conjunction with other action types in this size of ".concat(componentName));
-      actions > primaryActions + secondaryActions + ghostActions && problems.push("you can only have 'primary', 'secondary' and 'ghost' buttons in a ".concat(componentName));
+      actions > primaryActions + secondaryActions + dangerActions + ghostActions && problems.push("you can only have 'primary', 'danger', 'secondary', 'ghost' and 'danger--ghost' buttons in a ".concat(componentName));
     }
 
     return problems.length > 0 ? new Error("Invalid ".concat(location, " `").concat(name, "` supplied to `").concat(componentName, "`: ").concat(problems.join(', and '), ".")) : null;
@@ -174,7 +186,7 @@ ActionSet.propTypes = {
    * See https://react.carbondesignsystem.com/?path=/docs/components-button--default#component-api
    */
   actions: (0, _propsHelper.allPropTypes)([ActionSet.validateActions(), _propTypes.default.arrayOf(_propTypes.default.shape(_objectSpread(_objectSpread({}, _carbonComponentsReact.Button.propTypes), {}, {
-    kind: _propTypes.default.oneOf(['ghost', 'secondary', 'primary']),
+    kind: _propTypes.default.oneOf(['ghost', 'danger--ghost', 'secondary', 'danger', 'primary']),
     label: _propTypes.default.string,
     loading: _propTypes.default.bool,
     // we duplicate this Button prop to improve the DocGen here