Skip to content

Commit f909350

Browse files
committed
Extract ModeToggler into a reusable UI component
- inactive should not be dimmed - move the toggler to a separate ui component - the toggler should have be dimmed at all tiimes - the inactive toggler value should be dimmed slightly more - remove redundant css ├── apps │ └── editor │ └── src │ └── views │ └── prompt │ └── frontend │ └── Main │ └── MainView │ └── components │ └── Header │ ├── Header.module.scss │ ├── Header.tsx │ ├── hooks │ │ └── use-keyboard-shortcuts.ts │ └── index.ts └── packages └── ui └── src ├── components │ └── editor │ └── prompt │ ├── ModeToggler │ │ ├── ModeToggler.module.scss │ │ ├── ModeToggler.tsx │ │ └── index.ts │ └── PromptTypeButton │ ├── PromptTypeButton.module.scss │ ├── PromptTypeButton.stories.tsx │ ├── PromptTypeButton.tsx │ └── index.ts └── styles └── foundation └── _variables.scss
1 parent 387db50 commit f909350

7 files changed

Lines changed: 156 additions & 150 deletions

File tree

‎apps/editor/src/views/prompt/frontend/Home/Home.module.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
line-height: 1;
6262
letter-spacing: 1px;
6363
padding-top: 1px;
64+
white-space: nowrap;
6465
}
6566

