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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (188) hide show
  1. package/account/components/Profile/Profile.provider.d.ts +1 -1
  2. package/account/components/Profile/ProfileAddressBook.d.ts.map +1 -1
  3. package/account/components/Profile/ProfileAddressBook.js +13 -22
  4. package/account/components/Profile/ProfileAddressCard.d.ts.map +1 -1
  5. package/account/components/Profile/ProfileAddressCard.js +8 -18
  6. package/account/components/Profile/ProfileForm.d.ts.map +1 -1
  7. package/account/components/Profile/ProfileForm.js +15 -42
  8. package/account/components/ProfileContact/ProfileContact.js +13 -21
  9. package/admin-preview/components/FrontendSettingsPreviewBridge/FrontendSettingsPreviewBridge.d.ts.map +1 -1
  10. package/admin-preview/components/FrontendSettingsPreviewBridge/FrontendSettingsPreviewBridge.js +41 -7
  11. package/admin-preview/components/FrontendSettingsPreviewBridge/types.d.ts +7 -0
  12. package/admin-preview/components/FrontendSettingsPreviewBridge/types.d.ts.map +1 -1
  13. package/admin-preview/initialization/_internal/initialFrontendSettings.d.ts +32 -0
  14. package/admin-preview/initialization/_internal/initialFrontendSettings.d.ts.map +1 -0
  15. package/admin-preview/initialization/_internal/initialFrontendSettings.js +43 -0
  16. package/admin-preview/initialization/awaitInitialFrontendSettings.d.ts +22 -0
  17. package/admin-preview/initialization/awaitInitialFrontendSettings.d.ts.map +1 -0
  18. package/admin-preview/initialization/awaitInitialFrontendSettings.js +84 -0
  19. package/back-in-stock/components/BackInStockButton/index.js +5 -5
  20. package/cart/components/CartItem/CartItemProductLayout.js +1 -0
  21. package/cart/components/CartItem/CartItemProductLayoutWideRemoveItem.js +7 -14
  22. package/cart/components/CartItem/CartItemQuantityPicker.js +1 -0
  23. package/cart/components/CartItems/CartItemCardReservationLabelChangeStore.js +6 -24
  24. package/cart/components/CartSummaryWide/CartSummaryWide.js +2 -2
  25. package/cart/components/CartSummaryWide/CartSummaryWideCheckoutButton.js +9 -23
  26. package/cart/components/PaymentBar/PaymentBarCheckoutButton.js +8 -30
  27. package/cart/components/PaymentBar/testUtils/mockFactories.js +4 -11
  28. package/category/components/CategoryImage/index.js +13 -2
  29. package/checkout/components/AddressBook/AddressList.js +14 -23
  30. package/checkout/components/Checkout/CheckoutActions.js +4 -3
  31. package/checkout/components/Checkout/CheckoutAddress.js +8 -0
  32. package/checkout/components/Checkout/CheckoutSection.js +6 -2
  33. package/checkout/components/CheckoutConfirmation/CheckoutConfirmation.js +6 -7
  34. package/checkout/components/ResponsiveBackButton/ResponsiveBackButton.js +7 -17
  35. package/components/Badge/spec.js +6 -29
  36. package/components/Card/Card.js +1 -1
  37. package/components/ChipLayout/index.js +2 -4
  38. package/components/NavigationHandler/connector.js +1 -1
  39. package/components/NavigationHandler/index.d.ts +2 -2
  40. package/components/NavigationHandler/spec.js +10 -1
  41. package/components/Paper/Paper.d.ts +1 -2
  42. package/components/Paper/Paper.d.ts.map +1 -1
  43. package/components/Paper/spec.js +5 -22
  44. package/components/Tabs/components/Tab.d.ts.map +1 -1
  45. package/components/Tabs/components/Tab.js +14 -16
  46. package/components/Typography/Typography.d.ts +1 -1
  47. package/components/v2/Button/Button.d.ts +24 -13
  48. package/components/v2/Button/Button.d.ts.map +1 -1
  49. package/components/v2/Button/Button.js +139 -41
  50. package/components/v2/ButtonBase/ButtonBase.d.ts +50 -10
  51. package/components/v2/ButtonBase/ButtonBase.d.ts.map +1 -1
  52. package/components/v2/ButtonBase/ButtonBase.js +192 -17
  53. package/components/v2/ButtonBase/hooks.d.ts +0 -1
  54. package/components/v2/ButtonBase/hooks.d.ts.map +1 -1
  55. package/components/v2/ButtonBase/hooks.js +36 -12
  56. package/components/v2/ButtonGroup/ButtonGroup.d.ts +11 -5
  57. package/components/v2/ButtonGroup/ButtonGroup.d.ts.map +1 -1
  58. package/components/v2/ButtonGroup/ButtonGroup.js +49 -26
  59. package/components/v2/CircularProgress/CircularProgress.d.ts.map +1 -1
  60. package/components/v2/CircularProgress/CircularProgress.js +10 -5
  61. package/core/hooks/useNavigation.d.ts +10 -2
  62. package/core/hooks/useNavigation.d.ts.map +1 -1
  63. package/core/hooks/useNavigation.js +1 -2
  64. package/core/initialization/index.d.ts.map +1 -1
  65. package/core/initialization/index.js +24 -5
  66. package/core/router/conductor.d.ts +9 -0
  67. package/core/router/helpers.d.ts +28 -15
  68. package/core/router/helpers.d.ts.map +1 -1
  69. package/core/router/helpers.js +8 -8
  70. package/development/components/DevelopmentSettings/DevelopmentSettings.js +3 -3
  71. package/favorites/components/FavoriteButtonWide/FavoriteButtonWide.js +7 -17
  72. package/favorites/components/List/List.d.ts.map +1 -1
  73. package/favorites/components/List/List.js +0 -1
  74. package/favorites/components/List/ListContent.js +4 -5
  75. package/favorites/components/Lists/Lists.js +4 -5
  76. package/filter/components/FilterPageContent/components/ApplyButton/index.js +8 -10
  77. package/filter/components/FilterPageContent/components/ResetButton/index.js +8 -6
  78. package/locations/components/ChangeLocationButton/ChangeLocationButton.js +10 -14
  79. package/locations/components/FulfillmentSlotSwitcher/FulfillmentSlotDialog.js +4 -8
  80. package/locations/components/FulfillmentSlotSwitcher/FulfillmentSlotSwitcher.js +1 -1
  81. package/locations/components/FulfillmentSlotSwitcher/FulfillmentSlotSwitcherBar.js +8 -13
  82. package/locations/components/FulfillmentSlotSwitcher/FulfillmentSlotSwitcherDefault.js +10 -10
  83. package/locations/components/GlobalLocationSwitcher/GlobalLocationSwitcherBar.js +8 -14
  84. package/locations/components/GlobalLocationSwitcher/GlobalLocationSwitcherDefault.js +9 -10
  85. package/locations/components/ReserveForm/ReserveForm.js +6 -7
  86. package/locations/components/StoreDetails/components/GetDirectionsButton.js +2 -4
  87. package/locations/components/StoreDetails/components/StoreDetails.js +5 -10
  88. package/locations/components/StoreDetails/components/StoresNearbyListItem.js +13 -21
  89. package/locations/components/StoreFinder/StoreFinderSelectLocationButton.js +5 -11
  90. package/locations/components/StoreFinder/StoreFinderStoreInfoButton.js +5 -11
  91. package/locations/components/StoreList/StoreListSearch.js +1 -0
  92. package/locations/components/StoreList/StoreSelectLocationButton.js +5 -11
  93. package/login/components/ForgotPassword/ForgotPassword.js +11 -23
  94. package/orders/components/OrderDetails/OrderDetailsAuthenticate.js +5 -7
  95. package/package.json +7 -7
  96. package/page/components/NotFound.d.ts.map +1 -1
  97. package/page/components/NotFound.js +7 -6
  98. package/page/components/ResponsiveWidgetImage/ResponsiveWidgetImage.d.ts +1 -1
  99. package/page/components/ResponsiveWidgetImage/ResponsiveWidgetImage.js +2 -2
  100. package/page/components/WidgetVideo/WidgetVideo.d.ts +1 -1
  101. package/page/components/WidgetVideo/WidgetVideo.d.ts.map +1 -1
  102. package/page/helpers/index.d.ts +5 -2
  103. package/page/helpers/index.d.ts.map +1 -1
  104. package/page/helpers/index.js +8 -5
  105. package/page/widgets/Button/Button.js +2 -3
  106. package/page/widgets/NestedCategoryFilter/NestedCategoryFilter.js +8 -8
  107. package/page/widgets/ProductList/ProductList.js +18 -14
  108. package/page/widgets/Video/hooks.d.ts +2 -2
  109. package/product/components/ProductCard/index.js +7 -1
  110. package/product/components/ProductGrid/components/Item/components/ItemDetails/index.js +6 -1
  111. package/product/components/ProductGrid/components/Item/components/ItemImage/index.js +1 -11
  112. package/product/components/ProductGrid/components/Item/index.js +3 -2
  113. package/product/components/ProductGrid/components/Layout/index.js +2 -1
  114. package/product/components/ProductGridPrice/index.js +0 -1
  115. package/product/components/ProductImage/ProductImage.d.ts.map +1 -1
  116. package/product/components/ProductImage/ProductImage.js +7 -2
  117. package/product/components/ProductImage/ProductImagePlaceholder.js +3 -3
  118. package/product/components/ProductSlider/index.js +1 -1
  119. package/product/components/UnitQuantityPicker/UnitQuantityPicker.d.ts.map +1 -1
  120. package/product/components/UnitQuantityPicker/UnitQuantityPicker.js +15 -33
  121. package/push-opt-in/components/PushOptInModal/index.js +4 -4
  122. package/registration/components/Registration/RegistrationFormActions.js +4 -4
  123. package/reviews/components/Reviews/components/AllReviewsLink/index.js +6 -6
  124. package/reviews/components/Reviews/components/Header/components/WriteReviewLink/index.js +4 -3
  125. package/reviews/components/Reviews/components/Header/components/WriteReviewLink/spec.js +28 -22
  126. package/reviews/components/Reviews/spec.js +5 -6
  127. package/settings/reducers/appSettings.d.ts.map +1 -1
  128. package/settings/reducers/appSettings.js +18 -2
  129. package/settings/selectors/appSettings.d.ts +37 -2
  130. package/settings/selectors/appSettings.d.ts.map +1 -1
  131. package/settings/selectors/appSettings.js +30 -1
  132. package/settings/types/appSettings.d.ts +42 -2
  133. package/settings/types/appSettings.d.ts.map +1 -1
  134. package/settings/types/appSettings.js +124 -1
  135. package/styles/helpers/index.d.ts +1 -0
  136. package/styles/helpers/index.js +1 -0
  137. package/styles/helpers/loadFontCss.d.ts +22 -0
  138. package/styles/helpers/loadFontCss.d.ts.map +1 -0
  139. package/styles/helpers/loadFontCss.js +138 -0
  140. package/styles/helpers/loadThemeCss.d.ts.map +1 -1
  141. package/styles/helpers/loadThemeCss.js +11 -0
  142. package/styles/index.d.ts +1 -1
  143. package/styles/index.d.ts.map +1 -1
  144. package/styles/theme/createDefaultThemeOptions/index.d.ts.map +1 -1
  145. package/styles/theme/createDefaultThemeOptions/index.js +94 -3
  146. package/styles/theme/createTheme/createComponents.types.d.ts +25 -0
  147. package/styles/theme/createTheme/createComponents.types.d.ts.map +1 -1
  148. package/styles/theme/createTheme/createComponents.types.js +28 -3
  149. package/styles/theme/createTheme/createShape.d.ts +2 -3
  150. package/styles/theme/createTheme/createShape.d.ts.map +1 -1
  151. package/styles/theme/createTheme/createShape.js +1 -2
  152. package/styles/theme/createTheme/createThemeFromColorScheme.d.ts +3 -1
  153. package/styles/theme/createTheme/createThemeFromColorScheme.d.ts.map +1 -1
  154. package/styles/theme/createTheme/createThemeFromColorScheme.js +4 -2
  155. package/styles/theme/createTheme/createTypography.d.ts +2 -1
  156. package/styles/theme/createTheme/createTypography.js +58 -18
  157. package/styles/theme/createTheme/index.d.ts +2 -2
  158. package/styles/theme/createTheme/index.d.ts.map +1 -1
  159. package/styles/theme/createTheme/index.js +2 -2
  160. package/styles/theme/createTheme/types.d.ts +9 -2
  161. package/styles/theme/createTheme/types.d.ts.map +1 -1
  162. package/styles/theme/createTheme/types.js +6 -0
  163. package/styles/theme/hooks/useColorScheme.d.ts +2 -2
  164. package/styles/theme/hooks/useColorScheme.d.ts.map +1 -1
  165. package/styles/theme/hooks/useColorScheme.js +1 -1
  166. package/styles/theme/hooks/useMediaQuery.d.ts +7 -0
  167. package/styles/theme/hooks/useMediaQuery.d.ts.map +1 -1
  168. package/styles/theme/hooks/useMediaQuery.js +5 -5
  169. package/styles/theme/hooks/useTheme.js +1 -1
  170. package/styles/theme/index.d.ts +3 -1
  171. package/styles/theme/index.d.ts.map +1 -1
  172. package/styles/theme/providers/ColorSchemeContext.d.ts +30 -9
  173. package/styles/theme/providers/ColorSchemeContext.d.ts.map +1 -1
  174. package/styles/theme/providers/ColorSchemeContext.js +8 -0
  175. package/styles/theme/providers/ThemeContext.d.ts +3 -0
  176. package/styles/theme/providers/ThemeContext.d.ts.map +1 -0
  177. package/styles/theme/providers/ThemeContext.js +2 -0
  178. package/styles/theme/providers/ThemeProvider.d.ts +2 -2
  179. package/styles/theme/providers/ThemeProvider.d.ts.map +1 -1
  180. package/styles/theme/providers/ThemeProvider.js +58 -16
  181. package/styles/theme/utils/color.d.ts +12 -12
  182. package/styles/theme/utils/color.d.ts.map +1 -1
  183. package/tracking/components/CookieConsentModal/index.js +3 -4
  184. package/tracking/components/PrivacySettings/index.js +3 -3
  185. package/cart/components/PaymentBar/PaymentBarReserveButton.connector.js +0 -6
  186. package/cart/components/PaymentBar/PaymentBarReserveButton.js +0 -71
  187. package/locations/components/StoreFinder/StoreFinderGetDirectionsButton.connector.js +0 -16
  188. package/locations/components/StoreFinder/StoreFinderGetDirectionsButton.js +0 -52
