fix(MD-4219): check for view data

qlik-oss · Mar 23, 2023 · 72f5e4c · 72f5e4c
1 parent 6dff211
commit 72f5e4c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/src/atoms.ts b/src/atoms.ts
@@ -4,6 +4,7 @@ export type ExpandCellAtom = {
   expand: boolean;
   data?: any;
   titles?: Array<String>;
+  viewData?: boolean;
 };
 
 export type DragBoxAtom = {

diff --git a/src/components/Cell.tsx b/src/components/Cell.tsx
@@ -10,9 +10,10 @@ export type CellProps = {
   rowData: any;
   colData: any;
   style?: StyleProp<ViewStyle>;
+  viewData?: boolean;
 };
 
-const Cell: React.FC<CellProps> = ({ rowData, colData, style }) => {
+const Cell: React.FC<CellProps> = ({ rowData, colData, style, viewData }) => {
   const getCell = useCallback(() => {
     if (colData.representation.type === 'miniChart') {
       return (
@@ -23,7 +24,7 @@ const Cell: React.FC<CellProps> = ({ rowData, colData, style }) => {
         />
       );
     }
-    if (colData.representation.type === 'image') {
+    if (colData.representation.type === 'image' && !viewData) {
       return (
         <ImageCell
           style={styles.imageCell}

diff --git a/src/components/ExpandedTableCell.tsx b/src/components/ExpandedTableCell.tsx
@@ -45,6 +45,7 @@ const ExpandedTableCell = () => {
               style={styles.cell}
               colData={item}
               rowData={expandedCell.data.row.cells[index]}
+              viewData={expandedCell.viewData}
             />
           </DataTable.Row>
         ))}

diff --git a/src/components/SimpleGrid.tsx b/src/components/SimpleGrid.tsx
@@ -117,6 +117,7 @@ const SimpleGrid: React.FC<SimpleGridProps> = ({
           expand: true,
           data: { row, col },
           titles: translations.headerValues,
+          viewData: layout?.isDataView,
         });
       } catch (error) {}
     },

diff --git a/src/components/TextCell.tsx b/src/components/TextCell.tsx
@@ -42,7 +42,7 @@ const TextCell: React.FC<TextCellProps> = ({ rowData, colData }) => {
   const iconStyle = useMemo(() => {
     let name;
     let color;
-    if (colData?.representation.type === 'text') {
+    if (colData?.representation.type === 'text' || colData?.representation.type === 'image') {
       return;
     }
     if (rowData?.indicator?.icon) {