@vixoniccom/news-internal 0.4.21-dev.17 → 0.4.21-dev.19

package/package.json

@@ -8,7 +8,7 @@
   "author": {
     "name": ""
   },
-  "version": "0.4.21-dev.17",
+  "version": "0.4.21-dev.19",
   "scripts": {
     "prepublish": "vixonic-module-packager --mode=build",
     "watch": "vixonic-module-packager --mode=watch",

package/src/components/App.tsx

@@ -10,16 +10,37 @@ export type Props = {
 
 export const App: React.FunctionComponent<Props> = ({ data }) => {
   const [news, setNews] = useState<NewsItem[]>([])
+  
+   const getPrefixBySize = (n: any, size: string, prefix: string): string => {
+    const prefixMap: { [key: string]: string } = {
+      'short': n[`${prefix}Short`],
+      'medium': n[`${prefix}Medium`],
+      'large': n[`${prefix}Large`],
+      'extra-large': n[`${prefix}ExtraLarge`]
+    }
+    return prefixMap[size] || n[`${prefix}Medium`] || ''
+  }
 
   const parseNews = (data?: VixonicData): NewsItem[] => {
     if (!data) return []
-    const { news } = data.parameters
+    const { news, newsSizeSelect } = data.parameters
     const parsedNews = news?.map((n) => {
       const { image, ...rest } = n
       let parsedImage
       const qrUrl = n.qrCodeUrl
       if (image?.filename) parsedImage = `${data.downloadsPath}/${image.filename}`
-      return { ...rest, image: parsedImage, id: uuid(), qrCodeUrl: qrUrl }
+    
+      let title = getPrefixBySize(n, newsSizeSelect || 'medium', 'title')
+      let description = getPrefixBySize(n, newsSizeSelect || 'medium', 'description')
+
+      return {
+         ...rest,
+          title,
+          description,
+          image: parsedImage,
+          id: uuid(),
+          qrCodeUrl: qrUrl 
+        }
     }).filter((n) => {
       const { expirationDate } = n
       const today = dayjs()

package/src/components/TextContainer/index.tsx

@@ -18,7 +18,7 @@ export const TextContainer: React.FunctionComponent<Props> = (props) => {
     height: '100%',
     flex: 1
   }}>
-    {parameters.titleEnabled && <FormattedText text={item.titleShort || item.titleMedium || item.titleLarge || item.titleExtraLarge || ''} unit={'px'}
+    {parameters.titleEnabled && <FormattedText text={item.title || ''} unit={'px'}
       format={parameters.titleFormat} lineHeight={parameters.titleLineHeight}
       style={
         (parameters.textSeparation && parameters.titleEnabled && parameters.descriptionEnabled)
@@ -26,7 +26,7 @@ export const TextContainer: React.FunctionComponent<Props> = (props) => {
           : undefined
       } multiline />
     }
-    {parameters.descriptionEnabled && <FormattedHtmlText html={item.descriptionShort || item.descriptionMedium || item.descriptionLarge || item.descriptionExtraLarge || ''} unit={'px'}
+    {parameters.descriptionEnabled && <FormattedHtmlText html={item.description || ''} unit={'px'}
       format={parameters.descriptionFormat} lineHeight={parameters.descriptionLineHeight}
       defaults={{ fontSize: 10, fontColor: 'black', alignment: 'left' }}
       multiline />

package/src/global.d.ts

@@ -1,13 +1,7 @@
 type NewsItem = {
   id: string
-  titleShort?: string
-  descriptionShort?: string
-  titleMedium?: string
-  descriptionMedium?: string
-  titleLarge?: string
-  descriptionLarge?: string
-  titleExtraLarge?: string
-  descriptionExtraLarge?: string
+  title?: string
+  description?: string
   image?: string
   qrCodeUrl?: string
   qrCodeTitle?: string