@datorama/core 22.8.2-rc.2 → 22.9.2-rc.1

package/bundles/datorama-core.umd.js

@@ -14474,35 +14474,29 @@
         GridService.prototype.setGridSort = function (gridSort) {
             if (gridSort && this.api && this.api.grid.getDisplayedRowCount() > 0) {
                 var colId_1 = gridSort.colId, sort = gridSort.sort, sortIndex = gridSort.sortIndex;
-                var sortToApply = gridSort;
-                if (!isNil(sortIndex)) {
-                    var gridColumns = this.api.columns.getAllGridColumns();
-                    if (gridColumns) {
+                var gridColumns = this.api.columns.getAllGridColumns();
+                if (gridColumns) {
+                    var sortToApply = gridSort;
+                    /** Sort by column id */
+                    var columnById = gridColumns.find(function (col) {
+                        return (col.getColDef().showRowGroup || col.getColId()) === colId_1;
+                    });
+                    if (columnById) {
+                        sortToApply = { colId: columnById.getColId(), sort: sort };
+                    }
+                    else if (!isNil(sortIndex)) {
                         var valueColumns = this.api.columns.getValueColumns();
                         var valueColumn = valueColumns.find(function (col) { return col.getColId() === colId_1; });
                         var isPivotColId = colId_1.startsWith('pivot');
                         if (isPivotColId || valueColumn) {
                             /** Column is pivot value column, sort by index */
                             var columnByIndex = gridColumns[sortIndex];
-                            // const pivotValueColumn = columnByIndex && columnByIndex.getColDef().pivotValueColumn;
-                            // const pivotValueColumnId = pivotValueColumn && pivotValueColumn.getColId();
-                            // if (pivotValueColumnId === colId) {
                             sortToApply = { colId: columnByIndex.getColId(), sort: sort, sortIndex: sortIndex };
-                            // }
-                        }
-                        else {
-                            /** Sort by column id */
-                            var columnById = gridColumns.find(function (col) {
-                                return (col.getColDef().showRowGroup || col.getColId()) === colId_1;
-                            });
-                            if (columnById) {
-                                sortToApply = { colId: columnById.getColId(), sort: sort };
-                            }
                         }
                     }
+                    this.updateSettings({ sort: sortToApply });
+                    this.api.grid.setSortModel([sortToApply]);
                 }
-                this.updateSettings({ sort: sortToApply });
-                this.api.grid.setSortModel([sortToApply]);
             }
         };
         GridService.prototype.updateFilter = function (column, filter) {
@@ -21396,9 +21390,9 @@
             _this.format = 'html';
             _this.isOneLine = false;
             _this.initialValue = '';
-            _this.defaultPlugins = 'link fullscreen textcolor colorpicker image lists table textpattern autocomplete';
+            _this.defaultPlugins = 'link fullscreen image lists table autocomplete';
             _this.defaultToolbar = [
-                'fontselect fontsizeselect forecolor backcolor bold italic underline link',
+                'fontfamily fontsize forecolor backcolor bold italic underline link',
                 'alignleft aligncenter alignright alignjustify outdent indent | table numlist bullist  | image fullscreen'
             ];
             return _this;
@@ -21465,6 +21459,8 @@
                 min_width: 480,
                 menubar: false,
                 autocomplete: this.autocompleteOptions,
+                suffix: '.min',
+                skin: 'tinymce-5',
                 setup: function (editor) {
                     _this.editor = editor;
                     editor.on('init', function (e) {
@@ -25479,7 +25475,7 @@
         };
     }
 
-    window.coreVersion = '22.8.2-rc.';
+    window.coreVersion = '22.9.2-rc.';
 
     exports.APP_TRANSLATE = APP_TRANSLATE;
     exports.AceService = AceService;