@asgard-js/react 0.0.40-canary.2 → 0.0.41

package/package.json

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

package/src/components/chatbot/chatbot.tsx

@@ -1,9 +1,4 @@
-import {
-  forwardRef,
-  ForwardedRef,
-  ReactNode,
-  CSSProperties,
-} from 'react';
+import { forwardRef, ForwardedRef, ReactNode, CSSProperties } from 'react';
 import { ClientConfig, ConversationMessage } from '@asgard-js/core';
 import {
   AsgardThemeContextProvider,
@@ -17,14 +12,11 @@ import {
   AsgardAppInitializationContextProvider,
   AsgardServiceContextProviderProps,
 } from '../../context';
-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;
@@ -46,10 +38,6 @@ interface ChatbotProps extends AsgardTemplateContextValue {
   onClose?: () => void;
   loadingComponent?: ReactNode;
   defaultLinkTarget?: '_blank' | '_self' | '_parent' | '_top';
-  
-  // Auth state props
-  authState?: AuthState;
-  onApiKeySubmit?: (apiKey: string) => Promise<void>;
 }
 
 export interface ChatbotRef {
@@ -84,78 +72,8 @@ export const Chatbot = forwardRef(function Chatbot(
     className,
     style,
     defaultLinkTarget,
-    authState = 'authenticated',
-    onApiKeySubmit,
   } = props;
 
-  // Render different content based on authState
-  const renderContent = () => {
-    switch (authState) {
-      case 'loading':
-        return (
-          <div style={{ 
-            display: 'flex', 
-            alignItems: 'center', 
-            justifyContent: 'center', 
-            flex: 1,
-            padding: '20px'
-          }}>
-            {loadingComponent || <div>Loading...</div>}
-          </div>
-        );
-      
-      case 'needApiKey':
-        return (
-          <div style={{ 
-            display: 'flex', 
-            alignItems: 'center', 
-            justifyContent: 'center', 
-            flex: 1,
-            padding: '20px'
-          }}>
-            <ApiKeyInput
-              title={title}
-              onSubmit={onApiKeySubmit || (() => {})}
-              placeholder="Enter your key"
-            />
-          </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>
-          </div>
-        );
-      
-      case 'authenticated':
-      default:
-        return (
-          <>
-            <AsgardTemplateContextProvider
-              onErrorClick={onErrorClick}
-              errorMessageRenderer={errorMessageRenderer}
-              onTemplateBtnClick={onTemplateBtnClick}
-              defaultLinkTarget={defaultLinkTarget}
-            >
-              <ChatbotBody />
-            </AsgardTemplateContextProvider>
-            <ChatbotFooter />
-          </>
-        );
-    }
-  };
-
   return (
     <AsgardAppInitializationContextProvider
       enabled={enableLoadConfigFromService}
@@ -186,7 +104,15 @@ export const Chatbot = forwardRef(function Chatbot(
               customActions={customActions}
               maintainConnectionWhenClosed={maintainConnectionWhenClosed}
             />
-            {renderContent()}
+            <AsgardTemplateContextProvider
+              onErrorClick={onErrorClick}
+              errorMessageRenderer={errorMessageRenderer}
+              onTemplateBtnClick={onTemplateBtnClick}
+              defaultLinkTarget={defaultLinkTarget}
+            >
+              <ChatbotBody />
+            </AsgardTemplateContextProvider>
+            <ChatbotFooter />
           </ChatbotContainer>
         </AsgardServiceContextProvider>
       </AsgardThemeContextProvider>

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

@@ -366,7 +366,7 @@ export function AsgardThemeContextProvider(
           ButtonMessageTemplate: {
             button: {
               style: {
-                borderColor: themeFromAnnotations.chatbot?.borderColor,
+                borderColor: themeFromAnnotations.chatbot?.primaryComponent?.mainColor,
                 backgroundColor:
                   themeFromAnnotations.chatbot?.primaryComponent?.mainColor,
                 color:
@@ -384,7 +384,7 @@ export function AsgardThemeContextProvider(
               },
               button: {
                 style: {
-                  borderColor: themeFromAnnotations.chatbot?.borderColor,
+                  borderColor: themeFromAnnotations.chatbot?.primaryComponent?.mainColor,
                   backgroundColor:
                     themeFromAnnotations.chatbot?.primaryComponent?.mainColor,
                   color:
@@ -501,7 +501,7 @@ export function AsgardThemeContextProvider(
             ButtonMessageTemplate: {
               button: {
                 style: {
-                  borderColor: propsTheme.chatbot?.borderColor,
+                  borderColor: propsTheme.chatbot?.primaryComponent?.mainColor,
                   backgroundColor: propsTheme.chatbot?.primaryComponent?.mainColor,
                   color: propsTheme.chatbot?.primaryComponent?.secondaryColor,
                 },
@@ -514,7 +514,7 @@ export function AsgardThemeContextProvider(
                 },
                 button: {
                   style: {
-                    borderColor: propsTheme.chatbot?.borderColor,
+                    borderColor: propsTheme.chatbot?.primaryComponent?.mainColor,
                     backgroundColor: propsTheme.chatbot?.primaryComponent?.mainColor,
                     color: propsTheme.chatbot?.primaryComponent?.secondaryColor,
                   },

package/dist/components/chatbot/api-key-input/api-key-input.d.ts

@@ -1,11 +0,0 @@
-export interface ApiKeyInputProps {
-    onSubmit: (apiKey: string) => void;
-    loading?: boolean;
-    error?: string;
-    placeholder?: string;
-    title?: string;
-    showToggle?: boolean;
-    className?: string;
-}
-export declare function ApiKeyInput({ onSubmit, loading, error, placeholder, title, showToggle, className, }: ApiKeyInputProps): import("react/jsx-runtime").JSX.Element;
-//# sourceMappingURL=api-key-input.d.ts.map

package/dist/components/chatbot/api-key-input/api-key-input.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"api-key-input.d.ts","sourceRoot":"","sources":["../../../../src/components/chatbot/api-key-input/api-key-input.tsx"],"names":[],"mappings":"AAKA,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,WAAW,CAAC,EAC1B,QAAQ,EACR,OAAe,EACf,KAAK,EACL,WAA8B,EAC9B,KAAiB,EACjB,UAAiB,EACjB,SAAS,GACV,EAAE,gBAAgB,2CA+FlB"}

package/dist/components/chatbot/api-key-input/index.d.ts

@@ -1,2 +0,0 @@
-export * from './api-key-input';
-//# sourceMappingURL=index.d.ts.map

package/dist/components/chatbot/api-key-input/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/chatbot/api-key-input/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC"}

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

@@ -1,192 +0,0 @@
-.container {
-  width: 220px;
-  background: rgba(45, 45, 45, 0.95);
-  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;
-}
-
-.header {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  margin-bottom: 24px;
-}
-
-.icon {
-  width: 48px;
-  height: 48px;
-  margin-bottom: 12px;
-  opacity: 0.7;
-}
-
-.title {
-  margin: 0;
-  font-size: 18px;
-  font-weight: 500;
-  color: white;
-  text-align: center;
-}
-
-.form {
-  width: 100%;
-}
-
-.inputGroup {
-  margin-bottom: 20px;
-}
-
-.label {
-  display: block;
-  font-size: 14px;
-  font-weight: 400;
-  color: rgba(255, 255, 255, 0.7);
-  margin-bottom: 8px;
-}
-
-.inputWrapper {
-  position: relative;
-  width: 100%;
-}
-
-.input {
-  width: 100%;
-  height: 42px;
-  padding: 0 40px 0 12px;
-  font-size: 14px;
-  font-weight: 400;
-  color: rgba(255, 255, 255, 0.8);
-  background: rgba(255, 255, 255, 0.05);
-  border: 1px solid rgba(255, 255, 255, 0.1);
-  border-radius: 6px;
-  outline: none;
-  transition: all 0.2s ease;
-  box-sizing: border-box;
-
-  &::placeholder {
-    color: rgba(255, 255, 255, 0.4);
-  }
-
-  &:focus {
-    border-color: rgba(255, 255, 255, 0.3);
-    background: rgba(255, 255, 255, 0.08);
-  }
-
-  &.error {
-    border-color: rgba(255, 69, 58, 0.6);
-    background: rgba(255, 69, 58, 0.05);
-  }
-
-  &.disabled {
-    opacity: 0.5;
-    cursor: not-allowed;
-  }
-}
-
-.toggleButton {
-  position: absolute;
-  right: 8px;
-  top: 50%;
-  transform: translateY(-50%);
-  background: transparent;
-  border: none;
-  color: rgba(255, 255, 255, 0.5);
-  cursor: pointer;
-  padding: 4px;
-  border-radius: 4px;
-  transition: all 0.2s ease;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-
-  &:hover:not(:disabled) {
-    color: rgba(255, 255, 255, 0.7);
-    background: rgba(255, 255, 255, 0.05);
-  }
-
-  &:disabled {
-    opacity: 0.3;
-    cursor: not-allowed;
-  }
-}
-
-.toggleIcon {
-  width: 16px;
-  height: 16px;
-}
-
-.errorMessage {
-  margin-top: 6px;
-  font-size: 12px;
-  color: rgba(255, 69, 58, 0.8);
-}
-
-.submitButton {
-  width: 100%;
-  height: 42px;
-  background: #5856D6;
-  border: none;
-  border-radius: 6px;
-  color: white;
-  font-size: 14px;
-  font-weight: 500;
-  cursor: pointer;
-  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;
-    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,119 +0,0 @@
-import { useState, FormEvent, ChangeEvent } from 'react';
-import clsx from 'clsx';
-import ProfileSvg from '../../../icons/profile.svg?react';
-import styles from './api-key-input.module.scss';
-
-export interface ApiKeyInputProps {
-  onSubmit: (apiKey: string) => void;
-  loading?: boolean;
-  error?: string;
-  placeholder?: string;
-  title?: string;
-  showToggle?: boolean;
-  className?: string;
-}
-
-export function ApiKeyInput({
-  onSubmit,
-  loading = false,
-  error,
-  placeholder = 'Enter your key',
-  title = 'Preview',
-  showToggle = true,
-  className,
-}: ApiKeyInputProps) {
-  const [apiKey, setApiKey] = useState('');
-  const [showPassword, setShowPassword] = useState(false);
-
-  const handleSubmit = (e: FormEvent) => {
-    e.preventDefault();
-    if (apiKey.trim() && !loading) {
-      onSubmit(apiKey.trim());
-    }
-  };
-
-  const handleInputChange = (e: ChangeEvent<HTMLInputElement>) => {
-    setApiKey(e.target.value);
-  };
-
-  const togglePasswordVisibility = () => {
-    setShowPassword(!showPassword);
-  };
-
-  return (
-    <div className={clsx(styles.container, className)}>
-      <div className={styles.header}>
-        <ProfileSvg className={styles.icon} />
-        <h2 className={styles.title}>{title}</h2>
-      </div>
-
-      <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.input, {
-                [styles.error]: error,
-                [styles.disabled]: loading,
-              })}
-              disabled={loading}
-              autoComplete="off"
-            />
-            {showToggle && (
-              <button
-                type="button"
-                onClick={togglePasswordVisibility}
-                className={styles.toggleButton}
-                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>
-              </button>
-            )}
-          </div>
-          {error && (
-            <div className={styles.errorMessage}>
-              {error}
-            </div>
-          )}
-        </div>
-
-        <button
-          type="submit"
-          disabled={!apiKey.trim() || loading}
-          className={clsx(styles.submitButton, {
-            [styles.loading]: loading,
-          })}
-        >
-          {loading ? 'Loading...' : 'Continue'}
-        </button>
-      </form>
-    </div>
-  );
-}

package/src/components/chatbot/api-key-input/index.ts

@@ -1 +0,0 @@
-export * from './api-key-input';