@ray-js/t-agent-ui-ray 0.2.0-beta-9 → 0.2.0-beta-11

package/dist/MessageInput/MessageInputAIStream/AsrInput.js

@@ -1,5 +1,5 @@
 import "core-js/modules/web.dom-collections.iterator.js";
-import React, { useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { Button, View } from '@ray-js/ray';
 import cx from 'clsx';
 import { useTranslate } from '../../hooks';
@@ -39,6 +39,12 @@ const AsrInput = props => {
     }
     props.onConfirm();
   };
+  useEffect(() => {
+    if (active && !props.recording) {
+      setActive(false);
+      setCancel(false);
+    }
+  }, [props.recording]);
   return /*#__PURE__*/React.createElement(View, {
     className: "t-agent-message-input-ptt-bar"
   }, /*#__PURE__*/React.createElement(View, {

package/dist/MessageInput/MessageInputAIStream/index.js

@@ -12,6 +12,7 @@ import { Emitter, EmitterEvent } from '@ray-js/t-agent';
 import cx from 'clsx';
 import imageSvg from '../icons/image.svg';
 import videoSvg from '../icons/video.svg';
+import cameraSvg from '../icons/camera.svg';
 import { useAttachmentInput, useChatAgent, useEmitEvent, useIsUnmounted, useOnEvent, useTranslate } from '../../hooks';
 import AsrInput from './AsrInput';
 import { useSleep } from '../../hooks/useSleep';
@@ -47,7 +48,7 @@ export default function MessageInputAIStream(props) {
     setUploaded,
     upload
   } = attachmentInput;
-  const acRef = useRef(null);
+  const abortRef = useRef(null);
   const [responding, setResponding] = useState(false);
   const [mode, setMode] = useState('text');
   const agent = useChatAgent();
@@ -70,16 +71,26 @@ export default function MessageInputAIStream(props) {
     setUploaded([]);
     setText('');
     setResponding(true);
-    const ac = new AbortController();
-    acRef.current = ac;
-    ac.signal.addEventListener('abort', () => {
-      if (acRef.current === ac) {
-        acRef.current = null;
+    const controller = new AbortController();
+    let abortResolve;
+    abortRef.current = {
+      controller,
+      promise: new Promise(resolve => {
+        abortResolve = resolve;
+      })
+    };
+    controller.signal.addEventListener('abort', () => {
+      var _abortRef$current;
+      if (((_abortRef$current = abortRef.current) === null || _abortRef$current === void 0 ? void 0 : _abortRef$current.controller) === controller) {
+        abortRef.current = null;
         setResponding(false);
       }
     });
     try {
-      await agent.pushInputBlocks(inputBlocks, ac.signal);
+      await agent.pushInputBlocks(inputBlocks, controller.signal);
+      if (controller.signal.aborted) {
+        abortResolve();
+      }
     } finally {
       if (!isUnmounted()) {
         setResponding(false);
@@ -97,16 +108,25 @@ export default function MessageInputAIStream(props) {
     setMoreOpen(false);
     setUploaded([]);
     setResponding(true);
-    const ac = new AbortController();
-    acRef.current = ac;
-    ac.signal.addEventListener('abort', () => {
-      if (acRef.current === ac) {
-        acRef.current = null;
+    const controller = new AbortController();
+    let abortResolve;
+    abortRef.current = {
+      controller,
+      promise: new Promise(resolve => {
+        abortResolve = resolve;
+      })
+    };
+    controller.signal.addEventListener('abort', () => {
+      if (abortRef.current.controller === controller) {
+        abortRef.current = null;
       }
       setResponding(false);
     });
     try {
-      await agent.pushInputBlocks(blocks, ac.signal);
+      await agent.pushInputBlocks(blocks, controller.signal);
+      if (controller.signal.aborted) {
+        abortResolve();
+      }
     } finally {
       if (!isUnmounted()) {
         setResponding(false);
@@ -143,7 +163,7 @@ export default function MessageInputAIStream(props) {
       });
     }
   };
-  const sleep = useSleep();
+  useSleep();
   let container;
   const canSend = text.trim().length && !responding && !attachmentInput.uploading;
   if (mode === 'text') {
@@ -203,8 +223,8 @@ export default function MessageInputAIStream(props) {
       "data-testid": "t-agent-message-input-button-main",
       onClick: async () => {
         if (responding) {
-          if (acRef.current) {
-            acRef.current.abort('User abort');
+          if (abortRef.current) {
+            abortRef.current.controller.abort('User abort');
           }
         } else if (isMore) {
           openMoreClick();
@@ -226,14 +246,19 @@ export default function MessageInputAIStream(props) {
         if (attachmentInput.uploading) {
           return;
         }
-        if (responding && acRef.current) {
-          acRef.current.abort('User abort');
-          // 中断后等待一会再开始
-          await sleep(50);
+        const abort = abortRef.current;
+        if (responding && abort) {
+          abort.controller.abort('User abort');
+          // 中断后等待上次结束再开始
+          await abort.promise;
         }
         const emitter = new Emitter();
-        setTimeout(() => {
+        const id = setTimeout(() => {
           if (r.recording) {
+            ty.showToast({
+              icon: 'none',
+              title: t('t-agent.input.asr.error.timeout')
+            });
             r.confirm();
           }
         }, props.maxAudioMs || 30000);
@@ -242,6 +267,7 @@ export default function MessageInputAIStream(props) {
           recording: true,
           confirm: () => {
             r.recording = false;
+            clearTimeout(id);
             emitter.dispatchEvent(new EmitterEvent('confirm'));
             setRecord({
               startAt: 0,
@@ -252,6 +278,7 @@ export default function MessageInputAIStream(props) {
           },
           cancel: () => {
             r.recording = false;
+            clearTimeout(id);
             emitter.dispatchEvent(new EmitterEvent('cancel'));
             setRecord({
               startAt: 0,
@@ -294,8 +321,8 @@ export default function MessageInputAIStream(props) {
         setMoreOpen(false);
       },
       onAbort: () => {
-        if (responding && acRef.current) {
-          acRef.current.abort('User abort');
+        if (responding && abortRef.current) {
+          abortRef.current.controller.abort('User abort');
         }
       }
     });
@@ -363,7 +390,7 @@ export default function MessageInputAIStream(props) {
           });
           return;
         }
-        await upload('image', 1);
+        await upload('album', 1);
       } catch (e) {
         ty.showToast({
           icon: 'error',
@@ -375,6 +402,29 @@ export default function MessageInputAIStream(props) {
     className: "t-agent-message-input-panel-button-icon"
   }, /*#__PURE__*/React.createElement(Image, {
     src: imageSvg
+  }))), attachmentOptions.image && /*#__PURE__*/React.createElement(Button, {
+    className: "t-agent-message-input-panel-button",
+    onClick: async () => {
+      try {
+        if (uploaded.filter(f => f.type === 'image').length >= (attachmentOptions.imageCount || 1)) {
+          ty.showToast({
+            icon: 'none',
+            title: t('t-agent.input.upload.image.max-reached')
+          });
+          return;
+        }
+        await upload('camera', 1);
+      } catch (e) {
+        ty.showToast({
+          icon: 'error',
+          title: t('t-agent.input.upload.failed')
+        });
+      }
+    }
+  }, /*#__PURE__*/React.createElement(View, {
+    className: "t-agent-message-input-panel-button-icon"
+  }, /*#__PURE__*/React.createElement(Image, {
+    src: cameraSvg
   }))), attachmentOptions.video && /*#__PURE__*/React.createElement(Button, {
     className: "t-agent-message-input-panel-button",
     onClick: async () => {

package/dist/MessageInput/icons/camera.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="20" height="18" viewBox="0 0 20 18"><g><path d="M7.82843,2L5.82843,4L2,4L2,16L18,16L18,4L14.1716,4L12.1716,2L7.82843,2ZM7,0L13,0L15,2L19,2C19.5523,2,20,2.44772,20,3L20,17C20,17.5523,19.5523,18,19,18L1,18C0.44772,18,0,17.5523,0,17L0,3C0,2.44772,0.44772,2,1,2L5,2L7,0ZM10,15C6.96243,15,4.5,12.5376,4.5,9.5C4.5,6.46243,6.96243,4,10,4C13.0376,4,15.5,6.46243,15.5,9.5C15.5,12.5376,13.0376,15,10,15ZM10,13C11.933,13,13.5,11.433,13.5,9.5C13.5,7.567,11.933,6,10,6C8.067,6,6.5,7.567,6.5,9.5C6.5,11.433,8.067,13,10,13Z" fill="#3D3D3D" fill-opacity="1"/></g></svg>

package/dist/hooks/useAttachmentInput.d.ts

@@ -18,5 +18,5 @@ export declare function useAttachmentInput({ local }?: {
     setUploaded: import("react").Dispatch<import("react").SetStateAction<UploadFile[]>>;
     uploading: boolean;
     loadBlocks: (blocks: InputBlock[], append?: boolean) => void;
-    upload: (type: 'image' | 'video', count?: any) => Promise<void>;
+    upload: (type: 'image' | 'video' | 'camera' | 'album', count?: any) => Promise<void>;
 };

package/dist/hooks/useAttachmentInput.js

@@ -109,47 +109,80 @@ export function useAttachmentInput() {
   } = useRenderOptions();
   const upload = useCallback(async function (type) {
     let count = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
-    if (type === 'image') {
+    if (type === 'image' || type === 'camera' || type === 'album') {
       let file = [];
-      try {
-        const sourceType = await new Promise(resolve => {
-          ty.showActionSheet({
-            itemList: [t('t-agent.input.upload.source-type.camera'), t('t-agent.input.upload.source-type.album')],
-            success: _ref => {
-              let {
-                tapIndex
-              } = _ref;
-              if (tapIndex === 0) {
-                ty.authorize({
-                  scope: 'scope.camera',
-                  success() {
-                    resolve('camera');
-                  },
-                  fail() {
-                    ty.showToast({
-                      title: t('t-agent.input.upload.source-type.camera.require-permission'),
-                      icon: 'none'
-                    });
-                    resolve('');
-                  }
-                });
-              } else if (tapIndex === 1) {
-                resolve('album');
-              } else {
+      if (type === 'image') {
+        try {
+          const sourceType = await new Promise(resolve => {
+            ty.showActionSheet({
+              itemList: [t('t-agent.input.upload.source-type.camera'), t('t-agent.input.upload.source-type.album')],
+              success: _ref => {
+                let {
+                  tapIndex
+                } = _ref;
+                if (tapIndex === 0) {
+                  ty.authorize({
+                    scope: 'scope.camera',
+                    success() {
+                      resolve('camera');
+                    },
+                    fail() {
+                      ty.showToast({
+                        title: t('t-agent.input.upload.source-type.camera.require-permission'),
+                        icon: 'none'
+                      });
+                      resolve('');
+                    }
+                  });
+                } else if (tapIndex === 1) {
+                  resolve('album');
+                } else {
+                  resolve('');
+                }
+              },
+              fail() {
                 resolve('');
               }
-            },
-            fail() {
-              resolve('');
-            }
+            });
           });
-        });
-        if (!sourceType) {
+          if (!sourceType) {
+            return;
+          }
+          file = await chooseImage(count, sourceType);
+        } catch (err) {
+          return;
+        }
+      }
+      if (type === 'camera') {
+        try {
+          const allowUseCamera = await new Promise(resolve => {
+            ty.authorize({
+              scope: 'scope.camera',
+              success() {
+                resolve(true);
+              },
+              fail() {
+                ty.showToast({
+                  title: t('t-agent.input.upload.source-type.camera.require-permission'),
+                  icon: 'none'
+                });
+                resolve(false);
+              }
+            });
+          });
+          if (allowUseCamera) {
+            file = await chooseImage(count, 'camera');
+          }
+        } catch (err) {
+          return;
+        }
+      }
+      if (type === 'album') {
+        try {
+          file = await chooseImage(count, 'album');
+        } catch (err) {
           return;
         }
-        file = await chooseImage(count, sourceType);
-      } catch (err) {
-        return;
       }
       await Promise.all(file.map(async _ref2 => {
         let {

package/dist/i18n/strings.d.ts

@@ -22,6 +22,7 @@ declare const _default: {
         't-agent.input.asr.ptt': string;
         't-agent.input.asr.error.too-short': string;
         't-agent.input.asr.error.empty': string;
+        't-agent.input.asr.error.timeout': string;
         't-agent.message.feedback.success': string;
         't-agent.message.bubble.aborted': string;
         't-agent.message.action.copy': string;
@@ -164,6 +165,7 @@ declare const _default: {
         't-agent.input.asr.ptt': string;
         't-agent.input.asr.error.too-short': string;
         't-agent.input.asr.error.empty': string;
+        't-agent.input.asr.error.timeout': string;
         't-agent.message.feedback.success': string;
         't-agent.message.bubble.aborted': string;
         't-agent.message.action.copy': string;

package/dist/i18n/strings.js

@@ -22,6 +22,7 @@ export default {
     't-agent.input.asr.ptt': '按住说话',
     't-agent.input.asr.error.too-short': '说话时间太短',
     't-agent.input.asr.error.empty': '未能从语音中识别到文字',
+    't-agent.input.asr.error.timeout': '语音识别已达时长限制，将直接发送',
     't-agent.message.feedback.success': '反馈成功',
     't-agent.message.bubble.aborted': '用户中断',
     't-agent.message.action.copy': '复制消息',
@@ -160,15 +161,11 @@ export default {
     't-agent.input.voice.require-permission': 'Recording Permission Required',
     't-agent.input.upload.failed': 'File Upload Failed',
     't-agent.input.asr.oninput.text.top': 'Listening, speak now',
-    // 语音激活态顶部提示
     't-agent.input.asr.oninput.text.center': 'Release to send · Swipe up to cancel',
-    // 交互操作指引
     't-agent.input.asr.ptt': 'Press & hold to talk',
-    // Push-to-Talk 按钮提示
     't-agent.input.asr.error.too-short': 'Speaking time too short',
-    // 语音输入时间过短
     't-agent.input.asr.error.empty': 'No text recognized from voice',
-    // 语音识别未能识别到文字
+    't-agent.input.asr.error.timeout': 'Voice recognition has reached time limit, sending directly',
     't-agent.message.feedback.success': 'Feedback Successful',
     't-agent.message.bubble.aborted': 'User Aborted',
     't-agent.message.action.copy': 'Copy Message',

package/dist/tiles/FileTile/index.less

@@ -49,6 +49,7 @@
   display: -webkit-box;
   -webkit-line-clamp: 2; /* 控制显示行数 */
   -webkit-box-orient: vertical;
+  line-height: 33rpx;
   height: 66rpx;
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/t-agent-ui-ray",
-  "version": "0.2.0-beta-9",
+  "version": "0.2.0-beta-11",
   "author": "Tuya.inc",
   "license": "MIT",
   "private": false,
@@ -40,5 +40,5 @@
     "@types/echarts": "^4.9.22",
     "@types/markdown-it": "^14.1.1"
   },
-  "gitHead": "cfe00de066a09da4a63e7c965d42a622f95cda4c"
+  "gitHead": "dd56b31b0095fb82d0fb5d4f58581d00ae2970ee"
 }