fix: totals cell wrapping

android/src/main/java/com/qliktrialreactnativestraighttable/CellView.java

@@ -8,6 +8,7 @@
 import android.graphics.Color;
 import android.graphics.ImageFormat;
 import android.graphics.Rect;
+import android.text.TextUtils;
 import android.view.GestureDetector;
 import android.view.MenuItem;
 import android.view.MotionEvent;
@@ -76,6 +77,7 @@ private void createContent(String type, DataColumn dataColumn) {
       case "text":
         ClickableTextView textView = new ClickableTextView(getContext(), selectionsEngine, tableView, this, dataColumn);
         textView.setPadding(PADDING, 0, PADDING, 0);
+        textView.setEllipsize(TextUtils.TruncateAt.END);
         content = textView;
         break;
       case "image":
@@ -209,16 +211,21 @@ public void onRecycled() {
   }
 
   @Override
-  protected void onLayout(boolean changed, int l, int t, int r, int b) {
-    super.onLayout(changed, l, t, r, b);
-    LinearLayout.LayoutParams layout = (LinearLayout.LayoutParams) getLayoutParams();
-    if(column == null) {
-      return;
-    }
-    layout.width = column.width;
-    setLayoutParams(layout);
+  public void requestLayout() {
+    super.requestLayout();
+    post(measureAndLayout);
   }
 
+  private final Runnable measureAndLayout = new Runnable() {
+    @Override
+    public void run() {
+      measure(
+        MeasureSpec.makeMeasureSpec(getWidth(), MeasureSpec.EXACTLY),
+        MeasureSpec.makeMeasureSpec(getHeight(), MeasureSpec.EXACTLY));
+      layout(getLeft(), getTop(), getRight(), getBottom());
+    }
+  };
+
   class SingleTapListener extends GestureDetector.SimpleOnGestureListener {
     @Override
     public boolean onSingleTapConfirmed(MotionEvent motionEvent) {

android/src/main/java/com/qliktrialreactnativestraighttable/ClickableTextView.java

@@ -7,6 +7,7 @@
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.text.Html;
+import android.text.TextUtils;
 import android.util.Log;
 import android.graphics.Paint;
 import android.graphics.Rect;
@@ -217,9 +218,8 @@ public boolean isSelected(){
     return selected;
   }
 
-  @Override
-  public void setMaxLines(int maxLines) {
-    maxLines = textWrapper.setMaxLines(maxLines);
+  public void setMaxLines(int maxLines, DataColumn column) {
+    maxLines = textWrapper.setMaxLines(maxLines, column);
     super.setMaxLines(maxLines);
   }
 
@@ -230,6 +230,9 @@ public void testTextWrap(DataColumn dataColumn) {
   }
 
   public int getMeasuredLineCount() {
+    if(column != null && !column.isDim) {
+      return 1;
+    }
     return textWrapper.getMeasuredLinedCount();
   }
 
@@ -247,4 +250,5 @@ public void copyToClipBoard() {
   public String getCopyMenuString() {
     return "copy";
   }
+
 }

android/src/main/java/com/qliktrialreactnativestraighttable/HeaderCell.java

@@ -120,8 +120,8 @@ public boolean onTouchEvent(@NonNull MotionEvent e) {
   }
 
   void setMaxLines(int maxLineCount) {
-    if(this.cell != null) {
-      this.cell.setMaxLines(maxLineCount);
+    if(this.cell != null && this.column != null) {
+      this.cell.setMaxLines(maxLineCount, this.column);
     }
   }
   @SuppressLint("ViewConstructor")
@@ -149,9 +149,8 @@ public void testTextWrap() {
       }
     }
 
-    @Override
-    public void setMaxLines(int maxLines) {
-      maxLines = textWrapper.setMaxLines(maxLines);
+    public void setMaxLines(int maxLines, DataColumn column) {
+      maxLines = textWrapper.setMaxLines(maxLines, column);
       super.setMaxLines(maxLines);
     }
 

android/src/main/java/com/qliktrialreactnativestraighttable/HeaderView.java

@@ -54,7 +54,7 @@ public int getMaxLineCount() {
 
     for(int i = 0; i < this.dataColumns.size(); i++) {
       HeaderCell headerCell = (HeaderCell)this.getChildAt(i);
-      headerCell.cell.setMaxLines(lineCount);
+      headerCell.cell.setMaxLines(lineCount, dataColumns.get(i));
     }
     return lineCount;
   }

android/src/main/java/com/qliktrialreactnativestraighttable/RowViewHolder.java

@@ -98,7 +98,7 @@ public void setData(DataRow dataRow, int rowHeight, CellContentStyle cellContent
           setupHyperLink(textView);
         }
         if(column.isDim && cellContentStyle.wrap) {
-          textView.setMaxLines(rowHeight/cellContentStyle.lineHeight);
+          textView.setMaxLines(rowHeight/cellContentStyle.lineHeight, column);
         } else {
           textView.setMaxLines(1);
         }
@@ -149,18 +149,9 @@ public boolean updateWidth(float deltaWidth, int column) {
 
     DataColumn dataColumn = dataProvider.dataColumns.get(column);
     checkTextWrap(dataColumn);
-    checkNeighbourTextWrap(column);
-
     return true;
   }
 
-  private void checkNeighbourTextWrap(int column) {
-    if (column + 1 < numColumns ) {
-      DataColumn dataColumn = dataProvider.dataColumns.get(column);
-      checkTextWrap(dataColumn);
-    }
-  }
-
   private void checkTextWrap(DataColumn dataColumn) {
     if(dataColumn.isDim && dataColumn.isText() ) {
       CellView cellView = (CellView) row.getChildAt(dataColumn.columnIndex);
@@ -233,7 +224,7 @@ public void initializeHeight(int rowHeight, CellContentStyle cellContentStyle) {
         if(column.columnIndex < row.getChildCount()) {
           CellView cellView = (CellView) row.getChildAt(column.columnIndex);
           ClickableTextView clickableTextView = (ClickableTextView) cellView.content;
-          clickableTextView.setMaxLines(lines);
+          clickableTextView.setMaxLines(lines, column);
           clickableTextView.setGravity(column.textAlignment | Gravity.CENTER_VERTICAL);
           clickableTextView.requestLayout();
         }

android/src/main/java/com/qliktrialreactnativestraighttable/TextWrapper.java

@@ -65,7 +65,7 @@ void measureLineCountNoUpdate() {
   }
 
   protected int calculateLineCount() {
-    int width = column.width - additionalPadding;
+    int width = Math.max(column.width - textView.getPaddingRight() - textView.getPaddingLeft(), 0);
     measureTextPaint.setTypeface(textView.getTypeface());
     StaticLayout.Builder builder = StaticLayout.Builder.obtain(textView.getText(), 0, textView.getText().length(), measureTextPaint, width);
     builder.setIncludePad(true);
@@ -81,10 +81,16 @@ public int getMeasuredLinedCount() {
     return lineCount;
   }
 
-  public int setMaxLines(int maxLines) {
-    countWords(textView.getText().toString());
-    maxLines = wordCount > 1 ? maxLines : 1;
+  public int setMaxLines(int maxLines, DataColumn column) {
+    if(column.isDim) {
+      countWords(textView.getText().toString());
+      maxLines = wordCount > 1 ? maxLines : 1;
+    } else {
+      maxLines = 1;
+      wordCount = 1;
+    }
     return maxLines;
+
   }
 
   public void countWords(String text) {

android/src/main/java/com/qliktrialreactnativestraighttable/TotalsView.java

@@ -48,7 +48,7 @@ public int getMaxLineCount() {
 
     for(int i = 0; i < this.dataColumns.size(); i++) {
       TotalsViewCell totalsCell = (TotalsViewCell)this.getChildAt(i);
-      totalsCell.setMaxLines(lineCount);
+      totalsCell.setMaxLines(lineCount, dataColumns.get(i));
     }
     return lineCount;
   }

android/src/main/java/com/qliktrialreactnativestraighttable/TotalsViewCell.java

@@ -36,13 +36,15 @@ public void testTextWrap() {
     }
   }
 
-  @Override
-  public void setMaxLines(int maxLines) {
-    maxLines = textWrapper.setMaxLines(maxLines);
+  public void setMaxLines(int maxLines, DataColumn column) {
+    maxLines = textWrapper.setMaxLines(maxLines, column);
     super.setMaxLines(maxLines);
   }
 
   int getMeasuredLinedCount() {
+    if(column != null && !column.isDim) {
+      return 1;
+    }
     return textWrapper.getMeasuredLinedCount();
   }