@asgard-js/react 0.0.43-canary.2 → 0.0.43-canary.20

package/package.json

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

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

@@ -1,52 +1,51 @@
-.container {
+.api_key_input {
   width: 220px;
   background-color: var(--asg-color-bg);
   border-radius: 12px;
-  padding: 20px;
+  padding: 12px 20px;
   border: 0.5px solid var(--asg-color-border);
 }
 
-// Header styles removed as header is now handled by ChatbotHeader
-// .header {
-//   display: flex;
-//   flex-direction: column;
-//   gap: 4px;
-//   align-items: center;
-//   margin-bottom: 12px;
-// }
-// 
-// .icon {
-//   width: 24px;
-//   height: 24px;
-// }
-// 
-// .title {
-//   margin: 0;
-//   font-size: 18px;
-//   font-weight: 500;
-//   color: white;
-// }
-
-.form {
+.api_key_input__header {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  align-items: center;
+  margin-bottom: 12px;
+}
+
+.api_key_input__icon {
+  width: 24px;
+  height: 24px;
+}
+
+.api_key_input__title {
+  margin: 0;
+  font-size: 18px;
+  font-weight: 500;
+  color: white;
+}
+
+.api_key_input__form {
   width: 100%;
   display: flex;
   flex-direction: column;
   gap: 20px;
 }
 
-.label {
+.api_key_input__label {
   display: block;
   font-size: 14px;
   color: rgba(255, 255, 255, 0.7);
   margin-bottom: 8px;
 }
 
-.inputWrapper {
+.api_key_input__input_wrapper {
   position: relative;
   width: 100%;
 }
 
-.input {
+.api_key_input__input {
   width: 100%;
   height: 42px;
   padding: 0 40px 0 12px;
@@ -69,18 +68,18 @@
     background: rgba(255, 255, 255, 0.08);
   }
 
-  &.error {
+  &--error {
     border-color: rgba(255, 69, 58, 0.6);
     background: rgba(255, 69, 58, 0.05);
   }
 
-  &.disabled {
+  &--disabled {
     opacity: 0.5;
     cursor: not-allowed;
   }
 }
 
-.toggleButton {
+.api_key_input__toggle_button {
   position: absolute;
   right: 8px;
   top: 50%;
@@ -107,23 +106,23 @@
   }
 }
 
-.toggleIcon {
+.api_key_input__toggle_icon {
   width: 16px;
   height: 16px;
 }
 
-.errorMessage {
+.api_key_input__error_message {
   margin-top: 6px;
   font-size: 12px;
   color: rgba(255, 69, 58, 0.8);
 }
 
-.submitButton {
+.api_key_input__submit_button {
   width: 100%;
   height: 42px;
-  background: #5856d6;
   border: none;
   border-radius: 6px;
+  background-color: #5856d6;
   color: white;
   font-size: 14px;
   font-weight: 500;
@@ -131,14 +130,6 @@
   transition: all 0.2s ease;
   outline: none;
 
-  &:hover:not(:disabled) {
-    background: #4845c7;
-    transform: translateY(-1px);
-  }
-
-  &:active:not(:disabled) {
-    transform: translateY(0);
-  }
 
   &:disabled {
     opacity: 0.5;
@@ -146,7 +137,7 @@
     transform: none;
   }
 
-  &.loading {
+  &--loading {
     position: relative;
     color: transparent;
 
@@ -178,7 +169,7 @@
 
 // 響應式設計
 @media (max-width: 280px) {
-  .container {
+  .api_key_input {
     width: 100%;
     min-width: 200px;
   }

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

@@ -1,6 +1,10 @@
 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 {
@@ -8,6 +12,7 @@ export interface ApiKeyInputProps {
   loading?: boolean;
   error?: string;
   placeholder?: string;
+  title?: string;
   showToggle?: boolean;
   className?: string;
 }
@@ -17,12 +22,14 @@ 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();
@@ -41,24 +48,29 @@ export function ApiKeyInput({
 
   return (
     <div 
-      className={clsx(styles.container, className)}
+      className={clsx(styles.api_key_input, className)}
       style={{
         backgroundColor: chatbot.backgroundColor,
         borderColor: chatbot.borderColor,
       }}
     >
-      <form onSubmit={handleSubmit} className={styles.form}>
+      <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 className={styles.inputGroup}>
-          <label className={styles.label}>Key</label>
-          <div className={styles.inputWrapper}>
+          <label className={styles.api_key_input__label}>Key</label>
+          <div className={styles.api_key_input__input_wrapper}>
             <input
               type={showPassword ? 'text' : 'password'}
               value={apiKey}
               onChange={handleInputChange}
               placeholder={placeholder}
-              className={clsx(styles.input, {
-                [styles.error]: error,
-                [styles.disabled]: loading,
+              className={clsx(styles.api_key_input__input, {
+                [styles['api_key_input__input--error']]: error,
+                [styles['api_key_input__input--disabled']]: loading,
               })}
               disabled={loading}
               autoComplete="off"
@@ -67,45 +79,31 @@ export function ApiKeyInput({
               <button
                 type="button"
                 onClick={togglePasswordVisibility}
-                className={styles.toggleButton}
+                className={styles.api_key_input__toggle_button}
                 disabled={loading}
                 aria-label={showPassword ? 'Hide password' : 'Show password'}
               >
-                <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>
+                {showPassword ? (
+                  <EyeOffSvg className={styles.api_key_input__toggle_icon} />
+                ) : (
+                  <EyeSvg className={styles.api_key_input__toggle_icon} />
+                )}
               </button>
             )}
           </div>
-          {error && <div className={styles.errorMessage}>{error}</div>}
+          {error && <div className={styles.api_key_input__error_message}>{error}</div>}
         </div>
 
         <button
           type="submit"
           disabled={!apiKey.trim() || loading}
-          className={clsx(styles.submitButton, {
-            [styles.loading]: loading,
+          className={clsx(styles.api_key_input__submit_button, {
+            [styles['api_key_input__submit_button--loading']]: loading,
           })}
+          style={{
+            backgroundColor: chatbot?.mainColor,
+            color: chatbot?.secondaryColor,
+          }}
         >
           {loading ? 'Loading...' : 'Continue'}
         </button>

package/src/components/chatbot/chatbot.tsx

@@ -23,7 +23,7 @@ import { ChatbotBody } from './chatbot-body';
 import { ChatbotFooter } from './chatbot-footer';
 import { ChatbotContainer } from './chatbot-container/chatbot-container';
 
-type AuthState = 'loading' | 'needApiKey' | 'authenticated' | 'error';
+type AuthState = 'loading' | 'needApiKey' | 'authenticated' | 'error' | 'invalidApiKey';
 
 interface ChatbotProps extends AsgardTemplateContextValue {
   className?: string;
@@ -116,12 +116,31 @@ export const Chatbot = forwardRef(function Chatbot(
             padding: '20px'
           }}>
             <ApiKeyInput
+              title={title}
               onSubmit={onApiKeySubmit || (() => {})}
               placeholder="Enter your key"
             />
           </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={{ 
@@ -158,7 +177,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') {
+  if (authState !== 'needApiKey' && authState !== 'error' && authState !== 'invalidApiKey') {
     return (
       <AsgardAppInitializationContextProvider
         enabled={enableLoadConfigFromService}

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

@@ -31,6 +31,8 @@ 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'];
@@ -267,6 +269,9 @@ 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,
@@ -407,6 +412,8 @@ 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/icons/eye-off.svg

@@ -0,0 +1,4 @@
+<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

@@ -0,0 +1,4 @@
+<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>