carbon-react 116.2.0 → 116.2.1

package/lib/components/modal/__internal__/modal-manager.js

@@ -73,7 +73,7 @@ let ModalManagerInstance = /*#__PURE__*/function () {
     }
   }, {
     key: "removeModal",
-    value: function removeModal(modal) {
+    value: function removeModal(modal, triggerRefocusOnClose = true) {
       const modalIndex = this.modalList.findIndex(({
         modal: m
       }) => m === modal);
@@ -93,7 +93,7 @@ let ModalManagerInstance = /*#__PURE__*/function () {
         setTriggerRefocusFlag
       } = this.getTopModal();
 
-      if (setTriggerRefocusFlag) {
+      if (setTriggerRefocusFlag && triggerRefocusOnClose) {
         setTriggerRefocusFlag(true);
       }
     }

package/lib/components/modal/modal.component.js

@@ -76,7 +76,12 @@ const Modal = ({
       onCancel(ev);
     }
   }, [disableClose, disableEscKey, onCancel]);
-  (0, _useModalManager.default)(open, closeModal, ref, setTriggerRefocusFlag);
+  (0, _useModalManager.default)({
+    open,
+    closeModal,
+    modalRef: ref,
+    setTriggerRefocusFlag
+  });
   let background;
   let content;
 

package/lib/components/progress-tracker/index.d.ts

@@ -1 +1,2 @@
-export { default } from "./progress-tracker";
+export { default } from "./progress-tracker.component";
+export type { ProgressTrackerProps } from "./progress-tracker.component";

package/lib/components/progress-tracker/progress-tracker.component.d.ts

@@ -0,0 +1,46 @@
+/// <reference types="react" />
+import { MarginProps } from "styled-system";
+export interface ProgressTrackerProps extends MarginProps {
+    /** Specifies an aria label to the component */
+    "aria-label"?: string;
+    /** Specifies the aria describedby for the component */
+    "aria-describedby"?: string;
+    /** The value of progress to be read out to the user. */
+    "aria-valuenow"?: number;
+    /** The minimum value of the progress tracker */
+    "aria-valuemin"?: number;
+    /** The maximum value of the progress tracker */
+    "aria-valuemax"?: number;
+    /** Prop to define the human readable text alternative of aria-valuenow
+     * if aria-valuenow is not a number
+     */
+    "aria-valuetext"?: string;
+    /** Size of the progress bar. */
+    size?: "small" | "medium" | "large";
+    /** Length of the progress bar, any valid css string. */
+    length?: string;
+    /** Current progress (percentage). */
+    progress?: number;
+    /** If error occurs. */
+    error?: boolean;
+    /** Flag to control whether the default value labels (as percentages) should be rendered. */
+    description?: string;
+    /** Value to add a description to the label */
+    showDefaultLabels?: boolean;
+    /** Value to display as current progress. */
+    currentProgressLabel?: string;
+    /** Value to display as the maximum progress limit. */
+    maxProgressLabel?: string;
+    /** Value of the preposition defined between Value1 and Value2 on the label. */
+    customValuePreposition?: string;
+    /**
+     * The position the value label are rendered in.
+     * Top/bottom apply to horizontal and left/right to vertical orientation.
+     */
+    labelsPosition?: "top" | "bottom";
+}
+declare const ProgressTracker: {
+    ({ "aria-label": ariaLabel, "aria-describedby": ariaDescribedBy, "aria-valuenow": ariaValueNow, "aria-valuemin": ariaValueMin, "aria-valuemax": ariaValueMax, "aria-valuetext": ariaValueText, size, length, error, progress, description, showDefaultLabels, currentProgressLabel, customValuePreposition, maxProgressLabel, labelsPosition, ...rest }: ProgressTrackerProps): JSX.Element;
+    displayName: string;
+};
+export default ProgressTracker;

package/lib/components/progress-tracker/progress-tracker.component.js

@@ -9,14 +9,10 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _propTypes2 = _interopRequireDefault(require("@styled-system/prop-types"));
-
 var _useLocale = _interopRequireDefault(require("../../hooks/__internal__/useLocale"));
 
 var _tags = _interopRequireDefault(require("../../__internal__/utils/helpers/tags"));
 
-var _utils = require("../../style/utils");
-
 var _progressTracker = require("./progress-tracker.style");
 
 var _useResizeObserver = _interopRequireDefault(require("../../hooks/__internal__/useResizeObserver"));
@@ -29,8 +25,6 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
-const marginPropTypes = (0, _utils.filterStyledSystemMarginProps)(_propTypes2.default.space);
-
 const ProgressTracker = ({
   "aria-label": ariaLabel = "progress tracker",
   "aria-describedby": ariaDescribedBy,
@@ -51,11 +45,13 @@ const ProgressTracker = ({
   ...rest
 }) => {
   const l = (0, _useLocale.default)();
-  const barRef = (0, _react.useRef)();
-  const [barLength, setBarLength] = (0, _react.useState)(0);
+  const barRef = (0, _react.useRef)(null);
+  const [barLength, setBarLength] = (0, _react.useState)("0px");
   const prefixLabels = labelsPosition !== "bottom";
   const updateBarLength = (0, _react.useCallback)(() => {
-    setBarLength(`${barRef.current.offsetWidth}px`);
+    var _barRef$current;
+
+    setBarLength(`${(_barRef$current = barRef.current) === null || _barRef$current === void 0 ? void 0 : _barRef$current.offsetWidth}px`);
   }, []);
   (0, _react.useLayoutEffect)(() => {
     updateBarLength();
@@ -80,14 +76,13 @@ const ProgressTracker = ({
     const displayedCurrentProgressLabel = label(currentProgressLabel, `${progress}%`);
     const displayedMaxProgressLabel = label(maxProgressLabel, "100%");
     return /*#__PURE__*/_react.default.createElement(_progressTracker.StyledValuesLabel, {
-      position: labelsPosition,
+      labelsPosition: labelsPosition,
       size: size
     }, displayedCurrentProgressLabel && /*#__PURE__*/_react.default.createElement(_progressTracker.StyledValue, null, displayedCurrentProgressLabel), displayedMaxProgressLabel && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", null, customValuePreposition || l.progressTracker.of()), /*#__PURE__*/_react.default.createElement(_progressTracker.StyledValue, null, displayedMaxProgressLabel)), description && /*#__PURE__*/_react.default.createElement(_progressTracker.StyledDescription, null, description));
   };
 
   const defaultValueNow = ariaValueMin + (ariaValueMax - ariaValueMin) * progress / 100;
   return /*#__PURE__*/_react.default.createElement(_progressTracker.StyledProgressTracker, _extends({
-    size: size,
     length: length
   }, rest, (0, _tags.default)("progress-bar", rest), {
     role: "progressbar",
@@ -110,60 +105,178 @@ const ProgressTracker = ({
   })), !prefixLabels && renderValueLabels());
 };
 
-ProgressTracker.propTypes = { ...marginPropTypes,
-
-  /** Specifies an aria label to the component */
-  "aria-label": _propTypes.default.string,
-
-  /** Specifies the aria describedby for the component */
+ProgressTracker.propTypes = {
   "aria-describedby": _propTypes.default.string,
-
-  /** The value of progress to be read out to the user. */
-  "aria-valuenow": _propTypes.default.number,
-
-  /** The minimum value of the progress tracker */
-  "aria-valuemin": _propTypes.default.number,
-
-  /** The maximum value of the progress tracker */
+  "aria-label": _propTypes.default.string,
   "aria-valuemax": _propTypes.default.number,
-
-  /** Prop to define the human readable text alternative of aria-valuenow
-   * if aria-valuenow is not a number
-   */
+  "aria-valuemin": _propTypes.default.number,
+  "aria-valuenow": _propTypes.default.number,
   "aria-valuetext": _propTypes.default.string,
-
-  /** Size of the progress bar. */
-  size: _propTypes.default.oneOf(["small", "medium", "large"]),
-
-  /** Length of the progress bar, any valid css string. */
-  length: _propTypes.default.string,
-
-  /** Current progress (percentage). */
-  progress: _propTypes.default.number,
-
-  /** If error occurs. */
-  error: _propTypes.default.bool,
-
-  /** Flag to control whether the default value labels (as percentages) should be rendered. */
-  description: _propTypes.default.string,
-
-  /** Value to add a description to the label */
-  showDefaultLabels: _propTypes.default.bool,
-
-  /** Value to display as current progress. */
-  currentProgressLabel: _propTypes.default.string,
-
-  /** Value to display as the maximum progress limit. */
-  maxProgressLabel: _propTypes.default.string,
-
-  /** Value of the preposition defined between Value1 and Value2 on the label. */
-  customValuePreposition: _propTypes.default.string,
-
-  /**
-   * The position the value label are rendered in.
-   * Top/bottom apply to horizontal and left/right to vertical orientation.
-   */
-  labelsPosition: _propTypes.default.oneOf(["top", "bottom"])
+  "currentProgressLabel": _propTypes.default.string,
+  "customValuePreposition": _propTypes.default.string,
+  "description": _propTypes.default.string,
+  "error": _propTypes.default.bool,
+  "labelsPosition": _propTypes.default.oneOf(["bottom", "top"]),
+  "length": _propTypes.default.string,
+  "m": _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.oneOf([null]), _propTypes.default.number, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string])), _propTypes.default.number, _propTypes.default.object, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string]),
+  "margin": _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.oneOf([null]), _propTypes.default.number, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string])), _propTypes.default.number, _propTypes.default.object, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string]),
+  "marginBottom": _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.oneOf([null]), _propTypes.default.number, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string])), _propTypes.default.number, _propTypes.default.object, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string]),
+  "marginLeft": _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.oneOf([null]), _propTypes.default.number, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string])), _propTypes.default.number, _propTypes.default.object, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string]),
+  "marginRight": _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.oneOf([null]), _propTypes.default.number, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string])), _propTypes.default.number, _propTypes.default.object, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string]),
+  "marginTop": _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.oneOf([null]), _propTypes.default.number, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string])), _propTypes.default.number, _propTypes.default.object, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string]),
+  "marginX": _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.oneOf([null]), _propTypes.default.number, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string])), _propTypes.default.number, _propTypes.default.object, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string]),
+  "marginY": _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.oneOf([null]), _propTypes.default.number, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string])), _propTypes.default.number, _propTypes.default.object, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string]),
+  "maxProgressLabel": _propTypes.default.string,
+  "mb": _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.oneOf([null]), _propTypes.default.number, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string])), _propTypes.default.number, _propTypes.default.object, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string]),
+  "ml": _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.oneOf([null]), _propTypes.default.number, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string])), _propTypes.default.number, _propTypes.default.object, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string]),
+  "mr": _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.oneOf([null]), _propTypes.default.number, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string])), _propTypes.default.number, _propTypes.default.object, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string]),
+  "mt": _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.oneOf([null]), _propTypes.default.number, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string])), _propTypes.default.number, _propTypes.default.object, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string]),
+  "mx": _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.oneOf([null]), _propTypes.default.number, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string])), _propTypes.default.number, _propTypes.default.object, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string]),
+  "my": _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.oneOf([null]), _propTypes.default.number, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string])), _propTypes.default.number, _propTypes.default.object, _propTypes.default.shape({
+    "__@toStringTag": _propTypes.default.string.isRequired,
+    "description": _propTypes.default.string,
+    "toString": _propTypes.default.func.isRequired,
+    "valueOf": _propTypes.default.func.isRequired
+  }), _propTypes.default.string]),
+  "progress": _propTypes.default.number,
+  "showDefaultLabels": _propTypes.default.bool,
+  "size": _propTypes.default.oneOf(["large", "medium", "small"])
 };
