@difizen/libro-jupyter 0.3.9 → 0.3.11

package/es/command/command-contribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command-contribution.d.ts","sourceRoot":"","sources":["../../src/command/command-contribution.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,oBAAoB,EACpB,YAAY,EAMb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EACL,mBAAmB,EAEnB,YAAY,EAEb,MAAM,mBAAmB,CAAC;AAK3B,qBACa,+BAAgC,YAAW,mBAAmB;IACnD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACtC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;IAC9D,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAEpE,gBAAgB,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;CA8IjD"}
+{"version":3,"file":"command-contribution.d.ts","sourceRoot":"","sources":["../../src/command/command-contribution.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,oBAAoB,EACpB,YAAY,EAMb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EACL,mBAAmB,EAEnB,YAAY,EAEb,MAAM,mBAAmB,CAAC;AAK3B,qBACa,+BAAgC,YAAW,mBAAmB;IACnD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACtC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;IAC9D,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAEpE,gBAAgB,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;CAoIjD"}

package/es/command/command-contribution.js

@@ -11,7 +11,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
 function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'transform-class-properties is enabled and runs after the decorators transform.'); }
-import { KernelCommands, LibroCommandRegister, LibroService, LibroToolbarArea, LibroView, NotebookCommands, ExecutableCellView, LibroCellView } from '@difizen/libro-core';
+import { KernelCommands, LibroCommandRegister, LibroService, LibroToolbarArea, LibroView, NotebookCommands, ExecutableCellView } from '@difizen/libro-core';
 import { CommandContribution, inject, ModalService, singleton } from '@difizen/mana-app';
 import { LibroJupyterModel } from "../libro-jupyter-model.js";
 import { ExecutedWithKernelCellModel } from "../libro-jupyter-protocol.js";
@@ -81,26 +81,16 @@ export var LibroJupyterCommandContribution = (_dec = singleton({
       });
       this.libroCommand.registerLibroCommand(command, NotebookCommands['SideToolbarRunSelect'], {
         execute: function () {
-          var _execute2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(cell, libro) {
+          var _execute2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
             return _regeneratorRuntime().wrap(function _callee2$(_context2) {
               while (1) switch (_context2.prev = _context2.next) {
                 case 0:
-                  if (!(!cell || !libro || !(cell instanceof LibroCellView) || !(libro instanceof LibroView))) {
-                    _context2.next = 2;
-                    break;
-                  }
-                  return _context2.abrupt("return");
-                case 2:
-                  if (libro.model.executable) {
-                    libro.runCell(cell);
-                  }
-                case 3:
                 case "end":
                   return _context2.stop();
               }
             }, _callee2);
           }));
-          function execute(_x3, _x4) {
+          function execute() {
             return _execute2.apply(this, arguments);
           }
           return execute;
@@ -139,7 +129,7 @@ export var LibroJupyterCommandContribution = (_dec = singleton({
               }
             }, _callee3);
           }));
-          function execute(_x5, _x6) {
+          function execute(_x3, _x4) {
             return _execute3.apply(this, arguments);
           }
           return execute;

package/es/toolbar/side-toolbar-run-selector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"side-toolbar-run-selector.d.ts","sourceRoot":"","sources":["../../src/toolbar/side-toolbar-run-selector.tsx"],"names":[],"mappings":";AAaA,eAAO,MAAM,sBAAsB,EAAE,KAAK,CAAC,EAmF1C,CAAC"}
+{"version":3,"file":"side-toolbar-run-selector.d.ts","sourceRoot":"","sources":["../../src/toolbar/side-toolbar-run-selector.tsx"],"names":[],"mappings":";AAyBA,eAAO,MAAM,sBAAsB,EAAE,KAAK,CAAC,EA2F1C,CAAC"}

package/es/toolbar/side-toolbar-run-selector.js

@@ -1,3 +1,7 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -7,7 +11,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { PlayCircleOutlined } from '@ant-design/icons';
 import { NotebookCommands, LibroSideToolbarMenu } from '@difizen/libro-core';
 import { ServerManager } from '@difizen/libro-kernel';
-import { ConfigurationService, useInject, ViewInstance } from '@difizen/mana-app';
+import { ConfigurationService, useInject, ViewInstance, CommandRegistry, ToolbarInstance, getOrigin } from '@difizen/mana-app';
 import { l10n } from '@difizen/mana-l10n';
 import { Popover, Tooltip } from 'antd';
 import { useEffect, useState } from 'react';
