@carbon/ibm-products 1.3.0 → 1.6.1

package/lib/components/TagSet/TagSet.js

@@ -38,7 +38,7 @@ var _propsHelper = require("../../global/js/utils/props-helper");
 var _settings = require("../../settings");
 
 var _excluded = ["align", "className", "maxVisible", "overflowAlign", "overflowClassName", "overflowDirection", "allTagsModalTitle", "allTagsModalSearchLabel", "allTagsModalSearchPlaceholderText", "showAllTagsLabel", "tags"],
-    _excluded2 = ["label"],
+    _excluded2 = ["label", "id"],
     _excluded3 = ["label"];
 
 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); }
@@ -108,6 +108,7 @@ var TagSet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
 
     setHiddenSizingTags(tags && tags.length > 0 ? tags.map(function (_ref2, index) {
       var label = _ref2.label,
+          id = _ref2.id,
           other = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
       return /*#__PURE__*/_react.default.createElement("div", {
         key: index,
@@ -116,6 +117,8 @@ var TagSet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
           return newSizingTags[index] = el;
         }
       }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Tag, (0, _extends2.default)({}, other, {
+        // ensure id is not duplicated
+        "data-original-id": id,
         filter: false
       }), label));
     }) : []);

package/lib/components/Tearsheet/Tearsheet.js

