fix: make icon color follow dark mode, make name render correctly when passing flow from folder to another, add cache to icon (#7959)
* fixed icon color * fixed id * Fixed name not being resized * Update isEmptyFlow when currentFlowId changes * Adds cache to ForwardedIconComponent * Updated cache to come from styleUtils --------- Co-authored-by: Cristhian Zanforlin Lousa <cristhian.lousa@gmail.com>
This commit is contained in:
parent
d3e4fd3613
commit
c608a4fd5d
7 changed files with 45 additions and 28 deletions
|
|
@ -48,7 +48,7 @@ export function NodeIcon({
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={cn(
|
className={cn(
|
||||||
"text-white",
|
"text-foreground",
|
||||||
!showNode && "flex min-h-8 min-w-8 items-center justify-center",
|
!showNode && "flex min-h-8 min-w-8 items-center justify-center",
|
||||||
"bg-lucide-icon",
|
"bg-lucide-icon",
|
||||||
)}
|
)}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
import React, { Suspense, forwardRef, lazy, memo } from "react";
|
import React, { Suspense, forwardRef, lazy, memo } from "react";
|
||||||
import { IconComponentProps } from "../../../types/components";
|
import { IconComponentProps } from "../../../types/components";
|
||||||
import { getNodeIcon } from "../../../utils/styleUtils";
|
import { getNodeIcon, iconCache } from "../../../utils/styleUtils";
|
||||||
import { cn } from "../../../utils/utils";
|
import { cn } from "../../../utils/utils";
|
||||||
|
|
||||||
import { Skeleton } from "@/components/ui/skeleton";
|
import { Skeleton } from "@/components/ui/skeleton";
|
||||||
|
|
@ -24,7 +24,7 @@ export const ForwardedIconComponent = memo(
|
||||||
const [showFallback, setShowFallback] = useState(false);
|
const [showFallback, setShowFallback] = useState(false);
|
||||||
const [iconError, setIconError] = useState(false);
|
const [iconError, setIconError] = useState(false);
|
||||||
const [initialName, setInitialName] = useState(name);
|
const [initialName, setInitialName] = useState(name);
|
||||||
const [TargetIcon, setTargetIcon] = useState<any>(null);
|
const [TargetIcon, setTargetIcon] = useState<any>(iconCache.get(name));
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
// Reset states when icon name changes
|
// Reset states when icon name changes
|
||||||
|
|
@ -33,27 +33,44 @@ export const ForwardedIconComponent = memo(
|
||||||
setIconError(false);
|
setIconError(false);
|
||||||
setTargetIcon(null);
|
setTargetIcon(null);
|
||||||
|
|
||||||
const timer = setTimeout(() => {
|
const cachedIcon = iconCache.get(name);
|
||||||
setShowFallback(true);
|
|
||||||
}, 30);
|
const timer = cachedIcon
|
||||||
|
? setTimeout(() => {
|
||||||
|
setShowFallback(true);
|
||||||
|
}, 30)
|
||||||
|
: null;
|
||||||
|
|
||||||
// Load the icon if we have a name
|
// Load the icon if we have a name
|
||||||
if (name && typeof name === "string") {
|
if (name && typeof name === "string") {
|
||||||
getNodeIcon(name)
|
// Check if the icon is already in cache
|
||||||
.then((component) => {
|
|
||||||
setTargetIcon(component);
|
if (cachedIcon && cachedIcon !== TargetIcon) {
|
||||||
setShowFallback(false);
|
setTargetIcon(cachedIcon);
|
||||||
})
|
setShowFallback(false);
|
||||||
.catch((error) => {
|
} else {
|
||||||
console.error(`Error loading icon ${name}:`, error);
|
getNodeIcon(name)
|
||||||
setIconError(true);
|
.then((component) => {
|
||||||
setShowFallback(false);
|
// Store the fetched icon in cache
|
||||||
});
|
iconCache.set(name, component);
|
||||||
|
setTargetIcon(component);
|
||||||
|
setShowFallback(false);
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
console.error(`Error loading icon ${name}:`, error);
|
||||||
|
setIconError(true);
|
||||||
|
setShowFallback(false);
|
||||||
|
});
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
setShowFallback(false);
|
setShowFallback(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
return () => clearTimeout(timer);
|
return () => {
|
||||||
|
if (timer) {
|
||||||
|
clearTimeout(timer);
|
||||||
|
}
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}, [name]);
|
}, [name]);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -99,12 +99,6 @@ export const MenuBar = memo((): JSX.Element => {
|
||||||
[folders, currentFlowFolderId],
|
[folders, currentFlowFolderId],
|
||||||
);
|
);
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (measureRef.current) {
|
|
||||||
setInputWidth(measureRef.current.offsetWidth);
|
|
||||||
}
|
|
||||||
}, [flowName]);
|
|
||||||
|
|
||||||
function handleAddFlow() {
|
function handleAddFlow() {
|
||||||
try {
|
try {
|
||||||
addFlow().then((id) => {
|
addFlow().then((id) => {
|
||||||
|
|
@ -231,7 +225,7 @@ export const MenuBar = memo((): JSX.Element => {
|
||||||
if (measureRef.current) {
|
if (measureRef.current) {
|
||||||
setInputWidth(measureRef.current.offsetWidth + 10);
|
setInputWidth(measureRef.current.offsetWidth + 10);
|
||||||
}
|
}
|
||||||
}, [flowName]);
|
}, [flowName, onFlowPage]);
|
||||||
|
|
||||||
const swatchIndex =
|
const swatchIndex =
|
||||||
(currentFlowGradient && !isNaN(parseInt(currentFlowGradient))
|
(currentFlowGradient && !isNaN(parseInt(currentFlowGradient))
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,6 @@ import { useCustomNavigate } from "@/customization/hooks/use-custom-navigate";
|
||||||
import useTheme from "@/customization/hooks/use-custom-theme";
|
import useTheme from "@/customization/hooks/use-custom-theme";
|
||||||
import { useResetDismissUpdateAll } from "@/hooks/use-reset-dismiss-update-all";
|
import { useResetDismissUpdateAll } from "@/hooks/use-reset-dismiss-update-all";
|
||||||
import useAlertStore from "@/stores/alertStore";
|
import useAlertStore from "@/stores/alertStore";
|
||||||
import useFlowsManagerStore from "@/stores/flowsManagerStore";
|
|
||||||
import { useFolderStore } from "@/stores/foldersStore";
|
|
||||||
import { useEffect, useRef, useState } from "react";
|
import { useEffect, useRef, useState } from "react";
|
||||||
import { AccountMenu } from "./components/AccountMenu";
|
import { AccountMenu } from "./components/AccountMenu";
|
||||||
import FlowMenu from "./components/FlowMenu";
|
import FlowMenu from "./components/FlowMenu";
|
||||||
|
|
@ -23,7 +21,6 @@ export default function AppHeader(): JSX.Element {
|
||||||
const notificationCenter = useAlertStore((state) => state.notificationCenter);
|
const notificationCenter = useAlertStore((state) => state.notificationCenter);
|
||||||
const navigate = useCustomNavigate();
|
const navigate = useCustomNavigate();
|
||||||
const [activeState, setActiveState] = useState<"notifications" | null>(null);
|
const [activeState, setActiveState] = useState<"notifications" | null>(null);
|
||||||
const lastPath = window.location.pathname.split("/").filter(Boolean).pop();
|
|
||||||
const notificationRef = useRef<HTMLButtonElement | null>(null);
|
const notificationRef = useRef<HTMLButtonElement | null>(null);
|
||||||
const notificationContentRef = useRef<HTMLDivElement | null>(null);
|
const notificationContentRef = useRef<HTMLDivElement | null>(null);
|
||||||
useTheme();
|
useTheme();
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@ import {
|
||||||
} from "@/components/ui/popover";
|
} from "@/components/ui/popover";
|
||||||
import { cn } from "@/utils/utils";
|
import { cn } from "@/utils/utils";
|
||||||
import { PopoverAnchor } from "@radix-ui/react-popover";
|
import { PopoverAnchor } from "@radix-ui/react-popover";
|
||||||
|
import { uniqueId } from "lodash";
|
||||||
import { X } from "lucide-react";
|
import { X } from "lucide-react";
|
||||||
import { ReactNode, useMemo, useState } from "react";
|
import { ReactNode, useMemo, useState } from "react";
|
||||||
|
|
||||||
|
|
@ -269,7 +270,7 @@ const CustomInputPopover = ({
|
||||||
autoComplete="off"
|
autoComplete="off"
|
||||||
onFocus={() => setIsFocused(true)}
|
onFocus={() => setIsFocused(true)}
|
||||||
autoFocus={autoFocus}
|
autoFocus={autoFocus}
|
||||||
id={id}
|
id={id + uniqueId()}
|
||||||
ref={refInput}
|
ref={refInput}
|
||||||
type={!pwdVisible && password ? "password" : "text"}
|
type={!pwdVisible && password ? "password" : "text"}
|
||||||
onBlur={() => {
|
onBlur={() => {
|
||||||
|
|
|
||||||
|
|
@ -126,6 +126,12 @@ export default function Page({
|
||||||
useState<OnSelectionChangeParams | null>(null);
|
useState<OnSelectionChangeParams | null>(null);
|
||||||
const currentFlowId = useFlowsManagerStore((state) => state.currentFlowId);
|
const currentFlowId = useFlowsManagerStore((state) => state.currentFlowId);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (currentFlowId !== "") {
|
||||||
|
isEmptyFlow.current = nodes.length === 0;
|
||||||
|
}
|
||||||
|
}, [currentFlowId]);
|
||||||
|
|
||||||
const [isAddingNote, setIsAddingNote] = useState(false);
|
const [isAddingNote, setIsAddingNote] = useState(false);
|
||||||
|
|
||||||
const addComponent = useAddComponent();
|
const addComponent = useAddComponent();
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,8 @@ import dynamicIconImports from "lucide-react/dynamicIconImports";
|
||||||
import { lazy } from "react";
|
import { lazy } from "react";
|
||||||
import { FaApple, FaDiscord, FaGithub } from "react-icons/fa";
|
import { FaApple, FaDiscord, FaGithub } from "react-icons/fa";
|
||||||
|
|
||||||
|
export const iconCache = new Map<string, any>();
|
||||||
|
|
||||||
export const BG_NOISE =
|
export const BG_NOISE =
|
||||||
"url(data:image/png;base64,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)";
|
"url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAMAAAAp4XiDAAAAUVBMVEWFhYWDg4N3d3dtbW17e3t1dXWBgYGHh4d5eXlzc3OLi4ubm5uVlZWPj4+NjY19fX2JiYl/f39ra2uRkZGZmZlpaWmXl5dvb29xcXGTk5NnZ2c8TV1mAAAAG3RSTlNAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEAvEOwtAAAFVklEQVR4XpWWB67c2BUFb3g557T/hRo9/WUMZHlgr4Bg8Z4qQgQJlHI4A8SzFVrapvmTF9O7dmYRFZ60YiBhJRCgh1FYhiLAmdvX0CzTOpNE77ME0Zty/nWWzchDtiqrmQDeuv3powQ5ta2eN0FY0InkqDD73lT9c9lEzwUNqgFHs9VQce3TVClFCQrSTfOiYkVJQBmpbq2L6iZavPnAPcoU0dSw0SUTqz/GtrGuXfbyyBniKykOWQWGqwwMA7QiYAxi+IlPdqo+hYHnUt5ZPfnsHJyNiDtnpJyayNBkF6cWoYGAMY92U2hXHF/C1M8uP/ZtYdiuj26UdAdQQSXQErwSOMzt/XWRWAz5GuSBIkwG1H3FabJ2OsUOUhGC6tK4EMtJO0ttC6IBD3kM0ve0tJwMdSfjZo+EEISaeTr9P3wYrGjXqyC1krcKdhMpxEnt5JetoulscpyzhXN5FRpuPHvbeQaKxFAEB6EN+cYN6xD7RYGpXpNndMmZgM5Dcs3YSNFDHUo2LGfZuukSWyUYirJAdYbF3MfqEKmjM+I2EfhA94iG3L7uKrR+GdWD73ydlIB+6hgref1QTlmgmbM3/LeX5GI1Ux1RWpgxpLuZ2+I+IjzZ8wqE4nilvQdkUdfhzI5QDWy+kw5Wgg2pGpeEVeCCA7b85BO3F9DzxB3cdqvBzWcmzbyMiqhzuYqtHRVG2y4x+KOlnyqla8AoWWpuBoYRxzXrfKuILl6SfiWCbjxoZJUaCBj1CjH7GIaDbc9kqBY3W/Rgjda1iqQcOJu2WW+76pZC9QG7M00dffe9hNnseupFL53r8F7YHSwJWUKP2q+k7RdsxyOB11n0xtOvnW4irMMFNV4H0uqwS5ExsmP9AxbDTc9JwgneAT5vTiUSm1E7BSflSt3bfa1tv8Di3R8n3Af7MNWzs49hmauE2wP+ttrq+AsWpFG2awvsuOqbipWHgtuvuaAE+A1Z/7gC9hesnr+7wqCwG8c5yAg3AL1fm8T9AZtp/bbJGwl1pNrE7RuOX7PeMRUERVaPpEs+yqeoSmuOlokqw49pgomjLeh7icHNlG19yjs6XXOMedYm5xH2YxpV2tc0Ro2jJfxC50ApuxGob7lMsxfTbeUv07TyYxpeLucEH1gNd4IKH2LAg5TdVhlCafZvpskfncCfx8pOhJzd76bJWeYFnFciwcYfubRc12Ip/ppIhA1/mSZ/RxjFDrJC5xifFjJpY2Xl5zXdguFqYyTR1zSp1Y9p+tktDYYSNflcxI0iyO4TPBdlRcpeqjK/piF5bklq77VSEaA+z8qmJTFzIWiitbnzR794USKBUaT0NTEsVjZqLaFVqJoPN9ODG70IPbfBHKK+/q/AWR0tJzYHRULOa4MP+W/HfGadZUbfw177G7j/OGbIs8TahLyynl4X4RinF793Oz+BU0saXtUHrVBFT/DnA3ctNPoGbs4hRIjTok8i+algT1lTHi4SxFvONKNrgQFAq2/gFnWMXgwffgYMJpiKYkmW3tTg3ZQ9Jq+f8XN+A5eeUKHWvJWJ2sgJ1Sop+wwhqFVijqWaJhwtD8MNlSBeWNNWTa5Z5kPZw5+LbVT99wqTdx29lMUH4OIG/D86ruKEauBjvH5xy6um/Sfj7ei6UUVk4AIl3MyD4MSSTOFgSwsH/QJWaQ5as7ZcmgBZkzjjU1UrQ74ci1gWBCSGHtuV1H2mhSnO3Wp/3fEV5a+4wz//6qy8JxjZsmxxy5+4w9CDNJY09T072iKG0EnOS0arEYgXqYnXcYHwjTtUNAcMelOd4xpkoqiTYICWFq0JSiPfPDQdnt+4/wuqcXY47QILbgAAAABJRU5ErkJggg==)";
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue