moved settimeout call to filterbykey() fn

And solved restoration of cursor issue.

Author: ddooley

lib/AppContext.js

@@ -62,8 +62,6 @@ export default class AppContext {
     if (!( dh.schema.name === 'DH_LinkML' && class_name === 'Schema')) {
       let dependent_report = dh.context.dependent_rows.get(class_name);
       dh.filterByKeys(dh, class_name, dependent_report.fkey_vals);
-      console.log("tab", class_name,  dependent_report.fkey_vals)
-      setTimeout(() => { dh.hot.render(); }, 500);
     }
 
     //$(document).trigger('dhCurrentChange', {

lib/DataHarmonizer.js

@@ -559,8 +559,6 @@ class DataHarmonizer {
 
         afterFilter: function (filters) {
           // column: 0, conditions: ('cancogen_covid-19', "eq", [], operation: "conjunction"
-          // Didn't make a difference.
-          //self.hot.render();
 
         },
         //beforePaste:
@@ -812,7 +810,7 @@ class DataHarmonizer {
          * header row selection
          */
         // https://handsontable.com/docs/javascript-data-grid/api/hooks/#afterselection
-        afterSelectionEnd: (row, column, row2, column2, selectionLayerLevel) => {
+        afterSelectionEnd: (row, column, row2, column2, selectionLayerLevel, action) => {
 
           console.log("afterSelectionEnd",self.schema, row, column, row2, column2, selectionLayerLevel)
 
@@ -2194,11 +2192,12 @@ class DataHarmonizer {
 
       //}
 
-    //dh.hot.batchRender(() => {
-    dh.hot.suspendExecution();
-    //dh.hot.suspendRender();  
+    // Save, deselect, and then set cursor, Otherwise selected cell gets
+    // somehow set to same column but first row after filter!!!
+    let cursor = dh.hot.getSelected();
+    dh.hot.deselectCell(); 
 
-    //dh.hot.deselectCell() ;  //Otherwise selected cell gets initalized to 1st row !!!
+    dh.hot.suspendExecution(); // Recommended in handsontable example.
     const filtersPlugin = dh.hot.getPlugin('filters');
 
     filtersPlugin.clearConditions();
@@ -2215,9 +2214,23 @@ class DataHarmonizer {
     });
 
     filtersPlugin.filter();
-    // add sorting: hot.getPlugin('columnSorting').sort({ column: 1, sortOrder: 'desc' }) 
+    // Add sorting: hot.getPlugin('columnSorting').sort({ column: 1, sortOrder: 'desc' }) 
 
     dh.hot.resumeExecution();
+                
+    setTimeout(() => { dh.hot.render(); }, 400);
+
+    if (cursor) {
+      // Adding custom event type to selectCell() call, but so far not using this.
+      cursor[0].push('afterFilteriing'); 
+      dh.hot.selectCell(...cursor[0]);
+      // Note this will cause a "double event" of selecting same cell twice.
+
+    }
+ 
+    // filtersPlugin continues activity AFTER returning, leading to rendering
+    // not reflecting filtering work.  So we have to trigger a delayed render
+    //setTimeout(() => { dh.hot.render(); }, 500);
 
     return true
   }