@popmenu/ordering-ui 0.89.1 → 0.91.0

package/build/index.js

@@ -9,8 +9,8 @@ require('@material-ui/lab/Alert');
 require('@material-ui/core/AppBar');
 var MuiAvatar = require('@material-ui/core/Avatar');
 require('@material-ui/core/Badge');
-var MuiButton = require('@material-ui/core/Button');
-var CircularProgress = require('@material-ui/core/CircularProgress');
+require('@material-ui/core/Button');
+require('@material-ui/core/CircularProgress');
 require('@material-ui/core/ButtonGroup');
 var Card = require('@material-ui/core/Card');
 var CardActionArea = require('@material-ui/core/CardActionArea');
@@ -50,7 +50,6 @@ var MuiToggleButton = require('@material-ui/lab/ToggleButton');
 var MuiToggleButtonGroup = require('@material-ui/lab/ToggleButtonGroup');
 var MuiTooltip = require('@material-ui/core/Tooltip');
 var lab = require('@material-ui/lab');
-var MuiRadioGroup = require('@material-ui/core/RadioGroup');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -77,8 +76,6 @@ function _interopNamespace(e) {
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 var MuiAvatar__default = /*#__PURE__*/_interopDefaultLegacy(MuiAvatar);
-var MuiButton__default = /*#__PURE__*/_interopDefaultLegacy(MuiButton);
-var CircularProgress__default = /*#__PURE__*/_interopDefaultLegacy(CircularProgress);
 var Card__default = /*#__PURE__*/_interopDefaultLegacy(Card);
 var CardActionArea__default = /*#__PURE__*/_interopDefaultLegacy(CardActionArea);
 var CardContent__default = /*#__PURE__*/_interopDefaultLegacy(CardContent);
@@ -91,7 +88,6 @@ var Tab__default = /*#__PURE__*/_interopDefaultLegacy(Tab);
 var MuiToggleButton__default = /*#__PURE__*/_interopDefaultLegacy(MuiToggleButton);
 var MuiToggleButtonGroup__default = /*#__PURE__*/_interopDefaultLegacy(MuiToggleButtonGroup);
 var MuiTooltip__default = /*#__PURE__*/_interopDefaultLegacy(MuiTooltip);
-var MuiRadioGroup__default = /*#__PURE__*/_interopDefaultLegacy(MuiRadioGroup);
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -129,9 +125,19 @@ function __rest$1(s, e) {
                 t[p[i]] = s[p[i]];
         }
     return t;
+}
+
+function __spreadArray(to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || from);
 }
 
-var Button$1 = React.forwardRef(function (props, ref) {
+var Button = React.forwardRef(function (props, ref) {
     var _a = props.variation, variation = _a === void 0 ? 'primary' : _a, muiProps = __rest$1(props, ["variation"]);
     var variationProps = {};
     switch (variation) {
@@ -146,7 +152,7 @@ var Button$1 = React.forwardRef(function (props, ref) {
     }
     return React__default['default'].createElement(core.Button, __assign$1({}, variationProps, muiProps, { ref: ref }));
 });
-Button$1.displayName = 'Button';
+Button.displayName = 'Button';
 
 var useDishCardStyles = styles.makeStyles(function (theme) {
     var _a, _b;
@@ -474,6 +480,24 @@ function SvgTag(props) {
   })));
 }
 
+var _path$K;
+
+function _extends$1I() { _extends$1I = 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$1I.apply(this, arguments); }
+
+function SvgWarning(props) {
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$1I({
+    viewBox: "0 0 16 16",
+    fill: "none",
+    strokeLinecap: "round",
+    strokeLinejoin: "round",
+    width: "1em",
+    height: "1em"
+  }, props), _path$K || (_path$K = /*#__PURE__*/React__namespace.createElement("path", {
+    d: "M6.86 2.573L1.213 12a1.334 1.334 0 001.14 2h11.294a1.332 1.332 0 001.14-2L9.14 2.573a1.333 1.333 0 00-2.28 0v0zM8 6v2.667m0 2.667h.007",
+    stroke: "currentColor"
+  })));
+}
+
 var _path$z;
 
 function _extends$1o() { _extends$1o = 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$1o.apply(this, arguments); }
@@ -789,7 +813,7 @@ styles.makeStyles(function (theme) { return ({
     },
 }); });
 
