fix(MD-4210): check for image type in text when in viewdata

qlik-oss · Mar 23, 2023 · 3abcb5a · 3abcb5a
1 parent f58aec6
commit 3abcb5a
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 0 deletions.
diff --git a/android/src/main/java/com/qliktrialreactnativestraighttable/ClickableTextView.java b/android/src/main/java/com/qliktrialreactnativestraighttable/ClickableTextView.java
@@ -145,10 +145,15 @@ public void setCellData(DataCell cell, DataRow row, DataColumn column) {
       cell.cellForegroundColor = Color.BLACK;
       tableView.cellContentStyle.color = Color.BLACK;
     }
+
+
     cell.setIsDataView(isDataView);
     if(cell.indicator != null && cell.type.compareTo("miniChart") != 0) {
       buildSpannableText();
     } else {
+      if(column.representation != null && column.representation.type.compareTo("image") == 0) {
+        cell.qText = getImageLabel(cell, row, column); 
+      }
       setText(cell.qText);
       textWrapper.countWords(cell.qText);
     }
@@ -162,6 +167,22 @@ public void setCellData(DataCell cell, DataRow row, DataColumn column) {
       setupUrl();
     }
   }
+
+  private String getImageLabel(DataCell cell, DataRow row, DataColumn column) {
+    if(column.representation != null && column.stylingInfo != null) {
+      int index = column.stylingInfo.indexOf("imageLabel");
+      if(index == -1) {
+        index = column.stylingInfo.indexOf("imageUrl");
+      }
+      if(index != -1 && cell.qAttrExpValues != null) {
+        qValue value = cell.qAttrExpValues.values.get(index);
+        if(value != null) {
+          return value.qText;
+        }
+      }
+    }
+    return "";
+  }
 
   private void buildSpannableText() {
     int textColor = cell.indicator.applySegmentColors ? cell.indicator.color : TableTheme.defaultTextColor;

diff --git a/ios/DataCellView.swift b/ios/DataCellView.swift
@@ -163,6 +163,9 @@ class DataCellView: UICollectionViewCell, ExpandedCellProtocol {
             } else if representation.type == "url" {
               let index = col.stylingInfo?.firstIndex(of: "url")
               label.setupUrl(col, cell: element, index: index)
+            } else if representation.type == "image" {
+              // can fall down here if view data
+              label.setImageLabel(col, cell: element)
             } else {
               label.text = element.qText
               label.textColor = getForegroundColor(col: col, element: element, withStyle: styleInfo[index])

diff --git a/ios/PaddedLabel.swift b/ios/PaddedLabel.swift
@@ -283,6 +283,23 @@ class PaddedLabel: UILabel, SelectionsListener, ConstraintCellProtocol {
       }
     }
   }
+
+  func setImageLabel(_ col: DataColumn, cell: DataCell) {
+    if(setLabelFromStyle(style: "imageLabel", col: col, cell: cell)) {
+      return;
+    }
+    let _ = setLabelFromStyle(style: "imageUrl", col: col, cell: cell)
+  }
+
+  func setLabelFromStyle(style: String, col: DataColumn, cell: DataCell) -> Bool {
+    if let imageIndex = col.stylingInfo?.firstIndex(of: style) {
+      if let text = cell.qAttrExps?.qValues?[imageIndex].qText {
+        self.text = text
+        return true
+      }
+    }
+    return false
+  }
 
   func setAttributedText(_ t: String, withIcon: UniChar, element: DataCell, isDataView: Bool) {
     var iconColor = UIColor.black// self.textColor;