@@ -94,7 +94,7 @@ Tearsheet.propTypes = _objectSpread({
   actions: (0, _propsHelper.allPropTypes)([_ActionSet.ActionSet.validateActions(function () {
     return 'max';
   }), _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

package/lib/components/Tearsheet/TearsheetNarrow.js

@@ -90,7 +90,7 @@ TearsheetNarrow.propTypes = _objectSpread({
   actions: (0, _propsHelper.allPropTypes)([_ActionSet.ActionSet.validateActions(function () {
     return 'lg';
   }), _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

package/lib/components/Tearsheet/TearsheetShell.js

@@ -311,7 +311,7 @@ TearsheetShell.propTypes = _objectSpread({
   actions: _propTypes.default.arrayOf( // NB we don't include the validator here, as the component wrapping this
   // one should ensure appropriate validation is done.
   _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

package/lib/components/Toolbar/Toolbar.js

@@ -13,6 +13,8 @@ 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 _classnames = _interopRequireDefault(require("classnames"));
@@ -21,6 +23,8 @@ var _propTypes = require("prop-types");
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _getFocusableElements2 = require("../../global/js/utils/getFocusableElements");
+
 var _settings = require("../../settings");
 
 var _excluded = ["children", "className", "vertical"];
@@ -37,14 +41,73 @@ var ToolbarContext = /*#__PURE__*/(0, _react.createContext)();
 /** Toolbars are a collection of action items that organize a program’s interaction patterns into a series of closely related commands. */
 
 exports.ToolbarContext = ToolbarContext;
-var Toolbar = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
-  var children = _ref.children,
-      className = _ref.className,
-      vertical = _ref.vertical,
-      rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+var Toolbar = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, r) {
+  var children = _ref2.children,
+      className = _ref2.className,
+      vertical = _ref2.vertical,
+      rest = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
+  var focusableElements = (0, _react.useRef)();
+  var getFocusableElements = (0, _react.useCallback)(function () {
+    return focusableElements.current;
+  }, [focusableElements]);
+
+  var _ref = (0, _react.useRef)();
+
+  var ref = r || _ref;
+
+  var _useState = (0, _react.useState)(),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      focus = _useState2[0],
+      setFocus = _useState2[1];
+
+  (0, _react.useEffect)(function () {
+    focusableElements.current = (0, _getFocusableElements2.getFocusableElements)(ref.current);
+    typeof focus !== 'undefined' && getFocusableElements().forEach(function (element, index) {
+      element[index !== focus ? 'setAttribute' : 'removeAttribute']('tabindex', -1);
+    });
+  });
+  (0, _react.useEffect)(function () {
+    typeof focus !== 'undefined' && getFocusableElements()[focus].focus();
+  }, [focus, getFocusableElements]);
+
+  var _ref3 = !vertical ? ['ArrowRight', 'ArrowLeft'] : ['ArrowDown', 'ArrowUp'],
+      _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
+      arrowNext = _ref4[0],
+      arrowPrevious = _ref4[1];
+
+  function onArrowDown(increment) {
+    var nextFocus = focus + increment;
+    getFocusableElements()[nextFocus] && setFocus(nextFocus);
+  }
+
+  function onFocus(_ref5) {
+    var target = _ref5.target;
+    var elements = getFocusableElements();
+    elements.includes(target) && setFocus(elements.indexOf(target));
+  }
+
+  function onKeyDown(_ref6) {
+    var key = _ref6.key,
+        target = _ref6.target;
+
+    if (getFocusableElements().includes(target)) {
+      switch (key) {
+        case arrowNext:
+          onArrowDown(1);
+          break;
+
+        case arrowPrevious:
+          onArrowDown(-1);
+          break;
+      }
+    }
+  }
+
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, rest, {
     ref: ref,
-    className: (0, _classnames.default)(blockClass, className, (0, _defineProperty2.default)({}, "".concat(blockClass, "--vertical"), vertical))
+    className: (0, _classnames.default)(blockClass, className, (0, _defineProperty2.default)({}, "".concat(blockClass, "--vertical"), vertical)),
+    onFocus: onFocus,
+    onKeyDown: onKeyDown
   }, vertical && {
     'aria-orientation': 'vertical'
   }, {

package/lib/components/WebTerminal/WebTerminal.js

@@ -80,7 +80,7 @@ var WebTerminal = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
     ref: ref,
     className: (0, _classnames.default)([blockClass, (_ref2 = {}, (0, _defineProperty2.default)(_ref2, "".concat(blockClass, "--open"), open), (0, _defineProperty2.default)(_ref2, "".concat(blockClass, "--closed"), !open), (0, _defineProperty2.default)(_ref2, className, className), _ref2)]),
     style: {
-      animation: "".concat(open ? 'webTerminalEntrance 250ms' : 'webTerminalExit 250ms')
+      animation: "".concat(open ? 'web-terminal-entrance 250ms' : 'web-terminal-exit 250ms')
     },
     onAnimationEnd: onAnimationEnd
   }), /*#__PURE__*/_react.default.createElement("header", {

package/lib/components/index.js

@@ -15,12 +15,6 @@ Object.defineProperty(exports, "AboutModal", {
     return _AboutModal.AboutModal;
   }
 });
-Object.defineProperty(exports, "AddSelect", {
-  enumerable: true,
-  get: function get() {
-    return _AddSelect.AddSelect;
-  }
-});
 Object.defineProperty(exports, "CancelableTextEdit", {
   enumerable: true,
   get: function get() {
@@ -147,6 +141,12 @@ Object.defineProperty(exports, "ImportModal", {
     return _ImportModal.ImportModal;
   }
 });
+Object.defineProperty(exports, "InlineEdit", {
+  enumerable: true,
+  get: function get() {
+    return _InlineEdit.InlineEdit;
+  }
+});
 Object.defineProperty(exports, "LoadingBar", {
   enumerable: true,
   get: function get() {
@@ -159,6 +159,12 @@ Object.defineProperty(exports, "ModifiedTabs", {
     return _ModifiedTabs.ModifiedTabs;
   }
 });
+Object.defineProperty(exports, "MultiAddSelect", {
+  enumerable: true,
+  get: function get() {
+    return _MultiAddSelect.MultiAddSelect;
+  }
+});
 Object.defineProperty(exports, "NoDataEmptyState", {
   enumerable: true,
   get: function get() {
@@ -225,6 +231,12 @@ Object.defineProperty(exports, "SidePanel", {
     return _SidePanel.SidePanel;
   }
 });
+Object.defineProperty(exports, "SingleAddSelect", {
+  enumerable: true,
+  get: function get() {
+    return _SingleAddSelect.SingleAddSelect;
+  }
+});
 Object.defineProperty(exports, "StatusIcon", {
   enumerable: true,
   get: function get() {
@@ -288,8 +300,6 @@ Object.defineProperty(exports, "WebTerminal", {
 
 var _AboutModal = require("./AboutModal");
 
-var _AddSelect = require("./AddSelect");
-
 var _APIKeyModal = require("./APIKeyModal");
 
 var _Cascade = require("./Cascade");
@@ -320,6 +330,8 @@ var _LoadingBar = require("./LoadingBar");
 
 var _ModifiedTabs = require("./ModifiedTabs");
 
+var _MultiAddSelect = require("./MultiAddSelect");
+
 var _NotificationsPanel = require("./NotificationsPanel");
 
 var _PageHeader = require("./PageHeader");
@@ -332,6 +344,8 @@ var _Saving = require("./Saving");
 
 var _SidePanel = require("./SidePanel");
 
+var _SingleAddSelect = require("./SingleAddSelect");
+
 var _StatusIcon = require("./StatusIcon");
 
 var _TagSet = require("./TagSet");
@@ -348,4 +362,6 @@ var _EditSidePanel = require("./EditSidePanel");
 
 var _OptionsTile = require("./OptionsTile");
 
-var _CancelableTextEdit = require("./CancelableTextEdit");
+var _CancelableTextEdit = require("./CancelableTextEdit");
+
+var _InlineEdit = require("./InlineEdit");

package/lib/global/js/hooks/index.js

@@ -39,6 +39,12 @@ Object.defineProperty(exports, "useResetCreateComponent", {
     return _useResetCreateComponent.useResetCreateComponent;
   }
 });
+Object.defineProperty(exports, "useRetrieveStepData", {
+  enumerable: true,
+  get: function get() {
+    return _useRetrieveStepData.useRetrieveStepData;
+  }
+});
 Object.defineProperty(exports, "useValidCreateStepCount", {
   enumerable: true,
   get: function get() {
@@ -72,4 +78,6 @@ var _usePreviousValue = require("./usePreviousValue");
 
 var _useResetCreateComponent = require("./useResetCreateComponent");
 
+var _useRetrieveStepData = require("./useRetrieveStepData");
+
 var _useValidCreateStepCount = require("./useValidCreateStepCount");

package/lib/global/js/hooks/useCreateComponentFocus.js

@@ -15,34 +15,30 @@ var _getFocusableElements = require("../utils/getFocusableElements");
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-
-/**
- * Returns the previous state values included in the param
- * @param {object} previousState
- * @param {number} currentStep
- * @param {Function} getCreateComponentSteps
- * @param {string} componentBlockClass
- */
-var useCreateComponentFocus = function useCreateComponentFocus(previousState, currentStep, getCreateComponentSteps, componentBlockClass) {
+// Focus the first focusable element and call the onMount prop for the current step if one is provided
+var useCreateComponentFocus = function useCreateComponentFocus(_ref) {
+  var previousState = _ref.previousState,
+      currentStep = _ref.currentStep,
+      blockClass = _ref.blockClass,
+      onMount = _ref.onMount;
+  (0, _react.useEffect)(function () {
+    if (typeof onMount === 'function') {
+      onMount();
+    }
+  }, [onMount]);
   (0, _react.useEffect)(function () {
     if ((previousState === null || previousState === void 0 ? void 0 : previousState.currentStep) !== currentStep && currentStep > 0) {
-      var visibleStepInnerContent = document.querySelector(".".concat(componentBlockClass, "__step.").concat(componentBlockClass, "__step--visible-step"));
-      var createComponentSteps = getCreateComponentSteps();
-      var focusableStepElements = createComponentSteps && createComponentSteps.length && (0, _getFocusableElements.getFocusableElements)(visibleStepInnerContent);
-      var activeStepComponent = createComponentSteps && createComponentSteps.length && createComponentSteps[currentStep - 1];
-
-      if (activeStepComponent && activeStepComponent.props.onMount) {
-        activeStepComponent.props.onMount();
-      }
+      var visibleStepInnerContent = document.querySelector(".".concat(blockClass, "__step.").concat(blockClass, "__step__step--visible-step"));
+      var focusableStepElements = visibleStepInnerContent ? (0, _getFocusableElements.getFocusableElements)(visibleStepInnerContent) : [];
 
       if (focusableStepElements && focusableStepElements.length) {
         focusableStepElements[0].focus();
       } else {
-        var nextButton = document.querySelector(".".concat(componentBlockClass, "__create-button"));
+        var nextButton = document.querySelector(".".concat(blockClass, "__create-button"));
         nextButton === null || nextButton === void 0 ? void 0 : nextButton.focus();
       }
     }
-  }, [currentStep, getCreateComponentSteps, previousState, componentBlockClass]);
+  }, [currentStep, previousState, blockClass, onMount]);
 };
 
 exports.useCreateComponentFocus = useCreateComponentFocus;

package/lib/global/js/hooks/useCreateComponentStepChange.js

@@ -14,19 +14,23 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _react = require("react");
 
 /**
- * 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.
  */
 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,
@@ -39,8 +43,6 @@ var useCreateComponentStepChange = function useCreateComponentStepChange(_ref) {
       setModalIsOpen = _ref.setModalIsOpen;
   // useEffect to handle multi step logic
   (0, _react.useEffect)(function () {
-    var _getComponentSteps;
-
     var onUnmount = function onUnmount() {
       if (componentName !== 'CreateFullPage') {
         setCurrentStep(0);
@@ -85,73 +87,47 @@ var useCreateComponentStepChange = function useCreateComponentStepChange(_ref) {
       };
     }();
 
-    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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var createSteps;
         return _regenerator.default.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() {
@@ -161,51 +137,49 @@ var useCreateComponentStepChange = function useCreateComponentStepChange(_ref) {
 
     var handleSubmit = /*#__PURE__*/function () {
       var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        var createSteps;
         return _regenerator.default.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() {
@@ -213,22 +187,29 @@ var useCreateComponentStepChange = function useCreateComponentStepChange(_ref) {
       };
     }();
 
-    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
         });
       }
 
@@ -242,22 +223,31 @@ var useCreateComponentStepChange = function useCreateComponentStepChange(_ref) {
       });
       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 = (0, _react.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]);
 };
 
 exports.useCreateComponentStepChange = useCreateComponentStepChange;

package/lib/global/js/hooks/useResetCreateComponent.js

@@ -8,7 +8,7 @@ exports.useResetCreateComponent = void 0;
 var _react = require("react");
 
 /**
- * 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.
@@ -17,6 +17,7 @@ var _react = require("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
@@ -25,7 +26,8 @@ var _react = require("react");
  * @param {string} useResetCreateComponent.componentName
  */
 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,
@@ -36,7 +38,8 @@ 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
 
 
@@ -44,7 +47,7 @@ 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]);
 };
 
 exports.useResetCreateComponent = useResetCreateComponent;