@agentscope-ai/design 1.0.19-beta.1765956798383 → 1.0.19-beta.1765957449539

package/lib/antd/themes/generateTheme.js

@@ -48,11 +48,11 @@ var rgbToHex = function rgbToHex(r, g, b) {
  * RGB 转 HSL
  */
 var rgbToHsl = function rgbToHsl(r, g, b) {
-  r /= 255;
-  g /= 255;
-  b /= 255;
-  var max = Math.max(r, g, b),
-    min = Math.min(r, g, b);
+  var rr = r / 255;
+  var gg = g / 255;
+  var bb = b / 255;
+  var max = Math.max(rr, gg, bb),
+    min = Math.min(rr, gg, bb);
   var h,
     s,
     l = (max + min) / 2;
@@ -62,14 +62,14 @@ var rgbToHsl = function rgbToHsl(r, g, b) {
     var d = max - min;
     s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
     switch (max) {
-      case r:
-        h = ((g - b) / d + (g < b ? 6 : 0)) / 6;
+      case rr:
+        h = ((gg - bb) / d + (gg < bb ? 6 : 0)) / 6;
         break;
-      case g:
-        h = ((b - r) / d + 2) / 6;
+      case gg:
+        h = ((bb - rr) / d + 2) / 6;
         break;
-      case b:
-        h = ((r - g) / d + 4) / 6;
+      case bb:
+        h = ((rr - gg) / d + 4) / 6;
         break;
       default:
         h = 0;
@@ -86,26 +86,27 @@ var rgbToHsl = function rgbToHsl(r, g, b) {
  * HSL 转 RGB
  */
 var hslToRgb = function hslToRgb(h, s, l) {
-  h /= 360;
-  s /= 100;
-  l /= 100;
+  var hh = h / 360;
+  var ss = s / 100;
+  var ll = l / 100;
   var r, g, b;
-  if (s === 0) {
-    r = g = b = l;
+  if (ss === 0) {
+    r = g = b = ll;
   } else {
     var hue2rgb = function hue2rgb(p, q, t) {
-      if (t < 0) t += 1;
-      if (t > 1) t -= 1;
-      if (t < 1 / 6) return p + (q - p) * 6 * t;
+      var tt = t;
+      if (tt < 0) tt += 1;
+      if (tt > 1) tt -= 1;
+      if (tt < 1 / 6) return p + (q - p) * 6 * tt;
       if (t < 1 / 2) return q;
-      if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6;
+      if (tt < 2 / 3) return p + (q - p) * (2 / 3 - tt) * 6;
       return p;
     };
-    var q = l < 0.5 ? l * (1 + s) : l + s - l * s;
-    var p = 2 * l - q;
-    r = hue2rgb(p, q, h + 1 / 3);
-    g = hue2rgb(p, q, h);
-    b = hue2rgb(p, q, h - 1 / 3);
+    var q = ll < 0.5 ? ll * (1 + ss) : ll + ss - ll * ss;
+    var p = 2 * ll - q;
+    r = hue2rgb(p, q, hh + 1 / 3);
+    g = hue2rgb(p, q, hh);
+    b = hue2rgb(p, q, hh - 1 / 3);
   }
   return {
     r: Math.round(r * 255),
@@ -177,15 +178,15 @@ var generateTheme = function generateTheme(_ref) {
     textBaseHex = _ref.textBaseHex,
     _ref$darkMode = _ref.darkMode,
     darkMode = _ref$darkMode === void 0 ? false : _ref$darkMode;
-  bgBaseHex = bgBaseHex || (darkMode ? '#000000' : '#ffffff');
-  textBaseHex = textBaseHex || (darkMode ? '#E7E7ED' : '#1a1a1a');
+  var resolvedBgBaseHex = bgBaseHex || (darkMode ? '#000000' : '#ffffff');
+  var resolvedTextBaseHex = textBaseHex || (darkMode ? '#E7E7ED' : '#1a1a1a');
   var rgb = hexToRgb(primaryHex);
   if (!rgb) return null;
   var hsl = rgbToHsl(rgb.r, rgb.g, rgb.b);
 
   // 获取背景色和文本色的 RGB 和 HSL
-  var bgBaseRgb = hexToRgb(bgBaseHex);
-  var textBaseRgb = hexToRgb(textBaseHex);
+  var bgBaseRgb = hexToRgb(resolvedBgBaseHex);
+  var textBaseRgb = hexToRgb(resolvedTextBaseHex);
   var bgBaseHsl = bgBaseRgb ? rgbToHsl(bgBaseRgb.r, bgBaseRgb.g, bgBaseRgb.b) : {
     h: 210,
     s: 8,

package/lib/components/commonComponents/CodeBlock/index.js

@@ -10,7 +10,7 @@ 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 { getCommonConfig } from "../../..";
+import { bailianDarkTheme, bailianTheme, getCommonConfig, ConfigProvider } from "../../..";
 import { cpp } from '@codemirror/lang-cpp';
 import { css } from '@codemirror/lang-css';
 import { go } from '@codemirror/lang-go';
@@ -25,14 +25,14 @@ import { yaml } from '@codemirror/lang-yaml';
 import { linter, lintGutter } from '@codemirror/lint';
 import { vscodeDark, vscodeLight } from '@uiw/codemirror-theme-vscode';
 import CodeMirror from '@uiw/react-codemirror';
-import { ConfigProvider, theme } from 'antd';
+import { theme } from 'antd';
 import cls from 'classnames';
 import { omit } from 'lodash-es';
 import React, { useMemo } from 'react';
 import { useStyle } from "./index.style";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 export var langExtensionsMap = {
   javascript: [javascript()],
   jsx: [javascript()],
@@ -77,19 +77,28 @@ var CodeMirrorWrapper = function CodeMirrorWrapper(props) {
       return vscodeLight;
     }
     return props.theme === 'dark' ? vscodeDark : vscodeLight;
-  }, [isDarkMode]);
+  }, [isDarkMode, props.theme]);
   var extensions = typeof props.language === 'string' ? [].concat(_toConsumableArray(langExtensionsMap[props.language] || []), _toConsumableArray(props.value && props.language in lintExtensionsMap ? lintExtensionsMap[props.language] : [])) : props.language.reduce(function (ext, lang) {
     return [].concat(_toConsumableArray(ext), [langExtensionsMap[lang]]);
   }, []);
+  var codeMirrorElement = /*#__PURE__*/_jsx("div", {
+    className: cls("".concat(sparkPrefix, "-code-block"), props.className),
+    children: /*#__PURE__*/_jsx(CodeMirror, _objectSpread({
+      extensions: extensions,
+      value: props.language === 'json' ? beautifulJson(props.value) : props.value,
+      theme: getTheme
+    }, omit(props, ['language', 'theme', 'extensions', 'value'])))
+  });
+  if (props.theme !== undefined) {
+    var selectedTheme = props.theme === 'dark' ? bailianDarkTheme : bailianTheme;
+    return /*#__PURE__*/_jsx(_Fragment, {
+      children: /*#__PURE__*/_jsxs(ConfigProvider, _objectSpread(_objectSpread({}, selectedTheme), {}, {
+        children: [/*#__PURE__*/_jsx(Style, {}), codeMirrorElement]
+      }))
+    });
+  }
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsx(Style, {}), /*#__PURE__*/_jsx("div", {
-      className: cls("".concat(sparkPrefix, "-code-block"), props.className),
-      children: /*#__PURE__*/_jsx(CodeMirror, _objectSpread({
-        extensions: extensions,
-        value: props.language === 'json' ? beautifulJson(props.value) : props.value,
-        theme: getTheme
-      }, omit(props, ['language', 'theme', 'extensions', 'value'])))
-    })]
+    children: [/*#__PURE__*/_jsx(Style, {}), codeMirrorElement]
   });
 };
 export default CodeMirrorWrapper;