@7shifts/sous-chef 3.48.0-beta.2 → 3.48.1

package/dist/index.js

@@ -6349,6 +6349,13 @@ var calculateMaxHeight = function calculateMaxHeight(triggerPosition, customMaxH
   }
   return customMaxHeight !== undefined && customMaxHeight < calculatedMaxHeight ? customMaxHeight : calculatedMaxHeight;
 };
+var isScrollingSelectFields = function isScrollingSelectFields(scrollEvent) {
+  var target = scrollEvent.target;
+  var firstChild = target && target.firstChild ? target.firstChild : null;
+  var firstChildId = firstChild ? firstChild.id : '';
+  var isScrollingSelectField = firstChildId === null || firstChildId === void 0 ? void 0 : firstChildId.includes('react-select');
+  return isScrollingSelectField;
+};
 
 function useOnClickOutsideRole(role, cb) {
   React__default.useEffect(function () {
@@ -6404,7 +6411,7 @@ var PaneOverlay = function PaneOverlay(_ref) {
   React.useEffect(function () {
     var handleScroll = function handleScroll(e) {
       var _paneRef$current;
-      if (e.target !== paneRef.current && !((_paneRef$current = paneRef.current) !== null && _paneRef$current !== void 0 && _paneRef$current.contains(e.target))) {
+      if (e.target !== paneRef.current && !((_paneRef$current = paneRef.current) !== null && _paneRef$current !== void 0 && _paneRef$current.contains(e.target)) && !isScrollingSelectFields(e)) {
         onToggleDropdown();
       }
     };
@@ -7728,7 +7735,7 @@ var ProgressBar = function ProgressBar(_ref) {
   })), steps && steps.length > 0 && React__default.createElement("div", {
     className: styles$x['progress-bar__steps']
   }, steps.map(function (step) {
-    return React__default.createElement(Text, {
+    return React__default.createElement("div", {
       key: step
     }, step);
   })));
@@ -10556,9 +10563,7 @@ var PasswordCriteria = function PasswordCriteria(_ref) {
   }, met ? React__default.createElement(IconCheck, {
     size: "small",
     color: "grey-200"
-  }) : "\u25CF", React__default.createElement(Text, {
-    color: met ? 'grey-200' : 'grey-400'
-  }, children)));
+  }) : "\u25CF", children));
 };
 
 var usePasswordCriteria = function usePasswordCriteria(criterias) {
@@ -11516,16 +11521,20 @@ var getTimeOptions = function getTimeOptions(interval, startTime, skipStartTime)
   }
   return timeOptions;
 };
-var getDuration = function getDuration(timeOption, startTime) {
+var getDuration = function getDuration(timeOption, startTime, subtractDuration) {
+  if (subtractDuration === void 0) {
+    subtractDuration = 0;
+  }
   var start = new Date("Janurary 1 2023 " + startTime).getTime();
   var end = new Date("Janurary 1 2023 " + timeOption).getTime();
   var diffInMinutes = Math.round((end - start) / 60000);
-  if (diffInMinutes < 0) {
+  if (diffInMinutes <= 0) {
     diffInMinutes = diffInMinutes + 1440;
   }
-  if (diffInMinutes < 60) {
+  diffInMinutes = diffInMinutes - subtractDuration;
+  if (Math.abs(diffInMinutes) < 60) {
     return "(" + diffInMinutes + " min" + (diffInMinutes === 1 ? '' : 's') + ")";
-  } else if (diffInMinutes >= 60) {
+  } else if (Math.abs(diffInMinutes) >= 60) {
     return "(" + +(diffInMinutes / 60).toFixed(2) + " hr" + (diffInMinutes === 60 ? '' : 's') + ")";
   } else {
     return undefined;
@@ -11560,7 +11569,8 @@ var TimeFieldDropdown = function TimeFieldDropdown(_ref) {
     inputValue = _ref.inputValue,
     width = _ref.width,
     _ref$endField = _ref.endField,
-    endField = _ref$endField === void 0 ? false : _ref$endField;
+    endField = _ref$endField === void 0 ? false : _ref$endField,
+    subtractDuration = _ref.subtractDuration;
   var startTimeParsed = startTime ? getDateWithStartTime(startTime) : setToMidnight(new Date());
   var timeOptions = React.useMemo(function () {
     return getTimeOptions(interval, startTimeParsed, endField && !!startTime);
@@ -11591,11 +11601,11 @@ var TimeFieldDropdown = function TimeFieldDropdown(_ref) {
       }
     }, React__default.createElement(Inline, {
       space: 4
-    }, option, endField && startTime && getDuration(option, startTime)));
+    }, option, endField && startTime && getDuration(option, startTime, subtractDuration)));
   })));
 };
 
