Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(ai): add theming for AIConversation #5827

Merged
merged 14 commits into from
Oct 15, 2024
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import { Amplify } from 'aws-amplify';
import { createAIHooks, AIConversation } from '@aws-amplify/ui-react-ai';
import { ThemeStyle } from '@aws-amplify/ui-react/server';
import { generateClient } from 'aws-amplify/api';
import '@aws-amplify/ui-react/styles.css';
import outputs from './amplify_outputs';
import type { Schema } from '@environments/ai/gen2/amplify/data/resource';
import {
Authenticator,
Card,
createTheme,
withAuthenticator,
} from '@aws-amplify/ui-react';

const client = generateClient<Schema>({ authMode: 'userPool' });
const { useAIConversation } = createAIHooks(client);

Amplify.configure(outputs);

const theme = createTheme({
name: 'ai-conversation-theme',
tokens: {
components: {
aiConversation: {
message: {
backgroundColor: { value: '#f5f5f5' },
// color: { value: '#000000' },
},
},
},
},
});

function AIConversationThemePage() {
const [
{
data: { messages },
isLoading,
},
sendMessage,
] = useAIConversation('pirateChat');
return (
<Card>
<div {...theme.containerProps()}>
<AIConversation
messages={messages}
handleSendMessage={sendMessage}
isLoading={isLoading}
/>
<AIConversation
messages={messages}
handleSendMessage={sendMessage}
isLoading={isLoading}
variant="bubble"
/>
<ThemeStyle theme={theme} />
</div>
</Card>
);
}

export default withAuthenticator(AIConversationThemePage);
30 changes: 30 additions & 0 deletions packages/ui/src/theme/components/aiConverstion.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { Modifiers, ComponentStyles, Elements, ColorTheme } from './utils';

