edit cell wip

src/regrid.js

@@ -3,6 +3,7 @@ import {
   getBodyHTML,
   getRowHTML,
   getColumnHTML,
+  getEditCellHTML,
   prepareRowHeader,
   prepareRows,
   getDefault,
@@ -256,46 +257,57 @@ export default class ReGrid {
 
     this.setBodyWidth();
 
-    this.setStyle(
+    this.setStyle('.data-table .body-scrollable', {
-      '.data-table .body-scrollable',
+      'margin-top': (this.header.height() + 1) + 'px'
-      `margin-top: ${this.header.height() + 1}px;`
+    });
-    );
+
+    // hide edit cells by default
+    this.setStyle('.data-table .body-scrollable .edit-cell', {
+      display: 'none'
+    });
 
     this.bodyScrollable.find('.table').css('margin', 0);
   }
 
   bindEditCell() {
-    const { events } = this;
+    const self = this;
     const $editPopup = this.wrapper.find('.edit-popup');
 
     $editPopup.hide();
-    if (!events.on_cell_doubleclick) return;
+    // if (!self.events.onCellEdit) return;
 
     this.bodyScrollable.on('dblclick', '.data-table-col', function () {
       const $cell = $(this);
       const rowIndex = $cell.attr('data-row-index');
       const colIndex = $cell.attr('data-col-index');
+      const $editCell = $cell.find('.edit-cell');
 
-      $editPopup.empty();
+      const cell = self.getCell(rowIndex, colIndex);
-      const { top, left } = $cell.position();
 
-      $editPopup.css({
+      $editCell.find('input').val(cell.content);
-        top: top - 12,
+      // $editPopup.html(getEditCellHTML(cellValue.content));
-        left: left - 12
+
-      });
+      const width = $cell.find('.content').width() + 1;
+      const height = $cell.find('.content').height() + 1;
+
+      const selector = `.data-table .body-scrollable [data-row-index="${rowIndex}"][data-row-index="${rowIndex}"] .edit-cell`;
+
+      self.setStyle(selector, { width, height });
+      $editCell.show();
+      $editCell.find('input').select();
 
       // showing the popup is the responsibility of event handler
-      events.on_cell_doubleclick(
+      // self.events.onCellEdit(
-        $cell.get(0),
+      //   $cell.get(0),
-        $editPopup,
+      //   $editPopup,
-        rowIndex,
+      //   rowIndex,
-        colIndex
+      //   colIndex
-      );
+      // );
     });
 
     $(document.body).on('click', e => {
-      if ($(e.target).is('.edit-popup, .edit-popup *')) return;
+      if ($(e.target).is('.edit-cell, .edit-cell *')) return;
-      $editPopup.hide();
+      self.bodyScrollable.find('.edit-cell').hide();
     });
   }
 
@@ -404,17 +416,15 @@ export default class ReGrid {
   }
 
   setColumnWidth(colIndex, width) {
-    this.setStyle(
+    this.setStyle(`[data-col-index="${colIndex}"] .content`, {
-      `[data-col-index="${colIndex}"] .content`,
+      width: width + 'px'
-      `width: ${width}px;`
+    });
-    );
   }
 
   setRowHeight(rowIndex, height) {
-    self.setStyle(
+    this.setStyle(`[data-row-index="${rowIndex}"] .content`, {
-      `[data-row-index="${rowIndex}"] .content`,
+      height: height + 'px'
-      `width: ${height}px;`
+    });
-    );
   }
 
   setColumnHeaderWidth(colIndex, width) {
@@ -463,38 +473,60 @@ export default class ReGrid {
     );
   }
 
-  setStyle(rule, style) {
+  setStyle(rule, styleMap) {
     this.getStyleEl();
-
+    const self = this;
     let styles = this.$style.text();
     const rulePatternStr = `${escapeRegExp(rule)} {([^}]*)}`;
     const rulePattern = new RegExp(rulePatternStr, 'g');
 
     if (styles.match(rulePattern)) {
       // rules exists, append/replace properties
-      const property = style.split(':')[0];
-      const propPattern = new RegExp(`${escapeRegExp(property)}[^;]*;`);
 
-      styles = styles.replace(rulePattern, function (match, propertyStr) {
+      for (const property in styleMap) {
-        if (propertyStr.match(propPattern)) {
+        const value = styleMap[property];
-          // property exists, replace with empty string
-          propertyStr = propertyStr.replace(propPattern, '');
-        }
-        propertyStr = propertyStr.trim();
 
-        const replacer =
+        const propPattern = new RegExp(`${escapeRegExp(property)}[^;]*;`);
-          `${rule} {${propertyStr}${style}}`;
+
+        styles = styles.replace(rulePattern, function (match, propertyStr) {
+          if (propertyStr.match(propPattern)) {
+            // property exists, replace with empty string
+            propertyStr = propertyStr.replace(propPattern, '');
+          }
+          propertyStr = propertyStr.trim();
+
+          const _styleMap = {};
+
+          _styleMap[property] = value;
+          const replacer =
+            `${rule} {${propertyStr}${self.getCSSString(_styleMap)}}`;
+
+          return replacer;
+        });
+      }
 
-        return replacer;
-      });
     } else {
       // rules doesn't exists, add rule with properties
-      styles += `${rule} {${style}}`;
+      styles += `${rule} {${styleMap}}`;
     }
 
     this.$style.html(styles);
   }
 
+  getCSSString(styleMap) {
+    let style = '';
+
+    for (const prop in styleMap) {
+      if (styleMap.hasOwnProperty(prop)) {
+        style += `${prop}: ${styleMap[prop]};`;
+      }
+    }
+
+    console.log(style);
+
+    return style;
+  }
+
   getStyleEl() {
     if (!this.$style) {
       this.$style = $('<style data-id="regrid"></style>')
@@ -514,6 +546,12 @@ export default class ReGrid {
     return this.data.rows.find(row => row[0].rowIndex === rowIndex);
   }
 
+  getCell(rowIndex, colIndex) {
+    rowIndex = +rowIndex;
+    colIndex = +colIndex;
+    return this.data.rows[rowIndex][colIndex];
+  }
+
   getColumnHeaderElement(colIndex) {
     colIndex = +colIndex;
     if (colIndex < 0) return null;

src/style.scss

@@ -63,12 +63,37 @@
 
 .edit-popup {
     position: absolute;
-    border: 1px solid gray;
     background: white;
-    border-radius: 4px;
 	box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
 
-	padding: 12px;
+	input {
+		outline: none;
+		padding: 8px;
+		font-size: inherit;
+		font-family: inherit;
+		width: inherit;
+		height: inherit;
+		border: 2px solid theme-color('primary');
+	}
+}
+
+.edit-cell {
+	position: absolute;
+	top: -1px;
+	left: -1px;
+    background: white;
+	box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
+	z-index: 1;
+
+	input {
+		outline: none;
+		padding: 8px;
+		font-size: inherit;
+		font-family: inherit;
+		width: inherit;
+		height: inherit;
+		border: 2px solid theme-color('primary');
+	}
 }
 
 .noselect {

src/utils.js

@@ -17,6 +17,14 @@ function makeDataAttributeString(props) {
     .trim();
 }
 
+function getEditCellHTML() {
+  return `
+    <div class="edit-cell">
+      <input type="text" />
+    </div>
+  `;
+}
+
 function getColumnHTML(column) {
   const { rowIndex, colIndex, isHeader } = column;
   const dataAttr = makeDataAttributeString({
@@ -25,12 +33,15 @@ function getColumnHTML(column) {
     isHeader
   });
 
+  const editCellHTML = isHeader ? '' : getEditCellHTML();
+
   return `
     <td class="data-table-col noselect" ${dataAttr}>
       <div class="content ellipsis">
         ${column.format ? column.format(column.content) : column.content}
         <span class="sort-indicator"></span>
       </div>
+      ${editCellHTML}
     </td>
   `;
 }
@@ -121,6 +132,7 @@ export default {
   getBodyHTML,
   getRowHTML,
   getColumnHTML,
+  getEditCellHTML,
   prepareRowHeader,
   prepareRows,
   makeDataAttributeString,