@popmenu/ordering-ui 0.70.0 → 0.72.0

package/build/components/DishCard/DishCardProps.d.ts

@@ -1,3 +1,4 @@
+import { SyntheticEvent } from 'react';
 export interface DishCardProps {
     /** Renders the title of the dish */
     title: string;
@@ -5,6 +6,7 @@ export interface DishCardProps {
     price: string;
     /** Renders the description of the dish */
     description: string;
+    id: string;
     /** The image to be displayed. */
     image: {
         alt: string;
@@ -21,7 +23,7 @@ export interface DishCardProps {
     /** Number of reviews */
     reviewCount: number;
     /** Callback for when the DishCard is clicked */
-    onClick: () => void;
+    onClick: (event: SyntheticEvent) => void;
     /** Boolean for whether or not the view is in mobile */
     isMobile: boolean;
 }

package/build/components/DishModifierCard/DishModifierCardProps.d.ts

@@ -12,7 +12,7 @@ interface Base {
     /** Modifier options */
     modifiers: Array<Modifier>;
     /** The values of the modifier form */
-    value: Array<ModifierValue>;
+    value: Array<ModifierValue> | undefined;
     /** Handles the change event */
     onChange: OnChange;
 }

package/build/components/MenuFilter/MenuFilter.styles.d.ts

@@ -0,0 +1 @@
+export declare const useMenuFilterStyles: (props?: any) => import("@material-ui/styles").ClassNameMap<"chipButton" | "container" | "filterButton" | "tagText">;

package/build/index.es.js

@@ -970,6 +970,7 @@ var useButtonStyles = makeStyles$1(function (theme) { return ({
         color: getColor(theme),
         background: getBackground(theme),
         fontSize: getFontSize(),
+        textTransform: 'none',
         minWidth: 'unset',
     },
     disabled: {
@@ -1385,6 +1386,9 @@ var useDishCardStyles = makeStyles$1(function (theme) { return ({
         borderRadius: '30px',
         marginRight: theme.spacing(1),
     },
+    title: {
+        fontSize: '1.125rem',
+    },
     truncate: {
         '-webkit-line-clamp': 2,
         display: '-webkit-box',
@@ -1393,13 +1397,13 @@ var useDishCardStyles = makeStyles$1(function (theme) { return ({
         overflow: 'hidden',
     },
     price: {
-        fontSize: '18px',
+        fontSize: '1.25rem',
     },
 }); });
 
 var ItemTagGroup = function (props) {
     var children = props.children;
-    return (React__default.createElement(Box, { display: "flex", gridGap: 6, ml: 1 }, children));
+    return (React__default.createElement(Box, { display: "flex", gridGap: 6, ml: 1, flexWrap: "wrap" }, children));
 };
 
 var useItemtagStyles = makeStyles$1(function (theme) { return ({
@@ -1412,21 +1416,26 @@ var useItemtagStyles = makeStyles$1(function (theme) { return ({
             borderColor: ((_c = theme.palette[colorGroup]) === null || _c === void 0 ? void 0 : _c[colorVariant]) || color,
             border: '1.5px solid',
             background: 'none',
-            height: '20px',
-            width: '20px',
+            height: '24px',
+            lineHeight: 1.5,
+            position: 'static',
+            width: '24px',
         };
     },
+    text: {
+        lineHeight: 1.5,
+    },
 }); });
 
 var ItemTag = forwardRef(function (props, ref) {
     var _a = props.color, color = _a === void 0 ? 'gray.dark' : _a, alt = props.alt, children = props.children;
     var classes = useItemtagStyles({ color: color });
     return (React__default.createElement(Avatar$1, { ref: ref, alt: alt, classes: { root: classes.root } },
-        React__default.createElement(Typography, { variant: "caption" }, children)));
+        React__default.createElement(Typography, { variant: "caption", className: classes.text }, children)));
 });
 
 var DishCard = function (props) {
-    var title = props.title, description = props.description, image = props.image, likeCount = props.likeCount, reviewCount = props.reviewCount, itemTags = props.itemTags, price = props.price, onClick = props.onClick;
+    var title = props.title, description = props.description, image = props.image, likeCount = props.likeCount, reviewCount = props.reviewCount, itemTags = props.itemTags, price = props.price, onClick = props.onClick, id = props.id;
     var classes = useDishCardStyles(props);
     var theme = useTheme$1();
     var validImage = (image === null || image === void 0 ? void 0 : image.src) && (image === null || image === void 0 ? void 0 : image.alt);
@@ -1436,11 +1445,11 @@ var DishCard = function (props) {
         var documentFontSize = parseFloat(getComputedStyle(document.documentElement).fontSize);
         return collapsedSizeRem * documentFontSize;
     };
-    return (React__default.createElement(Box, { className: classes.root, onClick: onClick },
+    return (React__default.createElement(Box, { className: classes.root, onClick: onClick, id: id },
         React__default.createElement(Box, { display: "flex", flexDirection: "column", justifyContent: "space-between", width: "100%", marginRight: 1 },
             React__default.createElement(Box, null,
                 React__default.createElement(Box, { maxHeight: getTruncatedSizePx('h6') + 'px' },
-                    React__default.createElement(Typography, { variant: "h6", className: classes.truncate }, title)),
+                    React__default.createElement(Typography, { variant: "h6", className: classNames([classes.title, classes.truncate]) }, title)),
                 React__default.createElement(Box, { maxHeight: getTruncatedSizePx('body2') + 'px' },
                     React__default.createElement(Typography, { variant: "body2", className: classNames([classes.description, classes.truncate]) }, description)),
                 React__default.createElement(ReactionCounterGroup, null,
@@ -1541,10 +1550,10 @@ var DishDetailsReview = forwardRef(function (props) {
     return (React__default.createElement(Box, { display: "flex" },
         React__default.createElement(Box, { mr: 1 },
             React__default.createElement(Avatar, { size: "small", src: userAvatarUrl })),
-        React__default.createElement(Box, { maxWidth: "324px" },
+        React__default.createElement(Box, null,
             React__default.createElement(Box, { display: "flex", justifyContent: "space-between", mb: 1 },
                 React__default.createElement(Typography, { color: "grey.600" }, userName),
-                React__default.createElement(Typography, { color: "grey.600", variant: "subtitle1" }, timeSinceCreated)),
+                React__default.createElement(Typography, { color: "grey.600", variant: "subtitle1", style: { display: 'flex', alignItems: 'center' } }, timeSinceCreated)),
             React__default.createElement(Typography, { color: "grey.900", weight: "regular" }, content))));
 });
 DishDetailsReview.displayName = 'DishDetailsReview';
@@ -1563,6 +1572,14 @@ var useDishModifierCardStyles = makeStyles$1(function (theme) { return ({
     },
     name: {
         fontSize: '18px',
+        width: 'max-content',
+    },
+    nameContainer: {
+        display: 'flex',
+        alignItems: 'center',
+    },
+    statusTagContainer: {
+        margin: theme.spacing(0, 2),
     },
 }); });
 var useRadioModifierFormStyles = makeStyles$1(function (theme) { return ({
@@ -1607,7 +1624,6 @@ var useStatusTagStyles = makeStyles$1(function (theme) { return ({
     root: {
         borderRadius: '5px',
         display: 'flex',
-        height: '16px',
         padding: theme.spacing(1),
         alignItems: 'center',
         justifyContent: 'center',
@@ -1705,9 +1721,10 @@ var DishModifierCard = function (props) {
     }
     return (React__default.createElement(Box, { className: classes.root },
         React__default.createElement(Box, { display: "flex", justifyContent: "space-between", width: "100%", alignItems: "center", height: "fit-content" },
-            React__default.createElement(Box, { display: "flex", alignItems: "center", gridGap: 16 },
+            React__default.createElement(Box, { className: classes.nameContainer },
                 React__default.createElement(Typography, { className: classes.name }, name),
-                React__default.createElement(StatusTag, { variant: isRequired || isOutOfStock ? 'outlined' : 'filled', label: label, color: color })),
+                React__default.createElement(Box, { className: classes.statusTagContainer },
+                    React__default.createElement(StatusTag, { variant: isRequired || isOutOfStock ? 'outlined' : 'filled', label: label, color: color }))),
             React__default.createElement(Typography, { variant: "subtitle1", className: error ? classes.error : undefined }, helperText)),
         React__default.createElement(Box, null,
             React__default.createElement(FormControl, null,
@@ -1870,12 +1887,33 @@ function SvgLeafIcon(props) {
   })));
 }
 
+var useMenuFilterStyles = makeStyles$1(function (theme) { return ({
+    chipButton: {
+        position: 'static',
+    },
+    container: {
+        alignItems: 'center',
+        display: 'flex',
+        flexWrap: 'wrap',
+        gridGap: theme.spacing(0.5),
+    },
+    filterButton: {
+        maxHeight: theme.spacing(4.5),
+        position: 'static',
+        textTransform: 'none',
+    },
+    tagText: {
+        color: theme.palette.grey[900],
+    },
+}); });
+
 var MenuFilter = function (props) {
     var filterOptions = props.filterOptions, onFilter = props.onFilter, activeFilters = props.activeFilters;
     var _a = useState(null), anchorEl = _a[0], setAnchorEl = _a[1];
     var open = Boolean(anchorEl);
     var hasActiveFilters = activeFilters.length > 0;
     var allFiltersActive = filterOptions.length === 0;
+    var classes = useMenuFilterStyles();
     var handleChange = function (event) {
         onFilter({ target: { value: event.currentTarget.value } });
         setAnchorEl(null);
@@ -1891,17 +1929,19 @@ var MenuFilter = function (props) {
         setAnchorEl(null);
     };
     return (React__default.createElement(Box, { display: "flex" },
-        React__default.createElement(Button$2, { id: "menu-filter-button", "aria-controls": open ? 'filter-menu' : undefined, "aria-haspopup": "true", "aria-expanded": open ? 'true' : undefined, onClick: handleClick, size: "small" },
-            React__default.createElement(Box, { display: "flex", alignItems: "center", padding: 1 },
-                React__default.createElement(Icon, { icon: SvgLeafIcon }),
-                React__default.createElement(Box, { marginLeft: 1 },
-                    React__default.createElement(Typography, { color: "info.light" }, "Add Filter")))),
-        hasActiveFilters && (React__default.createElement(Box, { display: "flex", alignItems: "center", gridGap: 4, marginLeft: 1 }, activeFilters.map(function (filter, index) { return (React__default.createElement(Chip, { key: index, onClick: function () { return handleChipDelete(filter.id); }, label: React__default.createElement(Box, { display: "flex", alignItems: "center" },
-                React__default.createElement(Box, { marginLeft: -0.75, marginRight: 0.75 },
-                    React__default.createElement(ItemTag, { alt: filter.abbr, color: filter.color }, filter.abbr)),
-                React__default.createElement(Typography, null, filter.name),
-                React__default.createElement(Box, { display: "flex", marginLeft: 0.75, marginRight: -0.75 },
-                    React__default.createElement(Icon, { icon: SvgXCircle, size: "large", color: "#9E9E9E" }))) })); }))),
+        React__default.createElement(Box, { className: classes.container },
+            React__default.createElement(Button$2, { id: "menu-filter-button", "aria-controls": open ? 'filter-menu' : undefined, "aria-haspopup": "true", "aria-expanded": open ? 'true' : undefined, onClick: handleClick, size: "small", className: classes.filterButton },
+                React__default.createElement(Box, { display: "flex", alignItems: "center", padding: 1 },
+                    React__default.createElement(Icon, { icon: SvgLeafIcon }),
+                    React__default.createElement(Box, { marginLeft: 1 },
+                        React__default.createElement(Typography, { variant: "caption", color: "info.light" }, "Add Filter")))),
+            hasActiveFilters &&
+                activeFilters.map(function (filter, index) { return (React__default.createElement(Chip, { key: index, onClick: function () { return handleChipDelete(filter.id); }, className: classes.chipButton, label: React__default.createElement(Box, { display: "flex", alignItems: "center" },
+                        React__default.createElement(Box, { marginLeft: -0.75, marginRight: 0.75 },
+                            React__default.createElement(ItemTag, { alt: filter.abbr, color: filter.color }, filter.abbr)),
+                        React__default.createElement(Typography, { className: classes.tagText, variant: "caption" }, filter.name),
+                        React__default.createElement(Box, { display: "flex", marginLeft: 0.75, marginRight: -0.75 },
+                            React__default.createElement(Icon, { icon: SvgXCircle, size: "large", color: "#9E9E9E" }))) })); })),
         React__default.createElement(Menu, { id: "menu-filter-menu", anchorEl: anchorEl, open: open, onClose: handleClose, MenuListProps: {
                 'aria-labelledby': 'menu-filter-button',
             } },
@@ -1984,6 +2024,7 @@ var useSelectableChipStyles = makeStyles$1(function (theme) { return ({
         minWidth: 'unset',
         minHeight: 'unset',
         opacity: 'unset',
+        textTransform: 'none',
         '&::-webkit-scrollbar': {
             display: 'none',
         },