handsontable 0.0.0-next-deccb4d-20240618 → 0.0.0-next-fcd6191-20240619

package/helpers/mixed.js

@@ -134,7 +134,7 @@ const domMessages = {
 function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "0.0.0-next-deccb4d-20240618";
+  const hotVersion = "0.0.0-next-fcd6191-20240619";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/helpers/mixed.mjs

@@ -124,7 +124,7 @@ const domMessages = {
 export function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "0.0.0-next-deccb4d-20240618";
+  const hotVersion = "0.0.0-next-fcd6191-20240619";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/handsontable/handsontable/issues"
   },
   "author": "Handsoncode <hello@handsontable.com>",
-  "version": "0.0.0-next-deccb4d-20240618",
+  "version": "0.0.0-next-fcd6191-20240619",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/plugins/columnSorting/columnSorting.js

@@ -199,6 +199,7 @@ class ColumnSorting extends _base.BasePlugin {
       if (this.indexesSequenceCache !== null) {
         this.hot.rowIndexMapper.setIndexesSequence(this.indexesSequenceCache.getValues());
         this.hot.rowIndexMapper.unregisterMap(this.pluginKey);
+        this.indexesSequenceCache = null;
       }
     }, true);
     this.hot.columnIndexMapper.unregisterMap(`${this.pluginKey}.columnMeta`);
