Merge pull request #174 from mercedes-benz/develop

VULCAN-874/Ultrawide screen

Author: m-o-n-i-s-h

src/component/groupreport/GroupReport.tsx

@@ -1,6 +1,7 @@
 import { Box } from '@mui/material';
 import React from 'react';
 import NeoCard from '../../card/Card';
+import useUltraWide from '../../utils/useUltraWide';
 
 export default function GroupReport({
   groupedReports,
@@ -14,14 +15,38 @@ export default function GroupReport({
   getAddCardButtonPosition,
   onClonePressed,
 }) {
+  const isUltraWide = useUltraWide();
   return groupedReports[groupId].length > 0 ? (
     <Box display='grid' gridTemplateColumns='repeat(24, 1fr)' columnGap={1} sx={getBorderSpecsForGroupId(groupId)}>
       {groupedReports[groupId]
-        .sort((a: any, b: any) => a.groupOrder - b.groupOrder)
-        .map((report: { id: any; width: any; height: any }) => {
-          const { id, width: w, height: h } = report;
+        .sort((a: any, b: any) => {
+          const aGroupOrder = a.groupOrder;
+          const bGroupOrder = b.groupOrder;
+          const aUwGroupOrder = a.uwGroupOrder ?? 0;
+          const bUwGroupOrder = b.uwGroupOrder ?? 0;
+          const isUwHeightPresent = a.uwHeight && b.uwHeight;
+
+          if (isUltraWide && isUwHeightPresent) {
+            return aUwGroupOrder - bUwGroupOrder;
+          }
+          return aGroupOrder - bGroupOrder;
+        })
+        .map((report: { id: any; width: any; height: any; x: any; y: any; uwHeight: number }) => {
+          const { id, width: w, height: h, uwHeight } = report;
+          let modifiedWidth = w;
+          let modifiedHeight = h;
+          if (isUltraWide && uwHeight) {
+            modifiedWidth = w / 2;
+            modifiedHeight = uwHeight ?? 2;
+          }
+
           return (
-            <Box id={id} gridColumn={`span ${w}`} gridRow={`span ${h}`} sx={{ height: h * 100, paddingBottom: '15px' }}>
+            <Box
+              id={id}
+              gridColumn={`span ${modifiedWidth}`}
+              gridRow={`span ${modifiedHeight}`}
+              sx={{ height: modifiedHeight * 100, paddingBottom: '15px' }}
+            >
               <NeoCard
                 id={id}
                 key={getReportKey(pagenumber, id)}

src/utils/useUltraWide.ts

@@ -0,0 +1,25 @@
+import { useEffect, useState } from 'react';
+
+const useUltraWide = (): boolean => {
+  const [isUltraWide, setIsUltraWide] = useState<boolean>(false);
+
+  useEffect(() => {
+    const mediaQuery = '(min-aspect-ratio: 21/9)';
+
+    const updateUltraWideStatus = () => {
+      const ultraWideQuery = window.matchMedia(mediaQuery);
+      setIsUltraWide(ultraWideQuery.matches);
+    };
+
+    updateUltraWideStatus();
+    window.addEventListener('resize', updateUltraWideStatus);
+
+    return () => {
+      window.removeEventListener('resize', updateUltraWideStatus);
+    };
+  }, []);
+
+  return isUltraWide;
+};
+
+export default useUltraWide;