@shopgate/engage 7.32.0-beta.7 → 7.32.0-beta.8

package/tracking/components/PrivacySettings/index.js

@@ -1,5 +1,6 @@
 import React, { useCallback, useState } from 'react';
-import { Button, Grid, I18n, Link, Switch, ConditionalWrapper } from '@shopgate/engage/components';
+import { Grid, I18n, Link, Switch, ConditionalWrapper } from '@shopgate/engage/components';
+import { Button } from '@shopgate/engage/components/v2';
 import PropTypes from 'prop-types';
 import { makeStyles } from '@shopgate/engage/styles';
 import { appConfig } from '@shopgate/engage';
@@ -148,7 +149,7 @@ const PrivacySettings = ({
       className: classes.buttonWrapper,
       children: [/*#__PURE__*/_jsx(Button, {
         onClick: () => handleAcceptAllCookies(),
-        type: "primary",
+        color: "secondary",
         className: cx(classes.button, 'privacy-settings__button-accept-all'),
         children: /*#__PURE__*/_jsx(I18n.Text, {
           string: "cookieConsentModal.buttonAcceptAll"
@@ -158,7 +159,6 @@ const PrivacySettings = ({
           comfortCookiesAccepted: areComfortCookiesSelected,
           statisticsCookiesAccepted: areStatisticsCookiesSelected
         }),
-        type: "simple",
         className: cx(classes.button, 'privacy-settings__button-accept-selected'),
         children: /*#__PURE__*/_jsx(I18n.Text, {
           string: "cookieConsentModal.modalButtonConfirmSelected"

package/cart/components/PaymentBar/PaymentBarReserveButton.connector.js

@@ -1,6 +0,0 @@
-import { connect } from 'react-redux';
-import { historyReset } from '@shopgate/pwa-common/actions/router';
-const mapDispatchToProps = {
-  historyReset
-};
-export default connect(null, mapDispatchToProps);

package/cart/components/PaymentBar/PaymentBarReserveButton.js

@@ -1,71 +0,0 @@
-import "core-js/modules/es.regexp.flags.js";
-import React from 'react';
-import PropTypes from 'prop-types';
-import { I18n, SurroundPortals, RippleButton } from '@shopgate/engage/components';
-import { makeStyles } from '@shopgate/engage/styles';
-import { CART_CHECKOUT_BUTTON } from '@shopgate/pwa-common-commerce/cart/constants/Portals';
-import { FulfillmentSheet, STAGE_RESERVE_FORM } from "../../../locations";
-import { CartContext } from "../../cart.context";
-import connect from "./PaymentBarReserveButton.connector";
-import { jsx as _jsx } from "react/jsx-runtime";
-const useStyles = makeStyles()(theme => ({
-  button: {
-    width: '100%',
-    background: theme.components.ctaButton.background,
-    color: `${theme.contrastColor(theme.components.ctaButton.background)}!important`
-  },
-  disabledButton: {
-    width: '100%',
-    background: theme.palette.action.disabledBackground,
-    color: `${theme.contrastColor(theme.palette.action.disabledBackground)}!important`
-  }
-}));
-
-/**
- * The reserve button component.
- * @param {Object} props The component props.
- * @param {Function} props.historyReset The history reset function.
- * @return {JSX.Element} The rendered component.
- */
-const PaymentBarReserveButton = ({
-  historyReset
-}) => {
-  const {
-    classes
-  } = useStyles();
-  const {
-    flags: {
-      orderable
-    }
-  } = React.useContext(CartContext);
-
-  /**
-   * Handles the click on the button.
-   */
-  const handleClick = React.useCallback(() => {
-    FulfillmentSheet.open({
-      stage: STAGE_RESERVE_FORM,
-      callback: (_location, _product, orderSuccess) => {
-        if (orderSuccess === true) {
-          historyReset();
-        }
-      }
-    });
-  }, [historyReset]);
-  return /*#__PURE__*/_jsx(SurroundPortals, {
-    portalName: CART_CHECKOUT_BUTTON,
-    portalProps: {
-      isActive: orderable
-    },
-    children: /*#__PURE__*/_jsx(RippleButton, {
-      onClick: handleClick,
-      disabled: !orderable,
-      type: "regular",
-      className: orderable ? classes.button : classes.disabledButton,
-      children: /*#__PURE__*/_jsx(I18n.Text, {
-        string: "cart.reserve"
-      })
-    })
-  });
-};
-export default connect(PaymentBarReserveButton);

package/locations/components/StoreFinder/StoreFinderGetDirectionsButton.connector.js

@@ -1,16 +0,0 @@
-import { connect } from 'react-redux';
-import { historyPush } from '@shopgate/pwa-common/actions/router/historyPush';
-
-/**
- * @param {Function} dispatch The redux dispatch function.
- * @return {Object} The extended component props.
- */
-const mapDispatchToProps = dispatch => ({
-  openMap: url => dispatch(historyPush({
-    pathname: url,
-    state: {
-      target: '_blank'
-    }
-  }))
-});
-export default connect(null, mapDispatchToProps);

package/locations/components/StoreFinder/StoreFinderGetDirectionsButton.js

@@ -1,52 +0,0 @@
-import React, { useMemo, useCallback } from 'react';
-import PropTypes from 'prop-types';
-import { i18n, generateGoogleMapsDirectionsUrl } from '@shopgate/engage/core';
-import { makeStyles } from '@shopgate/engage/styles';
-import { RippleButton } from '@shopgate/engage/components';
-import connect from "./StoreFinderGetDirectionsButton.connector";
-import { jsx as _jsx } from "react/jsx-runtime";
-const useStyles = makeStyles()(theme => ({
-  container: {},
-  button: {
-    width: '100%',
-    background: `${theme.palette.primary.main} !important`,
-    color: `${theme.palette.primary.contrastText} !important`,
-    fontSize: `${theme.typography.body2.fontSize} !important`
-  }
-}));
-
-/**
- * @param {Object} props The component props
- * @returns {JSX}
- */
-const StoreFinderGetDirectionsButton = ({
-  address,
-  openMap,
-  className
-}) => {
-  const {
-    classes,
-    cx
-  } = useStyles();
-  const url = useMemo(() => address && generateGoogleMapsDirectionsUrl(address), [address]);
-  const handleClick = useCallback(() => {
-    openMap(url);
-  }, [openMap, url]);
-  if (!address) {
-    return null;
-  }
-  return /*#__PURE__*/_jsx("div", {
-    className: cx(classes.container, className),
-    children: /*#__PURE__*/_jsx(RippleButton, {
-      onClick: handleClick,
-      className: classes.button,
-      children: i18n.text('locations.get_directions')
-    })
-  });
-};
-StoreFinderGetDirectionsButton.defaultProps = {
-  address: null,
-  openMap: () => {},
-  className: null
-};
-export default connect(StoreFinderGetDirectionsButton);