v4.11.0

Author: marcelo-portugal

CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.11.0](https://github.com/angular-ui/ui-grid/compare/v4.10.3...v4.11.0) (2021-08-12)
+
+
+### Bug Fixes
+
+* 🐛 ensure viewport height cannot be negative ([a7111a1](https://github.com/angular-ui/ui-grid/commit/a7111a13b4c7d67068522881783925dedbacda88)), closes [#3034](https://github.com/angular-ui/ui-grid/issues/3034)
+
+
+### Features
+
+* 🎸 option to disable multi-column sorting ([c9abb8b](https://github.com/angular-ui/ui-grid/commit/c9abb8bab2101479b0498848b4a288c1ad7d17f9)), closes [#2913](https://github.com/angular-ui/ui-grid/issues/2913)
+* 🎸 the ability to disable hide columns on a grid level ([2dd1688](https://github.com/angular-ui/ui-grid/commit/2dd168859e03583cdc7e6ab671d146e343ae4275)), closes [#1604](https://github.com/angular-ui/ui-grid/issues/1604)
+
+
+
+
+
 ## [4.10.3](https://github.com/angular-ui/ui-grid/compare/v4.10.2...v4.10.3) (2021-08-01)
 
 

css/ui-grid.core.css

@@ -1,5 +1,5 @@
 /*!
- * ui-grid - v4.10.3 - 2021-08-01
+ * ui-grid - v4.11.0 - 2021-08-12
  * Copyright (c) 2021 ; License: MIT 
  */
 .ui-grid {

css/ui-grid.core.min.css

@@ -1,5 +1,5 @@
 /*!
- * ui-grid - v4.10.3 - 2021-08-01
+ * ui-grid - v4.11.0 - 2021-08-12
  * Copyright (c) 2021 ; License: MIT 
  */
 

i18n/ui-grid.auto-resize.js

@@ -1,5 +1,5 @@
 /*!
- * ui-grid - v4.10.3 - 2021-08-01
+ * ui-grid - v4.11.0 - 2021-08-12
  * Copyright (c) 2021 ; License: MIT 
  */
 

i18n/ui-grid.auto-resize.min.js

@@ -1,5 +1,5 @@
 /*!
- * ui-grid - v4.10.3 - 2021-08-01
+ * ui-grid - v4.11.0 - 2021-08-12
  * Copyright (c) 2021 ; License: MIT 
  */
 

i18n/ui-grid.cellnav.js

@@ -1,5 +1,5 @@
 /*!
- * ui-grid - v4.10.3 - 2021-08-01
+ * ui-grid - v4.11.0 - 2021-08-12
  * Copyright (c) 2021 ; License: MIT 
  */
 
@@ -423,6 +423,9 @@ function ( i18nService, uiGridConstants, gridUtil ) {
       $scope.$on( '$destroy', deregFunction );
     },
 
+    getGridOption: function( $scope, option ) {
+      return typeof($scope.grid) !== 'undefined' && $scope.grid && $scope.grid.options && $scope.grid.options[option];
+    },
 
     /**
      * @ngdoc boolean
@@ -440,7 +443,7 @@ function ( i18nService, uiGridConstants, gridUtil ) {
      *
      */
     sortable: function( $scope ) {
-      return Boolean( $scope.grid.options.enableSorting && typeof($scope.col) !== 'undefined' && $scope.col && $scope.col.enableSorting);
+      return Boolean( this.getGridOption($scope, 'enableSorting') && typeof($scope.col) !== 'undefined' && $scope.col && $scope.col.enableSorting);
     },
 
     /**
@@ -487,7 +490,12 @@ function ( i18nService, uiGridConstants, gridUtil ) {
      *
      */
     hideable: function( $scope ) {
-      return !(typeof($scope.col) !== 'undefined' && $scope.col && $scope.col.colDef && $scope.col.colDef.enableHiding === false );
+      return Boolean(
+        (this.getGridOption($scope, 'enableHiding') &&
+        typeof($scope.col) !== 'undefined' && $scope.col &&
+        ($scope.col.colDef && $scope.col.colDef.enableHiding !== false || !$scope.col.colDef)) ||
+        (!this.getGridOption($scope, 'enableHiding') && $scope.col && $scope.col.colDef && $scope.col.colDef.enableHiding)
+      );
     },
 
 
@@ -1938,17 +1946,10 @@ angular.module('ui.grid')
         return isColumnVisible(colDef) ? 'ui-grid-icon-ok' : 'ui-grid-icon-cancel';
       }
 
-      // add header for columns
-      showHideColumns.push({
-        title: i18nService.getSafeText('gridMenu.columns'),
-        order: 300,
-        templateUrl: 'ui-grid/ui-grid-menu-header-item'
-      });
-
       $scope.grid.options.gridMenuTitleFilter = $scope.grid.options.gridMenuTitleFilter ? $scope.grid.options.gridMenuTitleFilter : function( title ) { return title; };
 
       $scope.grid.options.columnDefs.forEach( function( colDef, index ) {
-        if ( colDef.enableHiding !== false ) {
+        if ( $scope.grid.options.enableHiding !== false && colDef.enableHiding !== false || colDef.enableHiding ) {
           // add hide menu item - shows an OK icon as we only show when column is already visible
           var menuItem = {
             icon: getColumnIcon(colDef),
@@ -1977,6 +1978,16 @@ angular.module('ui.grid')
           showHideColumns.push( menuItem );
         }
       });
+
+      // add header for columns
+      if ( showHideColumns.length ) {
+        showHideColumns.unshift({
+          title: i18nService.getSafeText('gridMenu.columns'),
+          order: 300,
+          templateUrl: 'ui-grid/ui-grid-menu-header-item'
+        });
+      }
+
       return showHideColumns;
     },
 
@@ -5523,7 +5534,7 @@ angular.module('ui.grid')
 
     // gridUtil.logDebug('viewPortHeight', viewPortHeight);
 
-    return viewPortHeight;
+    return viewPortHeight > 0 ? viewPortHeight : 0;
   };
 
   Grid.prototype.getViewportWidth = function getViewportWidth() {
@@ -5795,7 +5806,7 @@ angular.module('ui.grid')
       direction = directionOrAdd;
     }
 
-    if (!add) {
+    if (!add || (self.options && self.options.suppressMultiSort)) {
       self.resetColumnSorting(column);
       column.sort.priority = undefined;
       // Get the actual priority since there may be columns which have suppressRemoveSort set
@@ -8189,6 +8200,17 @@ angular.module('ui.grid')
        */
       baseOptions.scrollDebounce = typeof(baseOptions.scrollDebounce) !== "undefined" ? baseOptions.scrollDebounce : 300;
 
+      /**
+       * @ngdoc boolean
+       * @name enableHiding
+       * @propertyOf ui.grid.class:GridOptions
+       * @description True by default. When enabled, this setting adds ability to hide
+       * the column headers, allowing hiding of the column from the grid.
+       * Column hiding can then be disabled / enabled on individual columns using the columnDefs,
+       * if it set, it will override GridOptions enableHiding setting.
+       */
+      baseOptions.enableHiding = baseOptions.enableHiding !== false;
+
       /**
        * @ngdoc boolean
        * @name enableSorting
@@ -8200,6 +8222,16 @@ angular.module('ui.grid')
        */
       baseOptions.enableSorting = baseOptions.enableSorting !== false;
 
+      /**
+       * @ngdoc boolean
+       * @name suppressMultiSort
+       * @propertyOf ui.grid.class:GridOptions
+       * @description False by default. When enabled, this setting disables the ability
+       * to sort multiple columns by using the shift key or interacting with the column
+       * menu. Instead, each column sort will remove all other sorting.
+       */
+      baseOptions.suppressMultiSort = baseOptions.suppressMultiSort === true;
+
       /**
        * @ngdoc boolean
        * @name enableFiltering
@@ -8623,7 +8655,7 @@ angular.module('ui.grid')
 
     viewPortHeight = viewPortHeight + adjustment.height;
 
-    return viewPortHeight;
+    return viewPortHeight > 0 ? viewPortHeight : 0;
   };
 
   GridRenderContainer.prototype.getViewportWidth = function getViewportWidth() {

i18n/ui-grid.cellnav.min.js

@@ -1,5 +1,5 @@
 /*!
- * ui-grid - v4.10.3 - 2021-08-01
+ * ui-grid - v4.11.0 - 2021-08-12
  * Copyright (c) 2021 ; License: MIT 
  */