From 5c2c30e53fb95a15ba11daf2214b365e4b0fbe0e Mon Sep 17 00:00:00 2001 From: Helen Lin Date: Fri, 5 Nov 2021 12:23:28 -0700 Subject: [PATCH 1/5] fix: warning on elements with interactionPromptThreshold defined which is an attribute that should only be passed to 3D model --- .../hydrogen/src/components/MediaFile/MediaFile.tsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/hydrogen/src/components/MediaFile/MediaFile.tsx b/packages/hydrogen/src/components/MediaFile/MediaFile.tsx index 47c2abab6c..c5a039610e 100644 --- a/packages/hydrogen/src/components/MediaFile/MediaFile.tsx +++ b/packages/hydrogen/src/components/MediaFile/MediaFile.tsx @@ -18,6 +18,7 @@ export interface MediaFileProps { media: MediaImageMedia | Model3DMedia | ExternalVideoMedia | VideoMedia; /** The options for the `Image`, `Video`, `ExternalVideo`, or `Model3D` components. */ options?: VideoProps['options'] | ExternalVideoProps['options']; + interactionPromptThreshold?: number; } /** @@ -29,6 +30,7 @@ export interface MediaFileProps { export function MediaFile({ media, options, + interactionPromptThreshold, ...passthroughProps }: MediaFileProps) { switch (media.mediaContentType) { @@ -58,7 +60,13 @@ export function MediaFile({ /> ); case 'MODEL_3D': - return ; + return ( + + ); default: return null; } From 19f9bee7a18743d83c0dda73a8d2e0b90efff26d Mon Sep 17 00:00:00 2001 From: Helen Lin Date: Fri, 5 Nov 2021 12:30:29 -0700 Subject: [PATCH 2/5] fix: add to changelog --- packages/hydrogen/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/hydrogen/CHANGELOG.md b/packages/hydrogen/CHANGELOG.md index dbdd19196f..321e96daba 100644 --- a/packages/hydrogen/CHANGELOG.md +++ b/packages/hydrogen/CHANGELOG.md @@ -13,6 +13,7 @@ and adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). - feat: use Image url field instead of deprecated originalSrc field - feat: switch to unstable API - feat: fix lowercased SVG tags in RSC +- fix: MediaFile component warning on non-Model3D types ## 0.5.8 - 2021-11-04 From 7a618445fd66533d56000c3058ffd265976f6d2f Mon Sep 17 00:00:00 2001 From: Helen Lin Date: Fri, 5 Nov 2021 13:35:03 -0700 Subject: [PATCH 3/5] fix: don't pass interactionPromptThreshold when not dealing with a 3D model --- packages/dev/src/components/Gallery.client.jsx | 12 +++++++++++- .../hydrogen/src/components/MediaFile/MediaFile.tsx | 10 +--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/packages/dev/src/components/Gallery.client.jsx b/packages/dev/src/components/Gallery.client.jsx index 7607162414..47aaebc208 100644 --- a/packages/dev/src/components/Gallery.client.jsx +++ b/packages/dev/src/components/Gallery.client.jsx @@ -28,6 +28,12 @@ export default function Gallery() { > {galleryMedia.map((med) => { + let extraProps = {}; + + if (med.mediaContentType === 'MODEL_3D') { + extraProps = MODEL_3D_PROPS; + } + return ( ); })} ); } + +const MODEL_3D_PROPS = { + interactionPromptThreshold: '0', +}; diff --git a/packages/hydrogen/src/components/MediaFile/MediaFile.tsx b/packages/hydrogen/src/components/MediaFile/MediaFile.tsx index c5a039610e..47c2abab6c 100644 --- a/packages/hydrogen/src/components/MediaFile/MediaFile.tsx +++ b/packages/hydrogen/src/components/MediaFile/MediaFile.tsx @@ -18,7 +18,6 @@ export interface MediaFileProps { media: MediaImageMedia | Model3DMedia | ExternalVideoMedia | VideoMedia; /** The options for the `Image`, `Video`, `ExternalVideo`, or `Model3D` components. */ options?: VideoProps['options'] | ExternalVideoProps['options']; - interactionPromptThreshold?: number; } /** @@ -30,7 +29,6 @@ export interface MediaFileProps { export function MediaFile({ media, options, - interactionPromptThreshold, ...passthroughProps }: MediaFileProps) { switch (media.mediaContentType) { @@ -60,13 +58,7 @@ export function MediaFile({ /> ); case 'MODEL_3D': - return ( - - ); + return ; default: return null; } From e947cc90640687d956744046a467485d6d9c8305 Mon Sep 17 00:00:00 2001 From: Helen Lin Date: Fri, 5 Nov 2021 13:39:05 -0700 Subject: [PATCH 4/5] fix: model 3D constant --- packages/dev/src/components/Gallery.client.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/dev/src/components/Gallery.client.jsx b/packages/dev/src/components/Gallery.client.jsx index 47aaebc208..fa860194ec 100644 --- a/packages/dev/src/components/Gallery.client.jsx +++ b/packages/dev/src/components/Gallery.client.jsx @@ -10,7 +10,7 @@ export default function Gallery() { const featuredMedia = selectedVariant.image || media[0].image; const featuredMediaSrc = featuredMedia.url.split('?')[0]; const galleryMedia = media.filter((med) => { - if (med.mediaContentType === 'MODEL_3D') { + if (med.mediaContentType === MODEL_3D_TYPE) { return true; } @@ -30,7 +30,7 @@ export default function Gallery() { {galleryMedia.map((med) => { let extraProps = {}; - if (med.mediaContentType === 'MODEL_3D') { + if (med.mediaContentType === MODEL_3D_TYPE) { extraProps = MODEL_3D_PROPS; } @@ -52,6 +52,7 @@ export default function Gallery() { ); } +const MODEL_3D_TYPE = 'MODEL_3D'; const MODEL_3D_PROPS = { interactionPromptThreshold: '0', }; From 3352769e7fba518882f3875e06c94c80f8a3a6fd Mon Sep 17 00:00:00 2001 From: Helen Lin Date: Fri, 5 Nov 2021 14:10:33 -0700 Subject: [PATCH 5/5] fix: Update packages/hydrogen/CHANGELOG.md Co-authored-by: Josh Larson --- packages/hydrogen/CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/hydrogen/CHANGELOG.md b/packages/hydrogen/CHANGELOG.md index 3baabf77b9..1b642094f3 100644 --- a/packages/hydrogen/CHANGELOG.md +++ b/packages/hydrogen/CHANGELOG.md @@ -13,7 +13,6 @@ and adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). - fix: make sure all errors show an error dialog when hydrogen is in dev mode - feat: use Image url field instead of deprecated originalSrc field - feat: switch to unstable API -- feat: fix lowercased SVG tags in RSC - fix: MediaFile component warning on non-Model3D types - fix: remove console logs for caching - fix: lowercased SVG tags in RSC