@anker-in/campaign-ui 0.1.9 → 0.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anker-in/campaign-ui",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "type": "commonjs",
   "main": "./dist/cjs/index.js",
   "types": "./dist/cjs/index.d.ts",
@@ -73,10 +73,10 @@
     "stylelint": "^16.6.0"
   },
   "dependencies": {
-    "@copilotkit/react-core": "1.8.13",
-    "@copilotkit/react-ui": "1.8.13",
-    "@copilotkit/runtime-client-gql": "1.8.13",
-    "@copilotkit/shared": "1.8.13",
+    "@copilotkit/react-core": "1.8.11",
+    "@copilotkit/react-ui": "1.8.11",
+    "@copilotkit/runtime-client-gql": "1.8.11",
+    "@copilotkit/shared": "1.8.11",
     "@monaco-editor/react": "^4.6.0",
     "@radix-ui/react-checkbox": "^1.0.4",
     "@radix-ui/react-dialog": "^1.0.5",

package/src/components/chat/action.tsx

@@ -15,10 +15,13 @@ export interface ActionProps {
   start?: string
   history: Message[]
   addtocartHandler?: (_args: any) => Promise<any>
+  commonRender?: string | ((_props: any) => React.ReactElement)
+  pointsExchangeCouponRender?: string | ((_props: any) => React.ReactElement)
   gotocheckoutRender?: string | ((_props: any) => React.ReactElement)
   gotocartRender?: string | ((_props: any) => React.ReactElement)
   addtocartRender?: string | ((_props: any) => React.ReactElement)
   signupRender?: string | ((_props: any) => React.ReactElement)
+  shulexRender?: string | ((_props: any) => React.ReactElement)
   productRender?: string | ((_props: any) => React.ReactElement)
   productRenderTipMessage?: string
   children?: React.ReactNode
@@ -28,11 +31,14 @@ export const CopilotAction = ({
   start,
   history,
   addtocartHandler,
+  commonRender,
+  pointsExchangeCouponRender,
   gotocheckoutRender,
   gotocartRender,
   addtocartRender,
   productRender,
   signupRender,
+  shulexRender,
   children,
 }: ActionProps) => {
   const { setMessages, appendMessage, isLoading } = useCopilotChat()
@@ -68,6 +74,26 @@ export const CopilotAction = ({
     },
   })
 
+  useCopilotAction({
+    name: 'common_action',
+    description: 'common action',
+    parameters: [{ act: '' }] as any,
+    render: commonRender || (props => <div className="hidden">{JSON.stringify(props)}</div>),
+    handler: function () {
+      // console.log('common_action', props)
+    },
+  })
+
+  useCopilotAction({
+    name: 'points_exchange_coupon',
+    description: 'points exchange coupon',
+    parameters: [{ act: '' }] as any,
+    render: pointsExchangeCouponRender || (props => <div className="hidden">{JSON.stringify(props)}</div>),
+    handler: function () {
+      // console.log('points_exchange_coupon', props)
+    },
+  })
+
   useCopilotAction({
     name: 'go_to_cart',
     description: 'go to cart',
@@ -94,7 +120,7 @@ export const CopilotAction = ({
     parameters: [{ sku: '', handle: '' }] as any,
     render: productRender || (props => <div className="hidden">{JSON.stringify(props)}</div>),
     handler: function (props) {
-      console.log('show_product_card-props', props)
+      // console.log('show_product_card-props', props)
       // const ishistory = props?.find((item: { ishistory: any }) => item?.ishistory)
       // if (!ishistory) {
       //   const content = new TextMessage({
@@ -120,6 +146,20 @@ export const CopilotAction = ({
     },
   })
 
+  useCopilotAction({
+    name: 'shulex',
+    description: 'shulex',
+    parameters: [
+      {
+        name: 'shulex',
+      },
+    ] as any,
+    render: shulexRender || (props => <div className="hidden">{JSON.stringify(props)}</div>),
+    handler: function () {
+      // console.log('shulex-props', props)
+    },
+  })
+
   useCopilotReadable({
     description: "Today's date",
     value: new Date().toLocaleDateString(),

package/src/components/chat/index.tsx

@@ -34,6 +34,19 @@ export interface ChatProps {
    * unfollow: ResponseButton 在聊天框底部
    */
   showResponseButton?: string | boolean
+  /** messages 的回调事件
+   * 每次生成/接受新的messages，会将 整个 messages list 传递给外部
+   */
+  messagesCallback?: (_messages: any) => void
+  /** 通用 action 的触发事件
+   */
+  commonRender?: string | ((_props: any) => React.ReactElement)
+  /** shulex的 action 的触发事件
+   */
+  shulexRender?: string | ((_props: any) => React.ReactElement)
+  /** 通用 积分 换 Coupon 的触发事件
+   */
+  pointsExchangeCouponRender?: string | ((_props: any) => React.ReactElement)
   /** 跳转 checkout action 卡片，接受参数： {"status":"complete","args":[{"sku":["A3936031"],"handle":"space-a40-a3936031"}],"result":""}
    * 后端接口文档：https://anker-in.feishu.cn/wiki/DOYJwE9oxipWmYk072ncnJNznBb
    */
@@ -77,8 +90,12 @@ const Chat = (props: ChatProps) => {
     prologue = '',
     locale = '',
     query = '',
+    messagesCallback,
     showResponseButton,
     gotocheckoutRender,
+    commonRender,
+    shulexRender,
+    pointsExchangeCouponRender,
     gotocartRender,
     addtocartRender,
     productRender,
@@ -116,7 +133,7 @@ const Chat = (props: ChatProps) => {
     setCurrentSuggestions(result?.suggested_questions?.map((item: string) => ({ message: item, title: item })) || [])
     setstart(result?.opening_statement || '')
     sethistory(result?.history || [])
-  }, [userId, shopifyDomain, account, locale])
+  }, [userId, shopifyDomain, account, locale, query])
 
   const getSuggestions = useCallback(async () => {
     const result = await fetcher({
@@ -128,7 +145,7 @@ const Chat = (props: ChatProps) => {
     setCurrentSuggestions(
       result?.suggested_questions?.data?.map((item: string) => ({ message: item, title: item })) || []
     )
-  }, [userId, shopifyDomain, account, locale])
+  }, [userId, shopifyDomain, account, locale, query])
 
   const setOpenTipFn = () => {
     if (!openTip) setOpenTip(true)
@@ -167,13 +184,17 @@ const Chat = (props: ChatProps) => {
               <Messages
                 messages={messages}
                 inProgress={inProgress}
-                ResponseButton={showResponseButton === 'follow' ? <ResponseButton /> : undefined}
+                messagesCallback={messagesCallback}
+                ResponseButton={
+                  showResponseButton === 'follow' ? (
+                    <ResponseButton messagesId={messages?.[messages.length - 1]?.id} />
+                  ) : undefined
+                }
               >
                 <Suggestions currentSuggestions={currentSuggestions} />
               </Messages>
             )}
-            Button={props => {
-              const { open, setOpen: setOpenDefault } = props as any
+            Button={({ open, setOpen: setOpenDefault }: { open: boolean; setOpen: (open: boolean) => void }) => {
               const Button = popup?.Button || DefaultButton
               // eslint-disable-next-line react-hooks/rules-of-hooks
               useEffect(() => {
@@ -204,6 +225,9 @@ const Chat = (props: ChatProps) => {
             <CopilotAction
               start={start}
               history={history}
+              commonRender={commonRender}
+              shulexRender={shulexRender}
+              pointsExchangeCouponRender={pointsExchangeCouponRender}
               gotocartRender={gotocartRender}
               gotocheckoutRender={gotocheckoutRender}
               addtocartRender={addtocartRender}

package/src/components/chat/messages.tsx

@@ -12,7 +12,7 @@ import {
   Role,
 } from '@copilotkit/runtime-client-gql'
 
-const Messages = ({ messages, inProgress, ResponseButton, children }: MessagesProps) => {
+const Messages = ({ messages, inProgress, ResponseButton, messagesCallback, children }: MessagesProps) => {
   const [isExpanded, setIsExpanded] = useState(true)
 
   const { chatComponentsCache } = useCopilotContext()
@@ -51,6 +51,10 @@ const Messages = ({ messages, inProgress, ResponseButton, children }: MessagesPr
     scrollToBottom()
   }, [messages])
 
+  useEffect(() => {
+    if (messagesCallback) messagesCallback(messages)
+  }, [messages])
+
   useEffect(() => {
     const textarea = document.querySelector('.copilotKitInput textarea') as HTMLTextAreaElement
 
@@ -93,7 +97,7 @@ const Messages = ({ messages, inProgress, ResponseButton, children }: MessagesPr
         if (message instanceof TextMessage && message.role === 'user') {
           return (
             <div key={index} className="copilotKitMessage copilotKitUserMessage">
-              {message.content}
+              <Markdown content={message.content} />
             </div>
           )
         } else if (message instanceof TextMessage && message.role == 'assistant') {
@@ -107,8 +111,11 @@ const Messages = ({ messages, inProgress, ResponseButton, children }: MessagesPr
             </div>
           )
         } else if (message instanceof ActionExecutionMessage) {
-          if (chatComponentsCache.current !== null && chatComponentsCache.current[message.name]) {
-            const render = chatComponentsCache.current[message.name]
+          if (
+            chatComponentsCache.current !== null &&
+            chatComponentsCache.current[message.name as keyof typeof chatComponentsCache.current]
+          ) {
+            const render = chatComponentsCache.current[message.name as keyof typeof chatComponentsCache.current]
             // render a static string
             if (typeof render === 'string') {
               // when render is static, we show it only when in progress
@@ -135,8 +142,7 @@ const Messages = ({ messages, inProgress, ResponseButton, children }: MessagesPr
               } else if (message.status.code !== MessageStatusCode.Pending) {
                 status = 'executing'
               }
-
-              const toRender = render({
+              const toRender = (render as any)({
                 status: status as any,
                 args,
                 result: functionResults[message.id],

package/src/components/chat/props.ts

@@ -36,6 +36,7 @@ export interface MessagesProps {
   inProgress: boolean
   ResponseButton?: React.ReactElement
   children?: React.ReactNode
+  messagesCallback?: (messages: any) => void
 }
 
 export interface InputProps {

package/src/components/chat/response.tsx

@@ -1,14 +1,17 @@
 import { useChatContext } from '@copilotkit/react-ui'
 import { useCopilotChat } from '@copilotkit/react-core'
 
-const ResponseButton = () => {
+const ResponseButton = ({ messagesId }: { messagesId: string }) => {
   const context = useChatContext()
 
   const { isLoading, reloadMessages, stopGeneration } = useCopilotChat()
 
   return (
     !isLoading && (
-      <button onClick={isLoading ? stopGeneration : reloadMessages} className="copilotKitResponseButton">
+      <button
+        onClick={() => (isLoading ? stopGeneration() : reloadMessages(messagesId))}
+        className="copilotKitResponseButton"
+      >
         {isLoading ? context.labels.stopGenerating : context.labels.regenerateResponse}
         <span>{isLoading ? context.icons.stopIcon : context.icons.regenerateIcon}</span>
       </button>

package/src/components/chat/utils.ts

@@ -0,0 +1,4 @@
+import { useCopilotChat, useCopilotAction, useCopilotReadable } from '@copilotkit/react-core'
+import { Role, ActionExecutionMessage, TextMessage } from '@copilotkit/runtime-client-gql'
+
+export { useCopilotChat, useCopilotAction, useCopilotReadable, Role, ActionExecutionMessage, TextMessage }

package/src/components/index.ts

@@ -1,2 +1,12 @@
 // eslint-disable-next-line import/extensions
+
 export { default as Chat } from './chat/index.js'
+
+export {
+  Role,
+  ActionExecutionMessage,
+  TextMessage,
+  useCopilotChat,
+  useCopilotAction,
+  useCopilotReadable,
+} from './chat/utils.js'