@websolutespa/bom-mixer-ui 1.9.15 → 1.9.17

package/CHANGELOG.md

@@ -1,12 +1,24 @@
 # @websolutespa/bom-mixer-ui
 
+## 1.9.17
+
+### Patch Changes
+
+- Added: informative prop to Media
+
+## 1.9.16
+
+### Patch Changes
+
+- Modified: Meta
+- Updated dependencies
+  - @websolutespa/bom-core@1.8.21
+
 ## 1.9.15
 
 ### Patch Changes
 
 - Modified: Meta added indexable prop
-- Updated dependencies
-- Updated dependencies
 - Updated dependencies
   - @websolutespa/bom-mixer-store@1.8.11
   - @websolutespa/bom-mixer-models@1.8.18
@@ -53,7 +65,6 @@
 ### Patch Changes
 
 - Modified: Text, LazyLoader, IThemeFont
-- Updated dependencies
 - Updated dependencies
   - @websolutespa/bom-core@1.8.17
   - @websolutespa/bom-mixer-models@1.8.17
@@ -81,7 +92,6 @@
 ### Patch Changes
 
 - Added: Text.Html
-- Updated dependencies
 - Updated dependencies
   - @websolutespa/bom-mixer-store@1.8.4
   - @websolutespa/bom-core@1.8.11
@@ -165,7 +175,6 @@
 ### Patch Changes
 
 - Modified: Text added letter-spacing, MediaImage
-- Updated dependencies
 - Updated dependencies
   - @websolutespa/bom-mixer-models@1.8.8
   - @websolutespa/bom-core@1.8.10
@@ -185,7 +194,6 @@
 - 3a7fc91: Added: a11y Select, Drawer, Media
 - 3a7fc91: Added: a11y SvgAnimation
 - 3a7fc91: Modified: theme ColorScheme
-- Updated dependencies [3a7fc91]
 - Updated dependencies [3a7fc91]
   - @websolutespa/bom-mixer-icons@0.2.5
   - @websolutespa/bom-mixer-hooks@1.8.9
@@ -319,7 +327,6 @@
 
 - Modified: Media, Meta
 - Added: SvgAnimation mode overOut
-- Updated dependencies
 - Updated dependencies
   - @websolutespa/bom-core@1.7.5
   - @websolutespa/bom-mixer-models@1.7.4
@@ -358,7 +365,6 @@
 
 ### Patch Changes
 
-- Updating: dependencies
 - Updated dependencies
   - @websolutespa/bom-mixer-models@1.7.2
   - @websolutespa/bom-mixer-forms@0.3.1

package/dist/cjs/index.js

@@ -4842,7 +4842,8 @@ const MediaImage_ = _a => {
   }, canLoad ? imageProps : undefined, {
     className: classNames,
     loading: loading,
-    draggable: false
+    draggable: false,
+    "aria-hidden": !props.informative
   }));
 };
 const MediaImage = /*#__PURE__*/React.memo(MediaImage_);