+ProgressTracker.displayName = "ProgressTracker";
 var _default = ProgressTracker;
 exports.default = _default;

package/lib/components/progress-tracker/progress-tracker.style.d.ts

@@ -0,0 +1,8 @@
+import { ProgressTrackerProps } from "./progress-tracker.component";
+declare const StyledProgressTracker: import("styled-components").StyledComponent<"div", any, Pick<ProgressTrackerProps, "length" | "margin">, never>;
+declare const StyledProgressBar: import("styled-components").StyledComponent<"span", any, Pick<ProgressTrackerProps, "error" | "progress" | "size">, never>;
+declare const StyledValue: import("styled-components").StyledComponent<"span", any, {}, never>;
+declare const StyledDescription: import("styled-components").StyledComponent<"span", any, {}, never>;
+declare const StyledValuesLabel: import("styled-components").StyledComponent<"span", any, Pick<ProgressTrackerProps, "size" | "labelsPosition">, never>;
+declare const InnerBar: import("styled-components").StyledComponent<"span", any, Pick<ProgressTrackerProps, "error" | "progress" | "length" | "size">, never>;
+export { StyledProgressBar, InnerBar, StyledProgressTracker, StyledValuesLabel, StyledValue, StyledDescription, };

package/lib/components/progress-tracker/progress-tracker.style.js

