diff --git a/packages/pagebuilder/lib/ContentTypes/Row/__tests__/row.spec.js b/packages/pagebuilder/lib/ContentTypes/Row/__tests__/row.spec.js
index 2d64b28f72..8567dae076 100644
--- a/packages/pagebuilder/lib/ContentTypes/Row/__tests__/row.spec.js
+++ b/packages/pagebuilder/lib/ContentTypes/Row/__tests__/row.spec.js
@@ -38,12 +38,7 @@ test('render row with parallax initializes Jarallax', () => {
}
});
- expect(mockJarallax).toHaveBeenCalledWith(true, {
- speed: 0.75,
- imgPosition: 'center center',
- imgRepeat: 'repeat',
- imgSize: 'cover'
- });
+ expect(mockJarallax).toHaveBeenCalledWith(true, 'destroy');
});
test('render row with parallax initializes JarallaxVideo', () => {
@@ -99,15 +94,7 @@ test('row unmount causes Jarallax to be destroyed', () => {
});
expect(mockJarallax.mock.calls).toEqual([
- [
- true,
- {
- speed: 0.75,
- imgPosition: 'top left',
- imgRepeat: 'no-repeat',
- imgSize: 'contain'
- }
- ],
+ [true, 'destroy'],
[true, 'destroy']
]);
});
diff --git a/packages/pagebuilder/lib/ContentTypes/Row/row.js b/packages/pagebuilder/lib/ContentTypes/Row/row.js
index b4298ee2bc..9d50158e53 100644
--- a/packages/pagebuilder/lib/ContentTypes/Row/row.js
+++ b/packages/pagebuilder/lib/ContentTypes/Row/row.js
@@ -160,12 +160,7 @@ const Row = props => {
if (enableParallax && bgImageStyle && backgroundType !== 'video') {
({ jarallax } = require('jarallax'));
parallaxElement = backgroundElement.current;
- jarallax(parallaxElement, {
- speed: parallaxSpeed,
- imgSize: backgroundSize,
- imgPosition: backgroundPosition,
- imgRepeat: backgroundRepeat
- });
+ jarallax(parallaxElement, 'destroy');
}
if (backgroundType === 'video') {
diff --git a/packages/venia-ui/lib/components/CheckoutPage/ShippingInformation/AddressForm/__tests__/__snapshots__/customerForm.spec.js.snap b/packages/venia-ui/lib/components/CheckoutPage/ShippingInformation/AddressForm/__tests__/__snapshots__/customerForm.spec.js.snap
index a938625149..7adb4bf3d0 100644
--- a/packages/venia-ui/lib/components/CheckoutPage/ShippingInformation/AddressForm/__tests__/__snapshots__/customerForm.spec.js.snap
+++ b/packages/venia-ui/lib/components/CheckoutPage/ShippingInformation/AddressForm/__tests__/__snapshots__/customerForm.spec.js.snap
@@ -351,8 +351,8 @@ Array [
fieldInput="region[region]"
fieldSelect="region[region_id]"
optionValueKey="id"
- validate={[Function]}
/>
+
+
+
+
+
+
+
{
);
+ const createErrorMessage = JSON.stringify(
+ errors.get('createCustomerAddressMutation')
+ );
+ const updateErrorMessage = JSON.stringify(
+ errors.get('updateCustomerAddressMutation')
+ );
+ const errorMessage = 'region_id is required for the specified country code';
+ const regionError =
+ createErrorMessage?.includes(errorMessage) ||
+ updateErrorMessage?.includes(errorMessage);
+
+ // errors
return (
@@ -257,9 +269,10 @@ const CustomerForm = props => {
/>
+
{
defaultMessage: 'State Required'
})}
/>
+ {regionError ? (
+
+
+
+
+
+ ) : (
+ ''
+ )}
+
{
}
}, [addToast, formatMessage, showSignInToast, handleToastAction]);
+ const createErrorMessage = JSON.stringify(
+ errors.get('createCustomerAddressMutation')
+ );
+ const updateErrorMessage = JSON.stringify(
+ errors.get('updateCustomerAddressMutation')
+ );
+ const errorMessage = 'region_id is required for the specified country code';
+ const regionError =
+ createErrorMessage?.includes(errorMessage) ||
+ updateErrorMessage?.includes(errorMessage);
+
return (
@@ -308,7 +319,6 @@ const GuestForm = props => {
id: 'region.label',
defaultMessage: 'State'
})}
- validate={isRequired}
fieldInput={'region[region]'}
fieldSelect={'region[region_id]'}
optionValueKey={'id'}
@@ -318,6 +328,18 @@ const GuestForm = props => {
defaultMessage: 'State Required'
})}
/>
+ {regionError ? (
+
+
+
+
+
+ ) : (
+ ''
+ )}
{
const {
classes: propClasses,
+ regionError,
countryCodeField,
fieldInput,
fieldSelect,
@@ -47,13 +48,19 @@ const Region = props => {
const regionField =
regions.length || loading ? (
) : (
-
+
);
return (
diff --git a/packages/venia-ui/lib/components/Select/select.js b/packages/venia-ui/lib/components/Select/select.js
index 4c14caf012..553f03a93e 100644
--- a/packages/venia-ui/lib/components/Select/select.js
+++ b/packages/venia-ui/lib/components/Select/select.js
@@ -18,6 +18,7 @@ const Select = props => {
const {
before,
classes: propClasses,
+ regionError,
field,
items,
message,
@@ -25,7 +26,8 @@ const Select = props => {
} = props;
const fieldState = useFieldState(field);
const classes = useStyle(defaultClasses, propClasses);
- const inputClass = fieldState.error ? classes.input_error : classes.input;
+ const inputClass =
+ fieldState.error || regionError ? classes.input_error : classes.input;
const options = items.map(
({ disabled = null, hidden = null, label, value, key = value }) => (
diff --git a/packages/venia-ui/lib/components/TextInput/textInput.js b/packages/venia-ui/lib/components/TextInput/textInput.js
index 295fa336bc..550cc98701 100644
--- a/packages/venia-ui/lib/components/TextInput/textInput.js
+++ b/packages/venia-ui/lib/components/TextInput/textInput.js
@@ -12,13 +12,15 @@ const TextInput = props => {
after,
before,
classes: propClasses,
+ regionError,
field,
message,
...rest
} = props;
const fieldState = useFieldState(field);
const classes = useStyle(defaultClasses, propClasses);
- const inputClass = fieldState.error ? classes.input_error : classes.input;
+ var inputClass =
+ fieldState.error || regionError ? classes.input_error : classes.input;
return (