Skip to content

Commit 1471446

Browse files
committed
Update target selector to open on hover instead of click
- remove 'target' tooltip, show the dropdown immediately on hover, hide on hover out, don't react to clicks
1 parent d17dfc8 commit 1471446

5 files changed

Lines changed: 10 additions & 61 deletions

File tree

‎apps/editor/src/views/prompt/frontend/Main/MainView/MainView.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,6 @@ export const MainView: React.FC<Props> = (props) => {
538538
preview_prompt: t('prompt-field.action.preview-prompt'),
539539
send: t('prompt-field.action.send'),
540540
attach_selected_files: t('prompt-field.attach-selected-files'),
541-
target: t('prompt-field.target'),
542541
more: t('prompt-field.more')
543542
}}
544543
/>

‎apps/editor/src/views/prompt/frontend/i18n/translations/prompt-field.ts‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -359,24 +359,6 @@ export const prompt_field = {
359359
hu: 'Kiválasztott fájlok csatolása',
360360
bg: 'Прикачване на избраните файлове'
361361
},
362-
'prompt-field.target': {
363-
en: 'Target',
364-
pl: 'Cel',
365-
'zh-cn': '目标',
366-
ja: 'ターゲット',
367-
'zh-tw': '目標',
368-
de: 'Ziel',
369-
es: 'Objetivo',
370-
fr: 'Cible',
371-
'pt-br': 'Alvo',
372-
ru: 'Цель',
373-
ko: '대상',
374-
it: 'Destinazione',
375-
tr: 'Hedef',
376-
cs: 'Cíl',
377-
hu: 'Cél',
378-
bg: 'Цел'
379-
},
380362
'prompt-field.more': {
381363
en: 'More',
382364
pl: 'Więcej',

‎packages/ui/src/components/editor/common/prompts/PromptField/PromptField.module.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@
245245

246246
&__dropdown-item {
247247
@include accent-font;
248-
font-size: 15px;
249-
padding: 1px 4px;
248+
font-size: 14px;
249+
padding: 1px 3px;
250250
&:first-child {
251251
padding-left: 7px;
252252
}

‎packages/ui/src/components/editor/common/prompts/PromptField/PromptField.stories.tsx‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ export const Empty = () => (
6666
preview_prompt: 'Preview prompt',
6767
send: 'Send',
6868
attach_selected_files: 'Attach selected files',
69-
target: 'Target',
7069
more: 'More'
7170
}}
7271
/>
@@ -133,7 +132,6 @@ export const WithText = () => (
133132
preview_prompt: 'Preview prompt',
134133
send: 'Send',
135134
attach_selected_files: 'Attach selected files',
136-
target: 'Target',
137135
more: 'More'
138136
}}
139137
/>
@@ -200,7 +198,6 @@ export const LongText = () => (
200198
preview_prompt: 'Preview prompt',
201199
send: 'Send',
202200
attach_selected_files: 'Attach selected files',
203-
target: 'Target',
204201
more: 'More'
205202
}}
206203
/>
@@ -267,7 +264,6 @@ export const WithPlaceholderSavedContext = () => (
267264
preview_prompt: 'Preview prompt',
268265
send: 'Send',
269266
attach_selected_files: 'Attach selected files',
270-
target: 'Target',
271267
more: 'More'
272268
}}
273269
/>
@@ -334,7 +330,6 @@ export const WithCommit = () => (
334330
preview_prompt: 'Preview prompt',
335331
send: 'Send',
336332
attach_selected_files: 'Attach selected files',
337-
target: 'Target',
338333
more: 'More'
339334
}}
340335
/>
@@ -400,7 +395,6 @@ export const WithCommitWithQuotes = () => (
400395
preview_prompt: 'Preview prompt',
401396
send: 'Send',
402397
attach_selected_files: 'Attach selected files',
403-
target: 'Target',
404398
more: 'More'
405399
}}
406400
/>
@@ -474,7 +468,6 @@ export const WithEditFormatSelector = () => {
474468
preview_prompt: 'Preview prompt',
475469
send: 'Send',
476470
attach_selected_files: 'Attach selected files',
477-
target: 'Target',
478471
more: 'More'
479472
}}
480473
/>
@@ -540,7 +533,6 @@ export const WithWarning = () => (
540533
preview_prompt: 'Preview prompt',
541534
send: 'Send',
542535
attach_selected_files: 'Attach selected files',
543-
target: 'Target',
544536
more: 'More'
545537
}}
546538
/>
@@ -607,7 +599,6 @@ export const WithFilePaths = () => (
607599
preview_prompt: 'Preview prompt',
608600
send: 'Send',
609601
attach_selected_files: 'Attach selected files',
610-
target: 'Target',
611602
more: 'More'
612603
}}
613604
/>
@@ -702,7 +693,6 @@ export const WithTabs = () => {
702693
preview_prompt: 'Preview prompt',
703694
send: 'Send',
704695
attach_selected_files: 'Attach selected files',
705-
target: 'Target',
706696
more: 'More'
707697
}}
708698
/>

