@asgard-js/react 0.0.42-canary.2 → 0.0.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asgard-js/react",
-  "version": "0.0.42-canary.2",
+  "version": "0.0.42",
   "publishConfig": {
     "access": "public"
   },
@@ -54,7 +54,7 @@
     "vitest": "^1.6.0"
   },
   "peerDependencies": {
-    "@asgard-js/core": "^0.0.42-canary.1",
+    "@asgard-js/core": "^0.0.42",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
   },

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

@@ -1,61 +1,61 @@
-.container {
-  width: 220px;
-  background: rgba(45, 45, 45, 0.95);
+.api_key_input {
+  width: 360px;
+  max-width: calc(100vw - 32px);
+  background-color: var(--asg-color-bg);
   border-radius: 12px;
-  padding: 24px 20px 20px;
-  backdrop-filter: blur(10px);
-  border: 1px solid rgba(255, 255, 255, 0.1);
-  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.3);
-  color: white;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', sans-serif;
+  padding: 24px;
+  border: 0.5px solid var(--asg-color-border);
+
+  @media (max-width: 480px) {
+    width: 100%;
+    max-width: none;
+    padding: 20px;
+    margin: 0 16px;
+  }
 }
 
-.header {
+.api_key_input__header {
   display: flex;
   flex-direction: column;
+  gap: 8px;
   align-items: center;
-  margin-bottom: 24px;
+  margin-bottom: 20px;
 }
 
-.icon {
-  width: 48px;
-  height: 48px;
-  margin-bottom: 12px;
-  opacity: 0.7;
+.api_key_input__icon {
+  width: 40px;
+  height: 40px;
 }
 
-.title {
+.api_key_input__title {
   margin: 0;
-  font-size: 18px;
+  font-size: 20px;
   font-weight: 500;
   color: white;
-  text-align: center;
 }
 
-.form {
+.api_key_input__form {
   width: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
 }
 
-.inputGroup {
-  margin-bottom: 20px;
-}
-
-.label {
+.api_key_input__label {
   display: block;
   font-size: 14px;
-  font-weight: 400;
   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;
+  height: 48px;
   padding: 0 40px 0 12px;
   font-size: 14px;
   font-weight: 400;
@@ -67,6 +67,11 @@
   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);
   }
@@ -76,18 +81,18 @@
     background: rgba(255, 255, 255, 0.08);
   }
 
-  &.error {
-    border-color: rgba(255, 69, 58, 0.6);
-    background: rgba(255, 69, 58, 0.05);
+  &--error {
+    border-color: #FF4D4F;
+    background: rgba(255, 77, 79, 0.05);
   }
 
-  &.disabled {
+  &--disabled {
     opacity: 0.5;
     cursor: not-allowed;
   }
 }
 
-.toggleButton {
+.api_key_input__toggle_button {
   position: absolute;
   right: 8px;
   top: 50%;
@@ -114,23 +119,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);
+  color: #FF4D4F;
 }
 
-.submitButton {
+.api_key_input__submit_button {
   width: 100%;
-  height: 42px;
-  background: #5856D6;
+  height: 48px;
   border: none;
   border-radius: 6px;
+  background-color: #5856d6;
   color: white;
   font-size: 14px;
   font-weight: 500;
@@ -138,13 +143,9 @@
   transition: all 0.2s ease;
   outline: none;
 
-  &:hover:not(:disabled) {
-    background: #4845C7;
-    transform: translateY(-1px);
-  }
-
-  &:active:not(:disabled) {
-    transform: translateY(0);
+  @media (max-width: 480px) {
+    height: 44px;
+    font-size: 16px;
   }
 
   &:disabled {
@@ -152,41 +153,4 @@
     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,6 +1,10 @@
 import { useState, FormEvent, ChangeEvent } from 'react';
 import clsx from 'clsx';
-import ProfileSvg from '../../../icons/profile.svg?react';
+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 {
@@ -21,44 +25,52 @@ export function ApiKeyInput({
   title = 'Preview',
   showToggle = true,
   className,
-}: ApiKeyInputProps) {
+}: ApiKeyInputProps): JSX.Element {
   const [apiKey, setApiKey] = useState('');
   const [showPassword, setShowPassword] = useState(false);
+  const { chatbot } = useAsgardThemeContext();
+  const { avatar } = useAsgardContext();
 
-  const handleSubmit = (e: FormEvent) => {
+  const handleSubmit = (e: FormEvent): void => {
     e.preventDefault();
     if (apiKey.trim() && !loading) {
       onSubmit(apiKey.trim());
     }
   };
 
-  const handleInputChange = (e: ChangeEvent<HTMLInputElement>) => {
+  const handleInputChange = (e: ChangeEvent<HTMLInputElement>): void => {
     setApiKey(e.target.value);
   };
 
-  const togglePasswordVisibility = () => {
+  const togglePasswordVisibility = (): void => {
     setShowPassword(!showPassword);
   };
 
   return (
-    <div className={clsx(styles.container, className)}>
-      <div className={styles.header}>
-        <ProfileSvg className={styles.icon} />
-        <h2 className={styles.title}>{title}</h2>
+    <div 
+      className={clsx(styles.api_key_input, 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.form}>
-        <div className={styles.inputGroup}>
-          <label className={styles.label}>Key</label>
-          <div className={styles.inputWrapper}>
+      <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}>
             <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,49 +79,29 @@ 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={styles.api_key_input__submit_button}
+          style={{
+            backgroundColor: chatbot?.mainColor,
+            color: chatbot?.secondaryColor,
+          }}
         >
           {loading ? 'Loading...' : 'Continue'}
         </button>

package/src/components/chatbot/chatbot.module.scss

@@ -0,0 +1,24 @@
+.chatbot__auth_state_container {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex: 1;
+  padding: 20px;
+}
+
+.chatbot__error_state {
+  color: #ff6b6b;
+}
+
+.chatbot__error_state__content {
+  text-align: center;
+}
+
+.chatbot__error_state__icon {
+  font-size: 16px;
+  margin-bottom: 8px;
+}
+
+.chatbot__error_state__message {
+  // No additional styles needed - uses default text styling
+}

package/src/components/chatbot/chatbot.tsx

@@ -17,13 +17,14 @@ import {
   AsgardAppInitializationContextProvider,
   AsgardServiceContextProviderProps,
 } from '../../context';
+import { AuthState } from '@asgard-js/core';
+import clsx from 'clsx';
 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';
+import styles from './chatbot.module.scss';
 
 interface ChatbotProps extends AsgardTemplateContextValue {
   className?: string;
@@ -95,26 +96,14 @@ export const Chatbot = forwardRef(function Chatbot(
     switch (authState) {
       case 'loading':
         return (
-          <div style={{ 
-            display: 'flex', 
-            alignItems: 'center', 
-            justifyContent: 'center', 
-            flex: 1,
-            padding: '20px'
-          }}>
+          <div className={styles.chatbot__auth_state_container}>
             {loadingComponent || <div>Loading...</div>}
           </div>
         );
       
       case 'needApiKey':
         return (
-          <div style={{ 
-            display: 'flex', 
-            alignItems: 'center', 
-            justifyContent: 'center', 
-            flex: 1,
-            padding: '20px'
-          }}>
+          <div className={styles.chatbot__auth_state_container}>
             <ApiKeyInput
               title={title}
               onSubmit={onApiKeySubmit || (() => {})}
@@ -123,19 +112,24 @@ export const Chatbot = forwardRef(function Chatbot(
           </div>
         );
       
+      case 'invalidApiKey':
+        return (
+          <div className={styles.chatbot__auth_state_container}>
+            <ApiKeyInput
+              title={title}
+              onSubmit={onApiKeySubmit || (() => {})}
+              placeholder="Enter your key"
+              error="Please check if the key is correct."
+            />
+          </div>
+        );
+      
       case 'error':
         return (
-          <div style={{ 
-            display: 'flex', 
-            alignItems: 'center', 
-            justifyContent: 'center', 
-            flex: 1,
-            padding: '20px',
-            color: '#ff6b6b'
-          }}>
-            <div style={{ textAlign: 'center' }}>
-              <div style={{ fontSize: '16px', marginBottom: '8px' }}>⚠️</div>
-              <div>Something went wrong. Please try again later.</div>
+          <div className={clsx(styles.chatbot__auth_state_container, styles.chatbot__error_state)}>
+            <div className={styles.chatbot__error_state__content}>
+              <div className={styles.chatbot__error_state__icon}>⚠️</div>
+              <div className={styles.chatbot__error_state__message}>Something went wrong. Please try again later.</div>
             </div>
           </div>
         );
@@ -159,7 +153,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}
@@ -199,23 +193,35 @@ export const Chatbot = forwardRef(function Chatbot(
     );
   }
 
-  // For non-authenticated states, render without AsgardServiceContextProvider
+  // For non-authenticated states, provide AsgardServiceContextProvider but without SSE connection
   return (
     <AsgardThemeContextProvider theme={theme}>
-      <ChatbotContainer
-        fullScreen={fullScreen}
-        className={className}
-        style={style}
+      <AsgardServiceContextProvider
+        parentRef={ref}
+        avatar={avatar}
+        config={config}
+        customChannelId={customChannelId}
+        initMessages={initMessages}
+        onSseMessage={onSseMessage}
+        onAuthError={onAuthError}
+        botTypingPlaceholder={botTypingPlaceholder}
+        inputPlaceholder={inputPlaceholder}
       >
-        <ChatbotHeader
-          title={title}
-          onReset={onReset}
-          onClose={onClose}
-          customActions={customActions}
-          maintainConnectionWhenClosed={maintainConnectionWhenClosed}
-        />
-        {renderContent()}
-      </ChatbotContainer>
+        <ChatbotContainer
+          fullScreen={fullScreen}
+          className={className}
+          style={style}
+        >
+          <ChatbotHeader
+            title={title}
+            onReset={onReset}
+            onClose={onClose}
+            customActions={customActions}
+            maintainConnectionWhenClosed={maintainConnectionWhenClosed}
+          />
+          {renderContent()}
+        </ChatbotContainer>
+      </AsgardServiceContextProvider>
     </AsgardThemeContextProvider>
   );
 });

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>

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';