@carbon/ibm-products 1.4.0 → 1.5.0

package/es/components/ActionSet/ActionSet.js

@@ -38,7 +38,7 @@ var ActionSetButton = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
 
   return /*#__PURE__*/React.createElement(Button, _extends({}, rest, {
     isExpressive: true,
-    className: cx(className, ["".concat(blockClass, "__action-button"), _defineProperty({}, "".concat(blockClass, "__action-button--ghost"), kind === 'ghost')]),
+    className: cx(className, ["".concat(blockClass, "__action-button"), _defineProperty({}, "".concat(blockClass, "__action-button--ghost"), kind === 'ghost' || kind === 'danger--ghost')]),
     disabled: disabled || loading || false,
     kind: kind,
     onClick: onClick,
@@ -48,7 +48,7 @@ var ActionSetButton = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
 });
 ActionSetButton.displayName = 'ActionSetButton';
 ActionSetButton.propTypes = _objectSpread(_objectSpread({}, Button.PropTypes), {}, {
-  kind: PropTypes.oneOf(['ghost', 'secondary', 'primary']),
+  kind: PropTypes.oneOf(['ghost', 'danger--ghost', 'secondary', 'danger', 'primary']),
   label: PropTypes.string,
   loading: PropTypes.bool
 });
@@ -82,13 +82,24 @@ export var ActionSet = /*#__PURE__*/React.forwardRef(function (_ref3, ref) {
 
   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.createElement(ButtonSet, _extends({}, rest, {
     className: cx(blockClass, className, (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "--row-single"), !stacking && buttons.length === 1), _defineProperty(_cx, "".concat(blockClass, "--row-double"), !stacking && buttons.length === 2), _defineProperty(_cx, "".concat(blockClass, "--row-triple"), !stacking && buttons.length === 3), _defineProperty(_cx, "".concat(blockClass, "--row-quadruple"), !stacking && buttons.length >= 4), _defineProperty(_cx, "".concat(blockClass, "--stacking"), stacking), _cx), "".concat(blockClass, "--").concat(size)),
@@ -137,13 +148,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;
@@ -164,7 +176,7 @@ ActionSet.propTypes = {
    * See https://react.carbondesignsystem.com/?path=/docs/components-button--default#component-api
    */
   actions: allPropTypes([ActionSet.validateActions(), PropTypes.arrayOf(PropTypes.shape(_objectSpread(_objectSpread({}, Button.propTypes), {}, {
-    kind: PropTypes.oneOf(['ghost', 'secondary', 'primary']),
+    kind: PropTypes.oneOf(['ghost', 'danger--ghost', 'secondary', 'danger', 'primary']),
     label: PropTypes.string,
     loading: PropTypes.bool,
     // we duplicate this Button prop to improve the DocGen here

package/es/components/ActionSet/actions.js

@@ -4,19 +4,22 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-export var actionsOptions = [0, 1, 2, 3, 4, 5, 6, 7];
+export var actionsOptions = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
 export var actionsLabels = {
   0: 'None',
   1: 'One button',
-  2: 'One ghost button',
-  3: 'Two buttons',
-  4: 'Two buttons including one ghost',
-  5: 'Three buttons',
-  6: 'Three buttons including one ghost',
-  7: 'Four buttons including one ghost'
+  2: 'A danger button',
+  3: 'A ghost button',
+  4: 'Two buttons',
+  5: 'Two buttons with one ghost',
+  6: 'Three buttons',
+  7: 'Three buttons with one ghost',
+  8: 'Three buttons with one danger',
+  9: 'Four buttons with one ghost',
+  10: 'Four buttons with two danger'
 };
 export var actionsMapping = function actionsMapping(labels, action) {
-  var _labels$primary, _labels$secondary, _labels$secondary2, _labels$ghost;
+  var _labels$primary, _labels$danger, _labels$secondary, _labels$secondary2, _labels$dangerGhost, _labels$ghost;
 
   var act = function act(label, kind, key) {
     var actionCall = action && action("Click on '".concat(label, "'"));
@@ -32,17 +35,22 @@ export var actionsMapping = function actionsMapping(labels, action) {
   };
 
   var primary = act((_labels$primary = labels === null || labels === void 0 ? void 0 : labels.primary) !== null && _labels$primary !== void 0 ? _labels$primary : 'Primary', 'primary', 1);
-  var secondary = act((_labels$secondary = labels === null || labels === void 0 ? void 0 : labels.secondary) !== null && _labels$secondary !== void 0 ? _labels$secondary : 'Secondary', 'secondary', 2);
-  var secondary2 = act((_labels$secondary2 = labels === null || labels === void 0 ? void 0 : labels.secondary2) !== null && _labels$secondary2 !== void 0 ? _labels$secondary2 : 'Secondary', 'secondary', 3);
-  var ghost = act((_labels$ghost = labels === null || labels === void 0 ? void 0 : labels.ghost) !== null && _labels$ghost !== void 0 ? _labels$ghost : 'Ghost', 'ghost', 4);
+  var danger = act((_labels$danger = labels === null || labels === void 0 ? void 0 : labels.danger) !== null && _labels$danger !== void 0 ? _labels$danger : 'Danger', 'danger', 2);
+  var secondary = act((_labels$secondary = labels === null || labels === void 0 ? void 0 : labels.secondary) !== null && _labels$secondary !== void 0 ? _labels$secondary : 'Secondary', 'secondary', 3);
+  var secondary2 = act((_labels$secondary2 = labels === null || labels === void 0 ? void 0 : labels.secondary2) !== null && _labels$secondary2 !== void 0 ? _labels$secondary2 : 'Secondary', 'secondary', 4);
+  var dangerGhost = act((_labels$dangerGhost = labels === null || labels === void 0 ? void 0 : labels.dangerGhost) !== null && _labels$dangerGhost !== void 0 ? _labels$dangerGhost : 'Danger-ghost', 'danger--ghost', 5);
+  var ghost = act((_labels$ghost = labels === null || labels === void 0 ? void 0 : labels.ghost) !== null && _labels$ghost !== void 0 ? _labels$ghost : 'Ghost', 'ghost', 6);
   return {
     0: [],
     1: [primary],
-    2: [ghost],
-    3: [primary, secondary],
-    4: [primary, ghost],
-    5: [primary, secondary, secondary2],
-    6: [primary, secondary, ghost],
-    7: [primary, secondary, secondary2, ghost]
+    2: [danger],
+    3: [ghost],
+    4: [primary, secondary],
+    5: [primary, ghost],
+    6: [primary, secondary, secondary2],
+    7: [primary, secondary, ghost],
+    8: [danger, secondary, ghost],
+    9: [primary, secondary, secondary2, ghost],
+    10: [danger, secondary, secondary2, dangerGhost]
   };
 };

package/es/components/CreateFullPage/CreateFullPage.js

@@ -10,7 +10,7 @@ var _excluded = ["backButtonText", "cancelButtonText", "children", "className",
  * LICENSE file in the root directory of this source tree.
  */
 // Import portions of React that are needed.
-import React, { useState, createContext } from 'react'; // Other standard imports.
+import React, { useEffect, useState, createContext } from 'react'; // Other standard imports.
 
 import PropTypes from 'prop-types';
 import cx from 'classnames';
@@ -21,6 +21,7 @@ import { Grid, ModalFooter, ComposedModal, ModalHeader, ModalBody, Button, Form
 import { CreateInfluencer } from '../CreateInfluencer';
 import { ActionSet } from '../ActionSet';
 import { usePreviousValue, useValidCreateStepCount, useCreateComponentFocus, useCreateComponentStepChange } from '../../global/js/hooks';
+import { lastIndexInArray } from '../../global/js/utils/lastIndexInArray';
 var blockClass = "".concat(pkg.prefix, "--create-full-page");
 var componentName = 'CreateFullPage'; // This is a general context for the steps container
 // containing information about the state of the container
@@ -95,7 +96,30 @@ export var CreateFullPage = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       stepData = _useState18[0],
       setStepData = _useState18[1];
 
-  var totalStepCount = React.Children.count(children);
+  var _useState19 = useState(1),
+      _useState20 = _slicedToArray(_useState19, 2),
+      firstIncludedStep = _useState20[0],
+      setFirstIncludedStep = _useState20[1];
+
+  var _useState21 = useState(null),
+      _useState22 = _slicedToArray(_useState21, 2),
+      lastIncludedStep = _useState22[0],
+      setLastIncludedStep = _useState22[1];
+
+  useEffect(function () {
+    var firstItem = stepData.findIndex(function (item) {
+      return item === null || item === void 0 ? void 0 : item.shouldIncludeStep;
+    }) + 1;
+    var lastItem = lastIndexInArray(stepData, 'shouldIncludeStep', true);
+
+    if (firstItem !== firstIncludedStep) {
+      setFirstIncludedStep(firstItem);
+    }
+
+    if (lastItem !== lastIncludedStep) {
+      setLastIncludedStep(lastItem);
+    }
+  }, [stepData, firstIncludedStep, lastIncludedStep]);
   useCreateComponentFocus({
     previousState: previousState,
     currentStep: currentStep,
@@ -104,7 +128,9 @@ export var CreateFullPage = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   });
   useValidCreateStepCount(stepData.length, componentName);
   useCreateComponentStepChange({
-    totalStepCount: totalStepCount,
+    firstIncludedStep: firstIncludedStep,
+    lastIncludedStep: lastIncludedStep,
+    stepData: stepData,
     onNext: onNext,
     isSubmitDisabled: isDisabled,
     setCurrentStep: setCurrentStep,
@@ -158,8 +184,7 @@ export var CreateFullPage = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
         });
       },
       setStepData: setStepData,
-      stepData: stepData,
-      totalStepCount: totalStepCount
+      stepData: stepData
     }
   }, React.Children.map(children, function (child, index) {
     return /*#__PURE__*/React.createElement(StepNumberContext.Provider, {

package/es/components/CreateFullPage/CreateFullPageStep.js

@@ -1,5 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 
 /**
  * Copyright IBM Corp. 2021, 2022
@@ -7,13 +7,13 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
  * 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 React, { forwardRef, useContext, useEffect } from 'react';
+import React, { forwardRef, useContext, useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { pkg } from '../../settings';
 import { FormGroup } from 'carbon-components-react';
 import { StepsContext, StepNumberContext } from './CreateFullPage';
-import { usePreviousValue } from '../../global/js/hooks';
+import { usePreviousValue, useRetrieveStepData } from '../../global/js/hooks';
 import pconsole from '../../global/js/utils/pconsole';
 var componentName = 'CreateFullPageStep';
 var blockClass = "".concat(pkg.prefix, "--create-full-page__step");
@@ -25,6 +25,7 @@ export var CreateFullPageStep = /*#__PURE__*/forwardRef(function (_ref, ref) {
       subtitle = _ref.subtitle,
       description = _ref.description,
       disableSubmit = _ref.disableSubmit,
+      includeStep = _ref.includeStep,
       introStep = _ref.introStep,
       title = _ref.title,
       hasFieldset = _ref.hasFieldset,
@@ -32,47 +33,45 @@ export var CreateFullPageStep = /*#__PURE__*/forwardRef(function (_ref, ref) {
       onNext = _ref.onNext,
       onMount = _ref.onMount,
       secondaryLabel = _ref.secondaryLabel;
-  var steps = useContext(StepsContext);
+  var stepsContext = useContext(StepsContext);
   var stepNumber = useContext(StepNumberContext);
+
+  var _useState = useState(),
+      _useState2 = _slicedToArray(_useState, 2),
+      shouldIncludeStep = _useState2[0],
+      setShouldIncludeStep = _useState2[1];
+
   var previousState = usePreviousValue({
-    currentStep: steps === null || steps === void 0 ? void 0 : steps.currentStep
+    currentStep: stepsContext === null || stepsContext === void 0 ? void 0 : stepsContext.currentStep
+  });
+  useRetrieveStepData({
+    stepsContext: stepsContext,
+    stepNumber: stepNumber,
+    introStep: introStep,
+    shouldIncludeStep: shouldIncludeStep,
+    secondaryLabel: secondaryLabel,
+    title: title
   }); // This useEffect reports back the onNext and onMount values so that they can be used
   // in the appropriate custom hooks.
 
   useEffect(function () {
-    if (stepNumber === (steps === null || steps === void 0 ? void 0 : steps.currentStep) && (previousState === null || previousState === void 0 ? void 0 : previousState.currentStep) !== (steps === null || steps === void 0 ? void 0 : steps.currentStep)) {
-      steps === null || steps === void 0 ? void 0 : steps.setOnNext(onNext);
-      steps === null || steps === void 0 ? void 0 : steps.setOnMount(onMount);
+    if (stepNumber === (stepsContext === null || stepsContext === void 0 ? void 0 : stepsContext.currentStep) && (previousState === null || previousState === void 0 ? void 0 : previousState.currentStep) !== (stepsContext === null || stepsContext === void 0 ? void 0 : stepsContext.currentStep)) {
+      stepsContext === null || stepsContext === void 0 ? void 0 : stepsContext.setOnNext(onNext);
+      stepsContext === null || stepsContext === void 0 ? void 0 : stepsContext.setOnMount(onMount);
     }
-  }, [onMount, onNext, steps, stepNumber, previousState === null || previousState === void 0 ? void 0 : previousState.currentStep]); // This useEffect makes sure that every CreateTearsheetStep reports back it's
-  // title, secondaryLabel, and introStep props so that it can be sent to the CreateInfluencer.
-
+  }, [onMount, onNext, stepsContext, stepNumber, previousState === null || previousState === void 0 ? void 0 : previousState.currentStep]);
   useEffect(function () {
-    var _steps$stepData, _steps$stepData2;
-
-    var stepHasReported = steps === null || steps === void 0 ? void 0 : (_steps$stepData = steps.stepData) === null || _steps$stepData === void 0 ? void 0 : _steps$stepData.includes(function (item) {
-      return item.title === title;
-    });
-
-    if (!stepHasReported && (steps === null || steps === void 0 ? void 0 : (_steps$stepData2 = steps.stepData) === null || _steps$stepData2 === void 0 ? void 0 : _steps$stepData2.length) < (steps === null || steps === void 0 ? void 0 : steps.totalStepCount)) {
-      steps === null || steps === void 0 ? void 0 : steps.setStepData(function (prev) {
-        return [].concat(_toConsumableArray(prev), [{
-          title: title,
-          secondaryLabel: secondaryLabel,
-          introStep: introStep
-        }]);
-      });
-    }
-  }, [steps, title, secondaryLabel, introStep]); // Whenever we are the current step, supply our disableSubmit value to the
+    setShouldIncludeStep(includeStep);
+  }, [includeStep, stepsContext, title]); // Whenever we are the current step, supply our disableSubmit value to the
   // steps container context so that it can manage the 'Next' button appropriately.
 
   useEffect(function () {
-    if (stepNumber === (steps === null || steps === void 0 ? void 0 : steps.currentStep)) {
-      steps.setIsDisabled(disableSubmit);
+    if (stepNumber === (stepsContext === null || stepsContext === void 0 ? void 0 : stepsContext.currentStep)) {
+      stepsContext.setIsDisabled(disableSubmit);
     }
-  }, [steps, stepNumber, disableSubmit, onNext]);
-  return steps ? /*#__PURE__*/React.createElement("section", {
-    className: cx(blockClass, className, (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__step--hidden-step"), stepNumber !== (steps === null || steps === void 0 ? void 0 : steps.currentStep)), _defineProperty(_cx, "".concat(blockClass, "__step--visible-step"), stepNumber === (steps === null || steps === void 0 ? void 0 : steps.currentStep)), _cx)),
+  }, [stepsContext, stepNumber, disableSubmit, onNext]);
+  return stepsContext ? /*#__PURE__*/React.createElement("section", {
+    className: cx(blockClass, className, (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__step--hidden-step"), stepNumber !== (stepsContext === null || stepsContext === void 0 ? void 0 : stepsContext.currentStep)), _defineProperty(_cx, "".concat(blockClass, "__step--visible-step"), stepNumber === (stepsContext === null || stepsContext === void 0 ? void 0 : stepsContext.currentStep)), _cx)),
     ref: ref
   }, /*#__PURE__*/React.createElement("h5", {
     className: "".concat(blockClass, "-title")
@@ -121,6 +120,12 @@ CreateFullPageStep.propTypes = {
    */
   hasFieldset: PropTypes.bool,
 
+  /**
+   * This prop is used to help track dynamic steps. If this value is `false` then the step is not included in the visible steps or the ProgressIndicator
+   * steps. If this value is `true` then the step will be included in the list of visible steps, as well as being included in the ProgressIndicator step list
+   */
+  includeStep: PropTypes.bool,
+
   /**
    * This prop can be used on the first step to mark it as an intro step, which will not render the progress indicator steps
    */
@@ -153,4 +158,7 @@ CreateFullPageStep.propTypes = {
    * Sets the title text for a create full page step
    */
   title: PropTypes.node.isRequired
+};
+CreateFullPageStep.defaultProps = {
+  includeStep: true
 };

package/es/components/CreateInfluencer/CreateInfluencer.js

@@ -19,21 +19,42 @@ export var CreateInfluencer = function CreateInfluencer(_ref) {
       currentStep = _ref.currentStep,
       stepData = _ref.stepData;
 
-  // renders the step progression components in the left influencer area
+  var getNumberOfDynamicStepsBeforeCurrentStep = function getNumberOfDynamicStepsBeforeCurrentStep(array, key) {
+    var dynamicSteps = [];
+    array.forEach(function (item, index) {
+      var _array$index;
+
+      if (((_array$index = array[index]) === null || _array$index === void 0 ? void 0 : _array$index[key]) === false && index <= currentStep - 1) {
+        dynamicSteps.push(item);
+      }
+    });
+    return dynamicSteps.length;
+  }; // renders the step progression components in the left influencer area
+
+
   var renderProgressSteps = function renderProgressSteps() {
     var _stepData$, _stepData$2;
 
     var extractedSteps = stepData === null || stepData === void 0 ? void 0 : stepData.filter(function (item) {
       return !(item !== null && item !== void 0 && item.introStep);
     });
+    var progressSteps = extractedSteps === null || extractedSteps === void 0 ? void 0 : extractedSteps.filter(function (item) {
+      return item === null || item === void 0 ? void 0 : item.shouldIncludeStep;
+    }); // To get the ProgressIndicator's `currentIndex`, accounting for dynamic steps,
+    // we need to subtract the number of !shouldIncludeStep/s before the current step
+    // which we get from `getNumberOfDynamicStepsBeforeCurrentStep()`
+
+    var totalDynamicSteps = getNumberOfDynamicStepsBeforeCurrentStep(stepData, 'shouldIncludeStep') || 0;
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(blockClass, "__left-nav")
     }, currentStep === 1 && (_stepData$ = stepData[0]) !== null && _stepData$ !== void 0 && _stepData$.introStep ? null : /*#__PURE__*/React.createElement(ProgressIndicator, {
-      currentIndex: (_stepData$2 = stepData[0]) !== null && _stepData$2 !== void 0 && _stepData$2.introStep ? currentStep - 2 : currentStep - 1,
+      currentIndex: (_stepData$2 = stepData[0]) !== null && _stepData$2 !== void 0 && _stepData$2.introStep ? currentStep - totalDynamicSteps - 2 // minus 2 because we need to account for the intro step in addition to `currentIndex` being 0 index based and our steps being 1 index based
+      : currentStep - totalDynamicSteps - 1 // minus 1 because ProgressIndicator currentIndex prop is 0 index based, but our steps are 1 index based
+      ,
       spaceEqually: true,
       vertical: true,
       className: cx("".concat(blockClass, "__progress-indicator"))
-    }, extractedSteps.map(function (step, stepIndex) {
+    }, progressSteps.map(function (step, stepIndex) {
       return /*#__PURE__*/React.createElement(ProgressStep, {
         label: step.title,
         key: stepIndex,
@@ -66,6 +87,7 @@ CreateInfluencer.propTypes = {
   stepData: PropTypes.arrayOf(PropTypes.shape({
     introStep: PropTypes.bool,
     secondaryLabel: PropTypes.string,
+    shouldIncludeStep: PropTypes.bool,
     title: PropTypes.node
   }))
 };

package/es/components/CreateTearsheet/CreateTearsheet.js

@@ -9,7 +9,7 @@ var _excluded = ["backButtonText", "cancelButtonText", "children", "className",
  * 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 React, { forwardRef, useState, useRef, createContext } from 'react';
+import React, { forwardRef, useState, useRef, createContext, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { Grid, Form } from 'carbon-components-react';
@@ -19,6 +19,7 @@ import { CreateInfluencer } from '../CreateInfluencer';
 import { pkg } from '../../settings';
 import { usePreviousValue, useValidCreateStepCount, useResetCreateComponent, useCreateComponentFocus, useCreateComponentStepChange } from '../../global/js/hooks';
 import { getDevtoolsProps } from '../../global/js/utils/devtools';
+import { lastIndexInArray } from '../../global/js/utils/lastIndexInArray';
 var componentName = 'CreateTearsheet';
 var blockClass = "".concat(pkg.prefix, "--tearsheet-create"); // This is a general context for the steps container
 // containing information about the state of the container
@@ -86,12 +87,35 @@ export var CreateTearsheet = /*#__PURE__*/forwardRef(function (_ref, ref) {
       stepData = _useState16[0],
       setStepData = _useState16[1];
 
-  var totalStepCount = React.Children.count(children);
+  var _useState17 = useState(1),
+      _useState18 = _slicedToArray(_useState17, 2),
+      firstIncludedStep = _useState18[0],
+      setFirstIncludedStep = _useState18[1];
+
+  var _useState19 = useState(null),
+      _useState20 = _slicedToArray(_useState19, 2),
+      lastIncludedStep = _useState20[0],
+      setLastIncludedStep = _useState20[1];
+
   var previousState = usePreviousValue({
     currentStep: currentStep,
     open: open
   });
   var contentRef = useRef();
+  useEffect(function () {
+    var firstItem = stepData.findIndex(function (item) {
+      return item === null || item === void 0 ? void 0 : item.shouldIncludeStep;
+    }) + 1;
+    var lastItem = lastIndexInArray(stepData, 'shouldIncludeStep', true);
+
+    if (firstItem !== firstIncludedStep) {
+      setFirstIncludedStep(firstItem);
+    }
+
+    if (lastItem !== lastIncludedStep) {
+      setLastIncludedStep(lastItem);
+    }
+  }, [stepData, firstIncludedStep, lastIncludedStep]);
   useCreateComponentFocus({
     previousState: previousState,
     currentStep: currentStep,
@@ -100,15 +124,18 @@ export var CreateTearsheet = /*#__PURE__*/forwardRef(function (_ref, ref) {
   });
   useValidCreateStepCount(stepData.length, componentName);
   useResetCreateComponent({
+    firstIncludedStep: firstIncludedStep,
     previousState: previousState,
     open: open,
     setCurrentStep: setCurrentStep,
     initialStep: initialStep,
-    totalSteps: totalStepCount,
+    totalSteps: stepData === null || stepData === void 0 ? void 0 : stepData.length,
     componentName: componentName
   });
   useCreateComponentStepChange({
-    totalStepCount: totalStepCount,
+    firstIncludedStep: firstIncludedStep,
+    lastIncludedStep: lastIncludedStep,
+    stepData: stepData,
     onNext: onNext,
     isSubmitDisabled: isDisabled,
     setCurrentStep: setCurrentStep,
@@ -181,8 +208,7 @@ export var CreateTearsheet = /*#__PURE__*/forwardRef(function (_ref, ref) {
         });
       },
       setStepData: setStepData,
-      stepData: stepData,
-      totalStepCount: totalStepCount
+      stepData: stepData
     }
   }, React.Children.map(children, function (child, index) {
     return /*#__PURE__*/React.createElement(StepNumberContext.Provider, {

package/es/components/CreateTearsheet/CreateTearsheetStep.js

@@ -1,20 +1,20 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 
 /**
- * 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 React, { forwardRef, useContext, useEffect } from 'react';
+import React, { forwardRef, useContext, useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { Column, FormGroup, Row } from 'carbon-components-react';
 import { StepsContext, StepNumberContext } from './CreateTearsheet';
 import { pkg } from '../../settings';
 import pconsole from '../../global/js/utils/pconsole';
-import { usePreviousValue } from '../../global/js/hooks';
+import { usePreviousValue, useRetrieveStepData } from '../../global/js/hooks';
 var componentName = 'CreateTearsheetStep';
 var blockClass = "".concat(pkg.prefix, "--tearsheet-create__step");
 export var CreateTearsheetStep = /*#__PURE__*/forwardRef(function (_ref, ref) {
@@ -22,57 +22,57 @@ export var CreateTearsheetStep = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   var children = _ref.children,
       className = _ref.className,
-      subtitle = _ref.subtitle,
       description = _ref.description,
       disableSubmit = _ref.disableSubmit,
-      introStep = _ref.introStep,
-      title = _ref.title,
-      hasFieldset = _ref.hasFieldset,
       fieldsetLegendText = _ref.fieldsetLegendText,
+      hasFieldset = _ref.hasFieldset,
+      includeStep = _ref.includeStep,
+      introStep = _ref.introStep,
       onNext = _ref.onNext,
       onMount = _ref.onMount,
-      secondaryLabel = _ref.secondaryLabel;
-  var steps = useContext(StepsContext);
+      secondaryLabel = _ref.secondaryLabel,
+      subtitle = _ref.subtitle,
+      title = _ref.title;
+  var stepsContext = useContext(StepsContext);
   var stepNumber = useContext(StepNumberContext);
+
+  var _useState = useState(),
+      _useState2 = _slicedToArray(_useState, 2),
+      shouldIncludeStep = _useState2[0],
+      setShouldIncludeStep = _useState2[1];
+
   var previousState = usePreviousValue({
-    currentStep: steps === null || steps === void 0 ? void 0 : steps.currentStep
+    currentStep: stepsContext === null || stepsContext === void 0 ? void 0 : stepsContext.currentStep
+  });
+  useRetrieveStepData({
+    stepsContext: stepsContext,
+    stepNumber: stepNumber,
+    introStep: introStep,
+    shouldIncludeStep: shouldIncludeStep,
+    secondaryLabel: secondaryLabel,
+    title: title
   }); // This useEffect reports back the onNext and onMount values so that they can be used
   // in the appropriate custom hooks.
 
   useEffect(function () {
-    if (stepNumber === (steps === null || steps === void 0 ? void 0 : steps.currentStep) && (previousState === null || previousState === void 0 ? void 0 : previousState.currentStep) !== (steps === null || steps === void 0 ? void 0 : steps.currentStep)) {
-      steps === null || steps === void 0 ? void 0 : steps.setOnNext(onNext);
-      steps === null || steps === void 0 ? void 0 : steps.setOnMount(onMount);
+    if (stepNumber === (stepsContext === null || stepsContext === void 0 ? void 0 : stepsContext.currentStep) && (previousState === null || previousState === void 0 ? void 0 : previousState.currentStep) !== (stepsContext === null || stepsContext === void 0 ? void 0 : stepsContext.currentStep)) {
+      stepsContext === null || stepsContext === void 0 ? void 0 : stepsContext.setOnNext(onNext);
+      stepsContext === null || stepsContext === void 0 ? void 0 : stepsContext.setOnMount(onMount);
     }
-  }, [onMount, onNext, steps, stepNumber, previousState === null || previousState === void 0 ? void 0 : previousState.currentStep]); // This useEffect makes sure that every CreateTearsheetStep reports back it's
-  // title, secondaryLabel, and introStep props so that it can be sent to the CreateInfluencer.
+  }, [onMount, onNext, stepsContext, stepNumber, previousState === null || previousState === void 0 ? void 0 : previousState.currentStep]); // Used to take the `includeStep` prop and use it as a local state value
 
   useEffect(function () {
-    var _steps$stepData, _steps$stepData2;
-
-    var stepHasReported = steps === null || steps === void 0 ? void 0 : (_steps$stepData = steps.stepData) === null || _steps$stepData === void 0 ? void 0 : _steps$stepData.includes(function (item) {
-      return item.title === title;
-    });
-
-    if (!stepHasReported && (steps === null || steps === void 0 ? void 0 : (_steps$stepData2 = steps.stepData) === null || _steps$stepData2 === void 0 ? void 0 : _steps$stepData2.length) < (steps === null || steps === void 0 ? void 0 : steps.totalStepCount)) {
-      steps === null || steps === void 0 ? void 0 : steps.setStepData(function (prev) {
-        return [].concat(_toConsumableArray(prev), [{
-          title: title,
-          secondaryLabel: secondaryLabel,
-          introStep: introStep
-        }]);
-      });
-    }
-  }, [steps, title, secondaryLabel, introStep]); // Whenever we are the current step, supply our disableSubmit value to the
+    setShouldIncludeStep(includeStep);
+  }, [includeStep, stepsContext, title]); // Whenever we are the current step, supply our disableSubmit value to the
   // steps container context so that it can manage the 'Next' button appropriately.
 
   useEffect(function () {
-    if (stepNumber === (steps === null || steps === void 0 ? void 0 : steps.currentStep)) {
-      steps.setIsDisabled(disableSubmit);
+    if (stepNumber === (stepsContext === null || stepsContext === void 0 ? void 0 : stepsContext.currentStep)) {
+      stepsContext.setIsDisabled(disableSubmit);
     }
-  }, [steps, stepNumber, disableSubmit, onNext]);
-  return steps ? /*#__PURE__*/React.createElement("div", {
-    className: cx(blockClass, className, (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__step--hidden-step"), stepNumber !== (steps === null || steps === void 0 ? void 0 : steps.currentStep)), _defineProperty(_cx, "".concat(blockClass, "__step--visible-step"), stepNumber === (steps === null || steps === void 0 ? void 0 : steps.currentStep)), _cx)),
+  }, [stepsContext, stepNumber, disableSubmit, onNext]);
+  return stepsContext ? /*#__PURE__*/React.createElement("div", {
+    className: cx(blockClass, className, (_cx = {}, _defineProperty(_cx, "".concat(blockClass, "__step--hidden-step"), stepNumber !== (stepsContext === null || stepsContext === void 0 ? void 0 : stepsContext.currentStep)), _defineProperty(_cx, "".concat(blockClass, "__step--visible-step"), stepNumber === (stepsContext === null || stepsContext === void 0 ? void 0 : stepsContext.currentStep)), _cx)),
     ref: ref
   }, /*#__PURE__*/React.createElement(Row, null, /*#__PURE__*/React.createElement(Column, {
     xlg: 12,
@@ -130,6 +130,12 @@ CreateTearsheetStep.propTypes = {
    */
   hasFieldset: PropTypes.bool,
 
+  /**
+   * This prop is used to help track dynamic steps. If this value is `false` then the step is not included in the visible steps or the ProgressIndicator
+   * steps. If this value is `true` then the step will be included in the list of visible steps, as well as being included in the ProgressIndicator step list
+   */
+  includeStep: PropTypes.bool,
+
   /**
    * This prop can be used on the first step to mark it as an intro step, which will not render the progress indicator steps
    */
@@ -168,5 +174,6 @@ CreateTearsheetStep.propTypes = {
 // component needs to make a choice or assumption when a prop is not supplied.
 
 CreateTearsheetStep.defaultProps = {
-  hasFieldset: true
+  hasFieldset: true,
+  includeStep: true
 };