@cloudflare/component-multistep-modal 4.0.38 → 5.0.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change Log
 
+## 5.0.0
+
+### Major Changes
+
+- 0c59dd3257: - Refactored to allow the cancel CTA to be customizable as a secondary CTA at each step. This PR modifies the multistep modal component to accept custom cancel click behavior and label at each step, so that we can use the `Cancel Button` as a Secondary CTA instead of the traditional closing of the modal. It can be configure at each step to move forward, backward or use the default behavior of closing the modal in addition to executing custom code in the `cancelOnClick` callback. Another feature is the ability to provide a custom `cancelLabel` at each step.
+
+## 4.0.39
+
+### Patch Changes
+
+- Updated dependencies [8d9c4128ea]
+  - @cloudflare/component-button@8.5.10
+  - @cloudflare/component-modal@8.0.34
+  - @cloudflare/component-progress@9.0.39
+
 ## 4.0.38
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import MultistepModal from './MultistepModal';
 export { TID } from './constants';
 export type { IStepItem } from './types';
+export { OnCancelClickBehaviour } from './types';
 export { MultistepModal };

package/dist/types.d.ts

@@ -1,11 +1,19 @@
 /// <reference types="react" />
+export declare enum OnCancelClickBehaviour {
+    DEFAULT = "default",
+    ADVANCE = "advance",
+    BACK = "back"
+}
 export interface IStepItem {
     content: JSX.Element;
     nextLabel?: string | JSX.Element;
     nextDisabled?: boolean;
     nextLoading?: boolean;
     nextOnClick?: () => Promise<boolean> | boolean;
+    cancelOnClick?: () => Promise<boolean> | boolean;
     hideBack?: boolean;
     hideCancel?: boolean;
     progressLabel?: string | JSX.Element | null;
+    cancelLabel?: JSX.Element;
+    onCancelClickBehaviour?: OnCancelClickBehaviour;
 }

package/es/MultistepModal.js

@@ -13,6 +13,7 @@ import { createComponent } from '@cloudflare/style-container';
 import { Progress } from '@cloudflare/component-progress';
 import { Trans } from '@cloudflare/intl-react';
 import { TID } from './constants';
+import { OnCancelClickBehaviour } from './types';
 
 var getElements = (steps, step) => {
   if (!steps || !steps[step]) {
@@ -21,7 +22,10 @@ var getElements = (steps, step) => {
       nextLabel: 'Next step',
       nextDisabled: false,
       nextOnClick: () => true,
-      progress: undefined
+      progress: undefined,
+      cancelLabel: undefined,
+      cancelOnClick: () => true,
+      onCancelClickBehaviour: OnCancelClickBehaviour.DEFAULT
     };
   }
 
@@ -33,11 +37,14 @@ var getElements = (steps, step) => {
     nextOnClick: steps[step].nextOnClick,
     hideBack: steps[step].hideBack,
     hideCancel: steps[step].hideCancel,
+    cancelLabel: steps[step].cancelLabel,
+    cancelOnClick: steps[step].cancelOnClick,
     progress: steps[step].progressLabel ? steps.map((_step, index) => ({
       id: index,
       label: _step.progressLabel || '',
       disabled: true
-    })) : undefined
+    })) : undefined,
+    onCancelClickBehaviour: steps[step].onCancelClickBehaviour
   };
 };
 