@@ -5052,8 +5053,8 @@ function getMediaItemProps(mediaItem, options) {
   const media = __rest(mediaItem, ["width", "height", "sizes"]);
   const title = media.title || options.title;
   // console.log('getMediaItemProps', media.alt, options.alt);
-  // const alt: string | undefined = (media.alt || options.alt) as string | undefined;
-  const alt = options.alt || '';
+  const alt = media.alt || options.alt;
+  // const alt: string = (options.alt || '');
   const src = media.src || media.url || '';
   const mediaItemProps = {
     src,
@@ -5088,6 +5089,7 @@ function getMediaItemProps(mediaItem, options) {
     mediaItemProps.aspectRatioMd = options.aspectRatioMd;
     mediaItemProps.aspectRatioLg = options.aspectRatioLg;
     mediaItemProps.aspectRatioXl = options.aspectRatioXl;
+    mediaItemProps.informative = options.informative;
     if (options.eager) {
       mediaItemProps.loading = 'eager';
     }
@@ -5214,12 +5216,13 @@ const MediaBase = /*#__PURE__*/React.forwardRef((_a, ref) => {
       eager,
       alt,
       title,
+      informative,
       onClick,
       onLoaded,
       canLoad,
       as = 'div'
     } = _a,
-    props = __rest(_a, ["children", "item", "className", "width", "height", "size", "eager", "alt", "title", "onClick", "onLoaded", "canLoad", "as"]);
+    props = __rest(_a, ["children", "item", "className", "width", "height", "size", "eager", "alt", "title", "informative", "onClick", "onLoaded", "canLoad", "as"]);
   const {
     id,
     open
@@ -5254,6 +5257,7 @@ const MediaBase = /*#__PURE__*/React.forwardRef((_a, ref) => {
         eager,
         alt,
         title,
+        informative,
         open,
         onLoaded,
         canLoad
@@ -6135,15 +6139,43 @@ const MediaGallery = /*#__PURE__*/React.forwardRef((_a, ref) => {
 MediaGallery.displayName = 'MediaGallery';
 
 function Meta(_a) {
-  var _b, _c, _f;
+  var _b, _c, _d, _g;
   var {
       children,
       structuredDataCollections,
       brand
     } = _a,
     props = __rest(_a, ["children", "structuredDataCollections", "brand"]);
+  const layout = bomMixerHooks.useLayout();
   const page = bomMixerHooks.usePage();
   const extra = bomMixerHooks.useExtra();
+  // alternates
+  const alternates = React.useMemo(() => {
+    const alternates = [];
+    page.alternates.forEach(alternate => {
+      const market = layout.markets.find(x => x.id === alternate.market);
+      if (market) {
+        if (market.countries && market.countries.length > 0) {
+          market.countries.forEach(country => {
+            // country: string | { alpha2Code: string };
+            const alpha2Code = typeof country === 'string' ? country : country.alpha2Code;
+            alternates.push({
+              id: `${alternate.market}-${alternate.locale}-${alpha2Code}`,
+              href: bomMixerModels.resolveHref(alternate.id),
+              hrefLang: `${alternate.locale}-${alpha2Code}`
+            });
+          });
+        } else {
+          alternates.push({
+            id: `${alternate.market}-${alternate.locale}`,
+            href: bomMixerModels.resolveHref(alternate.id),
+            hrefLang: alternate.locale
+          });
+        }
+      }
+    });
+    return alternates;
+  }, [layout, page]);
   // title
   let title = ((_b = page.meta) === null || _b === void 0 ? void 0 : _b.title) || page.title;
   // description
@@ -6188,7 +6220,8 @@ function Meta(_a) {
   // structuredData
   const structuredData = bomMixerModels.resolveStructuredData(page, structuredDataCollections, brand);
   // image
-  const image = page.media ? page.media.src || page.media.url : brand === null || brand === void 0 ? void 0 : brand.logo;
+  const media = ((_d = page.meta) === null || _d === void 0 ? void 0 : _d.image) || page.media;
+  const image = media ? media.src || media.url : brand === null || brand === void 0 ? void 0 : brand.logo;
   return jsxRuntime.jsxs(Head__default.default, {
     children: [jsxRuntime.jsx("title", {
       children: title
@@ -6197,7 +6230,7 @@ function Meta(_a) {
       content: description
     }), false  , indexable() ? jsxRuntime.jsx("meta", {
       name: "robots",
-      content: ((_f = page.meta) === null || _f === void 0 ? void 0 : _f.robots) || 'index, follow'
+      content: ((_g = page.meta) === null || _g === void 0 ? void 0 : _g.robots) || 'index, follow'
     }) : jsxRuntime.jsx("meta", {
       name: "robots",
       content: "noindex, nofollow"
@@ -6210,11 +6243,11 @@ function Meta(_a) {
     }), relNext && jsxRuntime.jsx("link", {
       rel: "next",
       href: bomMixerModels.resolveHref(relNext)
-    }), page.alternates && page.alternates.map(alternate => jsxRuntime.jsx("link", {
+    }), alternates.map(alternate => jsxRuntime.jsx("link", {
       rel: "alternate",
-      href: bomMixerModels.resolveHref(alternate.id),
-      hrefLang: alternate.locale
-    }, `${alternate.locale}-${alternate.market}`)), image && jsxRuntime.jsx("meta", {
+      href: alternate.href,
+      hrefLang: alternate.hrefLang
+    }, alternate.id)), image && jsxRuntime.jsx("meta", {
       property: "og:image",
       content: bomMixerModels.resolveHref(image)
     }), false , structuredData && jsxRuntime.jsx("script", {