@agentscope-ai/design 1.0.19 → 1.0.20

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;