@@ -21,6 +25,10 @@ export var SideToolbarRunSelector = function SideToolbarRunSelector() {
   var libroServerManager = useInject(ServerManager);
   var configService = useInject(ConfigurationService);
   var libroModel = libroView ? libroView.model : undefined;
+  var command = useInject(CommandRegistry);
+  var toolbar = useInject(ToolbarInstance);
+  var data = toolbar.currentArgs;
+  var args = getOrigin(data) || [];
   var items = [{
     id: NotebookCommands['RunCell'].id,
     label: /*#__PURE__*/_jsxs(_Fragment, {
@@ -79,7 +87,11 @@ export var SideToolbarRunSelector = function SideToolbarRunSelector() {
       }),
       trigger: "hover",
       overlayClassName: "libro-popover-side-toolbar-menu libro-side-toolbar-run-select-menu",
-      children: /*#__PURE__*/_jsx(PlayCircleOutlined, {})
+      children: /*#__PURE__*/_jsx(PlayCircleOutlined, {
+        onClick: function onClick() {
+          command.executeCommand.apply(command, [NotebookCommands['RunCell'].id].concat(_toConsumableArray(args)));
+        }
+      })
     });
   }
   return /*#__PURE__*/_jsx(Tooltip, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-jupyter",
-  "version": "0.3.9",
+  "version": "0.3.11",
   "description": "",
   "keywords": [
     "libro"
@@ -37,22 +37,22 @@
   "dependencies": {
     "@ant-design/colors": "^7.0.0",
     "@ant-design/icons": "^5.1.0",
-    "@difizen/libro-code-cell": "^0.3.9",
-    "@difizen/libro-code-editor": "^0.3.9",
-    "@difizen/libro-codemirror": "^0.3.9",
-    "@difizen/libro-cofine-editor": "^0.3.9",
-    "@difizen/libro-common": "^0.3.9",
-    "@difizen/libro-core": "^0.3.9",
-    "@difizen/libro-kernel": "^0.3.9",
-    "@difizen/libro-l10n": "^0.3.9",
-    "@difizen/libro-language-client": "^0.3.9",
-    "@difizen/libro-lsp": "^0.3.9",
-    "@difizen/libro-markdown-cell": "^0.3.9",
-    "@difizen/libro-output": "^0.3.9",
-    "@difizen/libro-raw-cell": "^0.3.9",
-    "@difizen/libro-rendermime": "^0.3.9",
-    "@difizen/libro-search": "^0.3.9",
-    "@difizen/libro-search-code-cell": "^0.3.9",
+    "@difizen/libro-code-cell": "^0.3.11",
+    "@difizen/libro-code-editor": "^0.3.11",
+    "@difizen/libro-codemirror": "^0.3.11",
+    "@difizen/libro-cofine-editor": "^0.3.11",
+    "@difizen/libro-common": "^0.3.11",
+    "@difizen/libro-core": "^0.3.11",
+    "@difizen/libro-kernel": "^0.3.11",
+    "@difizen/libro-l10n": "^0.3.11",
+    "@difizen/libro-language-client": "^0.3.11",
+    "@difizen/libro-lsp": "^0.3.11",
+    "@difizen/libro-markdown-cell": "^0.3.11",
+    "@difizen/libro-output": "^0.3.11",
+    "@difizen/libro-raw-cell": "^0.3.11",
+    "@difizen/libro-rendermime": "^0.3.11",
+    "@difizen/libro-search": "^0.3.11",
+    "@difizen/libro-search-code-cell": "^0.3.11",
     "@difizen/mana-app": "latest",
     "@difizen/mana-l10n": "latest",
     "uuid": "^9.0.0",

package/src/command/command-contribution.ts

@@ -87,18 +87,8 @@ export class LibroJupyterCommandContribution implements CommandContribution {
       command,
       NotebookCommands['SideToolbarRunSelect'],
       {
-        execute: async (cell, libro) => {
-          if (
-            !cell ||
-            !libro ||
-            !(cell instanceof LibroCellView) ||
-            !(libro instanceof LibroView)
-          ) {
-            return;
-          }
-          if ((libro.model as LibroModel).executable) {
-            libro.runCell(cell);
-          }
+        execute: async () => {
+          //
         },
         isVisible: (cell, libro, path) => {
           if (

package/src/toolbar/side-toolbar-run-selector.tsx

@@ -1,8 +1,20 @@
 import { PlayCircleOutlined } from '@ant-design/icons';
-import type { LibroSideToolbarMenuItemType, LibroView } from '@difizen/libro-core';
+import type {
+  LibroSideToolbarMenuItemType,
+  LibroToolbarArags,
+  LibroView,
+} from '@difizen/libro-core';
 import { NotebookCommands, LibroSideToolbarMenu } from '@difizen/libro-core';
 import { ServerManager } from '@difizen/libro-kernel';
-import { ConfigurationService, useInject, ViewInstance } from '@difizen/mana-app';
+import type { Toolbar } from '@difizen/mana-app';
+import {
+  ConfigurationService,
+  useInject,
+  ViewInstance,
+  CommandRegistry,
+  ToolbarInstance,
+  getOrigin,
+} from '@difizen/mana-app';
 import { l10n } from '@difizen/mana-l10n';
 import { Popover, Tooltip } from 'antd';
 import { useEffect, useState } from 'react';
@@ -16,6 +28,10 @@ export const SideToolbarRunSelector: React.FC = () => {
   const libroServerManager = useInject(ServerManager);
   const configService = useInject<ConfigurationService>(ConfigurationService);
   const libroModel = libroView ? libroView.model : undefined;
+  const command = useInject(CommandRegistry);
+  const toolbar = useInject<Toolbar>(ToolbarInstance);
+  const data = toolbar.currentArgs as LibroToolbarArags;
+  const args = getOrigin(data) || [];
   const items: LibroSideToolbarMenuItemType[] = [
     {
       id: NotebookCommands['RunCell'].id,
@@ -80,7 +96,11 @@ export const SideToolbarRunSelector: React.FC = () => {
         trigger="hover"
         overlayClassName="libro-popover-side-toolbar-menu libro-side-toolbar-run-select-menu"
       >
-        <PlayCircleOutlined />
+        <PlayCircleOutlined
+          onClick={() => {
+            command.executeCommand(NotebookCommands['RunCell'].id, ...args);
+          }}
+        />
       </Popover>
     );
   }