@shopgate/engage 7.31.4-beta.1 → 7.32.0-beta.2

package/locations/components/FulfillmentSlotSwitcher/FulfillmentSlotSwitcherDefault.js

@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
-import { RippleButton, I18n } from '@shopgate/engage/components';
+import { RippleButton, I18n, Typography } from '@shopgate/engage/components';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { makeStyles } from '@shopgate/engage/styles';
 import { getTimeSlotDisplayText } from "./time";
@@ -9,19 +9,11 @@ const useStyles = makeStyles()(theme => ({
   wrapper: {
     display: 'flex',
     flexDirection: 'column',
-    fontSize: '0.875rem',
     padding: theme.spacing(0, 2),
     flexShrink: 0
   },
-  heading: {
-    color: 'var(--color-text-medium-emphasis)'
-  },
-  name: {
-    fontWeight: 500,
-    color: theme.palette.text.primary
-  },
   button: {
-    fontSize: '0.625rem !important',
+    fontSize: `${theme.typography.caption.fontSize} !important`,
     letterSpacing: '0.05em',
     padding: `${theme.spacing(0.375, 0)} !important`,
     ' *': {
@@ -31,7 +23,7 @@ const useStyles = makeStyles()(theme => ({
 }));
 
 /**
- * @returns {JSX}
+ * @returns {JSX.Element}
  */
 const FulfillmentSlotSwitcherDefault = ({
   handleChange,
@@ -44,12 +36,17 @@ const FulfillmentSlotSwitcherDefault = ({
   const displayTime = useMemo(() => getTimeSlotDisplayText(fulfillmentSlot), [fulfillmentSlot]);
   return /*#__PURE__*/_jsxs("div", {
     className: classes.wrapper,
-    children: [/*#__PURE__*/_jsx("div", {
-      className: classes.heading,
+    children: [/*#__PURE__*/_jsx(Typography, {
+      variant: "body2",
+      component: "div",
+      color: "textSecondary",
       children: i18n.text('locations.your_current_timeslot.heading')
     }), /*#__PURE__*/_jsxs("div", {
-      className: classes.name,
-      children: [/*#__PURE__*/_jsx("span", {
+      children: [/*#__PURE__*/_jsx(Typography, {
+        variant: "body2",
+        component: "span",
+        color: "textPrimary",
+        fontWeight: "medium",
         children: displayTime
       }), /*#__PURE__*/_jsx(RippleButton, {
         onClick: handleChange,

package/locations/components/GlobalLocationSelector/GlobalLocationSelector.js

@@ -4,8 +4,8 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { getCurrentRoute } from '@shopgate/pwa-common/selectors/router';
 import { selectGlobalLocation } from '@shopgate/engage/locations/action-creators';
+import { getIsLocationBasedShopping } from '@shopgate/engage/settings/selectors/merchantSettings';
 import { getPreferredLocation, getIsPending } from "../../selectors";
-import { getIsLocationBasedShopping } from "../../../core/selectors";
 import { FulfillmentSheet } from "../FulfillmentSheet";
 import { STAGE_SELECT_STORE, MULTI_LINE_RESERVE } from "../../constants";
 

package/locations/components/GlobalLocationSwitcher/GlobalLocationSwitcher.connector.js

@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { getIsLocationBasedShopping } from '@shopgate/engage/core';
+import { getIsLocationBasedShopping } from '@shopgate/engage/settings/selectors/merchantSettings';
 import { getPreferredLocation } from '@shopgate/engage/locations/selectors';
 import { selectGlobalLocation } from '@shopgate/engage/locations/action-creators';
 import { getIsCartStateConfigurable } from "../../selectors";

package/locations/components/GlobalLocationSwitcher/GlobalLocationSwitcherBar.js

@@ -1,26 +1,21 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { RippleButton, I18n } from '@shopgate/engage/components';
+import { RippleButton, I18n, Typography } from '@shopgate/engage/components';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { makeStyles } from '@shopgate/engage/styles';
-import { themeConfig } from '@shopgate/pwa-common/helpers/config';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const {
-  variables
-} = themeConfig;
 const useStyles = makeStyles()(theme => ({
   wrapper: {
-    fontSize: '0.875rem',
     color: theme.palette.text.primary,
-    background: 'var(--color-background-accent)'
+    background: theme.palette.background.emphasized
   },
   inner: {
     display: 'flex',
     flexShrink: 0,
     margin: theme.spacing(0, 2),
-    borderBottom: '1px solid #eaeaea',
+    borderBottom: `1px solid ${theme.components.border.light}`,
     alignItems: 'center',
-    height: variables.filterbar.height
+    height: theme.components.filterBar.height
   },
   innerStandalone: {
     borderBottom: 'none'
@@ -28,19 +23,16 @@ const useStyles = makeStyles()(theme => ({
   heading: {
     paddingRight: theme.spacing(1)
   },
-  name: {
-    fontWeight: 500
-  },
   button: {
     marginLeft: 'auto',
     letterSpacing: '0.05em',
     padding: `${theme.spacing(0.375, 0)} !important`,
     ' *': {
-      fontSize: '0.875rem',
+      fontSize: theme.typography.body2.fontSize,
       textTransform: 'initial',
       padding: '0 !important',
       color: theme.palette.text.primary,
-      fontWeight: 500
+      fontWeight: theme.typography.fontWeightMedium
     }
   }
 }));
@@ -65,11 +57,15 @@ const GlobalLocationSwitcherBar = ({
       }),
       children: [/*#__PURE__*/_jsxs("span", {
         "aria-label": `${i18n.text('locations.your_current_location.heading')}: ${locationName}`,
-        children: [/*#__PURE__*/_jsx("span", {
+        children: [/*#__PURE__*/_jsx(Typography, {
+          variant: "body2",
+          component: "span",
           className: classes.heading,
           children: `${i18n.text('locations.your_current_location.heading')}:`
-        }), /*#__PURE__*/_jsx("span", {
-          className: classes.name,
+        }), /*#__PURE__*/_jsx(Typography, {
+          variant: "body2",
+          component: "span",
+          fontWeight: "medium",
           children: locationName
         })]
       }), /*#__PURE__*/_jsx(RippleButton, {

package/locations/components/GlobalLocationSwitcher/GlobalLocationSwitcherDefault.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { RippleButton, I18n } from '@shopgate/engage/components';
+import { RippleButton, I18n, Typography } from '@shopgate/engage/components';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { makeStyles } from '@shopgate/engage/styles';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -8,19 +8,14 @@ const useStyles = makeStyles()(theme => ({
   wrapper: {
     display: 'flex',
     flexDirection: 'column',
-    fontSize: '0.875rem',
     padding: theme.spacing(0, 2),
     flexShrink: 0
   },
-  heading: {
-    color: 'var(--color-text-medium-emphasis)'
-  },
   name: {
-    fontWeight: 500,
     color: theme.palette.text.primary
   },
   button: {
-    fontSize: '0.625rem !important',
+    fontSize: `${theme.typography.caption.fontSize} !important`,
     letterSpacing: '0.05em',
     padding: `${theme.spacing(0.375, 0)} !important`,
     ' *': {
@@ -30,7 +25,7 @@ const useStyles = makeStyles()(theme => ({
 }));
 
 /**
- * @returns {JSX}
+ * @returns {JSX.Element}
  */
 const GlobalLocationSwitcherDefault = ({
   locationName,
@@ -42,12 +37,17 @@ const GlobalLocationSwitcherDefault = ({
   } = useStyles();
   return /*#__PURE__*/_jsxs("div", {
     className: classes.wrapper,
-    children: [/*#__PURE__*/_jsx("div", {
-      className: classes.heading,
+    children: [/*#__PURE__*/_jsx(Typography, {
+      variant: "body2",
+      component: "div",
+      color: "textSecondary",
       children: i18n.text('locations.your_current_location.heading')
     }), /*#__PURE__*/_jsxs("div", {
-      className: classes.name,
-      children: [/*#__PURE__*/_jsx("span", {
+      children: [/*#__PURE__*/_jsx(Typography, {
+        variant: "body2",
+        component: "span",
+        fontWeight: "medium",
+        className: classes.name,
         children: locationName
       }), /*#__PURE__*/_jsx(RippleButton, {
         onClick: handleChange,

package/locations/components/ReservationResponses/ReservationError.js

@@ -1,16 +1,15 @@
 import React from 'react';
+import { Typography } from '@shopgate/engage/components';
 import { makeStyles } from '@shopgate/engage/styles';
 import { i18n } from "../../../core/helpers/i18n";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const useStyles = makeStyles()(theme => ({
   container: {
-    background: theme.palette.background.default,
+    background: theme.palette.background.surface,
     padding: theme.spacing(2, 1.5, 16),
     boxShadow: 'inset rgba(0, 0, 0, .117647) 0 1px 6px, inset rgba(0, 0, 0, .117647) 0 1px 4px'
   },
   heading: {
-    fontSize: '1.125rem',
-    fontWeight: 'bold',
     margin: theme.spacing(1, 0, 2.5)
   },
   body: {
@@ -22,7 +21,7 @@ const useStyles = makeStyles()(theme => ({
 
 /**
  * Renders the reservation error screen.
- * @returns {JSX}
+ * @returns {JSX.Element}
  */
 export function ReservationError() {
   const {
@@ -30,10 +29,14 @@ export function ReservationError() {
   } = useStyles();
   return /*#__PURE__*/_jsxs("div", {
     className: classes.container,
-    children: [/*#__PURE__*/_jsx("h2", {
+    children: [/*#__PURE__*/_jsx(Typography, {
+      variant: "h4",
+      component: "h2",
+      fontWeight: "bold",
       className: classes.heading,
       children: i18n.text('locations.error_title')
-    }), /*#__PURE__*/_jsx("p", {
+    }), /*#__PURE__*/_jsx(Typography, {
+      component: "p",
       className: classes.body,
       children: i18n.text('locations.error_copy')
     })]

package/locations/components/ReservationResponses/ReservationSuccess.js

@@ -1,17 +1,16 @@
 import React, { useContext } from 'react';
+import { Typography } from '@shopgate/engage/components';
 import { makeStyles } from '@shopgate/engage/styles';
 import { i18n } from "../../../core/helpers/i18n";
 import { FulfillmentContext } from "../../locations.context";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const useStyles = makeStyles()(theme => ({
   container: {
-    background: theme.palette.background.default,
+    background: theme.palette.background.surface,
     padding: theme.spacing(2, 1.5, 16),
     boxShadow: 'inset rgba(0, 0, 0, .117647) 0 1px 6px, inset rgba(0, 0, 0, .117647) 0 1px 4px'
   },
   heading: {
-    fontSize: '1.125rem',
-    fontWeight: 'bold',
     margin: theme.spacing(1, 0, 2.5)
   },
   body: {
@@ -21,8 +20,6 @@ const useStyles = makeStyles()(theme => ({
   },
   orderNum: {
     padding: 0,
-    fontSize: '1.1875rem',
-    fontWeight: 'bold',
     margin: theme.spacing(0, 0, 2),
     border: 0
   }
@@ -41,16 +38,24 @@ export function ReservationSuccess() {
   } = useContext(FulfillmentContext);
   return /*#__PURE__*/_jsxs("div", {
     className: classes.container,
-    children: [/*#__PURE__*/_jsx("h2", {
+    children: [/*#__PURE__*/_jsx(Typography, {
+      variant: "h4",
+      component: "h2",
+      fontWeight: "bold",
       className: classes.heading,
       children: i18n.text('locations.success_title')
-    }), /*#__PURE__*/_jsx("p", {
+    }), /*#__PURE__*/_jsx(Typography, {
+      component: "p",
       className: classes.body,
       children: i18n.text('locations.success_copy')
-    }), /*#__PURE__*/_jsx("p", {
+    }), /*#__PURE__*/_jsx(Typography, {
+      component: "p",
       className: classes.body,
       children: i18n.text('locations.success_order_num')
-    }), orderNumbers !== null && /*#__PURE__*/_jsx("p", {
+    }), orderNumbers !== null && /*#__PURE__*/_jsx(Typography, {
+      variant: "h3",
+      component: "p",
+      fontWeight: "bold",
       className: classes.orderNum,
       children: orderNumbers[0]
     })]

package/locations/components/ReserveForm/ReserveForm.js

@@ -1,7 +1,7 @@
 import 'react-phone-number-input/style.css';
 import React, { useState, useContext, useMemo, useRef, useLayoutEffect, useCallback } from 'react';
 import { makeStyles } from '@shopgate/engage/styles';
-import { TextField, RippleButton, RadioGroup, RadioGroupItem, ProgressBar } from '@shopgate/engage/components';
+import { TextField, RippleButton, RadioGroup, RadioGroupItem, ProgressBar, Typography } from '@shopgate/engage/components';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { useFormState } from "../../../core/hooks/useFormState";
 import { FulfillmentContext } from "../../locations.context";
@@ -10,13 +10,11 @@ import { constraints } from "./ReserveForm.constraints";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const useStyles = makeStyles()(theme => ({
   form: {
-    background: theme.palette.background.default,
+    background: theme.palette.background.surface,
     padding: theme.spacing(1.5, 1.5, 2),
     boxShadow: 'inset rgba(0, 0, 0, .117647) 0 1px 6px, inset rgba(0, 0, 0, .117647) 0 1px 4px'
   },
   formHeading: {
-    fontSize: '1.125rem',
-    fontWeight: 'bold',
     margin: theme.spacing(0, 0, 1)
   },
   fieldset: {
@@ -187,7 +185,10 @@ function ReserveFormUnwrapped() {
           className: classes.formField,
           errorText: i18n.text(validationErrors.email)
         })]
-      }), /*#__PURE__*/_jsx("p", {
+      }), /*#__PURE__*/_jsx(Typography, {
+        variant: "h4",
+        component: "p",
+        fontWeight: "bold",
         className: classes.formHeading,
         children: i18n.text('locations.who_will_pickup')
       }), /*#__PURE__*/_jsx("div", {

package/locations/components/ReserveForm/ReserveFormPhone.js

@@ -1,7 +1,6 @@
 import React, { useMemo, useContext, memo, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import { makeStyles } from '@shopgate/engage/styles';
-import { themeConfig } from '@shopgate/pwa-common/helpers/config';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { parsePhoneNumber } from 'react-phone-number-input';
 import PhoneInput from 'react-phone-number-input/mobile';
@@ -12,14 +11,12 @@ import es from 'react-phone-number-input/locale/es.json';
 import fr from 'react-phone-number-input/locale/fr.json';
 import pt from 'react-phone-number-input/locale/pt.json';
 import flags from 'react-phone-number-input/flags';
+import { Typography } from '@shopgate/engage/components';
 import TextField from '@shopgate/pwa-ui-shared/TextField';
 import { useCountriesNames } from '@shopgate/engage/i18n';
 import { FulfillmentContext } from "../../locations.context";
 import connect from "./ReserveFormPhone.connector";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const {
-  colors
-} = themeConfig;
 const useStyles = makeStyles()(theme => ({
   formField: {
     width: '100%',
@@ -33,11 +30,11 @@ const useStyles = makeStyles()(theme => ({
     marginBottom: theme.spacing(1),
     ' input.PhoneInputInput': {
       outline: 'none',
-      fontSize: '1rem',
+      fontSize: theme.typography.body1.fontSize,
       lineHeight: '1.1875rem',
       borderRadius: 0,
       paddingBottom: theme.spacing(0.75),
-      borderBottom: `1px solid ${colors.shade12}`,
+      borderBottom: `1px solid ${theme.components.border.dark}`,
       '&:focus': {
         borderBottom: `2px solid ${theme.palette.primary.main}`,
         paddingBottom: theme.spacing(0.75) - 1
@@ -54,9 +51,7 @@ const useStyles = makeStyles()(theme => ({
     position: 'absolute',
     width: '100%',
     bottom: 2,
-    fontSize: '0.75rem',
     lineHeight: 0.875,
-    color: theme.palette.error.main,
     overflow: 'hidden',
     whiteSpace: 'nowrap',
     textOverflow: 'ellipsis'
@@ -177,7 +172,10 @@ const ReserveFormPhoneUnwrapped = /*#__PURE__*/memo(props => {
       placeholder: label,
       countries: countries,
       labels: labels
-    }), !!errorText && /*#__PURE__*/_jsx("div", {
+    }), !!errorText && /*#__PURE__*/_jsx(Typography, {
+      variant: "caption",
+      component: "div",
+      color: "error",
       className: classes.phoneFieldErrorText,
       children: errorText
     })]

package/locations/components/StockInfo/StockInfo.js

@@ -2,6 +2,7 @@ import * as React from 'react';
 import { connect } from 'react-redux';
 import defaultsDeep from 'lodash/defaultsDeep';
 import PropTypes from 'prop-types';
+import { Typography } from '@shopgate/engage/components';
 import { makeStyles, useTheme } from '@shopgate/engage/styles';
 import { makeGetLocationInventory } from "../../selectors";
 import { getThemeSettings } from "../../../core";
@@ -16,7 +17,6 @@ const useStyles = makeStyles()((theme, {
 }) => ({
   defaultClassName: {
     color: availabilityTextColor,
-    fontSize: '0.75rem',
     margin: 0,
     ':not(:empty) ~ *': {
       marginLeft: 14
@@ -73,7 +73,9 @@ const StockInfoUnwrapped = ({
   return /*#__PURE__*/_jsx(SurroundPortals, {
     portalName: PRODUCT_LOCATION_STOCK_INFO,
     portalProps: portalProps,
-    children: /*#__PURE__*/_jsx("span", {
+    children: /*#__PURE__*/_jsx(Typography, {
+      variant: "caption",
+      component: "span",
       className: cx(classes.defaultClassName, className),
       children: /*#__PURE__*/_jsx(StockInfoInventory, {
         availabilityText: availabilityText,

package/locations/components/StockInfoLists/index.js

@@ -4,7 +4,7 @@ import PlaceholderLabel from '@shopgate/pwa-ui-shared/PlaceholderLabel';
 import PropTypes from 'prop-types';
 import { makeStyles } from '@shopgate/engage/styles';
 import { getPreferredLocation, makeGetLocationInventory } from "../../selectors";
-import { I18n, SurroundPortals } from "../../../components";
+import { I18n, SurroundPortals, Typography } from "../../../components";
 import { StockInfo } from "../StockInfo";
 import { PRODUCT_LOCATION_STOCK_INFO_LIST } from "../../constants/Portals";
 import { showInventoryInLists } from "../../helpers/showInventoryInLists";
@@ -26,8 +26,7 @@ const makeMapStateToProps = () => {
 const useStyles = makeStyles()({
   wrapper: {
     flexDirection: 'row',
-    alignItems: 'flex-end',
-    fontSize: '0.65rem'
+    alignItems: 'flex-end'
   },
   text: {
     margin: '0 !important'
@@ -59,13 +58,13 @@ const StockInfoLists = ({
     location: preferredLocation,
     product
   };
-  /* eslint-disable jsx-a11y/aria-role */
   return /*#__PURE__*/_jsx(SurroundPortals, {
     portalName: PRODUCT_LOCATION_STOCK_INFO_LIST,
     portalProps: portalProps,
-    children: /*#__PURE__*/_jsx("div", {
+    children: /*#__PURE__*/_jsx(Typography, {
+      variant: "caption",
+      component: "div",
       className: classes.wrapper,
-      role: "text",
       children: /*#__PURE__*/_jsxs(PlaceholderLabel, {
         ready: !!inventory,
         children: [/*#__PURE__*/_jsx(StockInfo, {
@@ -84,7 +83,6 @@ const StockInfoLists = ({
       })
     })
   });
-  /* eslint-enable jsx-a11y/aria-role */
 };
 StockInfoLists.defaultProps = {
   inventory: null,

package/locations/components/StoreDetails/components/FindMoreStores.js

@@ -1,18 +1,14 @@
 import React from 'react';
 import { i18n } from '@shopgate/engage/core/helpers';
-import { MagnifierIcon, LocatorIcon, Link } from '@shopgate/engage/components';
+import { MagnifierIcon, LocatorIcon, Link, Typography } from '@shopgate/engage/components';
 import { makeStyles } from '@shopgate/engage/styles';
-import { themeColors } from '@shopgate/pwa-common/helpers/config';
 import { STORE_FINDER_PATTERN } from "../../../constants";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const useStyles = makeStyles()({
+const useStyles = makeStyles()(theme => ({
   container: {
     margin: '16px 0px'
   },
   title: {
-    fontSize: '20px',
-    fontWeight: '500',
-    color: 'var(--color-primary)',
     marginBottom: '8px'
   },
   inputCell: {
@@ -20,8 +16,8 @@ const useStyles = makeStyles()({
   },
   inputContainer: {
     position: 'relative',
-    background: themeColors.light,
-    border: `1px solid ${themeColors.shade7}`,
+    border: `1px solid ${theme.components.border.light}`,
+    background: theme.components.input.background,
     borderRadius: 4,
     display: 'flex',
     alignItems: 'center',
@@ -30,8 +26,8 @@ const useStyles = makeStyles()({
   inputIcon: {
     padding: 0,
     margin: '0 8px',
-    color: themeColors.shade9,
-    fontSize: '1.23rem',
+    color: theme.palette.grey.dark,
+    fontSize: theme.components.icon.small,
     flexShrink: 0,
     outline: 0
   },
@@ -48,7 +44,7 @@ const useStyles = makeStyles()({
     height: '100%',
     width: '100%'
   }
-});
+}));
 
 /**
  * Find more stores component.
@@ -60,7 +56,10 @@ const FindMoreStores = () => {
   } = useStyles();
   return /*#__PURE__*/_jsxs("div", {
     className: classes.container,
-    children: [/*#__PURE__*/_jsx("div", {
+    children: [/*#__PURE__*/_jsx(Typography, {
+      variant: "h3",
+      component: "div",
+      color: "primary",
       className: classes.title,
       "aria-hidden": true,
       children: i18n.text('location.findMoreStores')

package/locations/components/StoreDetails/components/GetDirectionsButton.js

@@ -6,12 +6,11 @@ import { generateGoogleMapsDirectionsUrl, i18n } from '@shopgate/engage/core';
 import { useDispatch } from 'react-redux';
 import { makeStyles } from '@shopgate/engage/styles';
 import { jsx as _jsx } from "react/jsx-runtime";
-const useStyles = makeStyles()({
-  container: {},
+const useStyles = makeStyles()(theme => ({
   buttonText: {
-    color: 'var(--color-primary)'
+    color: theme.palette.primary.main
   }
-});
+}));
 
 /**
  * @param {Object} props The component props
@@ -39,7 +38,6 @@ const GetDirectionsButton = ({
     }));
   };
   return /*#__PURE__*/_jsx("div", {
-    className: classes.container,
     children: /*#__PURE__*/_jsx(Button, {
       onClick: handleClick,
       role: "button",