@@ -1,16 +1,18 @@
1
1
  import React, { memo } from 'react';
2
2
  import PropTypes from 'prop-types';
3
- import { I18n, Button, SurroundPortals } from '@shopgate/engage/components';
3
+ import { I18n, SurroundPortals } from '@shopgate/engage/components';
4
+ import { Button } from '@shopgate/engage/components/v2';
4
5
  import { makeStyles } from '@shopgate/engage/styles';
5
6
  import { PORTAL_FILTER_RESET_BUTTON } from '@shopgate/engage/filter/constants';
6
7
  import { jsx as _jsx } from "react/jsx-runtime";
7
- const useStyles = makeStyles()({
8
+ const useStyles = makeStyles()(theme => ({
8
9
  buttonContainer: {
9
- marginTop: 4,
10
+ marginTop: theme.spacing(0.5),
11
+ marginRight: theme.spacing(2),
10
12
  marginBottom: 40,
11
13
  textAlign: 'right'
12
14
  }
13
- });
15
+ }));
14
16
 
15
17
  /**
16
18
  * The filter reset button component.
@@ -35,8 +37,8 @@ const FilterResetButton = ({
35
37
  children: /*#__PURE__*/_jsx("div", {
36
38
  className: classes.buttonContainer,
37
39
  children: /*#__PURE__*/_jsx(Button, {
38
- flat: true,
39
- type: "primary",
40
+ variant: "link",
41
+ color: "secondary",
40
42
  onClick: onClick,
41
43
  disabled: disabled,
42
44
  testId: "clearAllButton",
@@ -1,20 +1,15 @@
1
1
  import React from 'react';
2
2
  import PropTypes from 'prop-types';
3
- import { RippleButton, I18n, SurroundPortals } from '@shopgate/engage/components';
3
+ import { I18n, SurroundPortals } from '@shopgate/engage/components';
4
+ import { Button } from '@shopgate/engage/components/v2';
4
5
  import { makeStyles } from '@shopgate/engage/styles';
5
6
  import { PRODUCT_FULFILLMENT_CHANGE_LOCATION } from "../../constants/Portals";
6
7
  import { jsx as _jsx } from "react/jsx-runtime";
7
8
  const useStyles = makeStyles()(theme => ({
8
9
  button: {
9
- fontSize: `${theme.typography.caption.fontSize} !important`,
10
- letterSpacing: '0.05em',
11
- padding: `${theme.spacing(0.375, 0)} !important`,
12
- ' *': {
13
- padding: '0 !important'
14
- }
15
- },
16
- ripple: {
17
- padding: 0
10
+ fontSize: theme.typography.caption.fontSize,
11
+ padding: 0,
12
+ letterSpacing: '0.05em'
18
13
  }
19
14
  }));
20
15
 
@@ -38,13 +33,14 @@ export const ChangeLocationButtonUnwrapped = ({
38
33
  onClick,
39
34
  disabled
40
35
  },
41
- children: /*#__PURE__*/_jsx(RippleButton, {
36
+ children: /*#__PURE__*/_jsx(Button, {
37
+ variant: "link",
38
+ color: "primary",
39
+ size: "small",
40
+ dense: true,
42
41
  onClick: onClick,
43
42
  className: classes.button,
44
43
  disabled: disabled,
45
- rippleClassName: classes.ripple,
46
- type: "secondary",
47
- flat: true,
48
44
  children: /*#__PURE__*/_jsx(I18n.Text, {
49
45
  string: "locations.change_location"
50
46
  })
@@ -5,7 +5,8 @@ import PropTypes from 'prop-types';
5
5
  import { connect } from 'react-redux';
6
6
  import { makeStyles } from '@shopgate/engage/styles';
7
7
  import groupBy from 'lodash/groupBy';
8
- import { SheetDrawer, Button, Typography } from '@shopgate/engage/components';
8
+ import { SheetDrawer, Typography } from '@shopgate/engage/components';
9
+ import { Button } from '@shopgate/engage/components/v2';
9
10
  import { i18n } from '@shopgate/engage/core/helpers';
10
11
  import { getActiveFulfillmentSlot } from '@shopgate/engage/cart/cart.selectors';
11
12
  import { makeGetFulfillmentSlotsForLocation, getPreferredLocation } from "../../selectors";
@@ -105,11 +106,6 @@ const useStyles = makeStyles()(theme => ({
105
106
  background: theme.palette.background.surface,
106
107
  padding: 16,
107
108
  paddingBottom: 24
108
- },
109
- buttonSchedule: {
110
- '&&': {
111
- width: '100%'
112
- }
113
109
  }
114
110
  }));
115
111
 
@@ -301,8 +297,8 @@ const FulfillmentSlotSheet = ({
301
297
  }, group.name)), /*#__PURE__*/_jsx("div", {
302
298
  className: classes.buttonScheduleContainer,
303
299
  children: /*#__PURE__*/_jsx(Button, {
304
- className: classes.buttonSchedule,
305
- type: "secondary",
300
+ color: "primary",
301
+ fullWidth: true,
306
302
  onClick: handleChange,
307
303
  disabled: !selectedDate || !selectedSlot,
308
304
  children: i18n.text('locations.your_current_timeslot.dialog.schedule')
@@ -14,7 +14,7 @@ const useStyles = makeStyles()(theme => ({
14
14
  borderBottom: 0
15
15
  },
16
16
  ' > div': {
17
- borderRadius: 5,
17
+ borderRadius: theme.shape.borderRadius,
18
18
  margin: -1,
19
19
  background: theme.palette.background.surface,
20
20
  border: `1px solid ${theme.components.border.light}`
@@ -1,6 +1,7 @@
1
1
  import React, { useMemo } from 'react';
2
2
  import PropTypes from 'prop-types';
3
- import { RippleButton, I18n, Typography } from '@shopgate/engage/components';
3
+ import { I18n, Typography } from '@shopgate/engage/components';
4
+ import { Button } from '@shopgate/engage/components/v2';
4
5
  import { i18n } from '@shopgate/engage/core/helpers';
5
6
  import { makeStyles } from '@shopgate/engage/styles';
6
7
  import { getTimeSlotDisplayText } from "./time";
@@ -29,15 +30,8 @@ const useStyles = makeStyles()(theme => ({
29
30
  },
30
31
  button: {
31
32
  marginLeft: 'auto',
32
- letterSpacing: '0.05em',
33
- padding: `${theme.spacing(0.375, 0)} !important`,
34
- ' *': {
35
- fontSize: theme.typography.body2.fontSize,
36
- textTransform: 'initial',
37
- padding: '0 !important',
38
- color: theme.palette.text.primary,
39
- fontWeight: theme.typography.fontWeightMedium
40
- }
33
+ textTransform: 'none',
34
+ padding: theme.spacing(0.375, 0)
41
35
  }
42
36
  }));
43
37
 
@@ -71,11 +65,12 @@ const FulfillmentSlotSwitcherBar = ({
71
65
  component: "span",
72
66
  fontWeight: "medium",
73
67
  children: displayTime
74
- }), editable && /*#__PURE__*/_jsx(RippleButton, {
68
+ }), editable && /*#__PURE__*/_jsx(Button, {
69
+ variant: "text",
70
+ color: "inherit",
71
+ size: "small",
75
72
  onClick: handleChange,
76
- type: "secondary",
77
73
  className: classes.button,
78
- flat: true,
79
74
  children: /*#__PURE__*/_jsx(I18n.Text, {
80
75
  string: "locations.your_current_location.change"
81
76
  })
@@ -1,6 +1,7 @@
1
1
  import React, { useMemo } from 'react';
2
2
  import PropTypes from 'prop-types';
3
- import { RippleButton, I18n, Typography } from '@shopgate/engage/components';
3
+ import { I18n, Typography } from '@shopgate/engage/components';
4
+ import { Button } from '@shopgate/engage/components/v2';
4
5
  import { i18n } from '@shopgate/engage/core/helpers';
5
6
  import { makeStyles } from '@shopgate/engage/styles';
6
7
  import { getTimeSlotDisplayText } from "./time";
@@ -13,12 +14,10 @@ const useStyles = makeStyles()(theme => ({
13
14
  flexShrink: 0
14
15
  },
15
16
  button: {
16
- fontSize: `${theme.typography.caption.fontSize} !important`,
17
- letterSpacing: '0.05em',
18
- padding: `${theme.spacing(0.375, 0)} !important`,
19
- ' *': {
20
- padding: '0 !important'
21
- }
17
+ // Inline affordance that follows the location name, so it carries no button chrome and
18
+ // stays sentence case - matching the switcher bars that render the same action.
19
+ padding: theme.spacing(0.375, 0),
20
+ textTransform: 'none'
22
21
  }
23
22
  }));
24
23
 
@@ -48,12 +47,13 @@ const FulfillmentSlotSwitcherDefault = ({
48
47
  color: "textPrimary",
49
48
  fontWeight: "medium",
50
49
  children: displayTime
51
- }), /*#__PURE__*/_jsx(RippleButton, {
50
+ }), /*#__PURE__*/_jsx(Button, {
51
+ variant: "text",
52
+ color: "primary",
53
+ size: "small",
52
54
  onClick: handleChange,
53
- type: "secondary",
54
55
  className: classes.button,
55
56
  disabled: !editable,
56
- flat: true,
57
57
  children: /*#__PURE__*/_jsx(I18n.Text, {
58
58
  string: "locations.your_current_location.change"
59
59
  })
@@ -1,6 +1,7 @@
1
1
  import React from 'react';
2
2
  import PropTypes from 'prop-types';
3
- import { RippleButton, I18n, Typography } from '@shopgate/engage/components';
3
+ import { I18n, Typography } from '@shopgate/engage/components';
4
+ import { Button } from '@shopgate/engage/components/v2';
4
5
  import { i18n } from '@shopgate/engage/core/helpers';
5
6
  import { makeStyles } from '@shopgate/engage/styles';
6
7
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -24,16 +25,8 @@ const useStyles = makeStyles()(theme => ({
24
25
  paddingRight: theme.spacing(1)
25
26
  },
26
27
  button: {
27
- marginLeft: 'auto',
28
- letterSpacing: '0.05em',
29
- padding: `${theme.spacing(0.375, 0)} !important`,
30
- ' *': {
31
- fontSize: theme.typography.body2.fontSize,
32
- textTransform: 'initial',
33
- padding: '0 !important',
34
- color: theme.palette.text.primary,
35
- fontWeight: theme.typography.fontWeightMedium
36
- }
28
+ marginLeft: theme.spacing(2),
29
+ textTransform: 'none'
37
30
  }
38
31
  }));
39
32
 
@@ -68,12 +61,13 @@ const GlobalLocationSwitcherBar = ({
68
61
  fontWeight: "medium",
69
62
  children: locationName
70
63
  })]
71
- }), /*#__PURE__*/_jsx(RippleButton, {
64
+ }), /*#__PURE__*/_jsx(Button, {
65
+ variant: "link",
66
+ size: "small",
67
+ dense: true,
72
68
  onClick: handleChange,
73
- type: "secondary",
74
69
  className: classes.button,
75
70
  "aria-haspopup": true,
76
- flat: true,
77
71
  children: /*#__PURE__*/_jsx(I18n.Text, {
78
72
  string: "locations.your_current_location.change"
79
73
  })
@@ -1,6 +1,7 @@
1
1
  import React from 'react';
2
2
  import PropTypes from 'prop-types';
3
- import { RippleButton, I18n, Typography } from '@shopgate/engage/components';
3
+ import { I18n, Typography } from '@shopgate/engage/components';
4
+ import { Button } from '@shopgate/engage/components/v2';
4
5
  import { i18n } from '@shopgate/engage/core/helpers';
5
6
  import { makeStyles } from '@shopgate/engage/styles';
6
7
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -15,12 +16,8 @@ const useStyles = makeStyles()(theme => ({
15
16
  color: theme.palette.text.primary
16
17
  },
17
18
  button: {
18
- fontSize: `${theme.typography.caption.fontSize} !important`,
19
- letterSpacing: '0.05em',
20
- padding: `${theme.spacing(0.375, 0)} !important`,
21
- ' *': {
22
- padding: '0 !important'
23
- }
19
+ textTransform: 'none',
20
+ marginLeft: theme.spacing(1)
24
21
  }
25
22
  }));
26
23
 
@@ -49,12 +46,14 @@ const GlobalLocationSwitcherDefault = ({
49
46
  fontWeight: "medium",
50
47
  className: classes.name,
51
48
  children: locationName
52
- }), /*#__PURE__*/_jsx(RippleButton, {
49
+ }), /*#__PURE__*/_jsx(Button, {
50
+ variant: "link",
51
+ color: "primary",
52
+ size: "small",
53
+ dense: true,
53
54
  onClick: handleChange,
54
- type: "secondary",
55
55
  className: classes.button,
56
56
  disabled: !editable,
57
- flat: true,
58
57
  children: /*#__PURE__*/_jsx(I18n.Text, {
59
58
  string: "locations.your_current_location.change"
60
59
  })
@@ -1,7 +1,8 @@
1
1
  import 'react-phone-number-input/style.css';
2
2
  import React, { useState, useContext, useMemo, useRef, useLayoutEffect, useCallback } from 'react';
3
3
  import { makeStyles } from '@shopgate/engage/styles';
4
- import { TextField, RippleButton, RadioGroup, RadioGroupItem, ProgressBar, Typography } from '@shopgate/engage/components';
4
+ import { TextField, RadioGroup, RadioGroupItem, ProgressBar, Typography } from '@shopgate/engage/components';
5
+ import { Button } from '@shopgate/engage/components/v2';
5
6
  import { i18n } from '@shopgate/engage/core/helpers';
6
7
  import { useFormState } from "../../../core/hooks/useFormState";
7
8
  import { FulfillmentContext } from "../../locations.context";
@@ -35,9 +36,6 @@ const useStyles = makeStyles()(theme => ({
35
36
  paddingRight: 0
36
37
  }
37
38
  },
38
- button: {
39
- width: '100%'
40
- },
41
39
  progressBar: {
42
40
  height: '4px',
43
41
  position: 'relative'
@@ -239,10 +237,11 @@ function ReserveFormUnwrapped() {
239
237
  className: classes.formField,
240
238
  errorText: i18n.text(validationErrors.email2)
241
239
  })]
242
- }), /*#__PURE__*/_jsx(RippleButton, {
243
- type: "secondary",
240
+ }), /*#__PURE__*/_jsx(Button, {
241
+ type: "submit",
242
+ color: "primary",
243
+ fullWidth: true,
244
244
  disabled: changed || valid === false || isSubmitting,
245
- className: classes.button,
246
245
  children: i18n.text('locations.place_reservation')
247
246
  })]
248
247
  })]
@@ -1,7 +1,7 @@
1
1
  import React, { useMemo } from 'react';
2
2
  import { historyPush } from '@shopgate/pwa-common/actions/router';
3
3
  import PropTypes from 'prop-types';
4
- import { Button } from '@shopgate/engage/components';
4
+ import { ButtonBase } from '@shopgate/engage/components/v2';
5
5
  import { generateGoogleMapsDirectionsUrl, i18n } from '@shopgate/engage/core';
6
6
  import { useDispatch } from 'react-redux';
7
7
  import { makeStyles } from '@shopgate/engage/styles';
@@ -38,10 +38,8 @@ const GetDirectionsButton = ({
38
38
  }));
39
39
  };
40
40
  return /*#__PURE__*/_jsx("div", {
41
- children: /*#__PURE__*/_jsx(Button, {
41
+ children: /*#__PURE__*/_jsx(ButtonBase, {
42
42
  onClick: handleClick,
43
- role: "button",
44
- type: "plain",
45
43
  children: /*#__PURE__*/_jsx("span", {
46
44
  className: classes.buttonText,
47
45
  children: i18n.text('location.getDirections')
@@ -1,5 +1,6 @@
1
1
  import React, { useContext, useMemo } from 'react';
2
- import { LocationIcon, Button, Link, ConditionalWrapper, Typography } from '@shopgate/engage/components';
2
+ import { LocationIcon, Link, ConditionalWrapper, Typography } from '@shopgate/engage/components';
3
+ import { Button, ButtonBase } from '@shopgate/engage/components/v2';
3
4
  import { makeStyles } from '@shopgate/engage/styles';
4
5
  import { getWeekDaysOrder } from '@shopgate/engage/core';
5
6
  import { i18n } from '@shopgate/engage/core/helpers';
@@ -53,9 +54,6 @@ const useStyles = makeStyles()(theme => ({
53
54
  phoneNumber: {
54
55
  textDecoration: 'underline'
55
56
  },
56
- makeMyStoreButton: {
57
- color: theme.palette.primary.main
58
- },
59
57
  comingSoon: {
60
58
  fontStyle: 'italic'
61
59
  },
@@ -97,10 +95,8 @@ const StoreDetails = () => {
97
95
  return /*#__PURE__*/_jsxs("div", {
98
96
  children: [/*#__PURE__*/_jsx(ConditionalWrapper, {
99
97
  condition: !isRouteLocationPreferred,
100
- wrapper: children => /*#__PURE__*/_jsx(Button, {
98
+ wrapper: children => /*#__PURE__*/_jsx(ButtonBase, {
101
99
  onClick: () => selectLocation(routeLocation, true),
102
- role: "button",
103
- type: "plain",
104
100
  children: children
105
101
  }),
106
102
  children: /*#__PURE__*/_jsxs("div", {
@@ -144,10 +140,9 @@ const StoreDetails = () => {
144
140
  children: [/*#__PURE__*/_jsx(GetDirectionsButton, {
145
141
  address: address
146
142
  }), !isComingSoon && !isRouteLocationPreferred && /*#__PURE__*/_jsx(Button, {
143
+ variant: "text",
144
+ color: "primary",
147
145
  onClick: () => selectLocation(routeLocation, true),
148
- role: "button",
149
- type: "plain",
150
- className: classes.makeMyStoreButton,
151
146
  children: /*#__PURE__*/_jsx("span", {
152
147
  children: i18n.text('location.makeMyStore')
153
148
  })
@@ -2,7 +2,8 @@ import React, { useContext } from 'react';
2
2
  import { useDispatch } from 'react-redux';
3
3
  import PropTypes from 'prop-types';
4
4
  import { makeStyles } from '@shopgate/engage/styles';
5
- import { Button, Typography } from '@shopgate/engage/components';
5
+ import { Typography } from '@shopgate/engage/components';
6
+ import { Button } from '@shopgate/engage/components/v2';
6
7
  import { i18n } from '@shopgate/engage/core/helpers';
7
8
  import { historyPush } from '@shopgate/engage/core';
8
9
  import formatDistance from "../../../helpers/formatDistance";
@@ -10,9 +11,6 @@ import { STORE_DETAILS_PATH } from "../../../constants";
10
11
  import { StoreDetailsContext } from "../../../providers/StoreDetailsContext";
11
12
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
12
13
  const useStyles = makeStyles()(theme => ({
13
- button: {
14
- padding: '0px !important'
15
- },
16
14
  locationRow: {
17
15
  borderBottom: `1px solid ${theme.components.border.light}`,
18
16
  borderTop: `1px solid ${theme.components.border.light}`,
@@ -43,7 +41,7 @@ const useStyles = makeStyles()(theme => ({
43
41
  textAlign: 'start'
44
42
  },
45
43
  cellContainer: {
46
- padding: '8px',
44
+ padding: 6,
47
45
  textAlign: 'end'
48
46
  },
49
47
  cell: {
@@ -51,7 +49,7 @@ const useStyles = makeStyles()(theme => ({
51
49
  },
52
50
  buttonContainer: {
53
51
  display: 'flex',
54
- gap: '4px 16px',
52
+ gap: '0 16px',
55
53
  flexWrap: 'wrap',
56
54
  justifyContent: 'flex-end'
57
55
  }
@@ -121,13 +119,11 @@ const StoresNearbyListItem = ({
121
119
  children: [/*#__PURE__*/_jsxs("div", {
122
120
  className: classes.makeMyStore,
123
121
  children: [!isComingSoon && /*#__PURE__*/_jsx(Button, {
124
- className: classes.button,
122
+ variant: "link",
123
+ color: "secondary",
124
+ size: "small",
125
125
  onClick: () => selectLocation(location, true),
126
- role: "button",
127
- type: "primary",
128
- flat: true,
129
126
  disabled: isPreferredLocation,
130
- wrapContent: false,
131
127
  children: /*#__PURE__*/_jsx(Typography, {
132
128
  variant: "body2",
133
129
  component: "span",
@@ -135,12 +131,10 @@ const StoresNearbyListItem = ({
135
131
  children: `${i18n.text('location.makeMyStore')}`
136
132
  })
137
133
  }), isComingSoon && /*#__PURE__*/_jsx(Button, {
138
- className: classes.button,
139
- role: "button",
140
- type: "primary",
141
- flat: true,
134
+ variant: "link",
135
+ color: "secondary",
136
+ size: "small",
142
137
  disabled: true,
143
- wrapContent: false,
144
138
  children: /*#__PURE__*/_jsx(Typography, {
145
139
  variant: "body2",
146
140
  component: "span",
@@ -151,12 +145,10 @@ const StoresNearbyListItem = ({
151
145
  }), /*#__PURE__*/_jsx("div", {
152
146
  className: classes.storeInfo,
153
147
  children: /*#__PURE__*/_jsx(Button, {
154
- className: classes.button,
155
- role: "button",
156
- type: "primary",
157
- flat: true,
148
+ variant: "link",
149
+ color: "secondary",
150
+ size: "small",
158
151
  onClick: () => openStoreDetails(code),
159
- wrapContent: false,
160
152
  children: /*#__PURE__*/_jsx(Typography, {
161
153
  variant: "body2",
162
154
  component: "span",
@@ -1,5 +1,5 @@
1
1
  import React, { useCallback, useContext, useMemo } from 'react';
2
- import { RippleButton } from '@shopgate/engage/components';
2
+ import { Button } from '@shopgate/engage/components/v2';
3
3
  import { makeStyles } from '@shopgate/engage/styles';
4
4
  import { StoreContext } from "./Store.context";
5
5
  import { i18n } from "../../../core/helpers";
@@ -8,14 +8,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
8
8
  const useStyles = makeStyles()(theme => ({
9
9
  selectLocationButtonWrapper: {
10
10
  padding: theme.spacing(0, 2, 1, 2)
11
- },
12
- selectLocationButton: {
13
- width: '100%',
14
- fontSize: `${theme.typography.body2.fontSize} !important`,
15
- ':not(:disabled)': {
16
- background: `${theme.palette.primary.main} !important`,
17
- color: `${theme.palette.primary.contrastText} !important`
18
- }
19
11
  }
20
12
  }));
21
13
 
@@ -41,9 +33,11 @@ export const StoreFinderSelectLocationButton = () => {
41
33
  const isSelected = useMemo(() => selectedLocation?.code === store?.code, [selectedLocation, store]);
42
34
  return /*#__PURE__*/_jsx("div", {
43
35
  className: classes.selectLocationButtonWrapper,
44
- children: /*#__PURE__*/_jsx(RippleButton, {
36
+ children: /*#__PURE__*/_jsx(Button, {
37
+ color: "primary",
38
+ size: "small",
39
+ fullWidth: true,
45
40
  onClick: handleClick,
46
- className: classes.selectLocationButton,
47
41
  disabled: isLoading || store?.isComingSoon || isSelected,
48
42
  children: i18n.text(store?.isComingSoon ? 'location.comingSoon' : 'locations.select_location')
49
43
  })
@@ -1,6 +1,6 @@
1
1
  import React, { useCallback, useContext } from 'react';
2
2
  import PropTypes from 'prop-types';
3
- import { RippleButton } from '@shopgate/engage/components';
3
+ import { Button } from '@shopgate/engage/components/v2';
4
4
  import { historyPush } from '@shopgate/engage/core';
5
5
  import { connect } from 'react-redux';
6
6
  import { makeStyles } from '@shopgate/engage/styles';
@@ -10,14 +10,6 @@ import { StoreFinderContext } from "../../locations.context";
10
10
  import { STORE_DETAILS_PATH } from "../../constants";
11
11
  import { jsx as _jsx } from "react/jsx-runtime";
12
12
  const useStyles = makeStyles()(theme => ({
13
- showStoreInfoButton: {
14
- width: '100%',
15
- fontSize: `${theme.typography.body2.fontSize} !important`,
16
- ':not(:disabled)': {
17
- background: `${theme.palette.primary.main} !important`,
18
- color: `${theme.palette.primary.contrastText} !important`
19
- }
20
- },
21
13
  showStoreInfoButtonWrapper: {
22
14
  padding: theme.spacing(0, 2, 1, 2)
23
15
  }
@@ -54,9 +46,11 @@ const StoreFinderStoreInfoButton = ({
54
46
  }, [openStoreDetail, store]);
55
47
  return /*#__PURE__*/_jsx("div", {
56
48
  className: classes.showStoreInfoButtonWrapper,
57
- children: /*#__PURE__*/_jsx(RippleButton, {
49
+ children: /*#__PURE__*/_jsx(Button, {
50
+ color: "primary",
51
+ size: "small",
52
+ fullWidth: true,
58
53
  onClick: handleClick,
59
- className: classes.showStoreInfoButton,
60
54
  disabled: isLoading,
61
55
  children: i18n.text('locations.store_info')
62
56
  })
@@ -76,6 +76,7 @@ const useStyles = makeStyles()(theme => ({
76
76
  },
77
77
  input: {
78
78
  margin: '3px 0',
79
+ color: theme.palette.text.primary,
79
80
  width: '100%',
80
81
  lineHeight: '28px',
81
82
  outline: 'none',
@@ -1,5 +1,5 @@
1
1
  import React, { useContext, useCallback } from 'react';
2
- import { RippleButton } from '@shopgate/engage/components';
2
+ import { Button } from '@shopgate/engage/components/v2';
3
3
  import PropTypes from 'prop-types';
4
4
  import { makeStyles } from '@shopgate/engage/styles';
5
5
  import { isProductAvailable } from "../../helpers";
@@ -11,14 +11,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
11
11
  const useStyles = makeStyles()(theme => ({
12
12
  selectLocationButtonWrapper: {
13
13
  padding: theme.spacing(0, 2, 1, 2)
14
- },
15
- selectLocationButton: {
16
- width: '100%',
17
- fontSize: `${theme.typography.body2.fontSize} !important`,
18
- ':not(:disabled)': {
19
- background: theme.palette.primary.main,
20
- color: theme.palette.primary.contrastText
21
- }
22
14
  }
23
15
  }));
24
16
 
@@ -54,9 +46,11 @@ const StoreSelectLocationButton = ({
54
46
  }, [isAvailable, noInventory, product, selectLocation, setPostalCode, setUserSearchZipLocationFromSelection, store]);
55
47
  return /*#__PURE__*/_jsx("div", {
56
48
  className: classes.selectLocationButtonWrapper,
57
- children: /*#__PURE__*/_jsx(RippleButton, {
49
+ children: /*#__PURE__*/_jsx(Button, {
50
+ color: "primary",
51
+ size: "small",
52
+ fullWidth: true,
58
53
  onClick: handleClick,
59
- className: classes.selectLocationButton,
60
54
  disabled: isLoading || store?.isComingSoon || !noInventory && !isAvailable,
61
55
  children: i18n.text(store?.isComingSoon ? 'location.comingSoon' : 'locations.select_location')
62
56
  })