@@ -7,20 +7,47 @@ exports.StyledDescription = exports.StyledValue = exports.StyledValuesLabel = ex
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _styledSystem = require("styled-system");
 
 var _base = _interopRequireDefault(require("../../style/themes/base"));
 
-var _progressTracker = require("./progress-tracker.config");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function getHeight(size) {
+  switch (size) {
+    case "small":
+      return "var(--sizing050)";
+
+    case "large":
+      return "var(--sizing200)";
+
+    default:
+      return "var(--sizing100)";
+  }
+}
+
+function getBackgroundColour({
+  progress,
+  error
+}) {
+  if (error) return "var(--colorsSemanticNegative500)";
+  if (progress && progress >= 100) return "var(--colorsSemanticPositive500)";
+  return "var(--colorsSemanticNeutral500)";
+}
+
+function getBorderColour({
+  progress,
+  error
+}) {
+  if (error) return "var(--colorsSemanticNegative500)";
+  if (progress === 100) return "var(--colorsSemanticPositive500)";
+  return "var(--colorsSemanticNeutral500)";
+}
+
 const StyledProgressTracker = _styledComponents.default.div`
   ${_styledSystem.margin}
   text-align: center;
@@ -42,7 +69,10 @@ const StyledProgressBar = _styledComponents.default.span`
     display: flex;
     position: relative;
     background-color: var(--colorsSemanticNeutral200);
