Skip to content

Used styled components in Sidebar #2394

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

Closed
wants to merge 2 commits into from
Closed

Used styled components in Sidebar #2394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f18462
Partially added styled component to Sidebar
adityagarg06 Aug 22, 2023
ec95f63
Changed conditional rendering of styled components
adityagarg06 Sep 7, 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
161 changes: 103 additions & 58 deletions client/modules/IDE/components/Sidebar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { useRef, useState } from 'react';
import classNames from 'classnames';
import { useTranslation } from 'react-i18next';
import { useDispatch, useSelector } from 'react-redux';
import styled from 'styled-components';
import {
closeProjectOptions,
newFile,
Expand All @@ -11,11 +12,48 @@ import {
} from '../actions/ide';
import { selectRootFile } from '../selectors/files';
import { getAuthenticated, selectCanEditSketch } from '../selectors/users';

import { remSize } from '../../../theme';
import ConnectedFileNode from './FileNode';

import DownArrowIcon from '../../../images/down-filled-triangle.svg';

const SidebarHeader = styled.header`
padding-right: ${remSize(6)};
padding-left: ${remSize(19)};
display: flex;
justify-content: space-between;
align-items: center;
height: ${remSize(29)};
min-height: ${remSize(29)};
position: relative;
`;

const SidebarTitle = styled.h3`
font-size: ${remSize(12)};
display: inline-block;
white-space: nowrap;
overflow: hidden;
`;

const SidebarIcons = styled.div`
display: flex;
align-items: center;
height: 100%;
`;

const SidebarAddButton = styled.button`
width: ${remSize(20)};
height: ${remSize(20)};
& svg {
width: ${remSize(10)};
}
`;

const SidebarProjectOptions = styled.ul`
display: flex;
width: 100%;
max-width: ${remSize(180)};
`;
// TODO: use a generic Dropdown UI component

export default function SideBar() {
Expand Down Expand Up @@ -66,67 +104,74 @@ export default function SideBar() {

return (
<section className={sidebarClass}>
<header className="sidebar__header" onContextMenu={toggleProjectOptions}>
<h3 className="sidebar__title">
<span>{t('Sidebar.Title')}</span>
</h3>
<div className="sidebar__icons">
<button
aria-label={t('Sidebar.ToggleARIA')}
className="sidebar__add"
tabIndex="0"
ref={sidebarOptionsRef}
onClick={toggleProjectOptions}
onBlur={onBlurComponent}
onFocus={onFocusComponent}
>
<DownArrowIcon focusable="false" aria-hidden="true" />
</button>
<ul className="sidebar__project-options">
<li>
<button
aria-label={t('Sidebar.AddFolderARIA')}
onClick={() => {
dispatch(newFolder(rootFile.id));
setTimeout(() => dispatch(closeProjectOptions()), 0);
}}
<SidebarHeader onContextMenu={toggleProjectOptions}>
{isExpanded && (
<SidebarTitle>
<span>{t('Sidebar.Title')}</span>
</SidebarTitle>
)}
{canEditProject && (
<SidebarIcons>
{isExpanded && (
<SidebarAddButton
aria-label={t('Sidebar.ToggleARIA')}
tabIndex="0"
ref={sidebarOptionsRef}
onClick={toggleProjectOptions}
onBlur={onBlurComponent}
onFocus={onFocusComponent}
>
{t('Sidebar.AddFolder')}
</button>
</li>
<li>
<button
aria-label={t('Sidebar.AddFileARIA')}
onClick={() => {
dispatch(newFile(rootFile.id));
setTimeout(() => dispatch(closeProjectOptions()), 0);
}}
onBlur={onBlurComponent}
onFocus={onFocusComponent}
>
{t('Sidebar.AddFile')}
</button>
</li>
{isAuthenticated && (
<li>
<button
aria-label={t('Sidebar.UploadFileARIA')}
onClick={() => {
dispatch(openUploadFileModal(rootFile.id));
setTimeout(() => dispatch(closeProjectOptions()), 0);
}}
onBlur={onBlurComponent}
onFocus={onFocusComponent}
>
{t('Sidebar.UploadFile')}
</button>
</li>
<DownArrowIcon focusable="false" aria-hidden="true" />
</SidebarAddButton>
)}
{projectOptionsVisible && (
<SidebarProjectOptions className="sidebar__project-options">
<li>
<button
aria-label={t('Sidebar.AddFolderARIA')}
onClick={() => {
dispatch(newFolder(rootFile.id));
setTimeout(() => dispatch(closeProjectOptions()), 0);
}}
onBlur={onBlurComponent}
onFocus={onFocusComponent}
>
{t('Sidebar.AddFolder')}
</button>
</li>
<li>
<button
aria-label={t('Sidebar.AddFileARIA')}
onClick={() => {
dispatch(newFile(rootFile.id));
setTimeout(() => dispatch(closeProjectOptions()), 0);
}}
onBlur={onBlurComponent}
onFocus={onFocusComponent}
>
{t('Sidebar.AddFile')}
</button>
</li>
{isAuthenticated && (
<li>
<button
aria-label={t('Sidebar.UploadFileARIA')}
onClick={() => {
dispatch(openUploadFileModal(rootFile.id));
setTimeout(() => dispatch(closeProjectOptions()), 0);
}}
onBlur={onBlurComponent}
onFocus={onFocusComponent}
>
{t('Sidebar.UploadFile')}
</button>
</li>
)}
</SidebarProjectOptions>
)}
</ul>
</div>
</header>
</SidebarIcons>
)}
</SidebarHeader>
<ConnectedFileNode id={rootFile.id} canEdit={canEditProject} />
</section>
);
Expand Down
6 changes: 0 additions & 6 deletions client/styles/components/_sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,10 +303,4 @@

.sidebar__project-options {
@extend %dropdown-open-right;
display: none;
width: 100%;
max-width: #{180 / $base-font-size}rem;
.sidebar--project-options & {
display: flex;
}
}