@difizen/libro-core 0.1.32 → 0.1.33

package/es/index.less

@@ -56,13 +56,15 @@
 .libro-view-top {
   display: flex;
   align-items: center;
+  justify-content: space-between;
   width: 100%;
   height: 44px;
   // background-color: var(--mana-color-bg-elevated);
   border-bottom: 1px solid var(--mana-libro-toptoolbar-border-color);
 
   .libro-header-left {
-    width: 265px;
+    width: 240px;
+    flex-shrink: 0;
 
     .mana-toolbar {
       justify-content: left;
@@ -71,13 +73,12 @@
 
   .libro-header-center {
     .mana-toolbar {
-      justify-content: center;
+      justify-content: flex-start;
     }
   }
 
   .libro-header-center,
   .libro-header-right {
-    flex: 1;
     overflow: hidden;
 
     .mana-toolbar {
@@ -122,6 +123,7 @@
 
   .libro-header-right {
     color: unset;
+    flex: 0 0 auto;
   }
 
   .libro-keybind-instructions-icon {

package/es/material-from-designer.js

@@ -57,7 +57,7 @@ export var PauseCircleOutlined = function PauseCircleOutlined() {
       children: /*#__PURE__*/_jsxs("g", {
         id: "time-out",
         fillRule: "nonzero",
-        fill: "#7B7B7B",
+        fill: "currentColor",
         children: [/*#__PURE__*/_jsx("rect", {
           id: "\u77E9\u5F62",
           fill: "#000000",
@@ -91,7 +91,7 @@ export var Reload = function Reload() {
       children: /*#__PURE__*/_jsx("g", {
         id: "2.1-kernel-\u72B6\u6001\u5C55\u793A",
         transform: "translate(-776.000000, -80.000000)",
-        fill: "#7B7B7B",
+        fill: "currentColor",
         fillRule: "nonzero",
         children: /*#__PURE__*/_jsx("g", {
           id: "\u7F16\u7EC4-24",

package/es/toolbar/change-cell-to-selector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"change-cell-to-selector.d.ts","sourceRoot":"","sources":["../../src/toolbar/change-cell-to-selector.tsx"],"names":[],"mappings":";AAeA,OAAO,cAAc,CAAC;AAQtB,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAgCvC,CAAC;AAEF,eAAO,MAAM,cAAc,0CAA4B,CAAC"}
+{"version":3,"file":"change-cell-to-selector.d.ts","sourceRoot":"","sources":["../../src/toolbar/change-cell-to-selector.tsx"],"names":[],"mappings":";AAgBA,OAAO,cAAc,CAAC;AAQtB,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAwCvC,CAAC;AAEF,eAAO,MAAM,cAAc,0CAA4B,CAAC"}

package/es/toolbar/change-cell-to-selector.js

@@ -4,14 +4,13 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 _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; }
-import { useInject, ToolbarInstance, getOrigin, CommandRegistry } from '@difizen/mana-app';
-import { Select } from 'antd';
+import { useInject, ToolbarInstance, getOrigin, CommandRegistry, ThemeService } from '@difizen/mana-app';
+import { ConfigProvider, Select, theme } from 'antd';
 import { memo } from 'react';
 import { LibroCellService } from "../cell/index.js";
 import { NotebookCommands } from "../command/index.js";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
 var Option = Select.Option;
 var widthStyle = {
   width: 110
@@ -24,11 +23,15 @@ export var ToolItemSelectInner = function ToolItemSelectInner() {
   var data = toolbar.currentArgs;
   var command = useInject(CommandRegistry);
   var curCell = data === null || data === void 0 ? void 0 : data[0];
+  var themeService = useInject(ThemeService);
   var handleChange = function handleChange(value) {
     var args = getOrigin(data) || [];
     command.executeCommand.apply(command, [NotebookCommands['ChangeCellTo'].id].concat(_toConsumableArray(args), [value]));
   };
-  return /*#__PURE__*/_jsx(_Fragment, {
+  return /*#__PURE__*/_jsx(ConfigProvider, {
+    theme: {
+      algorithm: themeService.getCurrentTheme().type === 'dark' ? theme.darkAlgorithm : theme.defaultAlgorithm
+    },
     children: /*#__PURE__*/_jsx(Select, {
       value: curCell === null || curCell === void 0 || (_curCell$model = curCell.model) === null || _curCell$model === void 0 ? void 0 : _curCell$model.type,
       size: 'small',

package/package.json

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

package/src/index.less

@@ -56,13 +56,15 @@
 .libro-view-top {
   display: flex;
   align-items: center;
+  justify-content: space-between;
   width: 100%;
   height: 44px;
   // background-color: var(--mana-color-bg-elevated);
   border-bottom: 1px solid var(--mana-libro-toptoolbar-border-color);
 
   .libro-header-left {
-    width: 265px;
+    width: 240px;
+    flex-shrink: 0;
 
     .mana-toolbar {
       justify-content: left;
@@ -71,13 +73,12 @@
 
   .libro-header-center {
     .mana-toolbar {
-      justify-content: center;
+      justify-content: flex-start;
     }
   }
 
   .libro-header-center,
   .libro-header-right {
-    flex: 1;
     overflow: hidden;
 
     .mana-toolbar {
@@ -122,6 +123,7 @@
 
   .libro-header-right {
     color: unset;
+    flex: 0 0 auto;
   }
 
   .libro-keybind-instructions-icon {

package/src/material-from-designer.tsx

@@ -41,7 +41,7 @@ export const PauseCircleOutlined: React.FC = () => (
     xmlnsXlink="http://www.w3.org/1999/xlink"
   >
     <g id="原色" stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
-      <g id="time-out" fillRule="nonzero" fill="#7B7B7B">
+      <g id="time-out" fillRule="nonzero" fill="currentColor">
         <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="20" height="20" />
         <path
           d="M10,1.25 C5.16796875,1.25 1.25,5.16796875 1.25,10 C1.25,14.8320312 5.16796875,18.75 10,18.75 C14.8320312,18.75 18.75,14.8320312 18.75,10 C18.75,5.16796875 14.8320312,1.25 10,1.25 Z M10,17.265625 C5.98828125,17.265625 2.734375,14.0117187 2.734375,10 C2.734375,5.98828125 5.98828125,2.734375 10,2.734375 C14.0117187,2.734375 17.265625,5.98828125 17.265625,10 C17.265625,14.0117187 14.0117187,17.265625 10,17.265625 Z M8.28125,6.875 L7.34375,6.875 C7.2578125,6.875 7.1875,6.9453125 7.1875,7.03125 L7.1875,12.96875 C7.1875,13.0546875 7.2578125,13.125 7.34375,13.125 L8.28125,13.125 C8.3671875,13.125 8.4375,13.0546875 8.4375,12.96875 L8.4375,7.03125 C8.4375,6.9453125 8.3671875,6.875 8.28125,6.875 Z M12.65625,6.875 L11.71875,6.875 C11.6328125,6.875 11.5625,6.9453125 11.5625,7.03125 L11.5625,12.96875 C11.5625,13.0546875 11.6328125,13.125 11.71875,13.125 L12.65625,13.125 C12.7421875,13.125 12.8125,13.0546875 12.8125,12.96875 L12.8125,7.03125 C12.8125,6.9453125 12.7421875,6.875 12.65625,6.875 Z"
@@ -65,7 +65,7 @@ export const Reload: React.FC = () => (
       <g
         id="2.1-kernel-状态展示"
         transform="translate(-776.000000, -80.000000)"
-        fill="#7B7B7B"
+        fill="currentColor"
         fillRule="nonzero"
       >
         <g id="编组-24" transform="translate(637.000000, 80.000000)">

package/src/toolbar/change-cell-to-selector.tsx

@@ -3,9 +3,10 @@ import {
   ToolbarInstance,
   getOrigin,
   CommandRegistry,
+  ThemeService,
 } from '@difizen/mana-app';
 import type { Toolbar } from '@difizen/mana-app';
-import { Select } from 'antd';
+import { ConfigProvider, Select, theme } from 'antd';
 import { memo } from 'react';
 
 import type { CellMeta } from '../cell/index.js';
@@ -28,13 +29,21 @@ export const ToolItemSelectInner: React.FC = () => {
   const data = toolbar.currentArgs as LibroToolbarArags;
   const command = useInject(CommandRegistry);
   const curCell = data?.[0];
+  const themeService = useInject(ThemeService);
 
   const handleChange = (value: string) => {
     const args = getOrigin(data) || [];
     command.executeCommand(NotebookCommands['ChangeCellTo'].id, ...args, value);
   };
   return (
-    <>
+    <ConfigProvider
+      theme={{
+        algorithm:
+          themeService.getCurrentTheme().type === 'dark'
+            ? theme.darkAlgorithm
+            : theme.defaultAlgorithm,
+      }}
+    >
       <Select
         value={curCell?.model?.type}
         size={'small'}
@@ -51,7 +60,7 @@ export const ToolItemSelectInner: React.FC = () => {
           );
         })}
       </Select>
-    </>
+    </ConfigProvider>
   );
 };