Skip to content

fix(dashboard): bypass Rive in folder create/subfolder dialogs #1888

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

Open
alexis-morain wants to merge 1 commit into
base: main
Choose a base branch
from
+34 −155
Open

fix(dashboard): bypass Rive in folder create/subfolder dialogs #1888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
94 changes: 17 additions & 77 deletions apps/web/app/(org)/dashboard/caps/components/NewFolderDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,17 @@ import {
Input,
} from "@cap/ui";
import type { Folder, Space } from "@cap/web-domain";
import { faFolderPlus } from "@fortawesome/free-solid-svg-icons";
import { faFolder, faFolderPlus } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { type RiveFile, useRiveFile } from "@rive-app/react-canvas";
import clsx from "clsx";
import { Option } from "effect";
import { useRouter } from "next/navigation";
import React, { useEffect, useRef, useState } from "react";
import type React from "react";
import { useEffect, useState } from "react";
import { toast } from "sonner";
import { useEffectMutation, useRpcClient } from "@/lib/EffectRuntime";
import { PublicCollectionField } from "../../_components/PublicCollectionField";
import { useDashboardContext } from "../../Contexts";
import {
BlueFolder,
type FolderHandle,
NormalFolder,
RedFolder,
YellowFolder,
} from "./Folders";

interface Props {
open: boolean;
Expand All @@ -36,38 +29,10 @@ interface Props {
}

const FolderOptions = [
{
value: "normal",
label: "Normal",
component: (
riveFile: RiveFile | undefined,
ref: React.Ref<FolderHandle>,
) => <NormalFolder riveFile={riveFile} ref={ref} />,
},
{
value: "blue",
label: "Blue",
component: (
riveFile: RiveFile | undefined,
ref: React.Ref<FolderHandle>,
) => <BlueFolder riveFile={riveFile} ref={ref} />,
},
{
value: "red",
label: "Red",
component: (
riveFile: RiveFile | undefined,
ref: React.Ref<FolderHandle>,
) => <RedFolder riveFile={riveFile} ref={ref} />,
},
{
value: "yellow",
label: "Yellow",
component: (
riveFile: RiveFile | undefined,
ref: React.Ref<FolderHandle>,
) => <YellowFolder riveFile={riveFile} ref={ref} />,
},
{ value: "normal", label: "Normal", color: "#9ca3af" },
{ value: "blue", label: "Blue", color: "#3b82f6" },
{ value: "red", label: "Red", color: "#ef4444" },
{ value: "yellow", label: "Yellow", color: "#eab308" },
] as const;

export const NewFolderDialog: React.FC<Props> = ({
Expand All @@ -83,30 +48,13 @@ export const NewFolderDialog: React.FC<Props> = ({
const { activeOrganization, setUpgradeModalOpen } = useDashboardContext();
const router = useRouter();

const { riveFile } = useRiveFile({
src: "/rive/dashboard.riv",
});

useEffect(() => {
if (!open) {
setSelectedColor(null);
setPublicEnabled(false);
}
}, [open]);

const folderRefs = useRef(
FolderOptions.reduce(
(acc, opt) => {
acc[opt.value] = React.createRef<FolderHandle>();
return acc;
},
{} as Record<
(typeof FolderOptions)[number]["value"],
React.RefObject<FolderHandle | null>
>,
),
);

const rpc = useRpcClient();

const createFolder = useEffectMutation({
Expand Down Expand Up @@ -155,36 +103,28 @@ export const NewFolderDialog: React.FC<Props> = ({
<button
type="button"
className={clsx(
"flex flex-col flex-1 gap-1 items-center p-2 rounded-xl border transition-colors duration-200 cursor-pointer",
"flex flex-col flex-1 gap-2 items-center p-3 rounded-xl border transition-colors duration-200 cursor-pointer",
selectedColor === option.value
? "border-gray-12 bg-gray-3 hover:bg-gray-3 hover:border-gray-12"
: "border-gray-4 hover:bg-gray-3 hover:border-gray-5 bg-transparent",
)}
key={`rive-${option.value}`}
key={`folder-${option.value}`}
onClick={() => {
if (selectedColor === option.value) {
setSelectedColor(null);
return;
}
setSelectedColor(option.value);
}}
onMouseEnter={() => {
const folderRef = folderRefs.current[option.value]?.current;
if (!folderRef) return;
folderRef.stop();
folderRef.play("folder-open");
}}
onMouseLeave={() => {
const folderRef = folderRefs.current[option.value]?.current;
if (!folderRef) return;
folderRef.stop();
folderRef.play("folder-close");
}}
>
{option.component(
riveFile as RiveFile,
folderRefs.current[option.value],
)}
<FontAwesomeIcon
icon={faFolder}
style={{
color: option.color,
width: "40px",
height: "40px",
}}
/>
<span className="text-xs text-gray-10">{option.label}</span>
</button>
);
Expand Down
95 changes: 17 additions & 78 deletions apps/web/app/(org)/dashboard/folder/[id]/components/SubfolderDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,17 @@ import {
Input,
} from "@cap/ui";
import type { Folder } from "@cap/web-domain";
import { faFolderPlus } from "@fortawesome/free-solid-svg-icons";
import { faFolder, faFolderPlus } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import type { RiveFile } from "@rive-app/react-canvas";
import { useRiveFile } from "@rive-app/react-canvas";
import clsx from "clsx";
import { Option } from "effect";
import { useRouter } from "next/navigation";
import React, { useEffect, useRef, useState } from "react";
import type React from "react";
import { useEffect, useState } from "react";
import { toast } from "sonner";
import { useEffectMutation, useRpcClient } from "@/lib/EffectRuntime";
import { PublicCollectionField } from "../../../_components/PublicCollectionField";
import { useDashboardContext } from "../../../Contexts";
import {
BlueFolder,
type FolderHandle,
NormalFolder,
RedFolder,
YellowFolder,
} from "../../../caps/components/Folders";

interface Props {
open: boolean;
Expand All @@ -37,38 +29,10 @@ interface Props {
}

const FolderOptions = [
{
value: "normal",
label: "Normal",
component: (
riveFile: RiveFile | undefined,
ref: React.Ref<FolderHandle>,
) => <NormalFolder riveFile={riveFile} ref={ref} />,
},
{
value: "blue",
label: "Blue",
component: (
riveFile: RiveFile | undefined,
ref: React.Ref<FolderHandle>,
) => <BlueFolder riveFile={riveFile} ref={ref} />,
},
{
value: "red",
label: "Red",
component: (
riveFile: RiveFile | undefined,
ref: React.Ref<FolderHandle>,
) => <RedFolder riveFile={riveFile} ref={ref} />,
},
{
value: "yellow",
label: "Yellow",
component: (
riveFile: RiveFile | undefined,
ref: React.Ref<FolderHandle>,
) => <YellowFolder riveFile={riveFile} ref={ref} />,
},
{ value: "normal", label: "Normal", color: "#9ca3af" },
{ value: "blue", label: "Blue", color: "#3b82f6" },
{ value: "red", label: "Red", color: "#ef4444" },
{ value: "yellow", label: "Yellow", color: "#eab308" },
] as const;

export const SubfolderDialog: React.FC<Props> = ({
Expand All @@ -85,10 +49,6 @@ export const SubfolderDialog: React.FC<Props> = ({
useDashboardContext();
const router = useRouter();

const { riveFile } = useRiveFile({
src: "/rive/dashboard.riv",
});

useEffect(() => {
if (!open) {
setSelectedColor(null);
Expand All @@ -97,19 +57,6 @@ export const SubfolderDialog: React.FC<Props> = ({
}
}, [open]);

const folderRefs = useRef(
FolderOptions.reduce(
(acc, opt) => {
acc[opt.value] = React.createRef<FolderHandle>();
return acc;
},
{} as Record<
(typeof FolderOptions)[number]["value"],
React.RefObject<FolderHandle | null>
>,
),
);

const rpc = useRpcClient();

const createSubfolder = useEffectMutation({
Expand Down Expand Up @@ -158,36 +105,28 @@ export const SubfolderDialog: React.FC<Props> = ({
<button
type="button"
className={clsx(
"flex flex-col flex-1 gap-1 items-center p-2 rounded-xl border transition-colors duration-200 cursor-pointer",
"flex flex-col flex-1 gap-2 items-center p-3 rounded-xl border transition-colors duration-200 cursor-pointer",
selectedColor === option.value
? "border-gray-12 bg-gray-3 hover:bg-gray-3 hover:border-gray-12"
: "border-gray-4 hover:bg-gray-3 hover:border-gray-5 bg-transparent",
)}
key={`rive-${option.value}`}
key={`folder-${option.value}`}
onClick={() => {
if (selectedColor === option.value) {
setSelectedColor(null);
return;
}
setSelectedColor(option.value);
}}
onMouseEnter={() => {
const folderRef = folderRefs.current[option.value]?.current;
if (!folderRef) return;
folderRef.stop();
folderRef.play("folder-open");
}}
onMouseLeave={() => {
const folderRef = folderRefs.current[option.value]?.current;
if (!folderRef) return;
folderRef.stop();
folderRef.play("folder-close");
}}
>
{option.component(
riveFile as RiveFile,
folderRefs.current[option.value],
)}
<FontAwesomeIcon
icon={faFolder}
style={{
color: option.color,
width: "40px",
height: "40px",
}}
/>
<span className="text-xs text-gray-10">{option.label}</span>
</button>
);
Expand Down
Loading