@@ -93,7 +100,10 @@ class MultistepModal extends React.Component {
       nextOnClick,
       hideBack,
       hideCancel,
-      progress
+      progress,
+      cancelLabel,
+      cancelOnClick,
+      onCancelClickBehaviour
     } = getElements(renderSteps(step), step);
     return /*#__PURE__*/React.createElement(React.Fragment, null, isOpen ? /*#__PURE__*/React.createElement(TestDummy, {
       id: TID.MODAL_OPEN
@@ -130,9 +140,40 @@ class MultistepModal extends React.Component {
       spaced: true
     }, !hideCancel && /*#__PURE__*/React.createElement(Button, {
       type: "default",
-      onClick: () => onClose(),
+      onClick: /*#__PURE__*/_asyncToGenerator(function* () {
+        if (cancelOnClick) {
+          yield cancelOnClick(); // Advance to the next Step
+
+          if (onCancelClickBehaviour === OnCancelClickBehaviour.ADVANCE) {
+            onNextStep && onNextStep(step + 1);
+
+            if (nextOnClick) {
+              var res = yield nextOnClick();
+              res && _this.setState({
+                step: step + 1
+              });
+            } else {
+              _this.setState({
+                step: step + 1
+              });
+            } // Go back to the previous Step
+
+          } else if (onCancelClickBehaviour === OnCancelClickBehaviour.BACK) {
+            onPrevStep && onPrevStep(step - 1);
+
+            _this.setState({
+              step: step - 1
+            });
+          } else {
+            // Default - close the modal
+            onClose();
+          }
+        } else {
+          onClose();
+        }
+      }),
       testId: TID.BUTTON_CANCEL
-    }, /*#__PURE__*/React.createElement(Trans, {
+    }, cancelLabel ? cancelLabel : /*#__PURE__*/React.createElement(Trans, {
       id: "common.cancel"
     })), /*#__PURE__*/React.createElement(Button, {
       testId: TID.BUTTON_NEXT,

package/es/index.js

@@ -1,3 +1,4 @@
 import MultistepModal from './MultistepModal';
 export { TID } from './constants';
+export { OnCancelClickBehaviour } from './types';
 export { MultistepModal };

package/es/types.js

@@ -1 +1,7 @@
-export {};
+export var OnCancelClickBehaviour;
+
+(function (OnCancelClickBehaviour) {
+  OnCancelClickBehaviour["DEFAULT"] = "default";
+  OnCancelClickBehaviour["ADVANCE"] = "advance";
+  OnCancelClickBehaviour["BACK"] = "back";
+})(OnCancelClickBehaviour || (OnCancelClickBehaviour = {}));

package/lib/MultistepModal.js

@@ -25,6 +25,8 @@ var _intlReact = require("@cloudflare/intl-react");
 
 var _constants = require("./constants");
 
+var _types = require("./types");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
@@ -64,7 +66,12 @@ var getElements = function getElements(steps, step) {
       nextOnClick: function nextOnClick() {
         return true;
       },
-      progress: undefined
+      progress: undefined,
+      cancelLabel: undefined,
+      cancelOnClick: function cancelOnClick() {
+        return true;
+      },
+      onCancelClickBehaviour: _types.OnCancelClickBehaviour.DEFAULT
     };
   }
 
@@ -76,13 +83,16 @@ var getElements = function getElements(steps, step) {
     nextOnClick: steps[step].nextOnClick,
     hideBack: steps[step].hideBack,
     hideCancel: steps[step].hideCancel,
+    cancelLabel: steps[step].cancelLabel,
+    cancelOnClick: steps[step].cancelOnClick,
     progress: steps[step].progressLabel ? steps.map(function (_step, index) {
       return {
         id: index,
         label: _step.progressLabel || '',
         disabled: true
       };
-    }) : undefined
+    }) : undefined,
+    onCancelClickBehaviour: steps[step].onCancelClickBehaviour
   };
 };
 
@@ -152,7 +162,10 @@ var MultistepModal = /*#__PURE__*/function (_React$Component) {
           nextOnClick = _getElements.nextOnClick,
           hideBack = _getElements.hideBack,
           hideCancel = _getElements.hideCancel,
-          progress = _getElements.progress;
+          progress = _getElements.progress,
+          cancelLabel = _getElements.cancelLabel,
+          cancelOnClick = _getElements.cancelOnClick,
+          onCancelClickBehaviour = _getElements.onCancelClickBehaviour;
 
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, isOpen ? /*#__PURE__*/_react.default.createElement(_componentTestDummy.TestDummy, {
         id: _constants.TID.MODAL_OPEN
@@ -190,39 +203,109 @@ var MultistepModal = /*#__PURE__*/function (_React$Component) {
         spaced: true
       }, !hideCancel && /*#__PURE__*/_react.default.createElement(_componentButton.Button, {
         type: "default",
-        onClick: function onClick() {
-          return onClose();
-        },
+        onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          var res;
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  if (!cancelOnClick) {
+                    _context.next = 18;
+                    break;
+                  }
+
+                  _context.next = 3;
+                  return cancelOnClick();
+
+                case 3:
+                  if (!(onCancelClickBehaviour === _types.OnCancelClickBehaviour.ADVANCE)) {
+                    _context.next = 15;
+                    break;
+                  }
+
+                  onNextStep && onNextStep(step + 1);
+
+                  if (!nextOnClick) {
+                    _context.next = 12;
+                    break;
+                  }
+
+                  _context.next = 8;
+                  return nextOnClick();
+
+                case 8:
+                  res = _context.sent;
+                  res && _this2.setState({
+                    step: step + 1
+                  });
+                  _context.next = 13;
+                  break;
+
+                case 12:
+                  _this2.setState({
+                    step: step + 1
+                  });
+
+                case 13:
+                  _context.next = 16;
+                  break;
+
+                case 15:
+                  if (onCancelClickBehaviour === _types.OnCancelClickBehaviour.BACK) {
+                    onPrevStep && onPrevStep(step - 1);
+
+                    _this2.setState({
+                      step: step - 1
+                    });
+                  } else {
+                    // Default - close the modal
+                    onClose();
+                  }
+
+                case 16:
+                  _context.next = 19;
+                  break;
+
+                case 18:
+                  onClose();
+
+                case 19:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        })),
         testId: _constants.TID.BUTTON_CANCEL
-      }, /*#__PURE__*/_react.default.createElement(_intlReact.Trans, {
+      }, cancelLabel ? cancelLabel : /*#__PURE__*/_react.default.createElement(_intlReact.Trans, {
         id: "common.cancel"
       })), /*#__PURE__*/_react.default.createElement(_componentButton.Button, {
         testId: _constants.TID.BUTTON_NEXT,
         type: "primary",
         disabled: nextDisabled,
         loading: nextLoading,
-        onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
           var res;
-          return _regeneratorRuntime().wrap(function _callee$(_context) {
+          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) {
-              switch (_context.prev = _context.next) {
+              switch (_context2.prev = _context2.next) {
                 case 0:
                   onNextStep && onNextStep(step + 1);
 
                   if (!nextOnClick) {
-                    _context.next = 8;
+                    _context2.next = 8;
                     break;
                   }
 
-                  _context.next = 4;
+                  _context2.next = 4;
                   return nextOnClick();
 
                 case 4:
-                  res = _context.sent;
+                  res = _context2.sent;
                   res && _this2.setState({
                     step: step + 1
                   });
-                  _context.next = 9;
+                  _context2.next = 9;
                   break;
 
                 case 8:
@@ -232,10 +315,10 @@ var MultistepModal = /*#__PURE__*/function (_React$Component) {
 
                 case 9:
                 case "end":
-                  return _context.stop();
+                  return _context2.stop();
               }
             }
-          }, _callee);
+          }, _callee2);
         }))
       }, nextLabel))))));
     }

