From c2c1336a94bf777b96884b1b5ff5702bc25230e8 Mon Sep 17 00:00:00 2001
From: Savalek <def113@mail.ru>
Date: Thu, 31 May 2018 15:13:55 +0300
Subject: [PATCH 1/2] [ZEPPELIN-3510] ui-grid fix

---
 .../paragraph/result/display-table.css        | 12 ++++++-
 .../builtins/visualization-table.js           | 31 ++++++++++++++++---
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/zeppelin-web/src/app/notebook/paragraph/result/display-table.css b/zeppelin-web/src/app/notebook/paragraph/result/display-table.css
index 946210913bb..3dacf028387 100644
--- a/zeppelin-web/src/app/notebook/paragraph/result/display-table.css
+++ b/zeppelin-web/src/app/notebook/paragraph/result/display-table.css
@@ -34,10 +34,20 @@
 /** support `height: auto` for cells */
 .ui-grid-viewport .ui-grid-cell-contents {
   word-wrap: break-word;
-  white-space: normal !important;
+  white-space: pre-wrap !important;
   border-bottom: 1px solid #e8e8e8;
 }
 
+input[class *=coltuiGrid] {
+  white-space: pre-wrap !important;
+}
+
+.ui-grid-zeppelin-special-textarea {
+  width: -webkit-fill-available;
+  overflow: hidden;
+  resize: none;
+}
+
 .ui-grid-row, .ui-grid-cell {
   height: auto !important;
 }
diff --git a/zeppelin-web/src/app/visualization/builtins/visualization-table.js b/zeppelin-web/src/app/visualization/builtins/visualization-table.js
index 831bf95ccd6..c386f82a2f0 100644
--- a/zeppelin-web/src/app/visualization/builtins/visualization-table.js
+++ b/zeppelin-web/src/app/visualization/builtins/visualization-table.js
@@ -116,14 +116,24 @@ export default class TableVisualization extends Visualization {
           type: DefaultTableColumnType,
           cellTemplate: `
             <div ng-if="!grid.getCellValue(row, col).startsWith('%html')"
-                 class="ui-grid-cell-contents">
-              {{grid.getCellValue(row, col)}}
-            </div>
+                 class="ui-grid-cell-contents"><span>{{grid.getCellValue(row, col)}}</span></div>
             <div ng-if="grid.getCellValue(row, col).startsWith('%html')"
                  ng-bind-html="grid.getCellValue(row, col).split('%html')[1]"
                  class="ui-grid-cell-contents">
-            </div>
-          `,
+            </div>`,
+          editableCellTemplate:
+            `<div>
+               <form
+                 name="inputForm">
+                 <textarea
+                   class="ui-grid-zeppelin-special-textarea"
+                   type="INPUT_TYPE"
+                   ng-class="'colt' + col.uid"
+                   ui-grid-editor
+                   ng-model="MODEL_COL_FIELD" />
+               </form>
+             </div>
+             `,
           minWidth: this.getColumnMinWidth(colName),
           width: '*',
           sortingAlgorithm: function(a, b, row1, row2, sortType, gridCol) {
@@ -344,6 +354,17 @@ export default class TableVisualization extends Visualization {
       gridApi.colResizable.on.columnSizeChanged(scope, () => {
         self.persistConfigWithGridState(self.config);
       });
+      gridApi.edit.on.beginCellEdit(scope, function(rowEntity, colDef, triggerEvent) {
+        let textArea = triggerEvent.currentTarget.children[1].children[0].children[0];
+        textArea.style.height = textArea.scrollHeight + 'px';
+        textArea.addEventListener('keydown', function() {
+          let elem = this;
+          setTimeout(function() {
+            elem.style.height = 'auto';
+            elem.style.height = elem.scrollHeight + 'px';
+          });
+        }, 0);
+      });
 
       // pagination doesn't follow usual life-cycle in ui-grid v4.0.4
       // gridApi.pagination.on.paginationChanged(scope, () => { self.persistConfigWithGridState(self.config) })

From f4a2590d79eb6769f5400d3a786b7232113ebc88 Mon Sep 17 00:00:00 2001
From: Savalek <def113@mail.ru>
Date: Fri, 1 Jun 2018 10:42:17 +0300
Subject: [PATCH 2/2] [ZEPPELIN-3510] width fix

---
 .../src/app/notebook/paragraph/result/display-table.css         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zeppelin-web/src/app/notebook/paragraph/result/display-table.css b/zeppelin-web/src/app/notebook/paragraph/result/display-table.css
index 3dacf028387..8334f49a3a9 100644
--- a/zeppelin-web/src/app/notebook/paragraph/result/display-table.css
+++ b/zeppelin-web/src/app/notebook/paragraph/result/display-table.css
@@ -43,7 +43,7 @@ input[class *=coltuiGrid] {
 }
 
 .ui-grid-zeppelin-special-textarea {
-  width: -webkit-fill-available;
+  width: 100%;
   overflow: hidden;
   resize: none;
 }