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

refactor(ControlBar): implement redesigned control bar #165

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

refactor(ControlBar): implement redesigned control bar #165

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
512bc10
feat(controlBar): update new design of start/pause and stop buttons
ShaneHe023 Oct 6, 2023
7b648d9
fix(controlBar): set ControlBarContainer horizontally in the middle o…
ShaneHe023 Oct 6, 2023
47a28d4
style: run prettier
Lutra-Fs Oct 10, 2023
28e4dae
fix: merge branch 'main' into control-bar-new
Lutra-Fs Oct 10, 2023
205d68e
fix(ControlBar): fix eslint error
Lutra-Fs Oct 10, 2023
6c1f8d9
refactor(ControlBar): remove not used export
Lutra-Fs Oct 10, 2023
cd355ea
fix(controlBar): fix button overlapping
ShaneHe023 Oct 14, 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
103 changes: 71 additions & 32 deletions src/components/ControlBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,29 @@
import { Button, Space } from 'antd';
import styled from 'styled-components';
import { type ModelSave } from '../services/model/modelService';
import { useEffect } from 'react';
import type React from 'react';
import { useEffect, useState } from 'react';
import { CaretRightOutlined, PauseOutlined } from '@ant-design/icons';

export const ControlBarContainer = styled(Space)`
const ControlBarContainer = styled(Space)`
position: absolute;
bottom: 1rem;
right: 1rem;
bottom: 4rem;
right: 40%;
z-index: 100;
display: flex;
gap: 1.8rem;
background-color: #c5c5c5;
padding-top: 0.5rem;
padding-right: 1.8rem;
padding-bottom: 0.5rem;
padding-left: 1.8rem;
border-radius: 25px;
@media (max-width: 760px) {
right: 65%;
}
`;

export const SaveBtn = styled(Button)`
const SaveBtn = styled(Button)`
position: absolute;
bottom: 4rem;
right: 11rem;
Expand All @@ -26,7 +38,7 @@ export const SaveBtn = styled(Button)`
}
`;

export const RestoreBtn = styled(Button)`
const RestoreBtn = styled(Button)`
position: absolute;
bottom: 4rem;
right: 2rem;
Expand All @@ -41,6 +53,34 @@ export const RestoreBtn = styled(Button)`
}
`;

const ControlBarBtn = styled(Button)`
shape: circle;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shape is not in CSS properties.

border: none;
cursor: pointer;
outline: none;
height: 2rem;
width: 2rem;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
background-color: #909090;
font-size: 1rem;
`;

const ControlBarBtnWithAttr = styled(ControlBarBtn)`
&[data-icon='square']::after {
content: '';
position: absolute;
top: 50%;
left: 50%;
width: 40%;
height: 40%;
background-color: white;
transform: translate(-50%, -50%);
}
`;

interface ControlBarProps {
modelSaveSubs: Array<(save: ModelSave) => void>;
worker: Worker;
Expand Down Expand Up @@ -83,7 +123,15 @@ export default function ControlBar(props: ControlBarProps): React.ReactElement {
console.log('wrote a save to ' + filename, sav);
}

// take a file and send its contents to the worker
const [isPlaying, setIsPlaying] = useState(true);
const handleIconClick = (): void => {
if (isPlaying) {
worker.postMessage({ func: 'pause' });
} else {
worker.postMessage({ func: 'start' });
}
setIsPlaying(!isPlaying);
};

return (
<>
Expand All @@ -103,34 +151,25 @@ export default function ControlBar(props: ControlBarProps): React.ReactElement {
Restore Model
</RestoreBtn>
<ControlBarContainer size="small" direction="horizontal">
<Button
onClick={() => {
worker.postMessage({ func: 'start' });
}}
>
Play
</Button>
<Button
onClick={() => {
worker.postMessage({ func: 'pause' });
}}
>
Pause
</Button>
<Button
<ControlBarBtn onClick={handleIconClick}>
{isPlaying ? (
<PauseOutlined style={{ color: 'white' }} />
) : (
<CaretRightOutlined
style={{
color: 'white',
fontSize: '1.4em',
marginLeft: '0.15em',
}}
/>
)}
</ControlBarBtn>
<ControlBarBtnWithAttr
data-icon="square"
onClick={() => {
worker.postMessage({ func: 'stop' });
}}
>
Stop
</Button>
<Button
onClick={() => {
worker.terminate();
}}
>
TERMINATE
</Button>
/>
</ControlBarContainer>
</>
);
Expand Down
Loading