@difizen/libro-core 0.2.40 → 0.2.41-next.0

package/es/slot/libro-slot-view.js

@@ -1,11 +1,16 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var _dec, _dec2, _dec3, _class, _class2, _descriptor;
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get.bind(); } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
+function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -41,11 +46,11 @@ export var LibroExtensionViewComponent = /*#__PURE__*/forwardRef(function LibroE
   } else {
     var activeView = filteredChildren.find(function (item) {
       return instance.active && equals(item, instance.active);
-    }) || filteredChildren[filteredChildren.length - 1];
+    });
     return /*#__PURE__*/_jsxs("div", {
       className: 'libro-slot-container',
       ref: ref,
-      children: [/*#__PURE__*/_jsx(ViewRender, {
+      children: [activeView && /*#__PURE__*/_jsx(ViewRender, {
         view: activeView
       }), instance.children.map(function (item) {
         return !isDisplayView(item) && /*#__PURE__*/_jsx(ViewRender, {
@@ -68,9 +73,55 @@ export var LibroSlotView = (_dec = transient(), _dec2 = view('libro-slot-view'),
     _this.label = null;
     _this.view = LibroExtensionViewComponent;
     _initializerDefineProperty(_this, "sort", _descriptor, _assertThisInitialized(_this));
+    // sort?: boolean = true;
+    _this.history = [];
     return _this;
-  } // sort?: boolean = true;
-  return _createClass(LibroSlotView);
+  }
+  _createClass(LibroSlotView, [{
+    key: "addView",
+    value: function () {
+      var _addView = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(viewInstance, option) {
+        var toDispose;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (option !== null && option !== void 0 && option.reveal) {
+                this.history.push(viewInstance);
+              }
+              toDispose = _get(_getPrototypeOf(LibroSlotView.prototype), "addView", this).call(this, viewInstance, option);
+              return _context.abrupt("return", toDispose);
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function addView(_x, _x2) {
+        return _addView.apply(this, arguments);
+      }
+      return addView;
+    }()
+  }, {
+    key: "revertActive",
+    value: function revertActive() {
+      var _this2 = this;
+      var index = this.history.findIndex(function (item) {
+        var _this2$active;
+        return item.id === ((_this2$active = _this2.active) === null || _this2$active === void 0 ? void 0 : _this2$active.id);
+      });
+      if (index < 0) {
+        return;
+      }
+      this.history.splice(index, 1);
+      if (this.history.length > 0) {
+        var last = this.history[this.history.length - 1];
+        this.active = last;
+      } else {
+        this.active = undefined;
+      }
+    }
+  }]);
+  return LibroSlotView;
 }(DefaultSlotView), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "sort", [_dec3], {
   configurable: true,
   enumerable: true,

package/es/theme/libro-color-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"libro-color-registry.d.ts","sourceRoot":"","sources":["../../src/theme/libro-color-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAGtD,qBACa,kBAAmB,YAAW,iBAAiB;IAC1D,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;CA2X5C"}
+{"version":3,"file":"libro-color-registry.d.ts","sourceRoot":"","sources":["../../src/theme/libro-color-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAGtD,qBACa,kBAAmB,YAAW,iBAAiB;IAC1D,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;CAgY5C"}

package/es/theme/libro-color-registry.js

@@ -410,6 +410,13 @@ export var LibroColorRegistry = (_dec = singleton({
           light: '#212121'
         },
         description: ''
+      }, {
+        id: 'libro.editor.class.color',
+        defaults: {
+          dark: '#6868f3',
+          light: '#0000ff'
+        },
+        description: ''
       }, {
         id: 'libro.editor.def.color',
         defaults: {

package/es/utils/index.d.ts

@@ -0,0 +1,8 @@
+import type { RefObject } from 'react';
+type Size = {
+    width: number;
+    height: number;
+};
+export declare function useSize(ref: RefObject<HTMLDivElement>): Size | undefined;
+export {};
+//# sourceMappingURL=index.d.ts.map

package/es/utils/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAsBvC,KAAK,IAAI,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAC9C,wBAAgB,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,cAAc,CAAC,GAAG,IAAI,GAAG,SAAS,CAuBxE"}

package/es/utils/index.js

@@ -0,0 +1,53 @@
+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); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { useUnmount } from '@difizen/mana-app';
+import { useCallback, useLayoutEffect, useRef, useState } from 'react';
+function useRafState(initialState) {
+  var ref = useRef(0);
+  var _useState = useState(initialState),
+    _useState2 = _slicedToArray(_useState, 2),
+    state = _useState2[0],
+    setState = _useState2[1];
+  var setRafState = useCallback(function (value) {
+    cancelAnimationFrame(ref.current);
+    ref.current = requestAnimationFrame(function () {
+      setState(value);
+    });
+  }, []);
+  useUnmount(function () {
+    cancelAnimationFrame(ref.current);
+  });
+  return [state, setRafState];
+}
+export function useSize(ref) {
+  var _useRafState = useRafState(),
+    _useRafState2 = _slicedToArray(_useRafState, 2),
+    size = _useRafState2[0],
+    setSize = _useRafState2[1];
+  useLayoutEffect(function () {
+    var el = ref === null || ref === void 0 ? void 0 : ref.current;
+    if (!el) {
+      return;
+    }
+    var resizeObserver = new ResizeObserver(function (entries) {
+      entries.forEach(function (entry) {
+        var _entry$target = entry.target,
+          clientWidth = _entry$target.clientWidth,
+          clientHeight = _entry$target.clientHeight;
+        setSize({
+          width: clientWidth,
+          height: clientHeight
+        });
+      });
+    });
+    resizeObserver.observe(el);
+    return function () {
+      resizeObserver.disconnect();
+    };
+  }, [ref, setSize]);
+  return size;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-core",
-  "version": "0.2.40",
+  "version": "0.2.41-next.0",
   "description": "",
   "keywords": [
     "libro",
@@ -34,10 +34,10 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^5.1.0",
-    "@difizen/libro-code-editor": "^0.2.40",
-    "@difizen/libro-common": "^0.2.40",
-    "@difizen/libro-shared-model": "^0.2.40",
-    "@difizen/libro-virtualized": "^0.2.40",
+    "@difizen/libro-code-editor": "^0.2.41-next.0",
+    "@difizen/libro-common": "^0.2.41-next.0",
+    "@difizen/libro-shared-model": "^0.2.41-next.0",
+    "@difizen/libro-virtualized": "^0.2.41-next.0",
     "@difizen/mana-app": "latest",
     "@difizen/mana-l10n": "latest",
     "@difizen/mana-react": "latest",

package/src/cell/libro-cell-view.tsx

@@ -137,7 +137,7 @@ export class LibroCellView extends BaseView implements CellView {
     super.dispose();
   }
   toJSON(): LibroCell {
-    const meta = { ...(this.model.toJSON() as LibroCell), outputs: [] };
+    const meta = { ...(this.model.toJSON() as LibroCell) };
     const modelContribution = this.cellService.findModelProvider(this.model.options);
     if (modelContribution?.cellMeta.nbformatType) {
       meta.metadata.libroCellType = modelContribution?.cellMeta.type;

package/src/cell/libro-executable-cell-view.ts

@@ -1,3 +1,4 @@
+import type { ICodeCell } from '@difizen/libro-common';
 import { watch } from '@difizen/mana-app';
 import { ViewOption } from '@difizen/mana-app';
 import { inject } from '@difizen/mana-app';
@@ -6,6 +7,7 @@ import type { CellModel } from '../libro-protocol.js';
 import type { CellViewOptions } from '../libro-protocol.js';
 import type { BaseOutputArea } from '../output/index.js';
 
+import type { LibroCell } from './libro-cell-protocol.js';
 import { CellService } from './libro-cell-protocol.js';
 import { EditorCellView, LibroEditorCellView } from './libro-edit-cell-view.js';
 import { ExecutableCellModel } from './libro-executable-cell-model.js';
@@ -78,6 +80,15 @@ export abstract class LibroEditableExecutableCellView
       }),
     );
   }
+
+  override toJSON(): LibroCell {
+    const meta = super.toJSON();
+    return {
+      ...meta,
+      source: meta.source ?? this.options.cell.source,
+      outputs: this.outputArea?.toJSON() ?? [],
+    } as ICodeCell;
+  }
 }
 
 /**

package/src/components/cell-protocol.ts

@@ -10,6 +10,10 @@ export type CellInputBottonBlankProvider = FC<{ cell: CellView }>;
 
 export const CellInputBottonBlankProvider = Symbol('CellInputBottonBlankProvider');
 
+export type CellOutputTopProvider = FC<{ cell: CellView }>;
+
+export const CellOutputTopProvider = Symbol('CellOutputTopProvider');
+
 export type CellOutputBottomBlankProvider = FC<{ cell: CellView }>;
 
 export const CellOutputBottomBlankProvider = Symbol('CellOutputBottomBlankProvider');

package/src/components/dnd-cell-item-render.tsx

@@ -42,7 +42,10 @@ import {
 } from '../material-from-designer.js';
 import { hasErrorOutput } from '../output/index.js';
 
-import { CellOutputBottomBlankProvider } from './cell-protocol.js';
+import {
+  CellOutputBottomBlankProvider,
+  CellOutputTopProvider,
+} from './cell-protocol.js';
 import {
   CellExecutionTimeProvider,
   CellInputBottonBlankProvider,
@@ -129,6 +132,7 @@ export const CellOutputContent: React.FC<{ cell: CellView }> = memo(
     const CellOutputBottomBlank = useInject<CellOutputBottomBlankProvider>(
       CellOutputBottomBlankProvider,
     );
+    const CellOutputTopBlank = useInject<CellOutputTopProvider>(CellOutputTopProvider);
     const CellExecutionTime = useInject<CellExecutionTimeProvider>(
       CellExecutionTimeProvider,
     );
@@ -156,6 +160,7 @@ export const CellOutputContent: React.FC<{ cell: CellView }> = memo(
         className={`libro-cell-output-content ${hasOutputsScrolled ? 'scrolled' : ''} `}
       >
         <CellExecutionTime cell={cell} />
+        <CellOutputTopBlank cell={cell} />
         <CellOutputVisulization cell={cell} />
         {observableCell.outputArea.length > 0 && <ViewRender view={cell.outputArea} />}
         <CellOutputBottomBlank cell={cell} />
@@ -182,6 +187,12 @@ export const LibroCellOutputBottomBlank: CellOutputBottomBlankProvider = forward
   },
 );
 
+export const LibroCellTopBlank: CellOutputTopProvider = forwardRef(
+  function LibroCellTopBlank() {
+    return null;
+  },
+);
+
 export const LibroCellVisualization: CellOutputVisulizationProvider = forwardRef(
   function LibroCellVisualization() {
     return null;

package/src/components/dnd-component/default-dnd-content.tsx

@@ -1,6 +1,7 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import { getOrigin, useInject, ViewInstance } from '@difizen/mana-app';
 import { useConfigurationValue } from '@difizen/mana-app';
+import { Button } from 'antd';
 import type { Identifier } from 'dnd-core';
 import React, {
   useCallback,
@@ -30,7 +31,11 @@ export interface Dragparams {
   index: number;
 }
 
-export const DndCellContainer: React.FC<DndContentProps> = ({ cell, index }) => {
+export const DndCellContainer: React.FC<DndContentProps> = ({
+  cell,
+  index,
+  position,
+}) => {
   const ref = useRef<HTMLDivElement>(null);
   const instance = useInject<LibroView>(ViewInstance);
   const [multiSelectionWhenShiftClick] = useConfigurationValue(
@@ -285,7 +290,10 @@ export const DndCellContainer: React.FC<DndContentProps> = ({ cell, index }) =>
       ref={ref}
       id={cell.id}
     >
-      <BetweenCellContent index={index} addCell={cell.parent.addCellAbove} />
+      <BetweenCellContent
+        index={position || index}
+        addCell={cell.parent.addCellAbove}
+      />
       {isDragOver && <div className="libro-drag-hoverline" />}
       {isMouseOverDragArea && <HolderOutlined className="libro-handle-style" />}
       <div
@@ -311,12 +319,14 @@ export const DndCellContainer: React.FC<DndContentProps> = ({ cell, index }) =>
       </div>
       {isCollapsible && cell.headingCollapsed && cell.collapsibleChildNumber > 0 && (
         <div className="libro-cell-collapsed-expander">
-          <button
+          <Button
             className="libro-cell-expand-button"
             onClick={() => instance.collapseCell(cell, false)}
+            icon={<PlusOutlined className="" />}
+            type="default"
           >
-            <PlusOutlined className="" /> {cell.collapsibleChildNumber} cell hidden
-          </button>
+            {cell.collapsibleChildNumber} cell hidden
+          </Button>
         </div>
       )}
     </div>

package/src/components/dnd-component/dnd-list.tsx

@@ -31,15 +31,29 @@ export const DndCellRender: FC<DndContentProps> = memo(function DndCellRender({
 });
 
 // 定义一个函数用于渲染非虚拟列表时的单元格
-const renderNonVirtualListCells = (cells: CellView[]) => (
-  <div style={{ height: '100%', overflow: 'visible' }}>
-    {cells
-      .filter((cell) => !cell.collapsedHidden)
-      .map((cell, index) => (
-        <DndCellRender cell={cell} key={cell.id} index={index} />
-      ))}
-  </div>
-);
+const renderNonVirtualListCells = (cells: CellView[]) => {
+  let position = -1;
+  return (
+    <div style={{ height: '100%', overflow: 'visible' }}>
+      {cells
+        // .filter((cell) => !cell.collapsedHidden)
+        .map((cell, index) => {
+          position += 1;
+          if (cell.collapsedHidden) {
+            return null;
+          }
+          return (
+            <DndCellRender
+              cell={cell}
+              key={cell.id}
+              index={index}
+              position={position}
+            />
+          );
+        })}
+    </div>
+  );
+};
 
 export const DndCellsRender = forwardRef<
   HTMLDivElement,

package/src/components/libro-virtualized-render.tsx

@@ -131,6 +131,7 @@ export const LibroCellsOutputRender: React.FC<{
 
   // 绘制所有的非编辑器区域
   const noEditorArea = useMemo(() => {
+    let position = -1;
     return (
       <div
         style={{
@@ -142,9 +143,20 @@ export const LibroCellsOutputRender: React.FC<{
         ref={noEditorAreaRef}
       >
         {cells
-          .filter((cell) => cell.collapsedHidden === false)
+          // .filter((cell) => cell.collapsedHidden === false)
           .map((cell, index) => {
-            return <DndCellRender cell={cell} key={cell.id} index={index} />;
+            position += 1;
+            if (cell.collapsedHidden) {
+              return null;
+            }
+            return (
+              <DndCellRender
+                cell={cell}
+                key={cell.id}
+                index={index}
+                position={position}
+              />
+            );
           })}
         {addCellButtons}
       </div>

package/src/index.less

@@ -188,6 +188,7 @@
   padding-left: 72px;
 
   .libro-cell-expand-button {
+    height: 24px;
     padding: 0 12px;
   }
 }
@@ -250,12 +251,12 @@
 
   &.active.command-mode.error,
   &.error {
-    border: 1px solid var(--mana-libro-error-color) !important;
+    border: 1px solid var(--mana-libro-error-color);
     box-shadow: unset;
   }
 
   &.active.edit-mode.error {
-    border: 1px solid var(--mana-libro-error-color) !important;
+    border: 1px solid var(--mana-libro-error-color);
     box-shadow: rgba(237, 19, 69, 25%) 0 0 0 2px;
   }
 
@@ -545,7 +546,7 @@
 
 .libro-view-content-left {
   position: relative;
-  width: calc(100% - 40px);
+  width: calc(100% - 20px);
   height: 100%;
 
   // &.libro-view-content-has-right {
@@ -585,6 +586,10 @@
   }
 }
 
+.libro-output-area {
+  padding-top: 12px;
+}
+
 .libro-cell-output-content {
   &.scrolled {
     .libro-output-area {
@@ -594,6 +599,11 @@
   }
 }
 
+.libro-cell-output-content:has(.libro-output-area),
+.libro-cell-output-content:has(.libro-cell-bottom-blank) {
+  border-top: 1px solid var(--mana-libro-code-border-color);
+}
+
 .libro-cell-output-scroll-button {
   position: absolute;
   top: 4px;
@@ -635,6 +645,7 @@
 .libro-view-content-right {
   flex: 1;
   margin-left: 40px;
+  height: calc(100% - 40px);
 }
 
 .libro-totop-button {
@@ -755,12 +766,6 @@
   text-align: right;
 }
 
-.libro-output-area {
-  padding-top: 18px;
-  border-top: 1px solid var(--mana-libro-code-border-color);
-  // overflow: hidden;
-}
-
 .libro-tooltip {
   text-align: center;
 }

package/src/index.tsx

@@ -23,3 +23,4 @@ export * from './virtualized-manager.js';
 export * from './virtualized-manager-helper.js';
 export * from './libro-workspace-service.js';
 export * from './libro-context-key.js';
+export * from './utils/index.js';

package/src/libro-model.ts

@@ -67,6 +67,11 @@ export class LibroModel implements NotebookModel, DndListModel {
     return this.onSourceChangedEmitter.event;
   }
 
+  protected onRestartEmitter: Emitter<void> = new Emitter();
+  get onRestart() {
+    return this.onRestartEmitter.event;
+  }
+
   protected onCellContentChangedEmitter: Emitter<ICellContentChange> = new Emitter();
   get onCellContentChanged() {
     return this.onCellContentChangedEmitter.event;
@@ -439,6 +444,10 @@ export class LibroModel implements NotebookModel, DndListModel {
     this.insertCells([cell], position, mode);
   };
 
+  async restart() {
+    this.onRestartEmitter.fire();
+  }
+
   insertCells = (cells: CellView[], position?: number, mode?: string) => {
     // 非初始化阶段才需要自动滚动
     if (!this.isInitialized) {
@@ -458,6 +467,7 @@ export class LibroModel implements NotebookModel, DndListModel {
       this.cellViewCache.set(cell.model.id, cell);
       return cell.toJSON();
     });
+
     getOrigin(this.sharedModel).transact(() => {
       const insertIndex = position ?? this.sharedModel.cells.length;
       getOrigin(this.sharedModel).insertCells(insertIndex, cellData);

package/src/libro-protocol.ts

@@ -207,6 +207,8 @@ export interface BaseNotebookModel {
    */
   onChange?: () => void;
 
+  onRestart?: Event<void>;
+
   onSourceChange?: (cells: CellView[]) => void;
 
   onCellContentChange: (changes: ICellContentChange) => void;
@@ -409,6 +411,7 @@ export interface DndListModel {
 export interface DndContentProps {
   cell: CellView;
   index: number;
+  position: number;
 }
 
 export interface DndItemProps {

package/src/libro-setting.ts

@@ -81,7 +81,7 @@ export const RightContentFixed: ConfigurationNode<boolean> = {
   description: l10n.t('libroview的右边栏是否相对固定'),
   title: l10n.t('右侧内容是否相对固定'),
   type: 'checkbox',
-  defaultValue: false,
+  defaultValue: true,
   schema: {
     type: 'boolean',
   },

package/src/libro-view.tsx

@@ -69,6 +69,7 @@ import {
   RightContentFixed,
 } from './libro-setting.js';
 import { LibroSlotManager, LibroSlotView } from './slot/index.js';
+import { useSize } from './utils/index.js';
 import { VirtualizedManagerHelper } from './virtualized-manager-helper.js';
 import type { VirtualizedManager } from './virtualized-manager.js';
 import './index.less';
@@ -138,11 +139,23 @@ export const LibroContentComponent = memo(function LibroContentComponent() {
     ) {
       libroViewContentRef.current.style.cssText = 'display: block;';
       libroViewRightContentRef.current.style.cssText =
-        'position: absolute;top:44px;right:20px';
-      libroViewLeftContentRef.current.style.cssText = 'padding-right: 80px;';
+        'position: absolute;top:40px;right:20px';
+      libroViewLeftContentRef.current.style.cssText = 'padding-right: 20px;';
     }
   }, [rightContentFixed]);
 
+  const rightSize = useSize(libroViewRightContentRef);
+  let leftContentStyles = {};
+  let rightContentStyles = {};
+  if (rightSize?.width && rightSize?.width > 0) {
+    leftContentStyles = {
+      width: `calc(100% - ${rightSize.width}px)`,
+    };
+    rightContentStyles = {
+      marginLeft: 0,
+    };
+  }
+
   return (
     <>
       {headerVisible && (
@@ -155,7 +168,11 @@ export const LibroContentComponent = memo(function LibroContentComponent() {
         onScroll={handleScroll}
         ref={libroViewContentRef}
       >
-        <div className="libro-view-content-left" ref={libroViewLeftContentRef}>
+        <div
+          className="libro-view-content-left"
+          style={leftContentStyles}
+          ref={libroViewLeftContentRef}
+        >
           <DndContext>
             <CustomDragLayer />
             <DndList libroView={instance} ref={ref}>
@@ -166,7 +183,11 @@ export const LibroContentComponent = memo(function LibroContentComponent() {
             </DndList>
           </DndContext>
         </div>
-        <div className="libro-view-content-right" ref={libroViewRightContentRef}>
+        <div
+          className="libro-view-content-right"
+          style={rightContentStyles}
+          ref={libroViewRightContentRef}
+        >
           {/* {tocVisible && instance.toc && <ViewRender view={instance.toc} />} */}
           <Slot
             name={libroSlotManager.getSlotName(instance, 'right')}
@@ -305,6 +326,11 @@ export class LibroView extends BaseView implements NotebookView {
     return this.onBlurEmitter.event;
   }
 
+  onRestartEmitter: Emitter = new Emitter();
+  get onRestart() {
+    return this.onRestartEmitter.event;
+  }
+
   @inject(CellService) cellService: CellService;
   @inject(LibroService) libroService: LibroService;
   @inject(LibroSlotManager) libroSlotManager: LibroSlotManager;