@yuntijs/ui 1.0.0-beta.94 → 1.0.0-beta.96

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

@@ -0,0 +1,7 @@
+import { PropsWithChildren } from 'react';
+export interface ThinkProps {
+    second?: number;
+    done?: boolean;
+}
+declare const Render: import("react").NamedExoticComponent<PropsWithChildren<ThinkProps>>;
+export default Render;

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

@@ -0,0 +1,57 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _taggedTemplateLiteral from "@babel/runtime/helpers/esm/taggedTemplateLiteral";
+var _templateObject, _templateObject2, _templateObject3;
+import { Icon, Markdown } from '@lobehub/ui';
+import { createStyles } from 'antd-style';
+import { ChevronDown, ChevronRight, Sparkles } from 'lucide-react';
+import { memo, useState } from 'react';
+import { Flexbox } from 'react-layout-kit';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+var useStyles = createStyles(function (_ref) {
+  var css = _ref.css,
+    token = _ref.token,
+    isDarkMode = _ref.isDarkMode;
+  return {
+    container: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    cursor: pointer;\n    padding-block: 12px;\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  "])))
+  };
+});
+var Render = /*#__PURE__*/memo(function (_ref2) {
+  var children = _ref2.children,
+    second = _ref2.second,
+    done = _ref2.done;
+  var _useStyles = useStyles(),
+    styles = _useStyles.styles,
+    theme = _useStyles.theme;
+  var _useState = useState(true),
+    _useState2 = _slicedToArray(_useState, 2),
+    showDetail = _useState2[0],
+    setShowDetail = _useState2[1];
+  return /*#__PURE__*/_jsxs(Flexbox, {
+    className: styles.container,
+    onClick: function onClick() {
+      setShowDetail(!showDetail);
+    },
+    children: [/*#__PURE__*/_jsxs(Flexbox, {
+      className: styles.titlebox,
+      distribution: 'space-between',
+      flex: 1,
+      horizontal: true,
+      children: [/*#__PURE__*/_jsxs(Flexbox, {
+        gap: 8,
+        horizontal: true,
+        children: [/*#__PURE__*/_jsx(Icon, {
+          color: theme.purple,
+          icon: Sparkles
+        }), done ? "\u5DF2\u6DF1\u5EA6\u601D\u8003\uFF08\u7528\u65F6 ".concat(second || 0, " \u79D2\uFF09") : '思考中...']
+      }), /*#__PURE__*/_jsx(Icon, {
+        icon: showDetail ? ChevronDown : ChevronRight
+      })]
+    }), showDetail && /*#__PURE__*/_jsx(Markdown, {
+      children: children
+    })]
+  });
+});
+export default Render;

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

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+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

@@ -0,0 +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/rehypePlugin.d.ts

@@ -0,0 +1,3 @@
+import type { Node } from 'unist';
+declare const rehypePlugin: () => (tree: Node) => void;
+export default rehypePlugin;

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

@@ -0,0 +1,32 @@
+import { visit } from 'unist-util-visit';
+
+// eslint-disable-next-line unicorn/consistent-function-scoping
+var rehypePlugin = function rehypePlugin() {
+  return function (tree) {
+    visit(tree, 'element', function (node, index, parent) {
+      if (node.type === 'element' && node.tagName === 'p') {
+        var children = node.children || [];
+        var openTagIndex = children.findIndex(function (child) {
+          return child.type === 'raw' && child.value === '<think>';
+        });
+        var closeTagIndex = children.findIndex(function (child) {
+          return child.type === 'raw' && child.value === '</think>';
+        });
+        if (openTagIndex !== -1 && closeTagIndex !== -1 && closeTagIndex > openTagIndex) {
+          var content = children.slice(openTagIndex + 1, closeTagIndex);
+          var thinkNode = {
+            children: content,
+            properties: {},
+            tagName: 'think',
+            type: 'element'
+          };
+
+          // Replace the entire paragraph with our new thinkNode node
+          parent.children.splice(index, 1, thinkNode);
+          return index; // Skip processing the newly inserted node
+        }
+      }
+    });
+  };
+};
+export default rehypePlugin;

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

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+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/MarkdownElements/index.js

@@ -0,0 +1,2 @@
+import AntThinkingElement from "./AntThinking";
+export var markdownElements = [AntThinkingElement];

package/es/ChatMarkdown/index.d.ts

