@lobehub/ui 1.118.0 → 1.118.1

package/es/Alert/index.d.ts

@@ -7,6 +7,8 @@ export interface AlertProps extends AntAlertProps {
     };
     colorfulText?: boolean;
     extra?: ReactNode;
+    extraDefaultExpand?: boolean;
+    extraIsolate?: boolean;
     text?: {
         detail?: string;
     };

package/es/Alert/index.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["closeIcon", "closable", "description", "showIcon", "type", "variant", "icon", "colorfulText", "style", "extra", "classNames", "text"];
+var _excluded = ["closeIcon", "closable", "description", "showIcon", "type", "variant", "icon", "colorfulText", "style", "extra", "classNames", "text", "extraDefaultExpand", "extraIsolate"];
 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 { Alert as AntdAlert, message } from 'antd';
@@ -44,8 +44,11 @@ var Alert = /*#__PURE__*/memo(function (_ref) {
     extra = _ref.extra,
     classNames = _ref.classNames,
     text = _ref.text,
+    _ref$extraDefaultExpa = _ref.extraDefaultExpand,
+    extraDefaultExpand = _ref$extraDefaultExpa === void 0 ? false : _ref$extraDefaultExpa,
+    extraIsolate = _ref.extraIsolate,
     rest = _objectWithoutProperties(_ref, _excluded);
-  var _useState = useState(true),
+  var _useState = useState(extraDefaultExpand),
     _useState2 = _slicedToArray(_useState, 2),
     expand = _useState2[0],
     setExpand = _useState2[1];
@@ -57,8 +60,9 @@ var Alert = /*#__PURE__*/memo(function (_ref) {
     theme = _useStyles.theme,
     styles = _useStyles.styles,
     cx = _useStyles.cx;
+  var isInsideExtra = !extraIsolate && !!extra;
   var alert = /*#__PURE__*/_jsx(AntdAlert, _objectSpread({
-    className: cx(styles.container, colorfulText && styles.colorfulText, !!extra && styles.hasExtra, variant === 'block' && styles.variantBlock, variant === 'ghost' && styles.variantGhost, variant === 'pure' && styles.variantPure, classNames === null || classNames === void 0 ? void 0 : classNames.alert, !extra && styles.container),
+    className: cx(styles.container, colorfulText && styles.colorfulText, !!isInsideExtra && styles.hasExtra, variant === 'block' && styles.variantBlock, variant === 'ghost' && styles.variantGhost, variant === 'pure' && styles.variantPure, classNames === null || classNames === void 0 ? void 0 : classNames.alert, !isInsideExtra && styles.container),
     closable: closable,
     closeIcon: closeIcon || /*#__PURE__*/_jsx(ActionIcon, {
       color: colors(theme, type),
@@ -79,6 +83,11 @@ var Alert = /*#__PURE__*/memo(function (_ref) {
     type: type
   }, rest));
   if (!extra) return alert;
+  if (extraIsolate) return /*#__PURE__*/_jsxs(Flexbox, {
+    className: classNames === null || classNames === void 0 ? void 0 : classNames.container,
+    gap: 8,
+    children: [alert, extra]
+  });
   return /*#__PURE__*/_jsxs(Flexbox, {
     className: classNames === null || classNames === void 0 ? void 0 : classNames.container,
     children: [alert, /*#__PURE__*/_jsxs(Flexbox, {

package/es/Alert/style.js

@@ -17,7 +17,7 @@ export var useStyles = createStyles(function (_ref, _ref2) {
     extra: css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n        position: relative;\n\n        overflow: hidden;\n\n        max-width: 100%;\n\n        border: 1px solid;\n        border-top: none;\n        border-bottom-right-radius: ", "px;\n        border-bottom-left-radius: ", "px;\n      "])), token.borderRadiusLG, token.borderRadiusLG),
     extraBody: css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n        overflow-x: auto;\n        width: 100%;\n        padding-block: ", "px;\n        padding-inline: ", "px;\n      "])), baseBlockPadding, baseInlinePadding),
     extraHeader: css(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n        padding-block: ", "px;\n        padding-inline: ", "px;\n        border-top: 1px dashed;\n      "])), baseBlockPadding * 0.75, baseInlinePadding * 0.75),
-    hasExtra: css(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n        border-bottom-right-radius: 0;\n        border-bottom-left-radius: 0;\n      "]))),
+    hasExtra: css(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n        border-bottom: none;\n        border-bottom-right-radius: 0;\n        border-bottom-left-radius: 0;\n      "]))),
     variantBlock: css(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n        border: none;\n      "]))),
     variantGhost: css(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n        background: transparent !important;\n      "]))),
     variantPure: css(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n        padding: 0 !important;\n        background: transparent !important;\n        border: none;\n      "]))),

package/es/ChatList/Item.d.ts

@@ -1,5 +1,6 @@
 import { FC, ReactNode } from 'react';
 import { ActionEvent } from "../ActionIconGroup";
+import type { AlertProps } from "../Alert";
 import { type ChatItemProps } from "../ChatItem";
 import { ChatMessage } from "../types/chatMessage";
 import { LLMRoleType } from "../types/llm";
@@ -15,7 +16,10 @@ export type RenderMessage = FC<ChatMessage & {
     editableContent: ReactNode;
 }>;
 export type RenderMessageExtra = FC<ChatMessage>;
-export type RenderErrorMessage = FC<ChatMessage>;
+export interface RenderErrorMessage {
+    Render?: FC<ChatMessage>;
+    config?: AlertProps;
+}
 export type RenderAction = FC<ActionsBarProps & ChatMessage>;
 export interface ListItemProps {
     groupNav?: ChatItemProps['avatarAddon'];

package/es/ChatList/Item.js

@@ -58,7 +58,7 @@ var Item = /*#__PURE__*/memo(function (props) {
     var RenderFunction;
     if (renderMessagesExtra !== null && renderMessagesExtra !== void 0 && renderMessagesExtra[item.role]) RenderFunction = renderMessagesExtra[item.role];
     if (renderMessagesExtra !== null && renderMessagesExtra !== void 0 && renderMessagesExtra['default']) RenderFunction = renderMessagesExtra['default'];
-    if (!RenderFunction && !RenderFunction) return;
+    if (!RenderFunction) return;
     return /*#__PURE__*/_jsx(RenderFunction, _objectSpread({}, data));
   }, [renderMessagesExtra === null || renderMessagesExtra === void 0 ? void 0 : renderMessagesExtra[item.role]]);
   var ErrorMessage = useCallback(function (_ref3) {
@@ -66,8 +66,8 @@ var Item = /*#__PURE__*/memo(function (props) {
     var data = _ref3.data;
     if (!renderErrorMessages || !(item !== null && item !== void 0 && (_item$error = item.error) !== null && _item$error !== void 0 && _item$error.type)) return;
     var RenderFunction;
-    if (renderErrorMessages !== null && renderErrorMessages !== void 0 && renderErrorMessages[item.error.type]) RenderFunction = renderErrorMessages[item.error.type];
-    if (!RenderFunction && renderErrorMessages !== null && renderErrorMessages !== void 0 && renderErrorMessages['default']) RenderFunction = renderErrorMessages['default'];
+    if (renderErrorMessages !== null && renderErrorMessages !== void 0 && renderErrorMessages[item.error.type]) RenderFunction = renderErrorMessages[item.error.type].Render;
+    if (!RenderFunction && renderErrorMessages !== null && renderErrorMessages !== void 0 && renderErrorMessages['default']) RenderFunction = renderErrorMessages['default'].Render;
     if (!RenderFunction) return;
     return /*#__PURE__*/_jsx(RenderFunction, _objectSpread({}, data));
   }, [renderErrorMessages === null || renderErrorMessages === void 0 ? void 0 : renderErrorMessages[item === null || item === void 0 || (_item$error2 = item.error) === null || _item$error2 === void 0 ? void 0 : _item$error2.type]]);
@@ -103,10 +103,16 @@ var Item = /*#__PURE__*/memo(function (props) {
   var error = useMemo(function () {
     var _item$error3;
     if (!item.error) return;
-    return {
-      message: (_item$error3 = item.error) === null || _item$error3 === void 0 ? void 0 : _item$error3.message
-    };
-  }, [item.error]);
+    var message = (_item$error3 = item.error) === null || _item$error3 === void 0 ? void 0 : _item$error3.message;
+    var alertConfig = {};
+    if (item.error.type && renderErrorMessages !== null && renderErrorMessages !== void 0 && renderErrorMessages[item.error.type]) {
+      var _renderErrorMessages$;
+      alertConfig = (_renderErrorMessages$ = renderErrorMessages[item.error.type]) === null || _renderErrorMessages$ === void 0 ? void 0 : _renderErrorMessages$.config;
+    }
+    return _objectSpread({
+      message: message
+    }, alertConfig);
+  }, [renderErrorMessages, item.error]);
   if (RenderItem) return /*#__PURE__*/_jsx(RenderItem, _objectSpread({}, props), item.id);
   return /*#__PURE__*/_jsx(ChatItem, {
     actions: /*#__PURE__*/_jsx(Actions, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/ui",
-  "version": "1.118.0",
+  "version": "1.118.1",
   "description": "Lobe UI is an open-source UI component library for building AIGC web apps",
   "keywords": [
     "lobehub",