@yuntijs/ui 1.0.0-beta.60 → 1.0.0-beta.62

package/es/ChatItem/components/MessageContent.d.ts

@@ -1,5 +1,5 @@
-import { MarkdownProps } from '@lobehub/ui';
 import { type ReactNode } from 'react';
+import { EditableMessageProps } from "../../EditableMessage";
 import { ChatItemProps } from '../type';
 export interface MessageContentProps {
     editing?: ChatItemProps['editing'];
@@ -14,7 +14,7 @@ export interface MessageContentProps {
     renderMessage?: ChatItemProps['renderMessage'];
     text?: ChatItemProps['text'];
     type?: ChatItemProps['type'];
-    markdownProps?: MarkdownProps;
+    markdownProps?: EditableMessageProps['markdownProps'];
     markdownClassname?: string;
 }
 declare const MessageContent: import("react").NamedExoticComponent<MessageContentProps>;

package/es/ChatItem/type.d.ts

@@ -1,5 +1,6 @@
-import { AlertProps, AvatarProps, DivProps, EditableMessageProps, MarkdownProps, MetaData } from '@lobehub/ui';
+import { AlertProps, AvatarProps, DivProps, MetaData } from '@lobehub/ui';
 import { ReactNode } from 'react';
+import type { EditableMessageProps } from "../EditableMessage";
 export interface ChatItemProps {
     /**
      * @description Actions to be displayed in the chat item
@@ -73,7 +74,7 @@ export interface ChatItemProps {
     /**
      * @description The markdownProps of the chat item
      */
-    markdownProps?: MarkdownProps;
+    markdownProps?: EditableMessageProps['markdownProps'];
     /**
      * @description The markdownClassname of the chat item
      */

package/es/LogViewer/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { DivProps } from 'react-layout-kit';
 import type { LazyLogProps } from './types';
-export interface LogViewerProps extends Omit<LazyLogProps, 'iconFilterLines' | 'iconFindNext' | 'iconFindPrevious'>, Pick<DivProps, 'className' | 'id' | 'style'> {
+export interface LogViewerProps extends Omit<LazyLogProps, 'iconFilterLines' | 'iconFindNext' | 'iconFindPrevious' | 'loadingComponent'>, Pick<DivProps, 'className' | 'id' | 'style'> {
     /**
      * Timed refresh, in ms, only takes effect when url is specified and not websocket
      */

package/es/LogViewer/index.js

@@ -1,15 +1,16 @@
 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 = ["className", "id", "style", "height", "onScroll", "url", "websocket", "refreshInterval"];
+var _excluded = ["className", "id", "style", "height", "onScroll", "url", "websocket", "refreshInterval", "onLoad", "onError"];
 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 } from '@lobehub/ui';
 import { LazyLog, ScrollFollow } from '@melloware/react-logviewer';
-import { ArrowDown, ArrowUp, TextSearch } from 'lucide-react';
-import React, { useEffect, useMemo, useState } from 'react';
+import { ArrowDown, ArrowUp, LoaderCircle, TextSearch } from 'lucide-react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useStyles } from "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 export var LogViewer = function LogViewer(_ref) {
   var className = _ref.className,
     id = _ref.id,
@@ -19,6 +20,8 @@ export var LogViewer = function LogViewer(_ref) {
     urlFromProps = _ref.url,
     websocket = _ref.websocket,
     refreshInterval = _ref.refreshInterval,
+    onLoad = _ref.onLoad,
+    onError = _ref.onError,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useStyles = useStyles(),
     cx = _useStyles.cx,
@@ -27,6 +30,16 @@ export var LogViewer = function LogViewer(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     urlHash = _useState2[0],
     setUrlHash = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    loading = _useState4[0],
+    setLoading = _useState4[1];
+  var setLoadingTimeout = useRef();
+  useEffect(function () {
+    return function () {
+      clearTimeout(setLoadingTimeout.current);
+    };
+  }, []);
   useEffect(function () {
     var intervalTimeout;
     if (urlFromProps && !websocket && refreshInterval) {
@@ -41,15 +54,28 @@ export var LogViewer = function LogViewer(_ref) {
     };
   }, [refreshInterval, urlFromProps, websocket]);
   var url = useMemo(function () {
+    // workaround for onLoad exec twice
+    setLoadingTimeout.current = setTimeout(function () {
+      setLoading(true);
+      setLoadingTimeout.current = undefined;
+    }, 50);
     return "".concat(urlFromProps, "#").concat(urlHash);
   }, [urlFromProps, urlHash]);
-  return /*#__PURE__*/_jsx("div", {
+  var handleOnLoad = useCallback(function () {
+    setLoading(false);
+    onLoad === null || onLoad === void 0 || onLoad();
+  }, [onLoad]);
+  var handleOnError = useCallback(function (error) {
+    setLoading(false);
+    onError === null || onError === void 0 || onError(error);
+  }, [onError]);
+  return /*#__PURE__*/_jsxs("div", {
     className: cx(styles.root, className),
     id: id,
     style: _objectSpread({
       height: height
     }, style),
-    children: /*#__PURE__*/_jsx(ScrollFollow, {
+    children: [/*#__PURE__*/_jsx(ScrollFollow, {
       render: function render(_ref2) {
         var follow = _ref2.follow,
           onFollowScroll = _ref2.onScroll;
@@ -71,6 +97,8 @@ export var LogViewer = function LogViewer(_ref) {
             className: styles.searchBarIcon,
             icon: ArrowUp
           }),
+          onError: handleOnError,
+          onLoad: handleOnLoad,
           onScroll: function onScroll(args) {
             onFollowScroll(args);
             _onScroll === null || _onScroll === void 0 || _onScroll(args);
@@ -78,6 +106,10 @@ export var LogViewer = function LogViewer(_ref) {
         }));
       },
       startFollowing: true
-    })
+    }), loading && /*#__PURE__*/_jsx(Icon, {
+      className: styles.loader,
+      icon: LoaderCircle,
+      spin: true
+    })]
   });
 };

package/es/LogViewer/style.d.ts

@@ -1,4 +1,5 @@
 export declare const useStyles: (props?: unknown) => import("antd-style").ReturnStyles<{
     root: import("antd-style").SerializedStyles;
     searchBarIcon: import("antd-style").SerializedStyles;
+    loader: import("antd-style").SerializedStyles;
 }>;

package/es/LogViewer/style.js

@@ -1,13 +1,14 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/esm/taggedTemplateLiteral";
-var _templateObject, _templateObject2;
+var _templateObject, _templateObject2, _templateObject3;
 import { createStyles } from 'antd-style';
 export var useStyles = createStyles(function (_ref) {
   var css = _ref.css,
     token = _ref.token;
   var bgColor = '#222222';
   return {
-    root: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        background-color: ", ";\n        border-radius: ", "px;\n        .react-lazylog-searchbar {\n          margin-bottom: ", "px;\n          padding: ", "px;\n\n          background-color: ", ";\n          border-bottom: 1px solid #2d2d2d;\n          border-top-left-radius: ", "px;\n          border-top-right-radius: ", "px;\n          & > input {\n            border-radius: ", "px;\n          }\n          & > button {\n            cursor: pointer;\n            padding: 2px 6px;\n            border-radius: ", "px;\n          }\n          &-up-arrow {\n            margin-right: 0;\n          }\n        }\n        .react-lazylog {\n          background-color: ", ";\n          border-radius: ", "px;\n          .log-number {\n            margin-right: 0;\n          }\n          .log-content {\n            margin-left: 15px;\n          }\n        }\n      "])), bgColor, token.borderRadiusLG, token.marginXXS, token.paddingXS, bgColor, token.borderRadiusLG, token.borderRadiusLG, token.borderRadius, token.borderRadius, bgColor, token.borderRadiusLG),
-    searchBarIcon: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n        font-size: 16px;\n      "])))
+    root: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        position: relative;\n        background-color: ", ";\n        border-radius: ", "px;\n\n        .react-lazylog-searchbar {\n          margin-bottom: ", "px;\n          padding: ", "px;\n\n          background-color: ", ";\n          border-bottom: 1px solid #2d2d2d;\n          border-top-left-radius: ", "px;\n          border-top-right-radius: ", "px;\n          & > input {\n            border-radius: ", "px;\n          }\n          & > button {\n            cursor: pointer;\n            padding: 2px 6px;\n            border-radius: ", "px;\n          }\n          &-up-arrow {\n            margin-right: 0;\n          }\n        }\n        .react-lazylog {\n          scrollbar-color: rgba(255, 255, 255, 0.2) transparent;\n          scrollbar-width: auto;\n          background-color: ", ";\n          border-radius: ", "px;\n\n          .log-number {\n            margin-right: 0;\n          }\n          .log-content {\n            margin-left: 15px;\n          }\n        }\n      "])), bgColor, token.borderRadiusLG, token.marginXXS, token.paddingXS, bgColor, token.borderRadiusLG, token.borderRadiusLG, token.borderRadius, token.borderRadius, bgColor, token.borderRadiusLG),
+    searchBarIcon: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n        font-size: 16px;\n      "]))),
+    loader: css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n        position: absolute;\n        right: ", "px;\n        bottom: ", "px;\n\n        font-size: 18px;\n        color: #999;\n      "])), token.marginSM, token.marginSM)
   };
 }, {
   hashPriority: 'low'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuntijs/ui",
-  "version": "1.0.0-beta.60",
+  "version": "1.0.0-beta.62",
   "description": "☁️ Yunti UI - an open-source UI component library for building Cloud Native web apps",
   "keywords": [
     "yuntijs",