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

feat: Improve visibility of card commands button #2127 #2147

Merged
merged 6 commits into from
Oct 6, 2023
Merged

feat: Improve visibility of card commands button #2127 #2147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
157e258
chore: slightly enhance kebab menu visibility #2127
marek-mihok Sep 27, 2023
6500d63
chore: further enhance visibility by removing opacity #2127
marek-mihok Oct 2, 2023
e3e4864
fix: Prevent plot from being overlaped by commands button, remove spa…
marek-mihok Oct 4, 2023
e172b7b
fix: Prevent vega plot from being overlaped by commands button #2127
marek-mihok Oct 4, 2023
1a682aa
fix: Make sure commands button does not overlap with form elements #2127
marek-mihok Oct 5, 2023
faec6b7
chore: center the falafel icon, move style constants to more general …
marek-mihok Oct 6, 2023
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
17 changes: 9 additions & 8 deletions ui/src/card_menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,26 @@ const
top: 0, right: 0,
$nest: {
'>div:first-child': {
padding: 24,
padding: 12,
paddingTop: 10,
fontSize: 16,
color: cssVar('$text7')
},
},
},
icon: {
userSelect: 'none',
marginRight: -6,
},
target: {
boxSizing: 'border-box',
cursor: 'pointer',
opacity: 0.5,
color: cssVar('$text'),
marginRight: -4,
$nest: {
'&:hover': {
opacity: 1,
color: cssVar('$themePrimary'),
},
},
},
target: {
boxSizing: 'border-box',
cursor: 'pointer',
}
})

Expand Down
3 changes: 3 additions & 0 deletions ui/src/parts/styleConstants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ export const Z_INDEX = {
TIME_PICKER: 4,
NOTIFICATION_BAR: 5
}

export const CARD_TITLE_PADDING_TOP = 16
export const CARD_TITLE_HEIGHT = 17
14 changes: 10 additions & 4 deletions ui/src/plot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import { Fmt, parseFormat } from './intl'
import { cards, grid } from './layout'
import { cssVarValue, cssVar, formItemWidth, themeB, themesB } from './theme'
import { bond, wave } from './ui'
import { Command } from './toolbar'
import { CARD_TITLE_HEIGHT, CARD_TITLE_PADDING_TOP } from './parts/styleConstants'

let
cat10 = [
Expand All @@ -38,6 +40,7 @@ let
]



type AnnotationOption = ArcOption | LineOption | TextOption | RegionOption | DataMarkerOption | DataRegionOption

enum SpaceT { CC, DD, TT, CD, DC, TC, CT, TD, DT }
Expand Down Expand Up @@ -1192,13 +1195,16 @@ interface State {
animate?: B
}

export const View = bond(({ name, state, changed }: Model<State>) => {
export const View = bond(({ name, state, changed }: Model<State & { commands?: Command[] }>) => {
const render = () => {
const { title = 'Untitled', plot, data, events, interactions, animate } = state
const { title = 'Untitled', plot, data, events, interactions, animate, commands } = state
return (
<div className={css.card}>
<div className='wave-s12 wave-w6'>{title}</div>
<div className={css.body}>
{title && <div className='wave-s12 wave-w6'>{title}</div>}
<div
className={css.body}
style={{ paddingTop: title ? CARD_TITLE_PADDING_TOP : commands?.length ? CARD_TITLE_PADDING_TOP + CARD_TITLE_HEIGHT : 0 }}
>
<XVisualization model={{ name, plot, data, events, interactions, animate }} />
</div>
</div>
Expand Down
13 changes: 9 additions & 4 deletions ui/src/vega.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import { Result } from 'vega-embed'
import { cards } from './layout'
import { formItemWidth } from './theme'
import { bond, debounce } from './ui'
import { Command } from './toolbar'
import { CARD_TITLE_HEIGHT, CARD_TITLE_PADDING_TOP } from './parts/styleConstants'

const
css = stylesheet({
Expand Down Expand Up @@ -142,14 +144,17 @@ interface State {
}

export const
View = bond(({ name, state, changed }: Model<State>) => {
View = bond(({ name, state, changed }: Model<State & { commands?: Command[] }>) => {
const
render = () => {
const { specification, data, title, grammar = 'vega-lite' } = state
const { specification, data, title, grammar = 'vega-lite', commands } = state
return (
<div data-test={name} className={css.card}>
{title && <div className='wave-s12 wave-w6' style={{ marginBottom: 16 }}>{title}</div>}
<div className={css.body}>
{title && <div className='wave-s12 wave-w6'>{title}</div>}
<div
className={css.body}
style={{ paddingTop: title ? CARD_TITLE_PADDING_TOP : commands?.length ? CARD_TITLE_PADDING_TOP + CARD_TITLE_HEIGHT : 0 }}
>
<XVegaVisualization model={{ specification, data, grammar }} />
</div>
</div>
Expand Down