export type AIConversationTheme<Required extends boolean = false> =
ComponentStyles &
Elements<
{
message?: ComponentStyles &
Modifiers<'user' | 'assistant' | 'bubble', Required>;
message__list?: ComponentStyles;
message__avatar?: ComponentStyles;
message__sender?: ComponentStyles;
message__sender__username?: ComponentStyles;
message__sender__timestamp?: ComponentStyles;
message__body?: ComponentStyles;
message__actions?: ComponentStyles;
form?: ComponentStyles;
form__dropzone?: ComponentStyles;
form__attatch?: ComponentStyles;
form__send?: ComponentStyles;
form_field?: ComponentStyles;

attachment?: ComponentStyles;
attachment__list?: ComponentStyles;
attachment__image?: ComponentStyles;
attachment__size?: ComponentStyles;
attachment__name?: ComponentStyles;
attachment__remove?: ComponentStyles;
},
Required
>;
3 changes: 3 additions & 0 deletions packages/ui/src/theme/components/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { WebTokens } from '../tokens';
import { AIConversationTheme } from './aiConverstion';
import { AccordionTheme } from './accordion';
import { AlertTheme } from './alert';
import { AutoCompleteTheme } from './autocomplete';
Expand Down Expand Up @@ -51,6 +52,7 @@ export type { ComponentTheme, BaseComponentTheme, BaseTheme };
export type ComponentsTheme<TokensType extends WebTokens = WebTokens> =
| BaseComponentTheme<BaseTheme, string, TokensType>
| BaseComponentTheme<AccordionTheme, 'accordion', TokensType>
| BaseComponentTheme<AIConversationTheme, 'aiConversation', TokensType>
| BaseComponentTheme<AlertTheme, 'alert', TokensType>
| BaseComponentTheme<AutoCompleteTheme, 'autocomplete', TokensType>
| BaseComponentTheme<AvatarTheme, 'avatar', TokensType>
Expand Down Expand Up @@ -100,6 +102,7 @@ export type ComponentsTheme<TokensType extends WebTokens = WebTokens> =
// if the name extends from a known name, like 'alert' this should return the specific shape
export type AllComponentThemes = {
accordion: AccordionTheme;
aiConversation: AIConversationTheme;
alert: AlertTheme;
autocomplete: AutoCompleteTheme;
avatar: AvatarTheme;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,27 @@
display: flex;
flex-direction: column;
height: 100%;
flex: 1;

&__suggestion {
}

&__message {
--content-bg: transparent;
// internal CSS vars to handle combination of variation and sender (user, ai)
--internal-content-bg: ;
--internal-flex-direction: ;
--internal-content-padding: ;
--internal-body-align-items: ;

display: flex;
flex-direction: var(--flex-direction);
gap: var(--amplify-space-small);
padding: var(--amplify-space-small);
flex-direction: var(--internal-flex-direction);
gap: var(--amplify-components-ai-conversation-message-gap);
padding-inline: var(
--amplify-components-ai-conversation-message-padding-inline
);
padding-block: var(
--amplify-components-ai-conversation-message-padding-block
);

&__list {
display: flex;
Expand All @@ -25,32 +35,47 @@

&__sender {
display: flex;
flex-direction: var(--flex-direction);
flex-direction: var(--internal-flex-direction);
align-items: center;
height: var(--amplify-components-avatar-height);
gap: var(--amplify-space-small);
min-height: var(--amplify-components-avatar-height);
gap: var(--amplify-components-ai-conversation-message-sender-gap);

&__username {
font-weight: bold;
color: var(
--amplify-components-ai-conversation-message-sender-username-color
);
font-size: var(
--amplify-components-ai-conversation-message-sender-username-font-size
);
font-weight: var(
--amplify-components-ai-conversation-message-sender-username-font-weight
);
}

&__timestamp {
color: var(--amplify-colors-font-tertiary);
font-size: var(--amplify-font-sizes-small);
color: var(
--amplify-components-ai-conversation-message-sender-timestamp-color
);
font-size: var(
--amplify-components-ai-conversation-message-sender-timestamp-font-size
);
font-weight: var(
--amplify-components-ai-conversation-message-sender-timestamp-font-weight
);
}
}

&__body {
display: flex;
flex-direction: column;
align-items: var(--body-align-items);
gap: var(--amplify-space-xs);
align-items: var(--internal-body-align-items);
gap: var(--amplify-components-ai-conversation-message-body-gap);
}

&__content {
background-color: var(--content-bg);
background-color: var(--internal-content-bg);
border-radius: var(--amplify-radii-medium);
padding: var(--content-padding);
padding: var(--internal-content-padding);
}

&__actions {
Expand All @@ -59,36 +84,37 @@
}

&--bubble {
--content-bg: var(--bg-color);
--content-padding: var(--amplify-space-xxs) var(--amplify-space-xs);
--flex-direction: row-reverse;
--body-align-items: flex-end;
--internal-content-bg: var(--internal-bg-color);
--internal-content-padding: var(--amplify-space-xxs)
var(--amplify-space-xs);
--internal-flex-direction: row-reverse;
--internal-body-align-items: flex-end;
}

&--filled {
}

&--user {
--bg-color: var(--amplify-colors-background-secondary);
--internal-bg-color: var(--amplify-colors-background-secondary);
}

&--assistant {
--bg-color: var(--amplify-colors-primary-10);
--flex-direction: row;
--body-align-items: flex-start;
--internal-bg-color: var(--amplify-colors-primary-10);
--internal-flex-direction: row;
--internal-body-align-items: flex-start;
}
}

&__form {
display: flex;
flex-direction: row;
align-items: flex-start;
gap: var(--amplify-space-small);
gap: var(--amplify-components-ai-conversation-form-gap);

&__dropzone {
text-align: initial;
border: none;
padding: var(--amplify-space-xs);
padding: var(--amplify-components-ai-conversation-form-dropzone-padding);
}

&__attach {
Expand All @@ -102,39 +128,66 @@
&__attachment {
display: flex;
flex-direction: row;
padding-block: var(--amplify-space-xxxs);
padding-inline: var(--amplify-space-xs);
border-width: var(--amplify-border-widths-small);
border-style: solid;
border-color: var(--amplify-colors-border-secondary);
border-radius: var(--amplify-radii-small);
align-items: center;
gap: var(--amplify-space-xs);
font-size: var(--amplify-font-sizes-small);
padding-block: var(
--amplify-components-ai-conversation-attachment-padding-block
);
padding-inline: var(
--amplify-components-ai-conversation-attachment-padding-inline
);
border-width: var(
--amplify-components-ai-conversation-attachment-border-width
);
border-style: solid;
border-color: var(
--amplify-components-ai-conversation-attachment-border-color
);
border-radius: var(
--amplify-components-ai-conversation-attachment-border-radius
);
gap: var(--amplify-components-ai-conversation-attachment-gap);
font-size: var(--amplify-components-ai-conversation-attachment-font-size);

&__list {
display: flex;
flex-direction: row;
flex-wrap: wrap;
gap: var(--amplify-space-small);
padding-block-start: var(--amplify-space-small);
gap: var(--amplify-components-ai-conversation-attachment-list-gap);
padding-block-start: var(
--amplify-components-ai-conversation-attachment-padding-block-start
);
}

&__image {
width: 1rem;
height: 1rem;
width: var(--amplify-components-ai-conversation-attachment-image-width);
height: var(--amplify-components-ai-conversation-attachment-image-height);
object-fit: cover;
}

&__name {
color: var(--amplify-components-ai-conversation-attachment-name-color);
font-size: var(
--amplify-components-ai-conversation-attachment-name-font-size
);
font-weight: var(
--amplify-components-ai-conversation-attachment-name-font-weight
);
}

&__size {
color: var(--amplify-colors-font-tertiary);
color: var(--amplify-components-ai-conversation-attachment-size-color);
font-size: var(
--amplify-components-ai-conversation-attachment-size-font-size
);
font-weight: var(
--amplify-components-ai-conversation-attachment-size-font-weight
);
}

&__remove {
padding: var(--amplify-space-xxs);
padding: var(
--amplify-components-ai-conversation-attachment-remove-padding
);
}
}

Expand Down
Loading
Loading