package/lib/index.js

@@ -9,6 +9,12 @@ Object.defineProperty(exports, "MultistepModal", {
     return _MultistepModal.default;
   }
 });
+Object.defineProperty(exports, "OnCancelClickBehaviour", {
+  enumerable: true,
+  get: function get() {
+    return _types.OnCancelClickBehaviour;
+  }
+});
 Object.defineProperty(exports, "TID", {
   enumerable: true,
   get: function get() {
@@ -20,4 +26,6 @@ var _MultistepModal = _interopRequireDefault(require("./MultistepModal"));
 
 var _constants = require("./constants");
 
+var _types = require("./types");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/types.js

@@ -2,4 +2,13 @@
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
+});
+exports.OnCancelClickBehaviour = void 0;
+var OnCancelClickBehaviour;
+exports.OnCancelClickBehaviour = OnCancelClickBehaviour;
+
+(function (OnCancelClickBehaviour) {
+  OnCancelClickBehaviour["DEFAULT"] = "default";
+  OnCancelClickBehaviour["ADVANCE"] = "advance";
+  OnCancelClickBehaviour["BACK"] = "back";
+})(OnCancelClickBehaviour || (exports.OnCancelClickBehaviour = OnCancelClickBehaviour = {}));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudflare/component-multistep-modal",
   "description": "Multistep modal with a progress bar",
-  "version": "4.0.38",
+  "version": "5.0.0",
   "main": "lib/index.js",
   "module": "es/index.js",
   "author": "Vojtech Miksu <vojtech@cloudflare.com>",
@@ -14,9 +14,9 @@
   },
   "dependencies": {
     "@cloudflare/component-box": "^4.0.6",
-    "@cloudflare/component-button": "^8.5.9",
-    "@cloudflare/component-modal": "^8.0.33",
-    "@cloudflare/component-progress": "^9.0.38",
+    "@cloudflare/component-button": "^8.5.10",
+    "@cloudflare/component-modal": "^8.0.34",
+    "@cloudflare/component-progress": "^9.0.39",
     "@cloudflare/component-test-dummy": "^4.0.6",
     "@cloudflare/intl-react": "^1.9.80",
     "prop-types": "^15.6.0"

package/src/MultistepModal.tsx

@@ -14,7 +14,7 @@ import { createComponent } from '@cloudflare/style-container';
 import { Progress } from '@cloudflare/component-progress';
 import { Trans } from '@cloudflare/intl-react';
 import { TID } from './constants';
-import { IStepItem } from './types';
+import { IStepItem, OnCancelClickBehaviour } from './types';
 
 type TWidth = 'narrow' | 'wide' | 'extra-wide' | 'super-extra-wide';
 
@@ -41,9 +41,12 @@ interface IElements {
   nextDisabled?: boolean;
   nextLoading?: boolean;
   nextOnClick?: () => Promise<boolean> | boolean;
+  cancelOnClick?: () => Promise<boolean> | boolean;
   progress?: IProgressStep[];
   hideBack?: boolean;
   hideCancel?: boolean;
+  cancelLabel?: JSX.Element | string;
+  onCancelClickBehaviour?: OnCancelClickBehaviour;
 }
 
 const getElements = (steps: IStepItem[], step: number): IElements => {
@@ -53,7 +56,10 @@ const getElements = (steps: IStepItem[], step: number): IElements => {
       nextLabel: 'Next step',
       nextDisabled: false,
       nextOnClick: () => true,
-      progress: undefined
+      progress: undefined,
+      cancelLabel: undefined,
+      cancelOnClick: () => true,
+      onCancelClickBehaviour: OnCancelClickBehaviour.DEFAULT
     };
   }
   return {
@@ -64,13 +70,16 @@ const getElements = (steps: IStepItem[], step: number): IElements => {
     nextOnClick: steps[step].nextOnClick,
     hideBack: steps[step].hideBack,
     hideCancel: steps[step].hideCancel,
+    cancelLabel: steps[step].cancelLabel,
+    cancelOnClick: steps[step].cancelOnClick,
     progress: steps[step].progressLabel
       ? steps.map((_step, index) => ({
           id: index,
           label: _step.progressLabel || '',
           disabled: true
         }))
-      : undefined
+      : undefined,
+    onCancelClickBehaviour: steps[step].onCancelClickBehaviour
   };
 };
 
@@ -111,8 +120,12 @@ class MultistepModal extends React.Component<IMultistepModalProps> {
       nextOnClick,
       hideBack,
       hideCancel,
-      progress
+      progress,
+      cancelLabel,
+      cancelOnClick,
+      onCancelClickBehaviour
     } = getElements(renderSteps(step), step);
+
     return (
       <React.Fragment>
         {isOpen ? (
@@ -162,10 +175,39 @@ class MultistepModal extends React.Component<IMultistepModalProps> {
                 {!hideCancel && (
                   <Button
                     type="default"
-                    onClick={() => onClose()}
+                    onClick={async () => {
+                      if (cancelOnClick) {
+                        await cancelOnClick();
+
+                        // Advance to the next Step
+                        if (
+                          onCancelClickBehaviour ===
+                          OnCancelClickBehaviour.ADVANCE
+                        ) {
+                          onNextStep && onNextStep(step + 1);
+                          if (nextOnClick) {
+                            const res = await nextOnClick();
+                            res && this.setState({ step: step + 1 });
+                          } else {
+                            this.setState({ step: step + 1 });
+                          }
+                          // Go back to the previous Step
+                        } else if (
+                          onCancelClickBehaviour === OnCancelClickBehaviour.BACK
+                        ) {
+                          onPrevStep && onPrevStep(step - 1);
+                          this.setState({ step: step - 1 });
+                        } else {
+                          // Default - close the modal
+                          onClose();
+                        }
+                      } else {
+                        onClose();
+                      }
+                    }}
                     testId={TID.BUTTON_CANCEL}
                   >
-                    <Trans id="common.cancel" />
+                    {cancelLabel ? cancelLabel : <Trans id="common.cancel" />}
                   </Button>
                 )}
                 <Button

package/src/index.ts

@@ -1,5 +1,6 @@
 import MultistepModal from './MultistepModal';
 export { TID } from './constants';
 export type { IStepItem } from './types';
+export { OnCancelClickBehaviour } from './types';
 
 export { MultistepModal };

package/src/types.ts

@@ -1,10 +1,18 @@
+export enum OnCancelClickBehaviour {
+  DEFAULT = 'default',
+  ADVANCE = 'advance',
+  BACK = 'back'
+}
 export interface IStepItem {
   content: JSX.Element;
   nextLabel?: string | JSX.Element;
   nextDisabled?: boolean;
   nextLoading?: boolean;
   nextOnClick?: () => Promise<boolean> | boolean;
+  cancelOnClick?: () => Promise<boolean> | boolean;
   hideBack?: boolean;
   hideCancel?: boolean;
   progressLabel?: string | JSX.Element | null;
+  cancelLabel?: JSX.Element;
+  onCancelClickBehaviour?: OnCancelClickBehaviour;
 }