jupyterlab-ipyflow 0.0.128 → 0.0.129

package/lib/index.js

@@ -66,7 +66,7 @@ let cellModelsById = {};
 let orderIdxById = {};
 let cellPendingExecution = null;
 let lastExecutionMode = null;
-let lastExecutionHighlightsEnabled = null;
+let lastExecutionHighlights = null;
 let executedReactiveReadyCells = new Set();
 let newReadyCells = new Set();
 let forcedReactiveCells = new Set();
@@ -193,25 +193,10 @@ const connectToComm = (session, notebook) => {
                 itercell.node.classList.remove(readyMakingInputClass);
             }
         });
-        const payload = {
+        comm.send({
             type: 'compute_exec_schedule',
             executed_cell_id: cell.id,
             cell_metadata_by_id,
-        };
-        comm.send(payload).done.then(() => {
-            if (cellPendingExecution !== null) {
-                CodeCell.execute(cellPendingExecution, session);
-            }
-            else {
-                if (lastExecutionMode === 'reactive') {
-                    readyCells = executedReactiveReadyCells;
-                    updateUI(notebook);
-                }
-                resetReactiveState();
-                comm.send({
-                    type: 'reactivity_cleanup',
-                });
-            }
         });
     };
     const notifyActiveCell = (newActiveCell) => {
@@ -317,7 +302,7 @@ const connectToComm = (session, notebook) => {
     };
     const updateUI = (notebook) => {
         clearCellState(notebook);
-        if (!lastExecutionHighlightsEnabled) {
+        if (lastExecutionHighlights === 'none') {
             return;
         }
         refreshNodeMapping(notebook);
@@ -345,7 +330,7 @@ const connectToComm = (session, notebook) => {
             const flow_order = msg.content.data['flow_order'];
             const exec_schedule = msg.content.data['exec_schedule'];
             lastExecutionMode = exec_mode;
-            lastExecutionHighlightsEnabled = msg.content.data['highlights_enabled'];
+            lastExecutionHighlights = msg.content.data['highlights'];
             executedReactiveReadyCells.add(msg.content.data['last_executed_cell_id']);
             for (const cell of notebook.widgets) {
                 if (cell.model.type !== 'code' || executedReactiveReadyCells.has(cell.model.id)) {
@@ -373,12 +358,24 @@ const connectToComm = (session, notebook) => {
                 }
             }
             if (cellPendingExecution === null) {
-                resetReactiveState();
-                updateUI(notebook);
+                if (lastExecutionMode === 'reactive') {
+                    if (lastExecutionHighlights === 'reactive') {
+                        readyCells = executedReactiveReadyCells;
+                    }
+                    updateUI(notebook);
+                    resetReactiveState();
+                    comm.send({
+                        type: 'reactivity_cleanup',
+                    });
+                }
+                else {
+                    resetReactiveState();
+                    updateUI(notebook);
+                }
             }
             else {
                 onActiveCellChange(notebook, cellPendingExecution);
-                clearCellState(notebook);
+                CodeCell.execute(cellPendingExecution, session);
             }
         }
     };

package/package.json

@@ -54,7 +54,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "prettier": "2.6.0",
     "rimraf": "^3.0.2",
-    "typescript": "^4.7.4"
+    "typescript": "4.3.5"
   },
   "sideEffects": [
     "style/*.css"
@@ -63,5 +63,5 @@
     "extension": true,
     "outputDir": "../../core/ipyflow/resources/labextension/"
   },
-  "version": "0.0.128"
+  "version": "0.0.129"
 }