-var _excluded$2J = ["interval", "startTime", "prefix", "endField", "duration"];
+var _excluded$2J = ["interval", "startTime", "prefix", "endField", "duration", "subtractDuration"];
 var TimeFieldElement = function TimeFieldElement(_ref, forwardedRef) {
   var _ref$interval = _ref.interval,
     interval = _ref$interval === void 0 ? 15 : _ref$interval,
@@ -11604,6 +11614,7 @@ var TimeFieldElement = function TimeFieldElement(_ref, forwardedRef) {
     _ref$endField = _ref.endField,
     endField = _ref$endField === void 0 ? false : _ref$endField,
     duration = _ref.duration,
+    subtractDuration = _ref.subtractDuration,
     allOtherProps = _objectWithoutPropertiesLoose(_ref, _excluded$2J);
   var internalRef = React.useRef(null);
   var ref = forwardedRef || internalRef;
@@ -11648,7 +11659,8 @@ var TimeFieldElement = function TimeFieldElement(_ref, forwardedRef) {
     onOptionClick: onOptionClick,
     inputValue: selectedDropdownValue,
     width: width,
-    endField: endField
+    endField: endField,
+    subtractDuration: subtractDuration
   });
 };
 var TimeRangeSelector = React.forwardRef(TimeFieldElement);
@@ -11665,7 +11677,8 @@ var TimeRangeEnd = function TimeRangeEnd(_ref) {
     duration = _ref.duration,
     disabled = _ref.disabled,
     testId = _ref.testId,
-    value = _ref.value;
+    value = _ref.value,
+    subtractDuration = _ref.subtractDuration;
   return React__default.createElement(TimeRangeSelector, {
     name: "end-time",
     startTime: startTime,
@@ -11680,7 +11693,8 @@ var TimeRangeEnd = function TimeRangeEnd(_ref) {
     endField: true,
     testId: testId && testId + "-end-time",
     disabled: disabled,
-    value: value
+    value: value,
+    subtractDuration: subtractDuration
   });
 };
 
@@ -11722,7 +11736,8 @@ var TimeRangeField = function TimeRangeField(_ref) {
     error = _ref.error,
     placeholder = _ref.placeholder,
     disabled = _ref.disabled,
-    testId = _ref.testId;
+    testId = _ref.testId,
+    subtractDuration = _ref.subtractDuration;
   var controllers = useRangeFieldControllers({
     name: name,
     id: inputId,
@@ -11754,7 +11769,7 @@ var TimeRangeField = function TimeRangeField(_ref) {
       end: inputValue === '' ? undefined : inputValue
     });
   };
-  var timeRangeDuration = getDuration(end, start);
+  var timeRangeDuration = getDuration(end, start, subtractDuration);
   return React__default.createElement(Field, _extends({}, fieldProps), React__default.createElement("div", {
     className: classnames(styles$19['time-range-field'], (_classnames = {}, _classnames[styles$19['time-range-field--invalid']] = hasError, _classnames[styles$19['time-range-field--disabled']] = disabled, _classnames)),
     "data-testid": testId
@@ -11779,7 +11794,8 @@ var TimeRangeField = function TimeRangeField(_ref) {
     duration: timeRangeDuration,
     testId: testId,
     disabled: disabled,
-    value: controllers.value.end
+    value: controllers.value.end,
+    subtractDuration: subtractDuration
   })));
 };