@@ -0,0 +1,10 @@
+import { type MarkdownProps } from '@lobehub/ui';
+import React from 'react';
+import { ThinkProps } from './MarkdownElements/AntThinking/Component';
+export interface ChatMarkdownProps extends MarkdownProps {
+    customComponentProps?: {
+        think?: Partial<ThinkProps>;
+        [k: string]: any;
+    };
+}
+export declare const ChatMarkdown: React.FC<ChatMarkdownProps>;

package/es/ChatMarkdown/index.js

@@ -0,0 +1,40 @@
+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", "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 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$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) {
+      return [element.tag, function (aprops) {
+        return /*#__PURE__*/_jsx(element.Component, _objectSpread(_objectSpread({}, aprops), customComponentProps === null || customComponentProps === void 0 ? void 0 : customComponentProps[element.tag]));
+      }];
+    }));
+    return _objectSpread(_objectSpread({}, defaultComponents), components);
+  }, [components, customComponentProps]);
+  var allRemarkPlugins = useMemo(function () {
+    return [].concat(_toConsumableArray(defaultRemarkPlugins), _toConsumableArray(remarkPlugins));
+  }, [remarkPlugins]);
+  return /*#__PURE__*/_jsx(Markdown, _objectSpread(_objectSpread({
+    components: allComponents,
+    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/es/EditableMessage/index.d.ts

@@ -1,5 +1,6 @@
-import { MarkdownProps, type MessageInputProps, type MessageModalProps } from '@lobehub/ui';
+import { type MessageInputProps, type MessageModalProps } from '@lobehub/ui';
 import { CSSProperties } from 'react';
+import { ChatMarkdownProps } from "../ChatMarkdown";
 export interface EditableMessageProps {
     /**
      * @title The class name for the Markdown and MessageInput component
@@ -70,6 +71,6 @@ export interface EditableMessageProps {
      * @title The current text value
      */
     value: string;
-    markdownProps?: Omit<MarkdownProps, 'children'>;
+    markdownProps?: Omit<ChatMarkdownProps, 'children'>;
 }
 export declare const EditableMessage: import("react").NamedExoticComponent<EditableMessageProps>;

package/es/EditableMessage/index.js

@@ -4,9 +4,10 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 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, MessageInput, MessageModal } from '@lobehub/ui';
+import { MessageInput, MessageModal } from '@lobehub/ui';
 import { memo } from 'react';
 import useControlledState from 'use-merge-value';
+import { ChatMarkdown } from "../ChatMarkdown";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -69,7 +70,7 @@ export var EditableMessage = /*#__PURE__*/memo(function (_ref) {
   });
   if (!value && showEditWhenEmpty) return input;
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [!expand && isEdit ? input : /*#__PURE__*/_jsx(Markdown, _objectSpread(_objectSpread({
+    children: [!expand && isEdit ? input : /*#__PURE__*/_jsx(ChatMarkdown, _objectSpread(_objectSpread({
       className: classNames === null || classNames === void 0 ? void 0 : classNames.markdown,
       fontSize: fontSize,
       fullFeaturedCodeBlock: fullFeaturedCodeBlock,

package/es/index.d.ts

@@ -29,6 +29,7 @@ export * from './Tree';
 export * from './Typography';
 export * from './ChatInputArea';
 export * from './ChatItem';
+export * from './ChatMarkdown';
 export * from './EditableMessage';
 export * from './Highlighter';
 export * from './styles';

package/es/index.js

@@ -33,6 +33,7 @@ export * from "./Typography";
 // ~ custom @lobehub/ui
 export * from "./ChatInputArea";
 export * from "./ChatItem";
+export * from "./ChatMarkdown";
 export * from "./EditableMessage";
 export * from "./Highlighter";
 export * from "./styles";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuntijs/ui",
-  "version": "1.0.0-beta.94",
+  "version": "1.0.0-beta.96",
   "description": "☁️ Yunti UI - an open-source UI component library for building Cloud Native web apps",
   "keywords": [
     "yuntijs",
@@ -113,6 +113,7 @@
     "@types/query-string": "^6",
     "@types/react": "18.2.40",
     "@types/react-dom": "^18",
+    "@types/unist": "^3.0.3",
     "@vitest/coverage-v8": "latest",
     "@yuntijs/lint": "^1.7.0",
     "antd": "^5.23.0",
@@ -128,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",
@@ -137,6 +139,7 @@
     "semantic-release": "^21",
     "stylelint": "^15",
     "typescript": "^5",
+    "unist-util-visit": "^5.0.0",
     "vitest": "latest"
   },
   "peerDependencies": {