handsontable 0.0.0-next-f3514b0-20240124 → 0.0.0-next-0146b3f-20240129

package/editors/checkboxEditor/checkboxEditor.js

@@ -14,11 +14,12 @@ class CheckboxEditor extends _baseEditor.BaseEditor {
     return EDITOR_TYPE;
   }
   beginEditing(initialValue, event) {
-    // Just some events connected with checkbox editor are delegated here. Some `keydown` events like `enter` and `space` key press
-    // are handled inside `checkboxRenderer`. Some events come here from `editorManager`. Below `if` statement was created by author
-    // for purpose of handling only `doubleclick` event which may be done on a cell with checkbox.
+    // Just some events connected with the checkbox editor are delegated here. Some `keydown` events like `enter` and
+    // `space` key presses are handled inside `checkboxRenderer`. Some events come here from `editorManager`. The below
+    // `if` statement was created by the author for the purpose of handling only the `doubleclick` event on the TD
+    // element with a checkbox.
 
-    if (event && event.type === 'mouseup') {
+    if (event && event.type === 'mouseup' && event.target.nodeName === 'TD') {
       const checkbox = this.TD.querySelector('input[type="checkbox"]');
       if (!(0, _element.hasClass)(checkbox, 'htBadValue')) {
         checkbox.click();

package/editors/checkboxEditor/checkboxEditor.mjs

@@ -11,11 +11,12 @@ export class CheckboxEditor extends BaseEditor {
     return EDITOR_TYPE;
   }
   beginEditing(initialValue, event) {
-    // Just some events connected with checkbox editor are delegated here. Some `keydown` events like `enter` and `space` key press
-    // are handled inside `checkboxRenderer`. Some events come here from `editorManager`. Below `if` statement was created by author
-    // for purpose of handling only `doubleclick` event which may be done on a cell with checkbox.
+    // Just some events connected with the checkbox editor are delegated here. Some `keydown` events like `enter` and
+    // `space` key presses are handled inside `checkboxRenderer`. Some events come here from `editorManager`. The below
+    // `if` statement was created by the author for the purpose of handling only the `doubleclick` event on the TD
+    // element with a checkbox.
 
-    if (event && event.type === 'mouseup') {
+    if (event && event.type === 'mouseup' && event.target.nodeName === 'TD') {
       const checkbox = this.TD.querySelector('input[type="checkbox"]');
       if (!hasClass(checkbox, 'htBadValue')) {
         checkbox.click();

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-f3514b0-20240124";
+  const hotVersion = "0.0.0-next-0146b3f-20240129";
   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-f3514b0-20240124";
+  const hotVersion = "0.0.0-next-0146b3f-20240129";
   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-f3514b0-20240124",
+  "version": "0.0.0-next-0146b3f-20240129",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/plugins/undoRedo/undoRedo.js

@@ -132,12 +132,6 @@ function UndoRedo(instance) {
     }
     plugin.done(() => new UndoRedo.RowMoveAction(rows, finalIndex));
   });
-  instance.addHook('beforeColumnMove', (columns, finalIndex) => {
-    if (columns === false) {
-      return;
-    }
-    plugin.done(() => new UndoRedo.ColumnMoveAction(columns, finalIndex));
-  });
   instance.addHook('beforeMergeCells', (cellRange, auto) => {
     if (auto) {
       return;
@@ -720,15 +714,15 @@ UndoRedo.UnmergeCellsAction = UnmergeCellsAction;
  */
 UndoRedo.RowMoveAction = function (rows, finalIndex) {
   this.rows = rows.slice();
-  this.finalRowIndex = finalIndex;
+  this.finalIndex = finalIndex;
   this.actionType = 'row_move';
 };
 (0, _object.inherit)(UndoRedo.RowMoveAction, UndoRedo.Action);
 UndoRedo.RowMoveAction.prototype.undo = function (instance, undoneCallback) {
   const manualRowMove = instance.getPlugin('manualRowMove');
   const copyOfRows = [].concat(this.rows);
-  const rowsMovedUp = copyOfRows.filter(a => a > this.finalRowIndex);
-  const rowsMovedDown = copyOfRows.filter(a => a <= this.finalRowIndex);
+  const rowsMovedUp = copyOfRows.filter(a => a > this.finalIndex);
+  const rowsMovedDown = copyOfRows.filter(a => a <= this.finalIndex);
   const allMovedRows = rowsMovedUp.sort((a, b) => b - a).concat(rowsMovedDown.sort((a, b) => a - b));
   instance.addHookOnce('afterViewRender', undoneCallback);
 
@@ -745,50 +739,10 @@ UndoRedo.RowMoveAction.prototype.undo = function (instance, undoneCallback) {
 UndoRedo.RowMoveAction.prototype.redo = function (instance, redoneCallback) {
   const manualRowMove = instance.getPlugin('manualRowMove');
   instance.addHookOnce('afterViewRender', redoneCallback);
-  manualRowMove.moveRows(this.rows.slice(), this.finalRowIndex);
-  instance.render();
-  instance.deselectCell();
-  instance.selectRows(this.finalRowIndex, this.finalRowIndex + this.rows.length - 1);
-};
-
-/**
- * ManualColumnMove action.
- *
- * @private
- * @param {number[]} columns An array with moved columns.
- * @param {number} finalIndex The destination index.
- */
-UndoRedo.ColumnMoveAction = function (columns, finalIndex) {
-  this.columns = columns.slice();
-  this.finalColumnIndex = finalIndex;
-  this.actionType = 'col_move';
-};
-(0, _object.inherit)(UndoRedo.ColumnMoveAction, UndoRedo.Action);
-UndoRedo.ColumnMoveAction.prototype.undo = function (instance, undoneCallback) {
-  const manualColumnMove = instance.getPlugin('manualColumnMove');
-  const copyOfColumns = [].concat(this.columns);
-  const columnsMovedLeft = copyOfColumns.filter(a => a > this.finalColumnIndex);
-  const rowsMovedRight = copyOfColumns.filter(a => a <= this.finalColumnIndex);
-  const allMovedColumns = columnsMovedLeft.sort((a, b) => b - a).concat(rowsMovedRight.sort((a, b) => a - b));
-  instance.addHookOnce('afterViewRender', undoneCallback);
-
-  // Moving columns from those with higher indexes to those with lower indexes when action was performed from right to left
-  // Moving columns from those with lower indexes to those with higher indexes when action was performed from left to right
-  for (let i = 0; i < allMovedColumns.length; i += 1) {
-    const newPhysicalColumn = instance.toVisualColumn(allMovedColumns[i]);
-    manualColumnMove.moveColumn(newPhysicalColumn, allMovedColumns[i]);
-  }
-  instance.render();
-  instance.deselectCell();
-  instance.selectColumns(this.columns[0], this.columns[0] + this.columns.length - 1);
-};
-UndoRedo.ColumnMoveAction.prototype.redo = function (instance, redoneCallback) {
-  const manualColumnMove = instance.getPlugin('manualColumnMove');
-  instance.addHookOnce('afterViewRender', redoneCallback);
-  manualColumnMove.moveColumns(this.columns.slice(), this.finalColumnIndex);
+  manualRowMove.moveRows(this.rows.slice(), this.finalIndex);
   instance.render();
   instance.deselectCell();
-  instance.selectColumns(this.finalColumnIndex, this.finalColumnIndex + this.columns.length - 1);
+  instance.selectRows(this.finalIndex, this.finalIndex + this.rows.length - 1);
 };
 
 /**

package/plugins/undoRedo/undoRedo.mjs

@@ -128,12 +128,6 @@ function UndoRedo(instance) {
     }
     plugin.done(() => new UndoRedo.RowMoveAction(rows, finalIndex));
   });
-  instance.addHook('beforeColumnMove', (columns, finalIndex) => {
-    if (columns === false) {
-      return;
-    }
-    plugin.done(() => new UndoRedo.ColumnMoveAction(columns, finalIndex));
-  });
   instance.addHook('beforeMergeCells', (cellRange, auto) => {
     if (auto) {
       return;
@@ -716,15 +710,15 @@ UndoRedo.UnmergeCellsAction = UnmergeCellsAction;
  */
 UndoRedo.RowMoveAction = function (rows, finalIndex) {
   this.rows = rows.slice();
-  this.finalRowIndex = finalIndex;
+  this.finalIndex = finalIndex;
   this.actionType = 'row_move';
 };
 inherit(UndoRedo.RowMoveAction, UndoRedo.Action);
 UndoRedo.RowMoveAction.prototype.undo = function (instance, undoneCallback) {
   const manualRowMove = instance.getPlugin('manualRowMove');
   const copyOfRows = [].concat(this.rows);
-  const rowsMovedUp = copyOfRows.filter(a => a > this.finalRowIndex);
-  const rowsMovedDown = copyOfRows.filter(a => a <= this.finalRowIndex);
+  const rowsMovedUp = copyOfRows.filter(a => a > this.finalIndex);
+  const rowsMovedDown = copyOfRows.filter(a => a <= this.finalIndex);
   const allMovedRows = rowsMovedUp.sort((a, b) => b - a).concat(rowsMovedDown.sort((a, b) => a - b));
   instance.addHookOnce('afterViewRender', undoneCallback);
 
@@ -741,50 +735,10 @@ UndoRedo.RowMoveAction.prototype.undo = function (instance, undoneCallback) {
 UndoRedo.RowMoveAction.prototype.redo = function (instance, redoneCallback) {
   const manualRowMove = instance.getPlugin('manualRowMove');
   instance.addHookOnce('afterViewRender', redoneCallback);
-  manualRowMove.moveRows(this.rows.slice(), this.finalRowIndex);
-  instance.render();
-  instance.deselectCell();
-  instance.selectRows(this.finalRowIndex, this.finalRowIndex + this.rows.length - 1);
-};
-
-/**
- * ManualColumnMove action.
- *
- * @private
- * @param {number[]} columns An array with moved columns.
- * @param {number} finalIndex The destination index.
- */
-UndoRedo.ColumnMoveAction = function (columns, finalIndex) {
-  this.columns = columns.slice();
-  this.finalColumnIndex = finalIndex;
-  this.actionType = 'col_move';
-};
-inherit(UndoRedo.ColumnMoveAction, UndoRedo.Action);
-UndoRedo.ColumnMoveAction.prototype.undo = function (instance, undoneCallback) {
-  const manualColumnMove = instance.getPlugin('manualColumnMove');
-  const copyOfColumns = [].concat(this.columns);
-  const columnsMovedLeft = copyOfColumns.filter(a => a > this.finalColumnIndex);
-  const rowsMovedRight = copyOfColumns.filter(a => a <= this.finalColumnIndex);
-  const allMovedColumns = columnsMovedLeft.sort((a, b) => b - a).concat(rowsMovedRight.sort((a, b) => a - b));
-  instance.addHookOnce('afterViewRender', undoneCallback);
-
-  // Moving columns from those with higher indexes to those with lower indexes when action was performed from right to left
-  // Moving columns from those with lower indexes to those with higher indexes when action was performed from left to right
-  for (let i = 0; i < allMovedColumns.length; i += 1) {
-    const newPhysicalColumn = instance.toVisualColumn(allMovedColumns[i]);
-    manualColumnMove.moveColumn(newPhysicalColumn, allMovedColumns[i]);
-  }
-  instance.render();
-  instance.deselectCell();
-  instance.selectColumns(this.columns[0], this.columns[0] + this.columns.length - 1);
-};
-UndoRedo.ColumnMoveAction.prototype.redo = function (instance, redoneCallback) {
-  const manualColumnMove = instance.getPlugin('manualColumnMove');
-  instance.addHookOnce('afterViewRender', redoneCallback);
-  manualColumnMove.moveColumns(this.columns.slice(), this.finalColumnIndex);
+  manualRowMove.moveRows(this.rows.slice(), this.finalIndex);
   instance.render();
   instance.deselectCell();
-  instance.selectColumns(this.finalColumnIndex, this.finalColumnIndex + this.columns.length - 1);
+  instance.selectRows(this.finalIndex, this.finalIndex + this.rows.length - 1);
 };
 
 /**

package/utils/parseTable.js

@@ -5,6 +5,7 @@ exports._dataToHTML = _dataToHTML;
 exports.htmlToGridSettings = htmlToGridSettings;
 exports.instanceToHTML = instanceToHTML;
 require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.string.replace-all.js");
 var _mixed = require("./../helpers/mixed");
 const ESCAPED_HTML_CHARS = {
   ' ': '\x20',
@@ -140,7 +141,14 @@ function htmlToGridSettings(element) {
   if (typeof checkElement === 'string') {
     const escapedAdjacentHTML = checkElement.replace(/<td\b[^>]*?>([\s\S]*?)<\/\s*td>/g, cellFragment => {
       const openingTag = cellFragment.match(/<td\b[^>]*?>/g)[0];
-      const cellValue = cellFragment.substring(openingTag.length, cellFragment.lastIndexOf('<')).replace(/(<(?!br)([^>]+)>)/gi, '');
+      const paragraphRegexp = /<p.*?>/g;
+      const cellValue = cellFragment.substring(openingTag.length, cellFragment.lastIndexOf('<')).trim() // Removing whitespaces from the start and the end of HTML fragment
+      .replaceAll(/\n\s+/g, ' ') // HTML tags may be split using multiple new lines and whitespaces
+      .replaceAll(paragraphRegexp, '\n') // Only paragraphs should split text using new line characters
+      .replace('\n', '') // First paragraph shouldn't start with new line characters
+      .replaceAll(/<\/(.*)>\s+$/mg, '</$1>') // HTML tags may end with whitespace.
+      .replace(/(<(?!br)([^>]+)>)/gi, '') // Removing HTML tags
+      .replaceAll(/^&nbsp;$/mg, ''); // Removing single &nbsp; characters separating new lines
       const closingTag = '</td>';
       return `${openingTag}${cellValue}${closingTag}`;
     });

package/utils/parseTable.mjs

@@ -1,4 +1,5 @@
 import "core-js/modules/es.array.push.js";
+import "core-js/modules/es.string.replace-all.js";
 import { isEmpty } from "./../helpers/mixed.mjs";
 const ESCAPED_HTML_CHARS = {
   ' ': '\x20',
@@ -134,7 +135,14 @@ export function htmlToGridSettings(element) {
   if (typeof checkElement === 'string') {
     const escapedAdjacentHTML = checkElement.replace(/<td\b[^>]*?>([\s\S]*?)<\/\s*td>/g, cellFragment => {
       const openingTag = cellFragment.match(/<td\b[^>]*?>/g)[0];
-      const cellValue = cellFragment.substring(openingTag.length, cellFragment.lastIndexOf('<')).replace(/(<(?!br)([^>]+)>)/gi, '');
+      const paragraphRegexp = /<p.*?>/g;
+      const cellValue = cellFragment.substring(openingTag.length, cellFragment.lastIndexOf('<')).trim() // Removing whitespaces from the start and the end of HTML fragment
+      .replaceAll(/\n\s+/g, ' ') // HTML tags may be split using multiple new lines and whitespaces
+      .replaceAll(paragraphRegexp, '\n') // Only paragraphs should split text using new line characters
+      .replace('\n', '') // First paragraph shouldn't start with new line characters
+      .replaceAll(/<\/(.*)>\s+$/mg, '</$1>') // HTML tags may end with whitespace.
+      .replace(/(<(?!br)([^>]+)>)/gi, '') // Removing HTML tags
+      .replaceAll(/^&nbsp;$/mg, ''); // Removing single &nbsp; characters separating new lines
       const closingTag = '</td>';
       return `${openingTag}${cellValue}${closingTag}`;
     });