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.

Sign up for GitHub

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

Jump to bottom

[Omn-192] - Settings View(Installation) #300

Merged
merged 16 commits into from
Mar 29, 2022
Merged

[Omn-192] - Settings View(Installation) #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8b81dd3
[Omn-192] - Settings View(Installation)
gitstart Mar 23, 2022
37d64a4
Merge commit '2dcb0e325c01c9f50b0d76f1d57fb930d0f6172d' into OMN-192
gitstart Mar 23, 2022
f6b780d
fix props naming
gitstart Mar 23, 2022
69ad032
fix props naming issue
gitstart Mar 23, 2022
3694992
resolve merge conflict
gitstart Mar 24, 2022
8dedb42
Merge commit '217b9e8835970e0f2c5b9fe2904af77f5caa8695' into OMN-192
gitstart Mar 28, 2022
7786a3f
effected review changes
gitstart Mar 28, 2022
9932b33
fix svg attr naming issues
gitstart Mar 28, 2022
659d931
Background colour of device icons on larger displays
jacksonh Mar 28, 2022
b4cee4d
Update terms, dont make icons into links. User taps the download butt…
jacksonh Mar 28, 2022
c74a139
Break the overal layout earlier
jacksonh Mar 28, 2022
febde10
Higher res @2x png images for install view
jacksonh Mar 28, 2022
b4d7d05
Use apple badge for install icon
jacksonh Mar 28, 2022
b266e26
use for URL because Next prefers that, set the link target on install
jacksonh Mar 28, 2022
b647640
Add noreferrer
jacksonh Mar 28, 2022
718db73
Tone down the shadow in dark mode
jacksonh Mar 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 18 additions & 17 deletions packages/web/components/elements/DropdownElements.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {
Label,
} from '@radix-ui/react-dropdown-menu'
import { styled } from './../tokens/stitches.config'
import { Button } from './Button'

const itemStyles = {
fontSize: 13,
Expand Down Expand Up @@ -46,10 +45,11 @@ const StyledTriggerItem = styled(TriggerItem, {

const DropdownContent = styled(Content, {
minWidth: 130,
backgroundColor: '$grayBase',
backgroundColor: '$grayBg',
borderRadius: '0.5em',
padding: 5,
border: '1px solid $grayBorder',
boxShadow: '$cardBoxShadow',
})

const StyledArrow = styled(Arrow, {
Expand All @@ -63,17 +63,14 @@ const StyledLabel = styled(Label, {
cursor: 'default',
})

export type DropdownAlignment =
| 'start'
| 'end'
| 'center'
export type DropdownAlignment = 'start' | 'end' | 'center'

type DropdownProps = {
labelText?: string
showArrow?: boolean
triggerElement: React.ReactNode
children: React.ReactNode
styledArrow?: boolean
align?: DropdownAlignment
align?: DropdownAlignment
}

export const DropdownSeparator = styled(Separator, {
Expand All @@ -98,22 +95,26 @@ export function DropdownOption(props: DropdownOptionProps): JSX.Element {
)
}

export function Dropdown(props: DropdownProps): JSX.Element {
export function Dropdown({
children,
align,
triggerElement,
labelText,
showArrow = true,
}: DropdownProps): JSX.Element {
return (
<Root modal={false}>
<DropdownTrigger>
{props.triggerElement}
</DropdownTrigger>
<DropdownTrigger>{triggerElement}</DropdownTrigger>
<DropdownContent
onInteractOutside={(event) => {
onInteractOutside={() => {
// remove focus from dropdown
;(document.activeElement as HTMLElement).blur()
}}
align={props.align ? props.align : 'center'}
align={align ? align : 'center'}
>
{props.labelText && <StyledLabel>{props.labelText}</StyledLabel>}
{props.children}
{props.styledArrow && <StyledArrow offset={20} />}
{labelText && <StyledLabel>{labelText}</StyledLabel>}
{children}
{showArrow && <StyledArrow offset={20} />}
</DropdownContent>
</Root>
)
Expand Down