Merge pull request #1059 from searchspring/develop

Release v0.56.4
searchspring · May 28, 2024 · 37da89b · 37da89b
2 parents adfae18 + f76b195
commit 37da89b
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 342 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/snap-preact-components/package.json b/packages/snap-preact-components/package.json
@@ -31,7 +31,7 @@
 		"@emotion/react": "11.9.0",
 		"@searchspring/snap-toolbox": "^0.56.3",
 		"classnames": "^2.3.2",
-		"cypress": "^12.15.0",
+		"cypress": "^13.7.1",
 		"cypress-wait-until": "^1.7.2",
 		"deepmerge": "4.3.1",
 		"dequal": "2.0.3",

diff --git a/packages/snap-preact-components/src/components/Atoms/BadgeImage/BadgeImage.tsx b/packages/snap-preact-components/src/components/Atoms/BadgeImage/BadgeImage.tsx
@@ -3,7 +3,7 @@ import { Fragment, h } from 'preact';
 
 import { jsx, css } from '@emotion/react';
 import classnames from 'classnames';
-import { observer } from 'mobx-react-lite';
+import { observer } from 'mobx-react';
 
 import { Theme, useTheme, CacheProvider } from '../../../providers';
 import { ComponentProps, StylingCSS } from '../../../types';

diff --git a/packages/snap-preact-components/src/components/Atoms/BadgePill/BadgePill.tsx b/packages/snap-preact-components/src/components/Atoms/BadgePill/BadgePill.tsx
@@ -3,7 +3,7 @@ import { Fragment, h } from 'preact';
 
 import { jsx, css } from '@emotion/react';
 import classnames from 'classnames';
-import { observer } from 'mobx-react-lite';
+import { observer } from 'mobx-react';
 import { Theme, useTheme, CacheProvider } from '../../../providers';
 import { ComponentProps, StylingCSS } from '../../../types';
 

diff --git a/packages/snap-preact-components/src/components/Atoms/BadgeRectangle/BadgeRectangle.tsx b/packages/snap-preact-components/src/components/Atoms/BadgeRectangle/BadgeRectangle.tsx
@@ -3,7 +3,7 @@ import { Fragment, h } from 'preact';
 
 import { jsx, css } from '@emotion/react';
 import classnames from 'classnames';
-import { observer } from 'mobx-react-lite';
+import { observer } from 'mobx-react';
 import { Theme, useTheme, CacheProvider } from '../../../providers';
 import { ComponentProps, StylingCSS } from '../../../types';
 

diff --git a/packages/snap-preact-components/src/components/Atoms/BadgeText/BadgeText.tsx b/packages/snap-preact-components/src/components/Atoms/BadgeText/BadgeText.tsx
@@ -3,7 +3,7 @@ import { Fragment, h } from 'preact';
 
 import { jsx, css } from '@emotion/react';
 import classnames from 'classnames';
-import { observer } from 'mobx-react-lite';
+import { observer } from 'mobx-react';
 import { Theme, useTheme, CacheProvider } from '../../../providers';
 import { ComponentProps, StylingCSS } from '../../../types';
 

diff --git a/packages/snap-preact-components/src/components/Molecules/CalloutBadge/CalloutBadge.tsx b/packages/snap-preact-components/src/components/Molecules/CalloutBadge/CalloutBadge.tsx
@@ -3,7 +3,7 @@ import { Fragment, h } from 'preact';
 
 import { jsx, css } from '@emotion/react';
 import classnames from 'classnames';
-import { observer } from 'mobx-react-lite';
+import { observer } from 'mobx-react';
 
 import { Theme, useTheme, CacheProvider } from '../../../providers';
 import { ComponentProps, StylingCSS, ComponentMap } from '../../../types';

diff --git a/packages/snap-preact-components/src/components/Molecules/OverlayBadge/OverlayBadge.tsx b/packages/snap-preact-components/src/components/Molecules/OverlayBadge/OverlayBadge.tsx
@@ -3,7 +3,7 @@ import { ComponentChildren, Fragment, h } from 'preact';
 
 import { jsx, css } from '@emotion/react';
 import classnames from 'classnames';
-import { observer } from 'mobx-react-lite';
+import { observer } from 'mobx-react';
 
 import { Theme, useTheme, CacheProvider } from '../../../providers';
 import { ComponentProps, StylingCSS, ComponentMap } from '../../../types';

diff --git a/packages/snap-store-mobx/src/Search/Stores/SearchResultStore.ts b/packages/snap-store-mobx/src/Search/Stores/SearchResultStore.ts
@@ -119,16 +119,20 @@ export class Banner {
 export type VariantData = {
 	mappings: SearchResponseModelResultMappings;
 	attributes: Record<string, unknown>;
-	options: Record<
-		string,
-		{
-			value: string;
-			attributeId?: string;
-			optionId?: string;
-		}
-	>;
+	options: VariantDataOptions;
 };
 
+export type VariantDataOptions = Record<
+	string,
+	{
+		value: string;
+		background?: string;
+		backgroundImageUrl?: string;
+		attributeId?: string;
+		optionId?: string;
+	}
+>;
+
 type ProductMinimal = {
 	id: string;
 	attributes: Record<string, unknown>;
@@ -505,6 +509,12 @@ export class VariantSelection {
 
 					if (this.config.thumbnailBackgroundImages) {
 						mappedValue.backgroundImageUrl = thumbnailImageUrl;
+					} else if (variant.options[this.field].backgroundImageUrl) {
+						mappedValue.backgroundImageUrl = variant.options[this.field].backgroundImageUrl;
+					}
+
+					if (variant.options[this.field].background) {
+						mappedValue.background = variant.options[this.field].background;
 					}
 
 					if (this.config.mappings && this.config.mappings && this.config.mappings[value.toString().toLowerCase()]) {
@@ -580,14 +590,7 @@ export class Variant {
 	public type = 'variant';
 	public available: boolean;
 	public attributes: Record<string, unknown> = {};
-	public options: Record<
-		string,
-		{
-			value: string;
-			attributeId?: string;
-			optionId?: string;
-		}
-	>;
+	public options: VariantDataOptions;
 
 	public mappings: SearchResponseModelResultMappings = {
 		core: {},