-    border: 1px solid ${getBorderColour(progress, error)};
+    border: 1px solid ${getBorderColour({
+  progress,
+  error
+})};
     border-radius: 25px;
     overflow-x: hidden;
     height: ${getHeight(size)};
@@ -72,81 +102,35 @@ const StyledValuesLabel = _styledComponents.default.span`
   gap: 4px;
   font-size: ${({
   size
-}) => fontSizes[size]};
+}) => size && fontSizes[size]};
   ${({
-  position
-}) => position === "bottom" && "margin-top: 8px"};
+  labelsPosition
+}) => labelsPosition === "bottom" && "margin-top: 8px"};
   ${({
-  position
-}) => position !== "bottom" && "margin-bottom: 8px"};
+  labelsPosition
+}) => labelsPosition !== "bottom" && "margin-bottom: 8px"};
 `;
 exports.StyledValuesLabel = StyledValuesLabel;
 const InnerBar = _styledComponents.default.span`
   ${({
   progress,
-  size,
+  size = "medium",
   length,
   error
 }) => (0, _styledComponents.css)`
     position: relative;
     left: 0;
-    background-color: ${getBackgroundColour(progress, error)};
+    background-color: ${getBackgroundColour({
+  progress,
+  error
+})};
     border-radius: 25px;
-    width: calc(${length} * ${progress / 100});
+    width: calc(${length} * ${progress && progress / 100});
     min-width: 2px;
     height: ${getHeight(size)};
   `}
 `;
 exports.InnerBar = InnerBar;
-
-function getHeight(size) {
-  switch (size) {
-    case "small":
-      return "var(--sizing050)";
-
-    case "large":
-      return "var(--sizing200)";
-
-    default:
-      return "var(--sizing100)";
-  }
-}
-
-function getBackgroundColour(progress, error) {
-  if (error) return "var(--colorsSemanticNegative500)";
-  if (progress >= 100) return "var(--colorsSemanticPositive500)";
-  return "var(--colorsSemanticNeutral500)";
-}
-
-function getBorderColour(progress, error) {
-  if (error) return "var(--colorsSemanticNegative500)";
-  if (progress === 100) return "var(--colorsSemanticPositive500)";
-  return "var(--colorsSemanticNeutral500)";
-}
-
 StyledProgressTracker.defaultProps = {
   theme: _base.default
-};
-StyledProgressBar.defaultProps = {
-  size: "medium"
-};
-InnerBar.defaultProps = {
-  progress: 0,
-  size: "medium"
-};
-InnerBar.propTypes = {
-  size: _propTypes.default.oneOf(_progressTracker.PROGRESS_TRACKER_SIZES),
-  progress: _propTypes.default.number
-};
-StyledProgressTracker.propTypes = {
-  theme: _propTypes.default.object
-};
-StyledValuesLabel.propTypes = {
-  position: _propTypes.default.oneOf(["top", "bottom", "left", "right"])
-};
-StyledValue.propTypes = {
-  isMaxValue: _propTypes.default.bool
-};
-StyledProgressBar.propTypes = {
-  size: _propTypes.default.oneOf(_progressTracker.PROGRESS_TRACKER_SIZES)
 };

package/lib/components/select/select-list/select-list.component.js

@@ -285,7 +285,12 @@ const SelectList = /*#__PURE__*/_react.default.forwardRef(({
       onSelectListClose();
     }
   }, [onSelectListClose]);
