这是indexloc提供的服务，不要输入任何密码
Skip to content

Gear icon appear on hover for workspace #410

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

Merged
merged 3 commits into from
Dec 5, 2023
Merged

Gear icon appear on hover for workspace #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b05c66
gear icon appear on hover for workspace
shatfield4 Dec 5, 2023
6f6f6e2
put back user role check for default
shatfield4 Dec 5, 2023
28d11fa
wrap in callback
timothycarambat Dec 5, 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
39 changes: 32 additions & 7 deletions frontend/src/components/Sidebar/ActiveWorkspaces/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState, useEffect } from "react";
import React, { useState, useEffect, useCallback } from "react";
import * as Skeleton from "react-loading-skeleton";
import "react-loading-skeleton/dist/skeleton.css";
import Workspace from "../../../models/workspace";
Expand All @@ -14,9 +14,10 @@ import useUser from "../../../hooks/useUser";
export default function ActiveWorkspaces() {
const { slug } = useParams();
const [loading, setLoading] = useState(true);
const [settingHover, setSettingHover] = useState(false);
const [settingHover, setSettingHover] = useState({});
const [workspaces, setWorkspaces] = useState([]);
const [selectedWs, setSelectedWs] = useState(null);
const [hoverStates, setHoverStates] = useState({});
const { showing, showModal, hideModal } = useManageWorkspaceModal();
const { user } = useUser();

Expand All @@ -29,6 +30,22 @@ export default function ActiveWorkspaces() {
getWorkspaces();
}, []);

const handleMouseEnter = useCallback((workspaceId) => {
setHoverStates((prev) => ({ ...prev, [workspaceId]: true }));
}, []);

const handleMouseLeave = useCallback((workspaceId) => {
setHoverStates((prev) => ({ ...prev, [workspaceId]: false }));
}, []);

const handleGearMouseEnter = useCallback((workspaceId) => {
setSettingHover((prev) => ({ ...prev, [workspaceId]: true }));
}, []);

const handleGearMouseLeave = useCallback((workspaceId) => {
setSettingHover((prev) => ({ ...prev, [workspaceId]: false }));
}, []);

if (loading) {
return (
<>
Expand All @@ -48,10 +65,14 @@ export default function ActiveWorkspaces() {
<>
{workspaces.map((workspace) => {
const isActive = workspace.slug === slug;
const isHovered = hoverStates[workspace.id];
const isGearHovered = settingHover[workspace.id];
return (
<div
key={workspace.id}
className="flex gap-x-2 items-center justify-between"
onMouseEnter={() => handleMouseEnter(workspace.id)}
onMouseLeave={() => handleMouseLeave(workspace.id)}
>
<a
href={isActive ? null : paths.workspace.chat(workspace.slug)}
Expand Down Expand Up @@ -82,17 +103,21 @@ export default function ActiveWorkspaces() {
</p>
</div>
<button
onMouseEnter={() => setSettingHover(true)}
onMouseLeave={() => setSettingHover(false)}
onClick={() => {
type="button"
onClick={(e) => {
e.preventDefault();
setSelectedWs(workspace);
showModal();
}}
onMouseEnter={() => handleGearMouseEnter(workspace.id)}
onMouseLeave={() => handleGearMouseLeave(workspace.id)}
className="rounded-md flex items-center justify-center text-white ml-auto"
>
<GearSix
weight={settingHover ? "fill" : "regular"}
hidden={!isActive || user?.role === "default"}
weight={isGearHovered ? "fill" : "regular"}
hidden={
(!isActive && !isHovered) || user?.role === "default"
}
className="h-[20px] w-[20px] transition-all duration-300"
/>
</button>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/WorkspaceChat/ChatContainer/ChatHistory/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default function ChatHistory({ history = [], workspace }) {
const debouncedScroll = debounce(handleScroll, 100);

useEffect(() => {
if(!chatHistoryRef.current) return null;
if (!chatHistoryRef.current) return null;
const chatHistoryElement = chatHistoryRef.current;
chatHistoryElement.addEventListener("scroll", debouncedScroll);

Expand Down