‎packages/ui/src/components/editor/common/prompts/PromptField/PromptField.tsx‎

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ export type PromptFieldProps = {
112112
preview_prompt: string
113113
send: string
114114
attach_selected_files: string
115-
target: string
116115
more: string
117116
}
118117
}
@@ -128,8 +127,6 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
128127
const [is_recording_hovered, set_is_recording_hovered] = useState(false)
129128
const [is_edit_format_hovered, set_is_edit_format_hovered] = useState(false)
130129
const [is_more_hovered, set_is_more_hovered] = useState(false)
131-
const [is_target_switch_hovered, set_is_target_switch_hovered] =
132-
useState(false)
133130
const [is_target_dropdown_open, set_is_target_dropdown_open] = useState(false)
134131
const [hovered_left_action, set_hovered_left_action] = useState<
135132
'at' | 'hash' | 'slash' | null
@@ -328,14 +325,6 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
328325
}
329326
}, [props.is_recording])
330327

331-
useEffect(() => {
332-
if (is_target_dropdown_open) {
333-
const handle_click = () => set_is_target_dropdown_open(false)
334-
window.addEventListener('click', handle_click)
335-
return () => window.removeEventListener('click', handle_click)
336-
}
337-
}, [is_target_dropdown_open])
338-
339328
const render_footer = () => {
340329
const primary_dropdown_items =
341330
(props.target == 'API' || props.target == 'CLI') && !props.value
@@ -679,10 +668,11 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
679668

680669
<div className={styles['footer__right__submit']} ref={dropdown_ref}>
681670
{props.target && props.on_target_change && (
682-
<div className={styles['footer__right__target-switch']}>
683-
{is_target_switch_hovered && !is_target_dropdown_open && (
684-
<Tooltip message={props.translations.target} align="center" />
685-
)}
671+
<div
672+
className={styles['footer__right__target-switch']}
673+
onMouseEnter={() => set_is_target_dropdown_open(true)}
674+
onMouseLeave={() => set_is_target_dropdown_open(false)}
675+
>
686676
{is_target_dropdown_open && (
687677
<div
688678
className={
@@ -703,7 +693,6 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
703693
e.stopPropagation()
704694
props.on_target_change!(t)
705695
set_is_target_dropdown_open(false)
706-
set_is_target_switch_hovered(false)
707696
}}
708697
disabled={t == props.target}
709698
>
@@ -719,13 +708,6 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
719708
styles['footer__right__submit__button'],
720709
styles['footer__right__target-switch__button']
721710
)}
722-
onClick={(e) => {
723-
e.stopPropagation()
724-
set_is_target_dropdown_open(!is_target_dropdown_open)
725-
close_dropdown()
726-
}}
727-
onMouseEnter={() => set_is_target_switch_hovered(true)}
728-
onMouseLeave={() => set_is_target_switch_hovered(false)}
729711
>
730712
<span
731713
className={styles['footer__right__target-switch__label']}
@@ -787,7 +769,6 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
787769
)}
788770
onClick={(e) => {
789771
handle_submit(e as any)
790-
set_is_target_dropdown_open(false)
791772
}}
792773
onMouseEnter={() => set_show_submit_tooltip(true)}
793774
onMouseLeave={() => set_show_submit_tooltip(false)}
@@ -799,10 +780,9 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
799780
<button
800781
ref={chevron_button_ref}
801782
className={styles['footer__right__submit__button']}
802-
onClick={() => {
803-
toggle_dropdown()
804-
set_is_target_dropdown_open(false)
805-
}}
783+
onClick={() => {
784+
toggle_dropdown()
785+
}}
806786
onMouseEnter={() => set_is_more_hovered(true)}
807787
onMouseLeave={() => set_is_more_hovered(false)}
808788
>
@@ -875,7 +855,6 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
875855
onClick={(e) => {
876856
e.stopPropagation()
877857
props.on_copy()
878-
set_is_target_dropdown_open(false)
879858
}}
880859
title={props.translations.copy_prompt}
881860
disabled={props.is_action_disabled}
@@ -887,7 +866,6 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
887866
className={styles['footer__right__submit__button']}
888867
onClick={() => {
889868
toggle_dropdown()
890-
set_is_target_dropdown_open(false)
891869
}}
892870
onMouseEnter={() => set_is_more_hovered(true)}
893871
onMouseLeave={() => set_is_more_hovered(false)}

0 commit comments

Comments
 (0)