Merge pull request #86 from eclipse-tractusx/feat/CPLP-3190/add-cards…

…-image-element
eclipse-tractusx · Jan 26, 2024 · c8ed680 · c8ed680
2 parents ed82a84 + e28b783
commit c8ed680
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.1.21
+
+- Add option to give an image element to Cards
+
 ## 2.1.20
 
 - Add accordion actions functionality in accordions

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@catena-x/portal-shared-components",
-  "version": "2.1.20",
+  "version": "2.1.21",
   "description": "Catena-X Portal Shared Components",
   "author": "Catena-X Contributors",
   "license": "Apache-2.0",

diff --git a/src/components/content/Cards/Card.tsx b/src/components/content/Cards/Card.tsx
@@ -85,6 +85,7 @@ export const Card = ({
   imageSize,
   imageShape,
   imageLoader,
+  imageElement,
   buttonText,
   onClick,
   onButtonClick,
@@ -243,6 +244,7 @@ export const Card = ({
             imageSize={imageSize}
             imageShape={imageShape}
             imageLoader={imageLoader}
+            imageElement={imageElement}
             preview={variant === 'preview'}
           />
           {subscriptionStatus && (

diff --git a/src/components/content/Cards/CardImage.tsx b/src/components/content/Cards/CardImage.tsx
@@ -35,17 +35,17 @@ export interface CardImageProps {
   imageSize?: CardImageSize
   imageShape?: CardImageShape
   imageLoader?: (src: string) => Promise<ArrayBuffer>
-  preview?: boolean
   imageElement?: JSX.Element
+  preview?: boolean
 }
 
 export const CardImage = ({
   image,
   imageSize = 'normal',
   imageShape = 'round',
   imageLoader,
-  preview = false,
   imageElement,
+  preview = false,
 }: CardImageProps) => {
   const { transitions } = useTheme()
   const withPreview = (size: number) => (preview ? size + 18 : size)

diff --git a/src/components/content/Cards/index.tsx b/src/components/content/Cards/index.tsx
@@ -69,7 +69,6 @@ export const Cards = ({
   imageSize,
   imageShape,
   imageLoader,
-  imageElement,
   columns = 6,
   expandOnHover,
   filledBackground,
@@ -97,7 +96,6 @@ export const Cards = ({
     imageSize,
     imageShape,
     imageLoader,
-    imageElement,
     expandOnHover,
     filledBackground,
     addButtonClicked,