-var useButtonStyles = styles.makeStyles(function () { return ({
+styles.makeStyles(function () { return ({
     root: {
         minWidth: 'unset',
     },
@@ -801,19 +825,6 @@ var useButtonStyles = styles.makeStyles(function () { return ({
     },
 }); });
 
-var Button = React.forwardRef(function (props, ref) {
-    props.textTransform; var loading = props.loading, classesOverride = props.classes, className = props.className, muiProps = __rest(props, ["textTransform", "loading", "classes", "className"]);
-    props.classes; var styleProps = __rest(props, ["classes"]);
-    var classes = useButtonStyles(styleProps);
-    var typography = styles.useTheme().typography;
-    var loadingIndicator = {
-        startIcon: React__default['default'].createElement(CircularProgress__default['default'], { color: "inherit", size: typography.button.fontSize }),
-        disabled: true,
-    };
-    return (React__default['default'].createElement(MuiButton__default['default'], __assign({ ref: ref, classes: __assign(__assign({}, classes), classesOverride), className: classNames$1([className, 'pm-button']) }, muiProps, (loading && loadingIndicator))));
-});
-Button.displayName = 'Button';
-
 var Checkbox$1 = React.forwardRef(function (props, ref) {
     var label = props.label, disabled = props.disabled, LabelProps = props.LabelProps, muiProps = __rest(props, ["label", "disabled", "LabelProps"]);
     var control = React__default['default'].createElement(MuiCheckbox__default['default'], __assign({ disabled: label ? undefined : disabled }, muiProps));
@@ -968,12 +979,12 @@ var useTypographyStyles = styles.makeStyles(function (theme) {
     });
 });
 
-var Typography = React.forwardRef(function (props, ref) {
-    props.weight; props.color; var restProps = __rest(props, ["weight", "color"]);
+var Typography = function (props) {
+    props.weight; props.color; var TypographyRef = props.TypographyRef, restProps = __rest(props, ["weight", "color", "TypographyRef"]);
     var classes = useTypographyStyles(__assign({}, props));
     var variantMapping = { subtitle1: 'p' };
-    return React__default['default'].createElement(core.Typography, __assign({ ref: ref, classes: classes, variantMapping: variantMapping }, restProps));
-});
+    return React__default['default'].createElement(core.Typography, __assign({ classes: classes, variantMapping: variantMapping, ref: TypographyRef }, restProps));
+};
 Typography.displayName = 'Typography';
 Typography.defaultProps = defaultTypographyProps;
 
@@ -1500,6 +1511,11 @@ var useDishCheckoutCardStyles = styles.makeStyles(function (theme) { return ({
     selectPaper: {
         maxHeight: theme.spacing(37),
     },
+    warning: {
+        color: theme.palette.error.main,
+        display: 'flex',
+        gridGap: theme.spacing(0.825),
+    },
 }); });
 
 var OrderingAppContext = React.createContext(null);
@@ -1517,7 +1533,7 @@ var OrderingAppContextProvider = function (props) {
 
 var DishCheckoutCard = function (props) {
     var _a;
-    var id = props.id, name = props.name, quantity = props.quantity, modifiers = props.modifiers, onDelete = props.onDelete, onEdit = props.onEdit, onQuantityChange = props.onQuantityChange, price = props.price, specialInstructions = props.specialInstructions, disabled = props.disabled;
+    var id = props.id, name = props.name, quantity = props.quantity, modifiers = props.modifiers, onDelete = props.onDelete, onEdit = props.onEdit, onQuantityChange = props.onQuantityChange, price = props.price, specialInstructions = props.specialInstructions, disabled = props.disabled, warningMessage = props.warningMessage;
     var classes = useDishCheckoutCardStyles(props);
     var appContext = useOrderingAppContext()[0];
     var _b = React.useState(false), open = _b[0], setOpen = _b[1];
@@ -1539,7 +1555,7 @@ var DishCheckoutCard = function (props) {
                     specialInstructions,
                     "\"")),
             React__default['default'].createElement(core.Box, { display: "flex", gridGap: 1, height: "100%", alignItems: "center" },
-                React__default['default'].createElement(Button$1, { disabled: disabled, className: classes.editButton, variant: "text", onClick: onEdit }, "Edit"),
+                React__default['default'].createElement(Button, { disabled: disabled, className: classes.editButton, variant: "text", onClick: onEdit }, "Edit"),
                 React__default['default'].createElement(IconButton, { disabled: disabled, onClick: onDelete, classes: { root: classes.deleteButton } },
                     React__default['default'].createElement(Icon, { icon: SvgTrash, size: "large" })))),
         React__default['default'].createElement(core.Box, { display: "flex", gridGap: 16, alignItems: "center" },
@@ -1558,7 +1574,11 @@ var DishCheckoutCard = function (props) {
                         getContentAnchorEl: null,
                         classes: { paper: classes.selectPaper },
                     }, className: classes.select }, Array.from({ length: 99 }, function (_, index) { return (React__default['default'].createElement(core.MenuItem, { key: index + 1, value: index + 1 }, index + 1)); }))),
-            React__default['default'].createElement(Typography, { className: classes.price }, formattedPrice))));
+            React__default['default'].createElement(Typography, { className: classes.price }, formattedPrice)),
+        warningMessage && (React__default['default'].createElement(core.Box, { className: classes.warning },
+            React__default['default'].createElement(core.Box, { paddingTop: 0.25 },
+                React__default['default'].createElement(Icon, { icon: SvgWarning, size: "medium" })),
+            React__default['default'].createElement(Typography, { variant: "body2" }, warningMessage)))));
 };
 
 var DishDetailsReview = React.forwardRef(function (props) {
@@ -1624,98 +1644,190 @@ var useLabelStyles = styles.makeStyles(function (theme) { return ({
     },
 }); });
 
+var useQuantityPickerStyles = styles.makeStyles(function (theme) { return ({
+    root: {
+        height: theme.spacing(7),
+        backgroundColor: 'none',
+    },
+}); });
+var useQuantityInputStyles = styles.makeStyles(function (theme) { return ({
+    root: {
+        height: '100%',
+        width: 'min-content',
+        borderRadius: theme.spacing(12.5),
+        background: function (props) { return (props.variation === 'modifierCount' ? 'unset' : theme.palette.grey[100]); },
+    },
+    input: {
+        '&::-webkit-clear-button, &::-webkit-outer-spin-button, &::-webkit-inner-spin-button': {
+            display: 'none',
+        },
+        '-moz-appearance': 'textfield',
+        fontWeight: 600,
+        padding: 0,
+        textAlign: 'center',
+        zIndex: function (props) { return (props.value === 0 && props.variation === 'modifierCount' ? -1 : 1); },
+        backgroundColor: function (props) { return (props.variation === 'modifierCount' ? theme.palette.grey[100] : 'unset'); },
+        alignSelf: function (props) { return (props.variation === 'modifierCount' ? 'stretch' : 'unset'); },
+        height: function (props) { return (props.variation === 'modifierCount' ? 'auto' : 'unset'); },
+        minWidth: function (props) { return (props.variation === 'modifierCount' ? theme.spacing(5) : theme.spacing(2.75)); },
+        borderRadius: function (props) { return (props.variation === 'modifierCount' ? theme.spacing(1) : 'unset'); },
+        margin: function (props) { return (props.variation === 'modifierCount' ? theme.spacing(0.5, 0) : 0); },
+    },
+}); });
+var useStartAdornmentStyles = styles.makeStyles(function (theme) { return ({
+    root: {
+        color: theme.palette.text.primary,
+        zIndex: function (props) { return (props.value === 0 && props.variation === 'modifierCount' ? -1 : 1); },
+    },
+}); });
+var useEndAdornmentStyles = styles.makeStyles(function (theme) { return ({
+    root: {
+        color: theme.palette.text.primary,
+    },
+}); });
+
+var QuantityPicker = function (props) {
+    var value = props.value, onChange = props.onChange, disabled = props.disabled, disableIncrement = props.disableIncrement, preventManualChange = props.preventManualChange, variation = props.variation;
+    var fieldClasses = useQuantityPickerStyles();
+    var inputClasses = useQuantityInputStyles(props);
+    var startAdornmentClasses = useStartAdornmentStyles(props);
+    var endAdornmentClasses = useEndAdornmentStyles(props);
+    var onIncrement = function (event) {
+        onChange(event, { quantity: value + 1, reason: 'increment' });
+    };
+    var onDecrement = function (event) {
+        onChange(event, { quantity: value - 1, reason: 'decrement' });
+    };
+    var handleChange = function (event) {
+        if (preventManualChange) {
+            event.preventDefault();
+        }
+        if (!preventManualChange) {
+            onChange(event, { quantity: parseInt(event.target.value), reason: 'change' });
+        }
+    };
+    return (React__default['default'].createElement(core.TextField, { classes: fieldClasses, type: "number", variant: variation === 'itemCount' ? 'filled' : 'standard', defaultValue: value, value: value, disabled: disabled, onChange: handleChange, InputProps: {
+            classes: inputClasses,
+            disableUnderline: true,
+            endAdornment: (React__default['default'].createElement(IconButton, { className: endAdornmentClasses.root, color: "default", tabIndex: -1, onClick: onIncrement, disabled: disabled || disableIncrement },
+                React__default['default'].createElement(Icon, { icon: SvgPlusCircle }))),
+            startAdornment: (React__default['default'].createElement(IconButton, { className: startAdornmentClasses.root, color: "default", tabIndex: -1, onClick: onDecrement, disabled: disabled || value <= 0 },
+                React__default['default'].createElement(Icon, { icon: SvgMinusCircle }))),
+        } }));
+};
+
 var Label = function (props) {
-    var name = props.name, price = props.price, disabled = props.disabled, isOutOfStock = props.isOutOfStock;
+    var name = props.name, price = props.price, outOfStock = props.outOfStock, messages = props.messages;
     var classes = useLabelStyles();
     return (React__default['default'].createElement(core.Box, { display: "flex", flexDirection: "column", className: classes.label },
         React__default['default'].createElement(core.Box, { display: "flex", alignItems: "center", gridGap: 8 },
             React__default['default'].createElement(core.Typography, null, name),
-            !isOutOfStock && disabled && (React__default['default'].createElement(core.Typography, { variant: "caption", className: classes.outOfStock }, "Out of stock"))),
-        price && React__default['default'].createElement(core.Typography, { className: !disabled ? classes.price : '' },
+            outOfStock && (React__default['default'].createElement(core.Typography, { variant: "caption", className: classes.outOfStock }, messages.outOfStockText))),
+        price && React__default['default'].createElement(core.Typography, null,
             "+ ",
             price)));
 };
-var CheckboxGroup = function (props) {
-    var value = props.value, modifiers = props.modifiers, onChange = props.onChange, disableNewSelections = props.disableNewSelections, isOutOfStock = props.isOutOfStock;
-    var classes = useCheckboxModifierFormStyles();
-    var appContext = useOrderingAppContext()[0];
-    var handleChange = function (event) {
-        var _a;
-        var price = (_a = modifiers.find(function (modifier) { return modifier.id === parseInt(event.target.value); })) === null || _a === void 0 ? void 0 : _a.price;
+var SingleSelectModifierControl = function (props) {
+    var modifiers = props.modifiers, isOutOfStock = props.isOutOfStock, onChange = props.onChange, value = props.value, messages = props.messages;
+    var radioClasses = useRadioModifierFormStyles();
+    var makeHandleChange = function (modifier) { return function (e) {
         onChange([
             {
-                id: parseInt(event.target.value),
-                price: (price && parseInt(price)) || 0,
-                quantity: 1,
-            },
-        ], event.target.checked);
-    };
-    return (React__default['default'].createElement(core.Box, { display: "flex", flexDirection: "column" }, modifiers.map(function (modifier, index) {
-        var targetValue = value === null || value === void 0 ? void 0 : value.find(function (v) { return v.id == modifier.id; });
-        return (React__default['default'].createElement(core.FormControlLabel, { key: index, value: modifier.id, control: React__default['default'].createElement(core.Checkbox, { className: classes.radio, disabled: (!targetValue && disableNewSelections) || isOutOfStock || modifier.outOfStock }), label: React__default['default'].createElement(Label, { name: modifier.name, price: modifier.price
-                    ? "" + (appContext && appContext.currencySymbol) + Number(modifier.price).toFixed(2)
-                    : null, disabled: isOutOfStock || modifier.outOfStock, isOutOfStock: isOutOfStock }), className: classes.root, checked: !!targetValue, onChange: handleChange }));
-    })));
-};
-var RadioGroup = function (props) {
-    var value = props.value, modifiers = props.modifiers, onChange = props.onChange, isOutOfStock = props.isOutOfStock;
-    var classes = useRadioModifierFormStyles();
-    var appContext = useOrderingAppContext()[0];
-    var handleChange = function (event) {
-        var _a;
-        var price = (_a = modifiers.find(function (modifier) { return modifier.id === parseInt(event.target.value); })) === null || _a === void 0 ? void 0 : _a.price;
-        onChange([
-            {
-                id: parseInt(event.target.value),
-                price: (price && parseInt(price)) || 0,
+                id: Number(e.target.value),
+                price: modifier.price,
                 quantity: 1,
             },
         ]);
-    };
-    return (React__default['default'].createElement(MuiRadioGroup__default['default'], { name: "selectedModifiers", value: value ? value[0].id : '', onChange: handleChange }, modifiers.map(function (modifier, index) { return (React__default['default'].createElement(core.FormControlLabel, { key: index, value: modifier.id, control: React__default['default'].createElement(core.Radio, { className: classes.radio, disabled: isOutOfStock || modifier.outOfStock }), label: React__default['default'].createElement(Label, { name: modifier.name, price: modifier.price ? "" + (appContext && appContext.currencySymbol) + Number(modifier.price).toFixed(2) : null, disabled: isOutOfStock || modifier.outOfStock, isOutOfStock: isOutOfStock }) })); })));
-};
-
-var ModifierOptionsControl = function (props) {
-    var type = props.type, modifiers = props.modifiers, value = props.value, onChange = props.onChange, disableNewSelections = props.disableNewSelections, isOutOfStock = props.isOutOfStock;
-    switch (type) {
+    }; };
+    return (React__default['default'].createElement(core.FormControl, { fullWidth: true },
+        React__default['default'].createElement(core.RadioGroup, null, modifiers.map(function (modifier) {
+            var _a;
+            return (React__default['default'].createElement(core.FormControlLabel, { key: modifier.id, value: modifier.id, control: React__default['default'].createElement(core.Radio, { checked: ((_a = value[0]) === null || _a === void 0 ? void 0 : _a.id) === modifier.id, className: radioClasses.radio, disabled: isOutOfStock || modifier.outOfStock, onChange: makeHandleChange(modifier) }), label: React__default['default'].createElement(Label, { messages: messages, name: modifier.name, price: modifier.formattedPrice, disabled: isOutOfStock || modifier.outOfStock, outOfStock: isOutOfStock }) }));
+        }))));
+};
+var MultipleSelectControl = function (props) {
+    var modifiers = props.modifiers, value = props.value, isOutOfStock = props.isOutOfStock, onChange = props.onChange, messages = props.messages, disableNewSelections = props.disableNewSelections;
+    var classes = useCheckboxModifierFormStyles();
+    var makeHandleChange = function (modifier) { return function () {
+        var isModifierInValue = Boolean(value.find(function (v) { return v.id === modifier.id; }));
+        if (isModifierInValue) {
+            onChange(value.filter(function (v) { return v.id !== modifier.id; }));
+        }
+        else {
+            onChange(__spreadArray(__spreadArray([], value), [{ id: modifier.id, price: modifier.price || 0, quantity: 1 }]));
+        }
+    }; };
+    return (React__default['default'].createElement(core.FormControl, { fullWidth: true },
+        React__default['default'].createElement(core.FormGroup, null, modifiers.map(function (modifier) { return (React__default['default'].createElement(core.FormControlLabel, { key: modifier.id, value: modifier.id, className: classes.root, checked: value.some(function (v) { return v.id === modifier.id; }), onChange: makeHandleChange(modifier), control: React__default['default'].createElement(core.Checkbox, { className: classes.radio, disabled: isOutOfStock || modifier.outOfStock || (!modifier.quantity && disableNewSelections) }), label: React__default['default'].createElement(Label, { messages: messages, name: modifier.name, price: modifier.formattedPrice, disabled: isOutOfStock || modifier.outOfStock, outOfStock: isOutOfStock }) })); }))));
+};
+var MultipleQuantitySelectControl = function (props) {
+    var modifiers = props.modifiers, value = props.value, isOutOfStock = props.isOutOfStock, onChange = props.onChange, messages = props.messages, disableNewSelections = props.disableNewSelections;
+    var makeHandleChange = function (modifier) { return function (_e, customEvent) {
+        var isModifierInValue = Boolean(value.find(function (v) { return v.id === modifier.id; }));
+        var isQuantityZero = customEvent.quantity === 0;
+        var shouldRemoveModifierFromValue = isModifierInValue && isQuantityZero;
+        var shouldAddModifierToValue = !isModifierInValue && !isQuantityZero;
+        var shouldUpdateModifierInValue = isModifierInValue && !isQuantityZero;
+        if (shouldRemoveModifierFromValue) {
+            onChange(value.filter(function (v) { return v.id !== modifier.id; }));
+        }
+        if (shouldAddModifierToValue) {
+            onChange(__spreadArray(__spreadArray([], value), [{ id: modifier.id, price: modifier.price, quantity: customEvent.quantity }]));
+        }
+        if (shouldUpdateModifierInValue) {
+            onChange(value.map(function (val) { return (val.id === modifier.id ? __assign$1(__assign$1({}, val), { quantity: customEvent.quantity }) : val); }));
+        }
+    }; };
+    return (React__default['default'].createElement(core.FormControl, { fullWidth: true },
+        React__default['default'].createElement(core.FormGroup, null, modifiers.map(function (modifier) { return (React__default['default'].createElement(core.Box, { key: modifier.id, style: { justifyContent: 'space-between' }, display: "flex" },
+            React__default['default'].createElement(Label, { messages: messages, name: modifier.name, price: modifier.formattedPrice, disabled: isOutOfStock || modifier.outOfStock, outOfStock: isOutOfStock }),
+            React__default['default'].createElement(QuantityPicker, { variation: "modifierCount", value: modifier.quantity, disableIncrement: disableNewSelections, preventManualChange: true, onChange: makeHandleChange(modifier) }))); }))));
+};
+var ModifierControls = function (props) {
+    switch (props.type) {
         case 'singleSelect':
-            return React__default['default'].createElement(RadioGroup, { modifiers: modifiers, value: value, onChange: onChange, isOutOfStock: isOutOfStock });
+            return React__default['default'].createElement(SingleSelectModifierControl, __assign$1({}, props));
         case 'multipleSelect':
-            return (React__default['default'].createElement(CheckboxGroup, { modifiers: modifiers, value: value, onChange: onChange, disableNewSelections: disableNewSelections, isOutOfStock: isOutOfStock }));
+            return React__default['default'].createElement(MultipleSelectControl, __assign$1({}, props));
+        case 'multipleQuantitySelect':
+            return React__default['default'].createElement(MultipleQuantitySelectControl, __assign$1({}, props));
         default:
             return null;
     }
 };
 
-var DishModifierCard = function (props) {
-    var name = props.name, disableNewSelections = props.disableNewSelections, modifiers = props.modifiers, value = props.value, messages = props.messages, onChange = props.onChange, type = props.type, error = props.error, isRequired = props.isRequired, isOutOfStock = props.isOutOfStock;
-    var optionalText = messages.optionalText, outOfStockText = messages.outOfStockText, requiredText = messages.requiredText, helperText = messages.helperText;
-    var isFullyOutOfStock = isOutOfStock || !modifiers.some(function (modifier) { return !modifier.outOfStock; });
-    var classes = useDishModifierCardStyles();
+var getStatusTagProps = function (props) {
+    var messages = props.messages, error = props.error, isRequired = props.isRequired, isOutOfStock = props.isOutOfStock;
+    var optionalText = messages.optionalText, outOfStockText = messages.outOfStockText, requiredText = messages.requiredText;
     var color = 'default';
     switch (true) {
         case error:
             color = 'error';
-        case isFullyOutOfStock:
+        case isOutOfStock:
             color = 'warning';
     }
     var label = optionalText;
     switch (true) {
-        case isFullyOutOfStock:
+        case isOutOfStock:
             label = outOfStockText;
             break;
         case isRequired:
             label = requiredText;
             break;
     }
+    var variant = isRequired || isOutOfStock ? 'outlined' : 'filled';
+    return { color: color, label: label, variant: variant };
+};
+var DishModifierCard = function (props) {
+    var name = props.name, disableNewSelections = props.disableNewSelections, modifiers = props.modifiers, value = props.value, messages = props.messages, onChange = props.onChange, type = props.type, error = props.error, isOutOfStock = props.isOutOfStock;
+    var classes = useDishModifierCardStyles();
     return (React__default['default'].createElement(core.Box, { className: classes.root },
         React__default['default'].createElement(core.Box, { display: "flex", justifyContent: "space-between", width: "100%", alignItems: "center", height: "fit-content", marginBottom: 2 },
-            React__default['default'].createElement(StatusTag, { variant: isRequired || isFullyOutOfStock ? 'outlined' : 'filled', label: label, color: color }),
-            !isFullyOutOfStock && (React__default['default'].createElement(Typography, { variant: "subtitle1", className: error ? classes.error : undefined }, helperText))),
+            React__default['default'].createElement(StatusTag, __assign$1({}, getStatusTagProps(props))),
+            !isOutOfStock && (React__default['default'].createElement(Typography, { variant: "subtitle1", className: error ? classes.error : undefined }, messages.helperText))),
         React__default['default'].createElement(Typography, { className: classes.name }, name),
         React__default['default'].createElement(core.Box, null,
-            React__default['default'].createElement(core.FormControl, null,
-                React__default['default'].createElement(ModifierOptionsControl, { type: type, modifiers: modifiers, value: value, onChange: onChange, disableNewSelections: disableNewSelections, isOutOfStock: isFullyOutOfStock })))));
+            React__default['default'].createElement(ModifierControls, { value: value, modifiers: modifiers, isOutOfStock: isOutOfStock, onChange: onChange, disableNewSelections: disableNewSelections, type: type, messages: messages }))));
 };
 DishModifierCard.displayName = 'DishModifierCard';
 
