Skip to content

Commit dad5603

Browse files
committed
Refactor edit format selector visibility to use style-based control instead of conditional rendering
1 parent 033c8be commit dad5603

2 files changed

Lines changed: 87 additions & 87 deletions

File tree

‎packages/ui/src/components/editor/panel/PromptField/PromptField.tsx‎

Lines changed: 85 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
327327
format_truncated_ref,
328328
format_before_after_ref,
329329
format_diff_ref
330-
} = use_edit_format_compacting(props.show_edit_format_selector)
330+
} = use_edit_format_compacting()
331331

332332
return (
333333
<div className={styles.container}>
@@ -467,93 +467,93 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
467467
e.stopPropagation()
468468
}}
469469
>
470-
{props.show_edit_format_selector && (
471-
<div
472-
className={styles['footer__right__edit-format']}
473-
ref={container_ref}
474-
>
475-
{(['whole', 'truncated', 'before-after', 'diff'] as const).map(
476-
(format, index) => {
477-
const is_compact =
478-
(format == 'before-after' && compact_step >= 1) ||
479-
(format == 'truncated' && compact_step >= 2) ||
480-
(format == 'whole' && compact_step >= 3) ||
481-
(format == 'diff' && compact_step >= 4)
482-
483-
const button_text = is_compact
484-
? format == 'before-after'
485-
? 'b/a'
486-
: format.charAt(0)
487-
: format == 'before-after'
488-
? 'before/after'
489-
: format
490-
491-
const is_selected = props.edit_format == format
492-
const should_underline = is_alt_pressed && !is_selected
493-
494-
let ref = null
495-
if (format == 'whole') ref = format_whole_ref
496-
if (format == 'truncated') ref = format_truncated_ref
497-
if (format == 'before-after') ref = format_before_after_ref
498-
if (format == 'diff') ref = format_diff_ref
499-
500-
return (
501-
<button
502-
ref={ref}
503-
key={format}
504-
className={cn(
505-
styles['footer__right__edit-format__button'],
506-
{
507-
[styles[
508-
'footer__right__edit-format__button--selected'
509-
]]: is_selected
470+
<div
471+
className={styles['footer__right__edit-format']}
472+
ref={container_ref}
473+
style={{
474+
display: props.show_edit_format_selector ? 'flex' : 'none'
475+
}}
476+
>
477+
{(['whole', 'truncated', 'before-after', 'diff'] as const).map(
478+
(format) => {
479+
const is_compact =
480+
(format == 'before-after' && compact_step >= 1) ||
481+
(format == 'truncated' && compact_step >= 2) ||
482+
(format == 'whole' && compact_step >= 3) ||
483+
(format == 'diff' && compact_step >= 4)
484+
485+
const button_text = is_compact
486+
? format == 'before-after'
487+
? 'b/a'
488+
: format.charAt(0)
489+
: format == 'before-after'
490+
? 'before/after'
491+
: format
492+
493+
const is_selected = props.edit_format == format
494+
const should_underline = is_alt_pressed && !is_selected
495+
496+
let ref = null
497+
if (format == 'whole') ref = format_whole_ref
498+
if (format == 'truncated') ref = format_truncated_ref
499+
if (format == 'before-after') ref = format_before_after_ref
500+
if (format == 'diff') ref = format_diff_ref
501+
502+
return (
503+
<button
504+
ref={ref}
505+
key={format}
506+
className={cn(
507+
styles['footer__right__edit-format__button'],
508+
{
509+
[styles[
510+
'footer__right__edit-format__button--selected'
511+
]]: is_selected
512+
}
513+
)}
514+
title={`Edit format instructions to include with the prompt ${edit_format_shortcuts[format]}`}
515+
onClick={() => props.on_edit_format_change?.(format)}
516+
onMouseEnter={() => set_hovered_edit_format(format)}
517+
onMouseLeave={() => set_hovered_edit_format(null)}
518+
>
519+
{is_compact && hovered_edit_format == format && (
520+
<Tooltip
521+
message={
522+
format == 'before-after'
523+
? 'Before and After'
524+
: format.charAt(0).toUpperCase() + format.slice(1)
510525
}
511-
)}
512-
title={`Edit format instructions to include with the prompt ${edit_format_shortcuts[format]}`}
513-
onClick={() => props.on_edit_format_change?.(format)}
514-
onMouseEnter={() => set_hovered_edit_format(format)}
515-
onMouseLeave={() => set_hovered_edit_format(null)}
526+
align="center"
527+
/>
528+
)}
529+
<span
530+
className={
531+
styles['footer__right__edit-format__button__spacer']
532+
}
533+
>
534+
{button_text}
535+
</span>
536+
<span
537+
className={
538+
styles['footer__right__edit-format__button__text']
539+
}
516540
>
517-
{is_compact && hovered_edit_format == format && (
518-
<Tooltip
519-
message={
520-
format == 'before-after'
521-
? 'Before and After'
522-
: format.charAt(0).toUpperCase() +
523-
format.slice(1)
524-
}
525-
align="center"
526-
/>
541+
{should_underline ? (
542+
<>
543+
<span className={styles['underlined']}>
544+
{button_text.charAt(0)}
545+
</span>
546+
{button_text.substring(1)}
547+
</>
548+
) : (
549+
button_text
527550
)}
528-
<span
529-
className={
530-
styles['footer__right__edit-format__button__spacer']
531-
}
532-
>
533-
{button_text}
534-
</span>
535-
<span
536-
className={
537-
styles['footer__right__edit-format__button__text']
538-
}
539-
>
540-
{should_underline ? (
541-
<>
542-
<span className={styles['underlined']}>
543-
{button_text.charAt(0)}
544-
</span>
545-
{button_text.substring(1)}
546-
</>
547-
) : (
548-
button_text
549-
)}
550-
</span>
551-
</button>
552-
)
553-
}
554-
)}
555-
</div>
556-
)}
551+
</span>
552+
</button>
553+
)
554+
}
555+
)}
556+
</div>
557557

558558
<div className={styles['footer__right__submit']} ref={dropdown_ref}>
559559
{(!props.is_web_mode ||

‎packages/ui/src/components/editor/panel/PromptField/hooks/use-edit-format-compacting.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useRef, useLayoutEffect } from 'react'
22
import { use_compacting } from '@shared/hooks'
33

4-
export const use_edit_format_compacting = (is_visible?: boolean) => {
4+
export const use_edit_format_compacting = () => {
55
const { container_ref, compact_step, report_width } = use_compacting(4)
66
const format_whole_ref = useRef<HTMLButtonElement>(null)
77
const format_truncated_ref = useRef<HTMLButtonElement>(null)
@@ -27,7 +27,7 @@ export const use_edit_format_compacting = (is_visible?: boolean) => {
2727

2828
report_width(width, compact_step)
2929
}
30-
}, [compact_step, report_width, is_visible])
30+
}, [compact_step, report_width])
3131

3232
return {
3333
container_ref,

0 commit comments

Comments
 (0)