jupyterlab-ipyflow 0.0.169 → 0.0.170

package/lib/index.js

@@ -71,19 +71,40 @@ const extension = {
                     app.commands.execute('notebook:enter-command-mode');
                     CodeCell.execute(notebooks.activeCell, session);
                 }
-                else if (!isAltModeExecuting &&
-                    notebooks.activeCell.model.type === 'code') {
-                    isAltModeExecuting = true;
+                else if (notebooks.activeCell.model.type === 'code') {
                     app.commands.execute('notebook:enter-command-mode');
-                    session.session.kernel
-                        .requestExecute({
-                        code: '%flow toggle-reactivity-until-next-reset',
-                        silent: true,
-                        store_history: false,
-                    })
-                        .done.then(() => {
-                        CodeCell.execute(notebooks.activeCell, session);
-                    });
+                    if (isAltModeExecuting) {
+                        // run the toggle twice to get to the same exec mode, but with updated timestamp
+                        session.session.kernel
+                            .requestExecute({
+                            code: '%flow toggle-reactivity-until-next-reset',
+                            silent: true,
+                            store_history: false,
+                        })
+                            .done.then(() => {
+                            session.session.kernel
+                                .requestExecute({
+                                code: '%flow toggle-reactivity-until-next-reset',
+                                silent: true,
+                                store_history: false,
+                            })
+                                .done.then(() => {
+                                CodeCell.execute(notebooks.activeCell, session);
+                            });
+                        });
+                    }
+                    else {
+                        isAltModeExecuting = true;
+                        session.session.kernel
+                            .requestExecute({
+                            code: '%flow toggle-reactivity-until-next-reset',
+                            silent: true,
+                            store_history: false,
+                        })
+                            .done.then(() => {
+                            CodeCell.execute(notebooks.activeCell, session);
+                        });
+                    }
                 }
             },
         });
@@ -251,10 +272,11 @@ const connectToComm = (session, notebook) => {
     const gatherCellMetadataAndContent = () => {
         const cell_metadata_by_id = {};
         notebook.widgets.forEach((itercell, idx) => {
-            cell_metadata_by_id[itercell.model.id] = {
+            const model = itercell.model;
+            cell_metadata_by_id[model.id] = {
                 index: idx,
-                content: itercell.model.value.text,
-                type: itercell.model.type,
+                content: model.sharedModel.getSource(),
+                type: model.type,
             };
         });
         return cell_metadata_by_id;
@@ -418,6 +440,10 @@ const connectToComm = (session, notebook) => {
             notebook.model.contentChanged.connect(onContentChanged);
             requestComputeExecSchedule();
         }
+        else if (payload.type === 'set_exec_mode') {
+            isAltModeExecuting = false;
+            lastExecutionMode = payload.exec_mode;
+        }
         else if (payload.type === 'compute_exec_schedule') {
             waitingCells = new Set(payload.waiting_cells);
             readyCells = new Set(payload.ready_cells);
@@ -435,7 +461,6 @@ const connectToComm = (session, notebook) => {
             const exec_mode = payload.exec_mode;
             isReactivelyExecuting =
                 isReactivelyExecuting ||
-                    exec_mode === 'reactive' ||
                     ((_b = payload === null || payload === void 0 ? void 0 : payload.is_reactively_executing) !== null && _b !== void 0 ? _b : false);
             const flow_order = payload.flow_order;
             const exec_schedule = payload.exec_schedule;
@@ -496,7 +521,9 @@ const connectToComm = (session, notebook) => {
                 executedReactiveReadyCells = new Set();
                 updateUI(notebook);
                 isReactivelyExecuting = false;
-                isAltModeExecuting = false;
+                if (lastExecutionMode === 'reactive') {
+                    isAltModeExecuting = false;
+                }
             }
             else {
                 isReactivelyExecuting = true;

package/package.json

@@ -48,7 +48,7 @@
     "lodash": "^4.0"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^3.4.3",
+    "@jupyterlab/builder": "^4.0.0-rc.1",
     "@types/lodash": "^4.14.191",
     "@typescript-eslint/eslint-plugin": "^5.15.0",
     "@typescript-eslint/parser": "^5.15.0",
@@ -67,5 +67,5 @@
     "extension": true,
     "outputDir": "../../core/ipyflow/resources/labextension/"
   },
-  "version": "0.0.169"
+  "version": "0.0.170"
 }