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

Align track view button placement with thumbnail view #1158

Merged
merged 2 commits into from
Nov 1, 2023
Merged

Align track view button placement with thumbnail view #1158

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e86e881
Align track view button placement with thumbnail view
Arnei Sep 14, 2023
7229849
Merge remote-tracking branch 'upstream/main' into move-buttons-to-right
Arnei Nov 1, 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
69 changes: 48 additions & 21 deletions src/main/TrackSelection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,21 @@ const TrackItem: React.FC<{track: Track, enabledCount: number}> = ({track, enabl
display: 'flex',
flexDirection: 'column',
alignItems: 'left',

width: '100%',
maxWidth: '500px',
});

const trackitemSubStyle = css({
display: 'flex',
flexDirection: 'row',
...(flexGapReplacementStyle(20, true)),

justifyContent: 'space-around',
flexWrap: 'wrap',
})

const playerStyle = css({
aspectRatio: '16 / 9',
width: '100%',
maxWidth: '457px',
});

const headerStyle = css({
Expand All @@ -103,6 +111,15 @@ const TrackItem: React.FC<{track: Track, enabledCount: number}> = ({track, enabl
},
});

const buttonsStyle = css({
// TODO: Avoid hard-coding max-width
"@media (max-width: 1550px)": {
width: '100%',
},
display: 'flex',
flexDirection: 'column',
})

// What state is the track in and can it be deactivated?
// We do not permit deactivating the last remaining track
// 2 -> Track is enabled and can be deactivated
Expand Down Expand Up @@ -131,19 +148,24 @@ const TrackItem: React.FC<{track: Track, enabledCount: number}> = ({track, enabl
return (
<div css={[backgroundBoxStyle(theme), trackItemStyle]}>
<div css={headerStyle}>{ header }</div>
<ReactPlayer
width="unset"
height="unset"
css={playerStyle}
style={{opacity: track.video_stream.enabled ? '1' : '0.5'}}
url={track.uri}
/>
<SelectButton
text={deleteText}
tooltip={deleteTooltip}
handler={trackEnabledChange}
Icon={deleteIcon}
active={deleteEnabled} />
<div css={trackitemSubStyle}>
<ReactPlayer
width="unset"
height="unset"
css={playerStyle}
style={{opacity: track.video_stream.enabled ? '1' : '0.5'}}
url={track.uri}
/>
<div css={buttonsStyle}>
<SelectButton
text={deleteText}
tooltip={deleteTooltip}
handler={trackEnabledChange}
Icon={deleteIcon}
active={deleteEnabled}
/>
</div>
</div>
</div>
);
}
Expand All @@ -163,33 +185,38 @@ const SelectButton : React.FC<selectButtonInterface> = ({handler, text, Icon, to
const buttonStyle = [
active ? basicButtonStyle(theme) : deactivatedButtonStyle,
{
padding: '10px 5px',
width: '30%',
padding: '16px',
maxHeight: '21px',
boxShadow: '',
border: `1px solid ${theme.text}`,
background: `${theme.element_bg}`,
textWrap: 'nowrap',
}];

const clickHandler = () => {
if (active) { handler() }
ref.current?.blur();
};

const keyHandler = (event: React.KeyboardEvent) => {
if (active && (event.key === " " || event.key === "Enter")) {
handler();
}
};

const ref = React.useRef<HTMLDivElement>(null)

return (
<ThemedTooltip title={tooltip}>
<div css={buttonStyle}
<div
css={buttonStyle}
tabIndex={0}
ref={ref}
role="button"
aria-label={tooltip}
onClick={clickHandler}
onKeyDown={keyHandler} >
<Icon css={customIconStyle}/>
<div>{ text }</div>
{ text }
</div>
</ThemedTooltip>
);
Expand Down
Loading