handsontable 14.1.0 → 14.2.0-next-4873a35-20240228

package/utils/ghostTable.js

@@ -65,7 +65,7 @@ class GhostTable {
   /**
    * Add row.
    *
-   * @param {number} row Row index.
+   * @param {number} row Visual row index.
    * @param {Map} samples Samples Map object.
    */
   addRow(row, samples) {
@@ -112,7 +112,7 @@ class GhostTable {
   /**
    * Add column.
    *
-   * @param {number} column Column index.
+   * @param {number} column Visual column index.
    * @param {Map} samples A map with sampled table values.
    */
   addColumn(column, samples) {
@@ -244,7 +244,7 @@ class GhostTable {
   /**
    * Create table row element.
    *
-   * @param {number} row Row index.
+   * @param {number} row Visual row index.
    * @returns {DocumentFragment} Returns created table row elements.
    */
   createRow(row) {
@@ -312,7 +312,7 @@ class GhostTable {
   /**
    * Create table column elements.
    *
-   * @param {number} column Column index.
+   * @param {number} column Visual column index.
    * @returns {DocumentFragment} Returns created column table column elements.
    */
   createCol(column) {
@@ -392,10 +392,10 @@ class GhostTable {
     if (row >= 0 && column >= 0) {
       colspan = this.hot.getCellMeta(row, column).colspan;
     }
-    let width = this.hot.view._wt.wtTable.getStretchedColumnWidth(column);
+    let width = this.hot.getColWidth(column);
     if (colspan > 1) {
       for (let nextColumn = column + 1; nextColumn < column + colspan; nextColumn++) {
-        width += this.hot.view._wt.wtTable.getStretchedColumnWidth(nextColumn);
+        width += this.hot.getColWidth(nextColumn);
       }
     }
     col.style.width = `${width}px`;

package/utils/ghostTable.mjs

@@ -62,7 +62,7 @@ class GhostTable {
   /**
    * Add row.
    *
-   * @param {number} row Row index.
+   * @param {number} row Visual row index.
    * @param {Map} samples Samples Map object.
    */
   addRow(row, samples) {
@@ -109,7 +109,7 @@ class GhostTable {
   /**
    * Add column.
    *
-   * @param {number} column Column index.
+   * @param {number} column Visual column index.
    * @param {Map} samples A map with sampled table values.
    */
   addColumn(column, samples) {
@@ -241,7 +241,7 @@ class GhostTable {
   /**
    * Create table row element.
    *
-   * @param {number} row Row index.
+   * @param {number} row Visual row index.
    * @returns {DocumentFragment} Returns created table row elements.
    */
   createRow(row) {
@@ -309,7 +309,7 @@ class GhostTable {
   /**
    * Create table column elements.
    *
-   * @param {number} column Column index.
+   * @param {number} column Visual column index.
    * @returns {DocumentFragment} Returns created column table column elements.
    */
   createCol(column) {
@@ -389,10 +389,10 @@ class GhostTable {
     if (row >= 0 && column >= 0) {
       colspan = this.hot.getCellMeta(row, column).colspan;
     }
-    let width = this.hot.view._wt.wtTable.getStretchedColumnWidth(column);
+    let width = this.hot.getColWidth(column);
     if (colspan > 1) {
       for (let nextColumn = column + 1; nextColumn < column + colspan; nextColumn++) {
-        width += this.hot.view._wt.wtTable.getStretchedColumnWidth(nextColumn);
+        width += this.hot.getColWidth(nextColumn);
       }
     }
     col.style.width = `${width}px`;

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}`;
     });