@@ -1835,6 +1947,11 @@ var useMenuDropdownStyles = styles.makeStyles(function (theme) {
                 alignSelf: 'start',
             },
             _a),
+        menuItem: {
+            alignItems: 'center',
+            display: 'flex',
+            gridGap: theme.spacing(1),
+        },
         select: {
             '& .MuiSelect-root': {
                 color: '#212121',
@@ -1842,6 +1959,9 @@ var useMenuDropdownStyles = styles.makeStyles(function (theme) {
                 zIndex: 10,
             },
         },
+        unavailable: {
+            color: theme.palette.grey[700],
+        },
     });
 });
 
@@ -1863,7 +1983,9 @@ var MenuDropdown = function (props) {
                     horizontal: 'left',
                 },
                 getContentAnchorEl: null,
-            }, className: classes.select }, menuOptions.map(function (option, index) { return (React__default['default'].createElement(core.MenuItem, { key: index, value: option.id }, option.name)); }))));
+            }, className: classes.select, renderValue: function (selected) { var _a; return (_a = menuOptions.find(function (menuOption) { return menuOption.id === selected; })) === null || _a === void 0 ? void 0 : _a.name; } }, menuOptions.map(function (option, index) { return (React__default['default'].createElement(core.MenuItem, { key: index, value: option.id, className: classNames(classes.menuItem, option.isUnavailable ? classes.unavailable : '') },
+            option.name,
+            option.isUnavailable && React__default['default'].createElement(Icon, { icon: SvgClock, size: "large" }))); }))));
 };
 
 var useMenuFilterStyles = styles.makeStyles(function (theme) { return ({
@@ -1925,61 +2047,6 @@ var MenuFilter = function (props) {
                     React__default['default'].createElement(Typography, { variant: "body1", color: "grey.500" }, noOptionsLabel)))))));
 };
 
