@asgard-js/react 0.0.43-canary.24 → 0.0.43-canary.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asgard-js/react",
-  "version": "0.0.43-canary.24",
+  "version": "0.0.43-canary.3",
   "publishConfig": {
     "access": "public"
   },

package/src/components/chatbot/api-key-input/api-key-input.module.scss

@@ -1,61 +1,33 @@
-.api_key_input {
-  width: 360px;
-  max-width: calc(100vw - 32px);
+.container {
+  width: 220px;
   background-color: var(--asg-color-bg);
   border-radius: 12px;
-  padding: 24px;
+  padding: 20px;
   border: 0.5px solid var(--asg-color-border);
-
-  @media (max-width: 480px) {
-    width: 100%;
-    max-width: none;
-    padding: 20px;
-    margin: 0 16px;
-  }
-}
-
-.api_key_input__header {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-  align-items: center;
-  margin-bottom: 20px;
 }
 
-.api_key_input__icon {
-  width: 40px;
-  height: 40px;
-}
-
-.api_key_input__title {
-  margin: 0;
-  font-size: 20px;
-  font-weight: 500;
-  color: white;
-}
-
-.api_key_input__form {
+.form {
   width: 100%;
   display: flex;
   flex-direction: column;
   gap: 20px;
 }
 
-.api_key_input__label {
+.label {
   display: block;
   font-size: 14px;
   color: rgba(255, 255, 255, 0.7);
   margin-bottom: 8px;
 }
 
-.api_key_input__input_wrapper {
+.inputWrapper {
   position: relative;
   width: 100%;
 }
 
-.api_key_input__input {
+.input {
   width: 100%;
-  height: 48px;
+  height: 42px;
   padding: 0 40px 0 12px;
   font-size: 14px;
   font-weight: 400;
@@ -67,11 +39,6 @@
   transition: all 0.2s ease;
   box-sizing: border-box;
 
-  @media (max-width: 480px) {
-    height: 44px;
-    font-size: 16px;
-  }
-
   &::placeholder {
     color: rgba(255, 255, 255, 0.4);
   }
@@ -81,18 +48,18 @@
     background: rgba(255, 255, 255, 0.08);
   }
 
-  &--error {
-    border-color: #FF4D4F;
-    background: rgba(255, 77, 79, 0.05);
+  &.error {
+    border-color: rgba(255, 69, 58, 0.6);
+    background: rgba(255, 69, 58, 0.05);
   }
 
-  &--disabled {
+  &.disabled {
     opacity: 0.5;
     cursor: not-allowed;
   }
 }
 
-.api_key_input__toggle_button {
+.toggleButton {
   position: absolute;
   right: 8px;
   top: 50%;
@@ -119,23 +86,23 @@
   }
 }
 
-.api_key_input__toggle_icon {
+.toggleIcon {
   width: 16px;
   height: 16px;
 }
 
-.api_key_input__error_message {
+.errorMessage {
   margin-top: 6px;
   font-size: 12px;
-  color: #FF4D4F;
+  color: rgba(255, 69, 58, 0.8);
 }
 
-.api_key_input__submit_button {
+.submitButton {
   width: 100%;
-  height: 48px;
+  height: 42px;
+  background: #5856d6;
   border: none;
   border-radius: 6px;
-  background-color: #5856d6;
   color: white;
   font-size: 14px;
   font-weight: 500;
@@ -143,9 +110,13 @@
   transition: all 0.2s ease;
   outline: none;
 
-  @media (max-width: 480px) {
-    height: 44px;
-    font-size: 16px;
+  &:hover:not(:disabled) {
+    background: #4845c7;
+    transform: translateY(-1px);
+  }
+
+  &:active:not(:disabled) {
+    transform: translateY(0);
   }
 
   &:disabled {
@@ -153,4 +124,41 @@
     cursor: not-allowed;
     transform: none;
   }
+
+  &.loading {
+    position: relative;
+    color: transparent;
+
+    &::after {
+      content: '';
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      width: 16px;
+      height: 16px;
+      margin-left: -8px;
+      margin-top: -8px;
+      border: 2px solid transparent;
+      border-top: 2px solid white;
+      border-radius: 50%;
+      animation: spin 1s linear infinite;
+    }
+  }
+}
+
+@keyframes spin {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
+// 響應式設計
+@media (max-width: 280px) {
+  .container {
+    width: 100%;
+    min-width: 200px;
+  }
 }

package/src/components/chatbot/api-key-input/api-key-input.tsx

@@ -1,10 +1,6 @@
 import { useState, FormEvent, ChangeEvent } from 'react';
 import clsx from 'clsx';
 import { useAsgardThemeContext } from '../../../context/asgard-theme-context';
-import { useAsgardContext } from '../../../context/asgard-service-context';
-import { ProfileIcon } from '../profile-icon';
-import EyeSvg from '../../../icons/eye.svg?react';
-import EyeOffSvg from '../../../icons/eye-off.svg?react';
 import styles from './api-key-input.module.scss';
 
 export interface ApiKeyInputProps {
@@ -12,7 +8,6 @@ export interface ApiKeyInputProps {
   loading?: boolean;
   error?: string;
   placeholder?: string;
-  title?: string;
   showToggle?: boolean;
   className?: string;
 }
@@ -22,14 +17,12 @@ export function ApiKeyInput({
   loading = false,
   error,
   placeholder = 'Enter your key',
-  title = 'Preview',
   showToggle = true,
   className,
 }: ApiKeyInputProps): JSX.Element {
   const [apiKey, setApiKey] = useState('');
   const [showPassword, setShowPassword] = useState(false);
   const { chatbot } = useAsgardThemeContext();
-  const { avatar } = useAsgardContext();
 
   const handleSubmit = (e: FormEvent): void => {
     e.preventDefault();
@@ -48,29 +41,24 @@ export function ApiKeyInput({
 
   return (
     <div 
-      className={clsx(styles.api_key_input, className)}
+      className={clsx(styles.container, className)}
       style={{
         backgroundColor: chatbot.backgroundColor,
         borderColor: chatbot.borderColor,
       }}
     >
-      <div className={styles.api_key_input__header}>
-        <ProfileIcon avatar={avatar} />
-        <h2 className={styles.api_key_input__title} style={chatbot?.header?.title?.style}>{title}</h2>
-      </div>
-
-      <form onSubmit={handleSubmit} className={styles.api_key_input__form}>
-        <div>
-          <label className={styles.api_key_input__label}>Key</label>
-          <div className={styles.api_key_input__input_wrapper}>
+      <form onSubmit={handleSubmit} className={styles.form}>
+        <div className={styles.inputGroup}>
+          <label className={styles.label}>Key</label>
+          <div className={styles.inputWrapper}>
             <input
               type={showPassword ? 'text' : 'password'}
               value={apiKey}
               onChange={handleInputChange}
               placeholder={placeholder}
-              className={clsx(styles.api_key_input__input, {
-                [styles['api_key_input__input--error']]: error,
-                [styles['api_key_input__input--disabled']]: loading,
+              className={clsx(styles.input, {
+                [styles.error]: error,
+                [styles.disabled]: loading,
               })}
               disabled={loading}
               autoComplete="off"
@@ -79,29 +67,45 @@ export function ApiKeyInput({
               <button
                 type="button"
                 onClick={togglePasswordVisibility}
-                className={styles.api_key_input__toggle_button}
+                className={styles.toggleButton}
                 disabled={loading}
                 aria-label={showPassword ? 'Hide password' : 'Show password'}
               >
-                {showPassword ? (
-                  <EyeOffSvg className={styles.api_key_input__toggle_icon} />
-                ) : (
-                  <EyeSvg className={styles.api_key_input__toggle_icon} />
-                )}
+                <svg
+                  className={styles.toggleIcon}
+                  width="16"
+                  height="16"
+                  viewBox="0 0 24 24"
+                  fill="none"
+                  stroke="currentColor"
+                  strokeWidth="2"
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                >
+                  {showPassword ? (
+                    <>
+                      <path d="M17.94 17.94A10.07 10.07 0 0 1 12 20c-7 0-11-8-11-8a18.45 18.45 0 0 1 5.06-5.94M9.9 4.24A9.12 9.12 0 0 1 12 4c7 0 11 8 11 8a18.5 18.5 0 0 1-2.16 3.19m-6.72-1.07a3 3 0 1 1-4.24-4.24" />
+                      <line x1="1" y1="1" x2="23" y2="23" />
+                    </>
+                  ) : (
+                    <>
+                      <path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z" />
+                      <circle cx="12" cy="12" r="3" />
+                    </>
+                  )}
+                </svg>
               </button>
             )}
           </div>
-          {error && <div className={styles.api_key_input__error_message}>{error}</div>}
+          {error && <div className={styles.errorMessage}>{error}</div>}
         </div>
 
         <button
           type="submit"
           disabled={!apiKey.trim() || loading}
-          className={styles.api_key_input__submit_button}
-          style={{
-            backgroundColor: chatbot?.mainColor,
-            color: chatbot?.secondaryColor,
-          }}
+          className={clsx(styles.submitButton, {
+            [styles.loading]: loading,
+          })}
         >
           {loading ? 'Loading...' : 'Continue'}
         </button>

package/src/components/chatbot/chatbot.tsx

@@ -17,13 +17,14 @@ import {
   AsgardAppInitializationContextProvider,
   AsgardServiceContextProviderProps,
 } from '../../context';
-import { AuthState } from '@asgard-js/core';
 import { ApiKeyInput } from './api-key-input';
 import { ChatbotHeader } from './chatbot-header';
 import { ChatbotBody } from './chatbot-body';
 import { ChatbotFooter } from './chatbot-footer';
 import { ChatbotContainer } from './chatbot-container/chatbot-container';
 
+type AuthState = 'loading' | 'needApiKey' | 'authenticated' | 'error';
+
 interface ChatbotProps extends AsgardTemplateContextValue {
   className?: string;
   style?: CSSProperties;
@@ -122,24 +123,6 @@ export const Chatbot = forwardRef(function Chatbot(
           </div>
         );
       
-      case 'invalidApiKey':
-        return (
-          <div style={{ 
-            display: 'flex', 
-            alignItems: 'center', 
-            justifyContent: 'center', 
-            flex: 1,
-            padding: '20px'
-          }}>
-            <ApiKeyInput
-              title={title}
-              onSubmit={onApiKeySubmit || (() => {})}
-              placeholder="Enter your key"
-              error="Please check if the key is correct."
-            />
-          </div>
-        );
-      
       case 'error':
         return (
           <div style={{ 
@@ -176,7 +159,7 @@ export const Chatbot = forwardRef(function Chatbot(
   };
 
   // Don't initialize SSE connection when explicitly needing API key or in error state
-  if (authState !== 'needApiKey' && authState !== 'error' && authState !== 'invalidApiKey') {
+  if (authState !== 'needApiKey' && authState !== 'error') {
     return (
       <AsgardAppInitializationContextProvider
         enabled={enableLoadConfigFromService}

package/src/context/asgard-theme-context.tsx

@@ -31,8 +31,6 @@ export interface AsgardThemeContextValue {
     backgroundColor?: CSSProperties['backgroundColor'];
     borderColor?: CSSProperties['borderColor'];
     inactiveColor?: CSSProperties['color'];
-    mainColor?: CSSProperties['color'];
-    secondaryColor?: CSSProperties['color'];
     primaryComponent?: {
       mainColor?: CSSProperties['color'];
       secondaryColor?: CSSProperties['color'];
@@ -269,9 +267,6 @@ export function AsgardThemeContextProvider(
         chatbot: {
           backgroundColor: themeFromAnnotations.chatbot?.backgroundColor,
           borderColor: themeFromAnnotations.chatbot?.borderColor,
-          mainColor: themeFromAnnotations.chatbot?.primaryComponent?.mainColor,
-          secondaryColor: themeFromAnnotations.chatbot?.primaryComponent?.secondaryColor,
-          
           header: {
             style: {
               borderBottomColor: themeFromAnnotations.chatbot?.borderColor,
@@ -412,8 +407,6 @@ export function AsgardThemeContextProvider(
           chatbot: {
             backgroundColor: propsTheme.chatbot?.backgroundColor,
             borderColor: propsTheme.chatbot?.borderColor,
-            mainColor: propsTheme.chatbot?.primaryComponent?.mainColor,
-            secondaryColor: propsTheme.chatbot?.primaryComponent?.secondaryColor,
             header: {
               style: {
                 borderBottomColor: propsTheme.chatbot?.borderColor,

package/src/index.ts

@@ -1,4 +1,4 @@
 import 'highlight.js/styles/atom-one-dark.css';
 export * from './components';
 export * from './context';
-export * from './hooks';
+export * from './hooks';

package/src/icons/eye-off.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-  <path d="M17.94 17.94A10.07 10.07 0 0 1 12 20c-7 0-11-8-11-8a18.45 18.45 0 0 1 5.06-5.94M9.9 4.24A9.12 9.12 0 0 1 12 4c7 0 11 8 11 8a18.5 18.5 0 0 1-2.16 3.19m-6.72-1.07a3 3 0 1 1-4.24-4.24"/>
-  <line x1="1" y1="1" x2="23" y2="23"/>
-</svg>

package/src/icons/eye.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-  <path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/>
-  <circle cx="12" cy="12" r="3"/>
-</svg>