fix(Grid): Avoid too-early header height calc

renderContainers with no canvasWidth were having their heights calculated.
If their columns were wrapping around it would mean too large of a height
on that renderContainer, and thus would be propogated to ALL the other
containers (i.e. pinned containers).

Author: c0bra

src/features/cellnav/js/cellnav.js

@@ -745,8 +745,8 @@
    *  @restrict A
    *  @description Stacks on top of ui.grid.uiGridCell to provide cell navigation
    */
-  module.directive('uiGridCell', ['$timeout', 'uiGridCellNavService', 'gridUtil', 'uiGridCellNavConstants', 'uiGridConstants',
-    function ($timeout, uiGridCellNavService, gridUtil, uiGridCellNavConstants, uiGridConstants) {
+  module.directive('uiGridCell', ['$timeout', '$document', 'uiGridCellNavService', 'gridUtil', 'uiGridCellNavConstants', 'uiGridConstants',
+    function ($timeout, $document, uiGridCellNavService, gridUtil, uiGridCellNavConstants, uiGridConstants) {
       return {
         priority: -150, // run after default uiGridCell directive and ui.grid.edit uiGridCell
         restrict: 'A',
@@ -772,7 +772,12 @@
               rowCol.col === $scope.col) {
               setFocused();
 
-              if (rowCol.hasOwnProperty('eventType') && rowCol.eventType === uiGridCellNavConstants.EVENT_TYPE.KEYDOWN) {
+              if (
+                // This cellNav event came from a keydown event so we can safely refocus
+                (rowCol.hasOwnProperty('eventType') && rowCol.eventType === uiGridCellNavConstants.EVENT_TYPE.KEYDOWN)
+                // The focus has gone to the body element, because we've probably wrapped around
+                // ($document.activeElement === $document.body)
+              ) {
                 $elm.find('div')[0].focus();
               }
             }

src/features/edit/js/gridEdit.js

@@ -394,7 +394,6 @@
               $elm.on('keydown', beginEditKeyDown);
               if ($scope.col.colDef.enableCellEditOnFocus) {
                 $elm.find('div').on('focus', beginEditFocus);
-                // $elm.find('div').on('click', beginEditFocus);
               }
             }
 
@@ -403,7 +402,6 @@
               $elm.off('keydown', beginEditKeyDown);
               if ($scope.col.colDef.enableCellEditOnFocus) {
                 $elm.find('div').off('focus', beginEditFocus);
-                // $elm.find('div').off('click', beginEditFocus);
               }
             }
 
@@ -418,6 +416,9 @@
               beginEdit();
             }
 
+            // If the cellNagv module is installed and we can get the uiGridCellNavConstants value injected,
+            //   then if the column has enableCellEditOnFocus set to true, we need to listen for cellNav events
+            //   to this cell and start editing when the "focus" reaches us
             try {
               var uiGridCellNavConstants = $injector.get('uiGridCellNavConstants');
 
@@ -512,6 +513,7 @@
              * 
              */
             function beginEdit() {
+              // If we are already editing, then just skip this so we don't try editing twice...
               if (inEdit) {
                 return;
               }

src/js/core/factories/Grid.js

@@ -1235,6 +1235,7 @@ angular.module('ui.grid')
    */
   Grid.prototype.queueRefresh = function queueRefresh() {
     var self = this;
+
     if (self.refreshCanceller) {
       $timeout.cancel(self.refreshCanceller);
     }
@@ -1598,7 +1599,7 @@ angular.module('ui.grid')
    * 
    */
   Grid.prototype.refresh = function refresh() {
-    // gridUtil.logDebug('grid refresh');
+    gridUtil.logDebug('grid refresh');
 
     var self = this;
 
@@ -1664,6 +1665,11 @@ angular.module('ui.grid')
       if (self.renderContainers.hasOwnProperty(containerId)) {
         var container = self.renderContainers[containerId];
 
+        // Skip containers that have no canvasWidth set yet
+        if (container.canvasWidth === null || isNaN(container.canvasWidth)) {
+          continue;
+        }
+
         if (container.header) {
           containerHeadersToRecalc.push(container);
         }
@@ -1684,6 +1690,11 @@ angular.module('ui.grid')
         for (i = 0; i < containerHeadersToRecalc.length; i++) {
           container = containerHeadersToRecalc[i];
 
+          // Skip containers that have no canvasWidth set yet
+          if (container.canvasWidth === null || isNaN(container.canvasWidth)) {
+            continue;
+          }
+
           if (container.header) {
             var oldHeaderHeight = container.headerHeight;
             var headerHeight = gridUtil.outerElementHeight(container.header);