-var useQuantityPickerStyles = styles.makeStyles(function (theme) { return ({
-    root: {
-        height: theme.spacing(7),
-    },
-}); });
-var useQuantityInputStyles = styles.makeStyles(function (theme) { return ({
-    root: {
-        height: '100%',
-        width: 'min-content',
-        borderRadius: theme.spacing(12.5),
-        background: theme.palette.grey[100],
-    },
-    input: {
-        '&::-webkit-clear-button, &::-webkit-outer-spin-button, &::-webkit-inner-spin-button': {
-            display: 'none',
-        },
-        '-moz-appearance': 'textfield',
-        fontWeight: 600,
-        minWidth: theme.spacing(2.75),
-        padding: 0,
-        textAlign: 'center',
-        position: 'relative',
-        left: 1,
-    },
-    adornedStart: {
-        padding: theme.spacing(0.25),
-    },
-    adornedEnd: {
-        padding: theme.spacing(0.5),
-    },
-}); });
-
-var QuantityPicker = function (props) {
-    var value = props.value, onChange = props.onChange, disabled = props.disabled;
-    var fieldClasses = useQuantityPickerStyles();
-    var inputClasses = useQuantityInputStyles();
-    var onIncrement = function () {
-        onChange({ target: { value: value + 1 } }, 'increment');
-    };
-    var onDecrement = function () {
-        onChange({ target: { value: value - 1 } }, 'decrement');
-    };
-    var handleChange = function (event) {
-        onChange({ target: { value: parseInt(event.target.value) } }, 'change');
-    };
-    return (React__default['default'].createElement(core.TextField, { classes: __assign$1({}, fieldClasses), variant: "filled", type: "number", defaultValue: value, value: value, disabled: disabled, onChange: handleChange, InputProps: {
-            classes: __assign$1({}, inputClasses),
-            disableUnderline: true,
-            endAdornment: (React__default['default'].createElement(IconButton, { color: "default", tabIndex: -1, onClick: onIncrement, disabled: disabled },
-                React__default['default'].createElement(Icon, { icon: SvgPlusCircle }))),
-            startAdornment: (React__default['default'].createElement(IconButton, { color: "default", tabIndex: -1, onClick: onDecrement, disabled: disabled },
-                React__default['default'].createElement(Icon, { icon: SvgMinusCircle }))),
-        } }));
-};
-
 var useSelectableChipStyles = styles.makeStyles(function (theme) { return ({
     root: {
         border: '2px solid',
@@ -2337,7 +2404,7 @@ var orderingTheme = {
     props: props,
 };
 
-exports.Button = Button$1;
+exports.Button = Button;
 exports.Checkbox = Checkbox;
 exports.DialogSection = DialogSection;
 exports.DialogTitle = DialogTitle;