fix: spreadsheet not updating when switching from and to a black spre…

…adsheet (#54) * fix: update dev cycle * chore: lint files * fix: spreadsheet not updating when switching from and to a black spreadsheet * chore: build * chore: increment version * chore: increment version Co-authored-by: Johnny Almonte <[email protected]>
standardnotes · Jul 1, 2021 · b385373 · b385373
1 parent 00cbf5c
commit b385373
Show file tree

Hide file tree

Showing 14 changed files with 6,347 additions and 13,520 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,3 @@
+node_modules/**
+dist/**
+webpack.*
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,29 @@
+{
+  "env": {
+    "browser": true,
+    "es6": true
+  },
+  "extends": [
+    "@standardnotes/eslint-config-extensions",
+    "plugin:react/recommended"
+  ],
+  "parser": "@babel/eslint-parser",
+  "parserOptions": {
+    "ecmaVersion": 11,
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    "sourceType": "module"
+  },
+  "plugins": [
+    "react"
+  ],
+  "settings": {
+    "react": {
+      "version": "detect"
+    }
+  },
+  "globals": {
+    "$": true
+  }
+}
diff --git a/app/components/Home.js b/app/components/Home.js
@@ -17,28 +17,28 @@ export default class Home extends React.Component {
 
   componentDidMount() {
     $(function() {
-      $("#spreadsheet").kendoSpreadsheet({
+      $('#spreadsheet').kendoSpreadsheet({
         rows: this.numRows,
         columns: this.numColumns,
         change: this.onChange,
         changeFormat: this.onChange, // triggered when cell structure changes (currency, date, etc)
         excelImport: (event) => {
           // Excel import functionality has been disabled completely.
           // We'll keep this code around below incase we enable it again in the future.
-          if(!confirm("Importing will completely overwrite any existing data. Are you sure you want to continue?")) {
+          if (!confirm('Importing will completely overwrite any existing data. Are you sure you want to continue?')) {
             event.preventDefault();
             return;
           }
 
-          if(!confirm("Note that importing from Excel may cause very large file sizes within Standard Notes, which may affect performance. You may continue with import, but if you notice performance issues, it is recommended you manually import data instead.")) {
+          if (!confirm('Note that importing from Excel may cause very large file sizes within Standard Notes, which may affect performance. You may continue with import, but if you notice performance issues, it is recommended you manually import data instead.')) {
             event.preventDefault();
             return;
           }
 
           event.promise.done(() => {
-            console.log("Import complete");
+            console.log('Import complete');
             this.onChange();
-          })
+          });
 
         },
         insertSheet: this.onChange,
@@ -50,12 +50,12 @@ export default class Home extends React.Component {
         hideRow: this.onChange,
         deleteColumn: this.onChange,
         deleteRow: this.onChange,
-        insertColumn: (event) => {
+        insertColumn: (_event) => {
           this.numColumns++;
           this.sheetSizeUpdated = true;
           this.onChange();
         },
-        insertRow: (event) => {
+        insertRow: () => {
           this.numRows++;
           this.sheetSizeUpdated = true;
           this.onChange();
@@ -77,23 +77,23 @@ export default class Home extends React.Component {
 
       this.reloadSpreadsheetContent();
 
-      $(".k-item, .k-button").click((e) => {
+      $('.k-item, .k-button').click(() => {
         setTimeout(() => {
           this.onChange();
         }, 10);
       });
 
       // remove import option
-      $(".k-upload-button").remove();
+      $('.k-upload-button').remove();
     }.bind(this));
   }
 
   getSpreadsheet() {
-    return $("#spreadsheet").getKendoSpreadsheet();
+    return $('#spreadsheet').getKendoSpreadsheet();
   }
 
-  onChange = (event) => {
-    if(!this.note) {
+  onChange = () => {
+    if (!this.note) {
       return;
     }
 
@@ -108,33 +108,32 @@ export default class Home extends React.Component {
 
     this.componentManager.saveItemWithPresave(note, () => {
       note.content.preview_html = null;
-      note.content.preview_plain = "Created with Secure Spreadsheets";
+      note.content.preview_plain = 'Created with Secure Spreadsheets';
 
-      var json = this.getJSON();
-      var content = JSON.stringify(json);
+      let json = this.getJSON();
+      let content = JSON.stringify(json);
       note.content.text = content;
     });
   }
 
   getJSON() {
-    var json = this.getSpreadsheet().toJSON();
+    const json = this.getSpreadsheet().toJSON();
     json.rows = this.numRows;
     json.columns = this.numColumns;
     return json;
   }
 
-
   connectToBridge() {
-    var permissions = [
+    const permissions = [
       {
-        name: "stream-context-item"
+        name: 'stream-context-item'
       }
-    ]
+    ];
 
     this.componentManager = new ComponentManager(permissions, () => {
       // on ready
-      var platform = this.componentManager.platform;
-      if(platform) {
+      const platform = this.componentManager.platform;
+      if (platform) {
         document.body.classList.add(platform);
       }
     });
@@ -144,8 +143,8 @@ export default class Home extends React.Component {
     this.componentManager.streamContextItem((note) => {
       this.note = note;
 
-       // Only update UI on non-metadata updates.
-      if(note.isMetadataUpdate) {
+      // Only update UI on non-metadata updates.
+      if (note.isMetadataUpdate) {
         return;
       }
 
@@ -154,24 +153,36 @@ export default class Home extends React.Component {
   }
 
   reloadSpreadsheetContent() {
-    if(!this.note) {
+    if (!this.note) {
       return;
     }
 
-    var text = this.note.content.text;
-    if(text.length == 0) {
-      return;
+    const text = this.note.content.text;
+
+    /**
+     * If the note's text is empty, we want to save the note
+     * so that the empty string is replaced with a JSON string
+     * that is readable by the editor.
+     */
+    if (text.length === 0) {
+      this.saveSpreadsheet();
     }
 
-    var json = JSON.parse(text);
-    if(json.rows) { this.numRows = json.rows; }
-    if(json.columns) { this.numColumns = json.columns; }
+    const json = JSON.parse(text);
+    if (json.rows) {
+      this.numRows = json.rows;
+    }
+
+    if (json.columns) {
+      this.numColumns = json.columns;
+    }
     this.getSpreadsheet().fromJSON(json);
+    this.getSpreadsheet().refresh();
   }
 
   render() {
     return (
       <div></div>
-    )
+    );
   }
 }
diff --git a/dist/dist.css b/dist/dist.css
diff --git a/dist/dist.css.map b/dist/dist.css.map
diff --git a/dist/dist.js b/dist/dist.js
diff --git a/dist/dist.js.LICENSE.txt b/dist/dist.js.LICENSE.txt
@@ -13,7 +13,7 @@ object-assign
  * LICENSE file in the root directory of this source tree.
  */
 
-/** @license React v16.13.1
+/** @license React v16.14.0
  * react-dom.production.min.js
  *
  * Copyright (c) Facebook, Inc. and its affiliates.
@@ -22,7 +22,7 @@ object-assign
  * LICENSE file in the root directory of this source tree.
  */
 
-/** @license React v16.13.1
+/** @license React v16.14.0
  * react.production.min.js
  *
  * Copyright (c) Facebook, Inc. and its affiliates.

diff --git a/dist/dist.js.map b/dist/dist.js.map