@yuntijs/ui 1.0.0-beta.95 → 1.0.0-beta.97

package/es/ChatMarkdown/MarkdownElements/AntThinking/Component.js

@@ -1,7 +1,10 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _taggedTemplateLiteral from "@babel/runtime/helpers/esm/taggedTemplateLiteral";
-var _templateObject, _templateObject2, _templateObject3;
-import { Icon } from '@lobehub/ui';
+var _templateObject, _templateObject2;
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+import { Icon, Markdown } from '@lobehub/ui';
 import { createStyles } from 'antd-style';
 import { ChevronDown, ChevronRight, Sparkles } from 'lucide-react';
 import { memo, useState } from 'react';
@@ -13,11 +16,16 @@ var useStyles = createStyles(function (_ref) {
     token = _ref.token,
     isDarkMode = _ref.isDarkMode;
   return {
-    container: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    cursor: pointer;\n    padding-block: 12px;\n    padding-block-end: 6px;\n    color: ", ";\n  "])), token.colorTextTertiary),
-    titlebox: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n    padding: 8px;\n    color: ", ";\n    background: ", ";\n    border-radius: 8px;\n\n    &:hover {\n      background: ", ";\n    }\n  "])), token.colorTextSecondary, token.colorFillTertiary, isDarkMode ? '' : token.colorFillSecondary),
-    title: css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n    overflow: hidden;\n    display: box;\n    -webkit-box-orient: vertical;\n\n    font-size: 12px;\n    text-overflow: ellipsis;\n\n    -webkit-line-clamp: 1;\n  "])))
+    container: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    cursor: pointer;\n    padding-block: 12px;\n    color: ", ";\n  "])), token.colorTextSecondary),
+    titlebox: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n    padding: 8px;\n\n    font-size: 12px;\n    color: ", ";\n\n    background: ", ";\n    border-radius: 8px;\n  "])), token.colorText, isDarkMode ? token.colorFillTertiary : '#f3f5fc')
   };
 });
+var mProps = {
+  fontSize: 12,
+  lineHeight: 1.625,
+  headerMultiple: 0.2,
+  marginMultiple: 0.6
+};
 var Render = /*#__PURE__*/memo(function (_ref2) {
   var children = _ref2.children,
     second = _ref2.second,
@@ -31,11 +39,9 @@ var Render = /*#__PURE__*/memo(function (_ref2) {
     setShowDetail = _useState2[1];
   return /*#__PURE__*/_jsxs(Flexbox, {
     className: styles.container,
-    gap: 16,
     onClick: function onClick() {
       setShowDetail(!showDetail);
     },
-    width: '100%',
     children: [/*#__PURE__*/_jsxs(Flexbox, {
       className: styles.titlebox,
       distribution: 'space-between',
@@ -47,11 +53,13 @@ var Render = /*#__PURE__*/memo(function (_ref2) {
         children: [/*#__PURE__*/_jsx(Icon, {
           color: theme.purple,
           icon: Sparkles
-        }), done ? "\u5DF2\u6DF1\u5EA6\u601D\u8003\uFF08\u7528\u65F6 ".concat(second || 0, " \u79D2\uFF09") : '思考中...']
+        }), done ? "\u5DF2\u6DF1\u5EA6\u601D\u8003".concat(second ? '（用时' + second + '秒）' : '', " ") : '思考中...']
       }), /*#__PURE__*/_jsx(Icon, {
         icon: showDetail ? ChevronDown : ChevronRight
       })]
-    }), showDetail && children]
+    }), showDetail && /*#__PURE__*/_jsx(Markdown, _objectSpread(_objectSpread({}, mProps), {}, {
+      children: children
+    }))]
   });
 });
 export default Render;

package/es/ChatMarkdown/MarkdownElements/AntThinking/index.d.ts

@@ -2,6 +2,7 @@
 declare const AntThinkingElement: {
     Component: import("react").NamedExoticComponent<import("react").PropsWithChildren<import("./Component").ThinkProps>>;
     rehypePlugin: () => (tree: import("unist").Node) => void;
+    remarkPlugins: () => (tree: any) => void;
     tag: string;
 };
 export default AntThinkingElement;

package/es/ChatMarkdown/MarkdownElements/AntThinking/index.js

@@ -1,8 +1,10 @@
 import Component from "./Component";
 import rehypePlugin from "./rehypePlugin";
+import { remarkCaptureThink } from "./remarkPlugin";
 var AntThinkingElement = {
   Component: Component,
   rehypePlugin: rehypePlugin,
+  remarkPlugins: remarkCaptureThink,
   tag: 'think'
 };
 export default AntThinkingElement;

package/es/ChatMarkdown/MarkdownElements/AntThinking/remarkPlugin.d.ts

@@ -0,0 +1 @@
+export declare const remarkCaptureThink: () => (tree: any) => void;

package/es/ChatMarkdown/MarkdownElements/AntThinking/remarkPlugin.js