@@ -586,8 +587,8 @@ class ColumnSorting extends _base.BasePlugin {
    * @private
    */
   sortByPresetSortStates(sortConfigs) {
+    this.hot.rowIndexMapper.setIndexesSequence(this.indexesSequenceCache.getValues());
     if (sortConfigs.length === 0) {
-      this.hot.rowIndexMapper.setIndexesSequence(this.indexesSequenceCache.getValues());
       return;
     }
     const indexesWithData = [];

package/plugins/columnSorting/columnSorting.mjs

@@ -195,6 +195,7 @@ export class ColumnSorting extends BasePlugin {
       if (this.indexesSequenceCache !== null) {
         this.hot.rowIndexMapper.setIndexesSequence(this.indexesSequenceCache.getValues());
         this.hot.rowIndexMapper.unregisterMap(this.pluginKey);
+        this.indexesSequenceCache = null;
       }
     }, true);
     this.hot.columnIndexMapper.unregisterMap(`${this.pluginKey}.columnMeta`);
@@ -582,8 +583,8 @@ export class ColumnSorting extends BasePlugin {
    * @private
    */
   sortByPresetSortStates(sortConfigs) {
+    this.hot.rowIndexMapper.setIndexesSequence(this.indexesSequenceCache.getValues());
     if (sortConfigs.length === 0) {
-      this.hot.rowIndexMapper.setIndexesSequence(this.indexesSequenceCache.getValues());
       return;
     }
     const indexesWithData = [];

package/plugins/multiColumnSorting/multiColumnSorting.js

@@ -104,6 +104,7 @@ class MultiColumnSorting extends _columnSorting.ColumnSorting {
   enablePlugin() {
     if (!this.enabled && this.hot.getSettings()[this.pluginKey] && this.hot.getSettings()[CONFLICTED_PLUGIN_KEY]) {
       (0, _utils2.warnAboutPluginsConflict)();
+      this.hot.getPlugin(CONFLICTED_PLUGIN_KEY).disablePlugin();
     }
     super.enablePlugin();
   }

package/plugins/multiColumnSorting/multiColumnSorting.mjs

@@ -101,6 +101,7 @@ export class MultiColumnSorting extends ColumnSorting {
   enablePlugin() {
     if (!this.enabled && this.hot.getSettings()[this.pluginKey] && this.hot.getSettings()[CONFLICTED_PLUGIN_KEY]) {
       warnAboutPluginsConflict();
+      this.hot.getPlugin(CONFLICTED_PLUGIN_KEY).disablePlugin();
     }
     super.enablePlugin();
   }

package/plugins/multiColumnSorting/utils.js

@@ -9,5 +9,5 @@ var _templateLiteralTag = require("../../helpers/templateLiteralTag");
  */
 function warnAboutPluginsConflict() {
   (0, _console.warn)((0, _templateLiteralTag.toSingleLine)`Plugins \`columnSorting\` and \`multiColumnSorting\` should not be enabled simultaneously. 
-    Only \`multiColumnSorting\` will work.`);
+    Only \`multiColumnSorting\` will work. The \`columnSorting\` plugin will be disabled.`);
 }

package/plugins/multiColumnSorting/utils.mjs

@@ -5,5 +5,5 @@ import { toSingleLine } from "../../helpers/templateLiteralTag.mjs";
  */
 export function warnAboutPluginsConflict() {
   warn(toSingleLine`Plugins \`columnSorting\` and \`multiColumnSorting\` should not be enabled simultaneously. 
-    Only \`multiColumnSorting\` will work.`);
+    Only \`multiColumnSorting\` will work. The \`columnSorting\` plugin will be disabled.`);
 }

package/plugins/undoRedo/undoRedo.js

@@ -151,6 +151,12 @@ function UndoRedo(instance) {
     }
     plugin.done(() => new UndoRedo.UnmergeCellsAction(instance, cellRange));
   });
+  instance.addHook('beforeColumnSort', (currentSortConfig, destinationSortConfigs, sortPossible) => {
+    if (!sortPossible) {
+      return;
+    }
+    plugin.done(() => new UndoRedo.ColumnSortAction(currentSortConfig, destinationSortConfigs));
+  });
 
   // TODO: Why this callback is needed? One test doesn't pass after calling method right after plugin creation (outside the callback).
   instance.addHook('afterInit', () => {
@@ -792,6 +798,37 @@ UndoRedo.ColumnMoveAction.prototype.redo = function (instance, redoneCallback) {
   instance.selectColumns(this.finalColumnIndex, this.finalColumnIndex + this.columns.length - 1);
 };
 
+/**
+ * ColumnSort action.
+ *
+ * @private
+ * @param {Array} currentSortState The current sort state.
+ * @param {Array} newSortState The new sort state.
+ */
+UndoRedo.ColumnSortAction = function (currentSortState, newSortState) {
+  this.previousSortState = currentSortState;
+  this.nextSortState = newSortState;
+};
+(0, _object.inherit)(UndoRedo.ColumnSortAction, UndoRedo.Action);
+UndoRedo.ColumnSortAction.prototype.undo = function (instance, undoneCallback) {
+  const sortPlugin = instance.getPlugin('columnSorting');
+  const multiSortPlugin = instance.getPlugin('multiColumnSorting');
+  const enabledSortPlugin = multiSortPlugin.isEnabled() ? multiSortPlugin : sortPlugin;
+  if (this.previousSortState.length) {
+    enabledSortPlugin.sort(this.previousSortState);
+  } else {
+    enabledSortPlugin.clearSort();
+  }
+  undoneCallback();
+};
+UndoRedo.ColumnSortAction.prototype.redo = function (instance, redoneCallback) {
+  const sortPlugin = instance.getPlugin('columnSorting');
+  const multiSortPlugin = instance.getPlugin('multiColumnSorting');
+  const enabledSortPlugin = multiSortPlugin.isEnabled() ? multiSortPlugin : sortPlugin;
+  enabledSortPlugin.sort(this.nextSortState);
+  redoneCallback();
+};
+
 /**
  * Enabling and disabling plugin and attaching its to an instance.
  *

package/plugins/undoRedo/undoRedo.mjs

@@ -147,6 +147,12 @@ function UndoRedo(instance) {
     }
     plugin.done(() => new UndoRedo.UnmergeCellsAction(instance, cellRange));
   });
+  instance.addHook('beforeColumnSort', (currentSortConfig, destinationSortConfigs, sortPossible) => {
+    if (!sortPossible) {
+      return;
+    }
+    plugin.done(() => new UndoRedo.ColumnSortAction(currentSortConfig, destinationSortConfigs));
+  });
 
   // TODO: Why this callback is needed? One test doesn't pass after calling method right after plugin creation (outside the callback).
   instance.addHook('afterInit', () => {
@@ -788,6 +794,37 @@ UndoRedo.ColumnMoveAction.prototype.redo = function (instance, redoneCallback) {
   instance.selectColumns(this.finalColumnIndex, this.finalColumnIndex + this.columns.length - 1);
 };
 
+/**
+ * ColumnSort action.
+ *
+ * @private
+ * @param {Array} currentSortState The current sort state.
+ * @param {Array} newSortState The new sort state.
+ */
+UndoRedo.ColumnSortAction = function (currentSortState, newSortState) {
+  this.previousSortState = currentSortState;
+  this.nextSortState = newSortState;
+};
+inherit(UndoRedo.ColumnSortAction, UndoRedo.Action);
+UndoRedo.ColumnSortAction.prototype.undo = function (instance, undoneCallback) {
+  const sortPlugin = instance.getPlugin('columnSorting');
+  const multiSortPlugin = instance.getPlugin('multiColumnSorting');
+  const enabledSortPlugin = multiSortPlugin.isEnabled() ? multiSortPlugin : sortPlugin;
+  if (this.previousSortState.length) {
+    enabledSortPlugin.sort(this.previousSortState);
+  } else {
+    enabledSortPlugin.clearSort();
+  }
+  undoneCallback();
+};
+UndoRedo.ColumnSortAction.prototype.redo = function (instance, redoneCallback) {
+  const sortPlugin = instance.getPlugin('columnSorting');
+  const multiSortPlugin = instance.getPlugin('multiColumnSorting');
+  const enabledSortPlugin = multiSortPlugin.isEnabled() ? multiSortPlugin : sortPlugin;
+  enabledSortPlugin.sort(this.nextSortState);
+  redoneCallback();
+};
+
 /**
  * Enabling and disabling plugin and attaching its to an instance.
  *