@ndla/ui 44.0.4 → 44.0.5

package/es/Embed/ImageEmbed.js

@@ -89,7 +89,8 @@ var ImageEmbed = function ImageEmbed(_ref) {
   var embed = _ref.embed,
     previewAlt = _ref.previewAlt,
     HeartButton = _ref.heartButton,
-    inGrid = _ref.inGrid;
+    inGrid = _ref.inGrid,
+    path = _ref.path;
   var _useState = useState(hideByline(embed.embedData.size)),
     _useState2 = _slicedToArray(_useState, 2),
     isBylineHidden = _useState2[0],
@@ -126,6 +127,7 @@ var ImageEmbed = function ImageEmbed(_ref) {
       src: !isCopyrighted ? embedData.pageUrl || data.image.imageUrl : undefined,
       crop: crop,
       size: embedData.size,
+      pagePath: path,
       children: _jsx(Image, {
         focalPoint: focalPoint,
         contentType: data.image.contentType,
@@ -170,10 +172,11 @@ var ImageWrapper = function ImageWrapper(_ref2) {
   var src = _ref2.src,
     crop = _ref2.crop,
     size = _ref2.size,
-    children = _ref2.children;
+    children = _ref2.children,
+    pagePath = _ref2.pagePath;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  if (isSmall(size) || hideByline(size) || !src) {
+  if (isSmall(size) || hideByline(size) || !src || pagePath && src.endsWith(pagePath)) {
     return _jsx(_Fragment, {
       children: children
     });

package/lib/Embed/ImageEmbed.d.ts

@@ -10,6 +10,7 @@ import { HeartButtonType } from './types';
 interface Props {
     embed: ImageMetaData;
     previewAlt?: boolean;
+    path?: string;
     heartButton?: HeartButtonType;
     inGrid?: boolean;
 }
@@ -37,5 +38,5 @@ export declare const getCrop: (data: ImageEmbedData) => {
     endX: never;
     endY: never;
 } | undefined;
-declare const ImageEmbed: ({ embed, previewAlt, heartButton: HeartButton, inGrid }: Props) => import("@emotion/react/jsx-runtime").JSX.Element;
+declare const ImageEmbed: ({ embed, previewAlt, heartButton: HeartButton, inGrid, path }: Props) => import("@emotion/react/jsx-runtime").JSX.Element;
 export default ImageEmbed;

package/lib/Embed/ImageEmbed.js

@@ -99,7 +99,8 @@ var ImageEmbed = function ImageEmbed(_ref) {
   var embed = _ref.embed,
     previewAlt = _ref.previewAlt,
     HeartButton = _ref.heartButton,
-    inGrid = _ref.inGrid;
+    inGrid = _ref.inGrid,
+    path = _ref.path;
   var _useState = (0, _react.useState)(hideByline(embed.embedData.size)),
     _useState2 = _slicedToArray(_useState, 2),
     isBylineHidden = _useState2[0],
@@ -136,6 +137,7 @@ var ImageEmbed = function ImageEmbed(_ref) {
       src: !isCopyrighted ? embedData.pageUrl || data.image.imageUrl : undefined,
       crop: crop,
       size: embedData.size,
+      pagePath: path,
       children: (0, _jsxRuntime.jsx)(_Image.default, {
         focalPoint: focalPoint,
         contentType: data.image.contentType,
@@ -180,10 +182,11 @@ var ImageWrapper = function ImageWrapper(_ref2) {
   var src = _ref2.src,
     crop = _ref2.crop,
     size = _ref2.size,
-    children = _ref2.children;
+    children = _ref2.children,
+    pagePath = _ref2.pagePath;
   var _useTranslation = (0, _reactI18next.useTranslation)(),
     t = _useTranslation.t;
-  if (isSmall(size) || hideByline(size) || !src) {
+  if (isSmall(size) || hideByline(size) || !src || pagePath && src.endsWith(pagePath)) {
     return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
       children: children
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/ui",
-  "version": "44.0.4",
+  "version": "44.0.5",
   "description": "UI component library for NDLA.",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -83,5 +83,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f6fe1cacc3f1faf1baf412dabb65cd6e64cbf0e9"
+  "gitHead": "9e4590018d33aad8ae6bfe3502ec2d351b7c3234"
 }

package/src/Embed/ImageEmbed.tsx

@@ -21,6 +21,7 @@ import { HeartButtonType } from './types';
 interface Props {
   embed: ImageMetaData;
   previewAlt?: boolean;
+  path?: string;
   heartButton?: HeartButtonType;
   inGrid?: boolean;
 }
@@ -99,7 +100,7 @@ export const getCrop = (data: ImageEmbedData) => {
 
 const expandedSizes = '(min-width: 1024px) 1024px, 100vw';
 
-const ImageEmbed = ({ embed, previewAlt, heartButton: HeartButton, inGrid }: Props) => {
+const ImageEmbed = ({ embed, previewAlt, heartButton: HeartButton, inGrid, path }: Props) => {
   const [isBylineHidden, setIsBylineHidden] = useState(hideByline(embed.embedData.size));
   const [imageSizes, setImageSizes] = useState<string | undefined>(undefined);
   if (embed.status === 'error') {
@@ -132,6 +133,7 @@ const ImageEmbed = ({ embed, previewAlt, heartButton: HeartButton, inGrid }: Pro
         src={!isCopyrighted ? embedData.pageUrl || data.image.imageUrl : undefined}
         crop={crop}
         size={embedData.size}
+        pagePath={path}
       >
         <Image
           focalPoint={focalPoint}
@@ -171,6 +173,7 @@ const ImageEmbed = ({ embed, previewAlt, heartButton: HeartButton, inGrid }: Pro
 interface ImageWrapperProps {
   src?: string;
   children: React.ReactNode;
+  pagePath?: string;
   crop?: {
     startX: number;
     startY: number;
@@ -183,9 +186,9 @@ const hideByline = (size?: string): boolean => {
   return !!size && size.endsWith('-hide-byline');
 };
 
-const ImageWrapper = ({ src, crop, size, children }: ImageWrapperProps) => {
+const ImageWrapper = ({ src, crop, size, children, pagePath }: ImageWrapperProps) => {
   const { t } = useTranslation();
-  if (isSmall(size) || hideByline(size) || !src) {
+  if (isSmall(size) || hideByline(size) || !src || (pagePath && src.endsWith(pagePath))) {
     return <>{children}</>;
   }