Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/@react-spectrum/ai/exports/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ export {
InsertTokenMenuItem,
PromptFieldAttachmentList,
PromptFieldToolbar,
PromptToken
PromptToken,
PromptFieldVoiceButton
} from '../src/PromptField';
export {ResponseStatus, ResponseStatusTitle, ResponseStatusPanel} from '../src/ResponseStatus';
export {Chat, Thread, ThreadItem, ThreadScrollButton, PromptFocusContext} from '../src/Chat';
Expand All @@ -31,7 +32,8 @@ export type {
PromptFieldAttachmentListProps,
PromptTokenFieldPopoverProps,
PromptFieldToolbarProps,
InsertMenuItemProps
InsertMenuItemProps,
PromptFieldVoiceButtonProps
} from '../src/PromptField';
export type {MessageFeedbackProps} from '../src/MessageFeedback';
export type {MessageSourceProps, SourceListProps, SourceListItemProps} from '../src/MessageSource';
Expand Down
35 changes: 23 additions & 12 deletions packages/@react-spectrum/ai/src/PromptField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {CenterBaseline} from '@react-spectrum/s2/CenterBaseline';
import {
createContext,
createRef,
forwardRef,
use,
useContext,
useDeferredValue,
Expand All @@ -43,6 +44,7 @@ import {
TokenFieldValue,
TokenSegment
} from 'react-stately/useTokenFieldState';
import {DOMRef} from '@react-types/shared';
import {IconContext} from '@react-spectrum/s2';
import {Image, Text} from '@react-spectrum/s2/Card';
// @ts-ignore
Expand All @@ -69,6 +71,7 @@ import Stop from '@react-spectrum/s2/icons/StopProcessing';
import {ToggleButton} from '@react-spectrum/s2/ToggleButton';
import {Tooltip, TooltipTrigger} from '@react-spectrum/s2/Tooltip';
import {useControlledState} from 'react-stately/useControlledState';
import {useDOMRef} from './useDOMRef';
import {useEffectEvent} from 'react-aria/private/utils/useEffectEvent';
import {useFocusWithin} from 'react-aria/useFocusWithin';
import {useKeyboard} from 'react-aria/useKeyboard';
Expand Down Expand Up @@ -97,6 +100,7 @@ export interface PromptFieldProps {
onRemoveAttachments?: (attachments: PromptFieldAttachment[]) => void;
styles?: StyleString;
variant?: 'balanced' | 'prominent' | 'subtle';
hideDisclaimer?: boolean;
}

interface PromptFieldState {
Expand Down Expand Up @@ -176,7 +180,10 @@ function matchMimeType(mimeType: string, acceptedMimeTypes: string[]): boolean {
});
}

export function PromptField(props: PromptFieldProps) {
export const PromptField = forwardRef(function PromptField(
props: PromptFieldProps,
ref: DOMRef<HTMLDivElement>
) {
let {
children,
acceptedAttachmentTypes,
Expand All @@ -185,8 +192,10 @@ export function PromptField(props: PromptFieldProps) {
styles,
onAddAttachments,
onRemoveAttachments,
hideDisclaimer,
variant = 'balanced'
} = props;
let domRef = useDOMRef(ref);
let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-spectrum/ai');
let [prompt, setPrompt] = useControlledState(
props.value,
Expand Down Expand Up @@ -263,7 +272,7 @@ export function PromptField(props: PromptFieldProps) {
onAddAttachments,
onRemoveAttachments
}}>
<div {...focusWithinProps}>
<div ref={domRef} {...focusWithinProps}>
<PromptFieldContainer
{...dropProps}
role="group"
Expand All @@ -274,19 +283,21 @@ export function PromptField(props: PromptFieldProps) {
inputRef={inputRef}>
{children}
</PromptFieldContainer>
<p className={style({font: 'ui-sm', textAlign: 'center'})}>
{stringFormatter.format('promptfield.aiDisclaimer')}{' '}
<Link
variant="secondary"
href="https://www.adobe.com/legal/licenses-terms/adobe-gen-ai-user-guidelines.html"
target="_blank">
{stringFormatter.format('promptfield.aiUserGuidlines')}
</Link>
</p>
{!hideDisclaimer && (
<p className={style({font: 'ui-sm', textAlign: 'center'})}>
{stringFormatter.format('promptfield.aiDisclaimer')}{' '}
<Link
variant="secondary"
href="https://www.adobe.com/legal/licenses-terms/adobe-gen-ai-user-guidelines.html"
target="_blank">
{stringFormatter.format('promptfield.aiUserGuidlines')}
</Link>
</p>
)}
</div>
</PromptFieldContext.Provider>
);
}
});

export interface PromptFieldAttachmentListProps extends AttachmentListProps<PromptFieldAttachment> {
children?: (attachment: PromptFieldAttachment) => React.ReactNode;
Expand Down
Loading