-  (0, _useModalManager.default)(isOpen, handleEscapeKey, listRef);
+  (0, _useModalManager.default)({
+    open: isOpen,
+    closeModal: handleEscapeKey,
+    modalRef: listRef,
+    triggerRefocusOnClose: false
+  });
   const handleListScroll = (0, _react.useCallback)(event => {
     const element = event.target;
     /* istanbul ignore else */

package/lib/components/toast/toast.component.js

@@ -67,7 +67,11 @@ const Toast = /*#__PURE__*/_react.default.forwardRef(({
       onDismiss(ev);
     }
   }, [onDismiss]);
-  (0, _useModalManager.default)(open, dismissToast, refToPass);
+  (0, _useModalManager.default)({
+    open,
+    closeModal: dismissToast,
+    modalRef: refToPass
+  });
   (0, _react.useEffect)(() => {
     /* istanbul ignore next */
     if (timer.current) clearTimeout(timer.current);

package/lib/hooks/__internal__/useMenuKeyboardNavigation/useMenuKeyboardNavigation.js

@@ -31,7 +31,11 @@ var _default = (mainControlRef, childrenRefs, hide, isOpen) => {
   }, [refocusMainControl]); // useModalmanager is used here to handle the escape key
   // and to ensure that closing the menu does not close the modal
 
-  (0, _useModalManager.default)(isOpen, handleEscapeKey, mainControlRef);
+  (0, _useModalManager.default)({
+    open: isOpen,
+    closeModal: handleEscapeKey,
+    modalRef: mainControlRef
+  });
   const handleKeyDown = (0, _react.useCallback)(ev => {
     if (!(_events.default.isEnterKey(ev) || _events.default.isSpaceKey(ev))) {
       ev.preventDefault();

package/lib/hooks/__internal__/useModalManager/useModalManager.d.ts

@@ -1,3 +1,10 @@
 import React from "react";
-declare const useModalManager: (open: boolean, closeModal: (e: KeyboardEvent) => void, modalRef: React.RefObject<HTMLElement>, setTriggerRefocusFlag?: ((flag: boolean) => void) | undefined) => void;
+declare type UseModalManagerArgs = {
+    open: boolean;
+    closeModal: (e: KeyboardEvent) => void;
+    modalRef: React.RefObject<HTMLElement>;
+    setTriggerRefocusFlag?: (flag: boolean) => void;
+    triggerRefocusOnClose?: boolean;
+};
+declare const useModalManager: ({ open, closeModal, modalRef, setTriggerRefocusFlag, triggerRefocusOnClose, }: UseModalManagerArgs) => void;
 export default useModalManager;

package/lib/hooks/__internal__/useModalManager/useModalManager.js

@@ -11,7 +11,13 @@ var _modalManager = _interopRequireDefault(require("../../../components/modal/__
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const useModalManager = (open, closeModal, modalRef, setTriggerRefocusFlag) => {
+const useModalManager = ({
+  open,
+  closeModal,
+  modalRef,
+  setTriggerRefocusFlag,
+  triggerRefocusOnClose = true
+}) => {
   const listenerAdded = (0, _react.useRef)(false);
   const modalRegistered = (0, _react.useRef)(false);
   const handleClose = (0, _react.useCallback)(ev => {
@@ -56,11 +62,11 @@ const useModalManager = (open, closeModal, modalRef, setTriggerRefocusFlag) => {
   }, [setTriggerRefocusFlag]);
   const unregisterModal = (0, _react.useCallback)(ref => {
     if (modalRegistered.current) {
-      _modalManager.default.removeModal(ref);
+      _modalManager.default.removeModal(ref, triggerRefocusOnClose);
 
       modalRegistered.current = false;
     }
-  }, []);
+  }, [triggerRefocusOnClose]);
   (0, _react.useEffect)(() => {
     const ref = modalRef.current;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-react",
-  "version": "116.2.0",
+  "version": "116.2.1",
   "description": "A library of reusable React components for easily building user interfaces.",
   "files": [
     "lib",
@@ -20,7 +20,7 @@
     "copy-files": "node ./scripts/copy-files.js",
     "precompile": "npm run type-check && npm run clean-lib && npm run build && npm run build:types && npm run copy-files",
     "prepublishOnly": "npm run precompile",
-    "postinstall": "node ./scripts/check_rfcs/check_rfcs.js",
+    "postinstall": "node ./scripts/check_rfcs/index.js",
     "watch": "npm run clean-lib && npm run copy-files -- --watch & npm run babel -- --watch",
     "build-storybook": "cross-env STORYBOOK_BUILD=true NODE_OPTIONS=--openssl-legacy-provider build-storybook -c .storybook",
     "start-storybook": "cross-env STORYBOOK_BUILD=true NODE_OPTIONS=--openssl-legacy-provider start-storybook -c .storybook",