@@ -0,0 +1,59 @@
+import { toMarkdown } from 'mdast-util-to-markdown';
+import { SKIP, visit } from 'unist-util-visit';
+export var remarkCaptureThink = function remarkCaptureThink() {
+  return function (tree) {
+    visit(tree, 'html', function (node, index, parent) {
+      if (node.value === '<think>') {
+        var startIndex = index;
+        var endIndex = startIndex + 1;
+        var hasCloseTag = false;
+
+        // 查找闭合标签
+        while (endIndex < parent.children.length) {
+          var sibling = parent.children[endIndex];
+          if (sibling.type === 'html' && sibling.value === '</think>') {
+            hasCloseTag = true;
+            break;
+          }
+          endIndex++;
+        }
+
+        // 计算需要删除的节点范围
+        var deleteCount = hasCloseTag ? endIndex - startIndex + 1 : parent.children.length - startIndex;
+
+        // 提取内容节点
+        var contentNodes = parent.children.slice(startIndex + 1, hasCloseTag ? endIndex : undefined);
+
+        // 转换为 Markdown 字符串
+        var content = contentNodes.map(function (n) {
+          // fix https://github.com/lobehub/lobe-chat/issues/5668
+          if (n.type === 'paragraph') {
+            return n.children.map(function (child) {
+              return child.value;
+            }).join('');
+          }
+          return toMarkdown(n);
+        }).join('\n\n').trim();
+
+        // 创建自定义节点
+        var thinkNode = {
+          data: {
+            hChildren: [{
+              type: 'text',
+              value: content
+            }],
+            hName: 'think'
+          },
+          position: node.position,
+          type: 'thinkBlock'
+        };
+
+        // 替换原始节点
+        parent.children.splice(startIndex, deleteCount, thinkNode);
+
+        // 跳过已处理的节点
+        return [SKIP, startIndex + 1];
+      }
+    });
+  };
+};

package/es/ChatMarkdown/MarkdownElements/index.d.ts

@@ -2,5 +2,6 @@
 export declare const markdownElements: {
     Component: import("react").NamedExoticComponent<import("react").PropsWithChildren<import("./AntThinking/Component").ThinkProps>>;
     rehypePlugin: () => (tree: import("unist").Node) => void;
+    remarkPlugins: () => (tree: any) => void;
     tag: string;
 }[];

package/es/ChatMarkdown/index.js

@@ -1,22 +1,24 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["components", "rehypePlugins", "customComponentProps"];
+var _excluded = ["components", "remarkPlugins", "customComponentProps", "children"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { Markdown } from '@lobehub/ui';
 import React, { useMemo } from 'react';
 import { markdownElements } from "./MarkdownElements";
+import { normalizeThinkTags } from "./utils";
 import { jsx as _jsx } from "react/jsx-runtime";
-var defaultRehypePlugins = markdownElements.map(function (element) {
-  return element.rehypePlugin;
+var defaultRemarkPlugins = markdownElements.map(function (element) {
+  return element.remarkPlugins;
 });
 export var ChatMarkdown = function ChatMarkdown(_ref) {
   var _ref$components = _ref.components,
     components = _ref$components === void 0 ? {} : _ref$components,
-    _ref$rehypePlugins = _ref.rehypePlugins,
-    rehypePlugins = _ref$rehypePlugins === void 0 ? [] : _ref$rehypePlugins,
+    _ref$remarkPlugins = _ref.remarkPlugins,
+    remarkPlugins = _ref$remarkPlugins === void 0 ? [] : _ref$remarkPlugins,
     customComponentProps = _ref.customComponentProps,
+    children = _ref.children,
     props = _objectWithoutProperties(_ref, _excluded);
   var allComponents = useMemo(function () {
     var defaultComponents = Object.fromEntries(markdownElements.map(function (element) {
@@ -26,11 +28,13 @@ export var ChatMarkdown = function ChatMarkdown(_ref) {
     }));
     return _objectSpread(_objectSpread({}, defaultComponents), components);
   }, [components, customComponentProps]);
-  var allRehypePlugins = useMemo(function () {
-    return [].concat(_toConsumableArray(defaultRehypePlugins), _toConsumableArray(rehypePlugins));
-  }, [rehypePlugins]);
-  return /*#__PURE__*/_jsx(Markdown, _objectSpread({
+  var allRemarkPlugins = useMemo(function () {
+    return [].concat(_toConsumableArray(defaultRemarkPlugins), _toConsumableArray(remarkPlugins));
+  }, [remarkPlugins]);
+  return /*#__PURE__*/_jsx(Markdown, _objectSpread(_objectSpread({
     components: allComponents,
-    rehypePlugins: allRehypePlugins
-  }, props));
+    remarkPlugins: allRemarkPlugins
+  }, props), {}, {
+    children: normalizeThinkTags(children)
+  }));
 };

package/es/ChatMarkdown/utils.d.ts

@@ -0,0 +1 @@
+export declare const normalizeThinkTags: (markdown: string) => string;

package/es/ChatMarkdown/utils.js

@@ -0,0 +1,10 @@
+// 预处理函数：确保 think 标签前后有两个换行符
+export var normalizeThinkTags = function normalizeThinkTags(markdown) {
+  return markdown
+  // 确保 <think> 标签前后有两个换行符
+  .replaceAll(/([^\n])\s*<think>/g, '$1\n\n<think>').replaceAll(/<think>\s*([^\n])/g, '<think>\n\n$1')
+  // 确保 </think> 标签前后有两个换行符
+  .replaceAll(/([^\n])\s*<\/think>/g, '$1\n\n</think>').replaceAll(/<\/think>\s*([^\n])/g, '</think>\n\n$1')
+  // 处理可能产生的多余换行符
+  .replaceAll(/\n{3,}/g, '\n\n');
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuntijs/ui",
-  "version": "1.0.0-beta.95",
+  "version": "1.0.0-beta.97",
   "description": "☁️ Yunti UI - an open-source UI component library for building Cloud Native web apps",
   "keywords": [
     "yuntijs",
@@ -129,6 +129,7 @@
     "jest": "^27",
     "jsdom": "^22",
     "lint-staged": "^15",
+    "mdast-util-to-markdown": "^2.1.2",
     "monaco-editor": "^0.45.0",
     "prettier": "^3",
     "react": "^18",