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

Jatin issue#3303 #3314

Merged
merged 6 commits into from
Mar 4, 2025
Merged

Jatin issue#3303 #3314

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a16d992
fix ProjectOptions closes issue #3303
Jatin24062005 Dec 31, 2024
e5ee1cc
fix issue#3303 ProjectOptions closes
Jatin24062005 Dec 31, 2024
e384eea
Merge branch 'develop' into JATIN-ISSUE#3303
raclim Mar 4, 2025
9b9bfa5
fix linting Issue
Jatin24062005 Mar 4, 2025
15d8b43
Using UseEffect for the Closing projectOption and Upgrading onBlur
Jatin24062005 Mar 4, 2025
be4bb32
remove comment, add back in onContextMenu
raclim Mar 4, 2025
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
104 changes: 56 additions & 48 deletions client/modules/IDE/components/Sidebar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useRef } from 'react';
import React, { useRef, useEffect } from 'react';
import classNames from 'classnames';
import { useTranslation } from 'react-i18next';
import { useDispatch, useSelector } from 'react-redux';
Expand Down Expand Up @@ -30,21 +30,37 @@ export default function SideBar() {
);
const isExpanded = useSelector((state) => state.ide.sidebarIsExpanded);
const canEditProject = useSelector(selectCanEditSketch);
const isAuthenticated = useSelector(getAuthenticated);

const sidebarOptionsRef = useRef(null);

const isAuthenticated = useSelector(getAuthenticated);
useEffect(() => {
function handleClickOutside(event) {
if (
projectOptionsVisible &&
sidebarOptionsRef.current &&
!sidebarOptionsRef.current.contains(event.target)
) {
setTimeout(() => dispatch(closeProjectOptions()), 300);
}
}

const onBlurComponent = () => {
setTimeout(() => dispatch(closeProjectOptions()), 200);
};
if (projectOptionsVisible) {
document.addEventListener('mousedown', handleClickOutside);
} else {
document.removeEventListener('mousedown', handleClickOutside);
}

return () => {
document.removeEventListener('mousedown', handleClickOutside);
};
}, [projectOptionsVisible, dispatch]);

const toggleProjectOptions = (e) => {
e.preventDefault();
if (projectOptionsVisible) {
dispatch(closeProjectOptions());
} else {
sidebarOptionsRef.current?.focus();
dispatch(openProjectOptions());
}
};
Expand All @@ -65,9 +81,7 @@ export default function SideBar() {
dispatch(collapseSidebar());
dispatch(closeProjectOptions());
}}
>
{' '}
</button>
/>
)}
<section className={sidebarClass}>
<header
Expand All @@ -77,60 +91,54 @@ export default function SideBar() {
<h3 className="sidebar__title">
<span>{t('Sidebar.Title')}</span>
</h3>
<div className="sidebar__icons">
<div className="sidebar__icons" ref={sidebarOptionsRef}>
<button
aria-label={t('Sidebar.ToggleARIA')}
className="sidebar__add"
tabIndex="0"
ref={sidebarOptionsRef}
onClick={toggleProjectOptions}
onBlur={onBlurComponent}
>
<PlusIcon focusable="false" aria-hidden="true" />
</button>
<ul className="sidebar__project-options">
<li>
<button
onMouseDown={(e) => e.preventDefault()}
aria-label={t('Sidebar.AddFolderARIA')}
onClick={() => {
dispatch(newFolder(rootFile.id));
setTimeout(() => dispatch(closeProjectOptions()), 0);
}}
onBlur={onBlurComponent}
>
{t('Sidebar.AddFolder')}
</button>
</li>
<li>
<button
onMouseDown={(e) => e.preventDefault()}
aria-label={t('Sidebar.AddFileARIA')}
onClick={() => {
dispatch(newFile(rootFile.id));
setTimeout(() => dispatch(closeProjectOptions()), 0);
}}
onBlur={onBlurComponent}
>
{t('Sidebar.AddFile')}
</button>
</li>
{isAuthenticated && (
{projectOptionsVisible && (
<ul className="sidebar__project-options">
<li>
<button
aria-label={t('Sidebar.AddFolderARIA')}
onClick={() => {
dispatch(newFolder(rootFile.id));
setTimeout(() => dispatch(closeProjectOptions()), 300);
}}
>
{t('Sidebar.AddFolder')}
</button>
</li>
<li>
<button
onMouseDown={(e) => e.preventDefault()}
aria-label={t('Sidebar.UploadFileARIA')}
aria-label={t('Sidebar.AddFileARIA')}
onClick={() => {
dispatch(openUploadFileModal(rootFile.id));
setTimeout(() => dispatch(closeProjectOptions()), 0);
dispatch(newFile(rootFile.id));
setTimeout(() => dispatch(closeProjectOptions()), 300);
}}
onBlur={onBlurComponent}
>
{t('Sidebar.UploadFile')}
{t('Sidebar.AddFile')}
</button>
</li>
)}
</ul>
{isAuthenticated && (
<li>
<button
aria-label={t('Sidebar.UploadFileARIA')}
onClick={() => {
dispatch(openUploadFileModal(rootFile.id));
setTimeout(() => dispatch(closeProjectOptions()), 300);
}}
>
{t('Sidebar.UploadFile')}
</button>
</li>
)}
</ul>
)}
</div>
</header>
<ConnectedFileNode id={rootFile.id} canEdit={canEditProject} />
Expand Down