6667
&__modes {

‎apps/editor/src/views/prompt/frontend/Main/MainView/components/Header/Header.module.scss‎

Lines changed: 1 addition & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
justify-content: space-between;
55
align-items: center;
66
padding: 0 12px;
7-
gap: 14px;
7+
gap: 8px;
88
height: var(--height);
99

1010
:global([data-modern-ui='true']) & {
@@ -21,97 +21,5 @@
2121
&__right {
2222
display: flex;
2323
align-items: center;
24-
25-
&__toggler {
26-
font-family: var(--font-family-accent);
27-
font-size: 18px;
28-
display: flex;
29-
flex-direction: column;
30-
align-items: center;
31-
justify-content: flex-start;
32-
height: var(--height);
33-
border-radius: 5px;
34-
--padding: 6px;
35-
padding: 1px var(--padding) 0 var(--padding);
36-
margin: 0 calc(var(--padding) * -1);
37-
line-height: 1;
38-
white-space: nowrap;
39-
letter-spacing: 1px;
40-
position: relative;
41-
overflow: hidden;
42-
43-
&:focus {
44-
outline: none;
45-
}
46-
47-
&__wrapper {
48-
display: grid;
49-
grid-template-areas: 'overlap';
50-
align-items: center;
51-
justify-items: center;
52-
height: 100%;
53-
width: 100%;
54-
flex-shrink: 0;
55-
56-
&--hover {
57-
> span:first-child {
58-
transform: translateY(-100%);
59-
opacity: 0;
60-
}
61-
> span:last-child {
62-
transform: translateY(0);
63-
opacity: 0.5;
64-
}
65-
}
66-
67-
&--no-transition {
68-
> span {
69-
transition: none !important;
70-
}
71-
}
72-
}
73-
74-
&__label {
75-
grid-area: overlap;
76-
width: 100%;
77-
display: flex;
78-
align-items: center;
79-
justify-content: center;
80-
white-space: nowrap;
81-
overflow: hidden;
82-
max-width: 100%;
83-
padding-right: 1px;
84-
transition:
85-
transform var(--transition-duration-250)
86-
var(--transition-timing-function),
87-
opacity var(--transition-duration-250)
88-
var(--transition-timing-function);
89-
90-
&:first-child {
91-
transform: translateY(0);
92-
opacity: 1;
93-
}
94-
95-
&:last-child {
96-
transform: translateY(100%);
97-
opacity: 0;
98-
}
99-
}
100-
101-
&__esc {
102-
position: absolute;
103-
top: 50%;
104-
left: 50%;
105-
transform: translate(-50%, -50%);
106-
background-color: var(--vscode-sideBar-background);
107-
color: var(--vscode-foreground);
108-
border: 1px solid var(--cwc-border-color-dimmed);
109-
padding: 2px 4px 3px 4px;
110-
border-radius: 4px;
111-
font-size: 11px;
112-
font-family: var(--vscode-font-family);
113-
letter-spacing: normal;
114-
}
115-
}
11624
}
11725
}

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

Lines changed: 8 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import { useCallback, useState } from 'react'
1+
import { useCallback } from 'react'
22
import { MODE, Mode } from '@/views/prompt/types/main-view-mode'
33
import { use_compacting, use_is_mac } from '@shared/hooks'
44
import { ApiPromptType, WebPromptType } from '@shared/types/prompt-types'
55
import { PromptTypeButton as UiPromptTypeButton } from '@ui/components/editor/prompt/PromptTypeButton'
6+
import { ModeToggler } from '@ui/components/editor/prompt/ModeToggler'
67
import { IconButton as UiIconButton } from '@ui/components/editor/common/IconButton'
78
import styles from './Header.module.scss'
89
import {
@@ -28,21 +29,7 @@ export const Header: React.FC<Props> = (props) => {
2829
const is_mac = use_is_mac()
2930
const { container_ref, compact_step } = use_compacting()
3031

31-
const [is_hovered, set_is_hovered] = useState(false)
32-
const [just_clicked, set_just_clicked] = useState(false)
33-
34-
const handle_mouse_enter = useCallback(() => {
35-
set_is_hovered(true)
36-
set_just_clicked(false)
37-
}, [])
38-
39-
const handle_mouse_leave = useCallback(() => {
40-
set_is_hovered(false)
41-
set_just_clicked(false)
42-
}, [])
43-
4432
const handle_heading_click = useCallback(() => {
45-
set_just_clicked(true)
4633
if (props.mode == MODE.WEB) {
4734
props.on_mode_change(MODE.API)
4835
} else {
@@ -112,35 +99,13 @@ export const Header: React.FC<Props> = (props) => {
11299
</div>
113100

114101
<div className={styles.header__right}>
115-
<button
116-
className={styles['header__right__toggler']}
117-
onClick={handle_heading_click}
118-
onMouseEnter={handle_mouse_enter}
119-
onMouseLeave={handle_mouse_leave}
102+
<ModeToggler
103+
mode={props.mode == MODE.WEB ? MODE.WEB : MODE.API}
104+
alt_mode={props.mode == MODE.WEB ? MODE.API : MODE.WEB}
120105
title={`${t('header.change-mode')} (${is_mac ? '⌥Esc' : 'Alt+Esc'})`}
121-
>
122-
<div
123-
className={`${styles['header__right__toggler__wrapper']} ${
124-
is_hovered && !just_clicked
125-
? styles['header__right__toggler__wrapper--hover']
126-
: ''
127-
} ${
128-
just_clicked
129-
? styles['header__right__toggler__wrapper--no-transition']
130-
: ''
131-
}`}
132-
>
133-
<span className={styles['header__right__toggler__label']}>
134-
{props.mode == MODE.WEB ? MODE.WEB : MODE.API}
135-
</span>
136-
<span className={styles['header__right__toggler__label']}>
137-
{props.mode == MODE.WEB ? MODE.API : MODE.WEB}
138-
</span>
139-
</div>
140-
{is_alt_pressed && (
141-
<span className={styles['header__right__toggler__esc']}>esc</span>
142-
)}
143-
</button>
106+
is_alt_pressed={is_alt_pressed}
107+
on_toggle={handle_heading_click}
108+
/>
144109
</div>
145110
</div>
146111
)
Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
.toggler {
2+
font-family: var(--font-family-accent);
3+
font-size: 16px;
4+
display: flex;
5+
flex-direction: column;
6+
align-items: center;
7+
justify-content: flex-start;
8+
height: 32px;
9+
border-radius: 5px;
10+
--padding: 6px;
11+
padding: 1px var(--padding) 0 var(--padding);
12+
margin: 0 calc(var(--padding) * -1);
13+
line-height: 1;
14+
letter-spacing: 1px;
15+
position: relative;
16+
overflow: hidden;
17+
background: transparent;
18+
border: none;
19+
color: var(--vscode-foreground);
20+
21+
&:focus {
22+
outline: none;
23+
}
24+
25+
&__wrapper {
26+
display: grid;
27+
grid-template-areas: 'overlap';
28+
align-items: center;
29+
justify-items: center;
30+
height: 100%;
31+
width: 100%;
32+
flex-shrink: 0;
33+
34+
&--hover {
35+
> span:first-child {
36+
transform: translateY(-100%);
37+
opacity: 0;
38+
}
39+
> span:last-child {
40+
transform: translateY(0);
41+
opacity: var(--dimmed-opacity);
42+
}
43+
}
44+
45+
&--no-transition {
46+
> span {
47+
transition: none !important;
48+
}
49+
}
50+
}
51+
52+
&__label {
53+
grid-area: overlap;
54+
width: 100%;
55+
display: flex;
56+
align-items: center;
57+
justify-content: center;
58+
white-space: nowrap;
59+
overflow: hidden;
60+
max-width: 100%;
61+
padding-right: 1px;
62+
transition:
63+
transform var(--transition-duration-250) var(--transition-timing-function),
64+
opacity var(--transition-duration-250) var(--transition-timing-function);
65+
66+
&:first-child {
67+
transform: translateY(0);
68+
opacity: 1;
69+
}
70+
71+
&:last-child {
72+
transform: translateY(100%);
73+
opacity: 0;
74+
}
75+
}
76+
77+
&__esc {
78+
position: absolute;
79+
top: 50%;
80+
left: 50%;
81+
transform: translate(-50%, -50%);
82+
background-color: var(--vscode-sideBar-background);
83+
color: var(--vscode-foreground);
84+
border: 1px solid var(--cwc-border-color-dimmed);
85+
padding: 2px 4px 3px 4px;
86+
border-radius: 4px;
87+
font-size: 11px;
88+
font-family: var(--vscode-font-family);
89+
letter-spacing: normal;
90+
}
91+
}
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
import { FC, useCallback, useState } from 'react'
2+
import styles from './ModeToggler.module.scss'
3+
import cn from 'classnames'
4+
5+
type Props = {
6+
mode: string
7+
alt_mode: string
8+
title?: string
9+
is_alt_pressed?: boolean
10+
on_toggle?: () => void
11+
}
12+
13+
export const ModeToggler: FC<Props> = (props) => {
14+
const [is_hovered, set_is_hovered] = useState(false)
15+
const [just_clicked, set_just_clicked] = useState(false)
16+
17+
const handle_mouse_enter = useCallback(() => {
18+
set_is_hovered(true)
19+
set_just_clicked(false)
20+
}, [])
21+
22+
const handle_mouse_leave = useCallback(() => {
23+
set_is_hovered(false)
24+
set_just_clicked(false)
25+
}, [])
26+
27+
const handle_click = useCallback(() => {
28+
set_just_clicked(true)
29+
props.on_toggle?.()
30+
}, [props.on_toggle])
31+
32+
return (
33+
<button
34+
className={styles.toggler}
35+
onClick={handle_click}
36+
onMouseEnter={handle_mouse_enter}
37+
onMouseLeave={handle_mouse_leave}
38+
title={props.title}
39+
type="button"
40+
>
41+
<div
42+
className={cn(styles.toggler__wrapper, {
43+
[styles['toggler__wrapper--hover']]: is_hovered && !just_clicked,
44+
[styles['toggler__wrapper--no-transition']]: just_clicked
45+
})}
46+
>
47+
<span className={styles.toggler__label}>{props.mode}</span>
48+
<span className={styles.toggler__label}>{props.alt_mode}</span>
49+
</div>
50+
{props.is_alt_pressed && <span className={styles.toggler__esc}>esc</span>}
51+
</button>
52+
)
53+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './ModeToggler'

‎packages/ui/src/components/editor/prompt/PromptTypeButton/PromptTypeButton.module.scss‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,8 @@
1313
flex-shrink: 0;
1414
position: relative;
1515

16-
&:not(&--active) {
17-
.button__icon,
18-
.button__label {
19-
opacity: var(--dimmed-opacity);
20-
}
21-
}
22-
2316
&:hover {
2417
background-color: var(--vscode-toolbar-hoverBackground);
25-
26-
.button__icon,
27-
.button__label {
28-
opacity: 1;
29-
}
3018
}
3119

3220
&:focus-visible {
@@ -89,8 +77,7 @@
8977

9078
&__label {
9179
font-family: var(--font-family-accent);
92-
font-weight: 500;
93-
font-size: 15px;
80+
font-size: 16px;
9481
line-height: 1;
9582
letter-spacing: 1px;
9683
padding-top: 2px;

0 commit comments

Comments
 (0)