-
+
+
- {configLoaded ? (
-
-
- {
- const libId =
- selectedLibrary === "all"
- ? null
- : parseInt(selectedLibrary);
- fetchImages(
- false,
- searchQuery,
- viewMode,
- libId,
- similarImageId
- );
- }}
- onSelect={setSelectedImage}
- onSimilarSearch={setSimilarImageId}
- selectedId={selectedImage?.id}
- />
-
- {selectedImage && (
- <>
-
-
-
- )}
-
- ) : (
-
+
+
-
-
-
-
- );
+
+
-
+
+
+
+
+
+
+
+
+
+
- Loading configuration...
-
- )}
-
-
- ;
- viewMode: "all" | "mine";
- setViewMode: (mode: "all" | "mine") => void;
-}
-
-export function SearchBar({
- searchQuery,
- setSearchQuery,
- onSearch,
- loading,
- similarImageId,
- setSimilarImageId,
- mode,
- selectedLibrary,
- setSelectedLibrary,
- libraries,
- viewMode,
- setViewMode,
-}: SearchBarProps) {
- return (
- ;
+ loading: boolean;
+ hasMore: boolean;
+ fetchImages: (
+ reset?: boolean,
+ query?: string,
+ viewMode?: "all" | "mine",
+ libId?: number | null,
+ similarId?: number | null
+ ) => Promise;
+ libraries: Array;
+ similarImageId: number | null;
+ setSimilarImageId: (id: number | null) => void;
+ mode: ApiMode;
+ gridSize: number;
+ setGridSize?: (size: number) => void;
+ gridPreviewContain: boolean;
+ configLoaded: boolean;
+ activeTab: string;
+ onImageSelect?: (image: PromptImageRead) => void;
+}
+
+export function ExploreTab({
+ images,
+ loading,
+ hasMore,
+ fetchImages,
+ libraries,
+ similarImageId,
+ setSimilarImageId,
+ mode,
+ gridSize,
+ setGridSize,
+ gridPreviewContain,
+ configLoaded,
+ activeTab,
+ onImageSelect,
+}: ExploreTabProps) {
+ const { targetNodes, handleLoadIntoNode, handleUseImage } = useNodeScanner();
+ const { openImage, closeImage, setGalleryImages, currentGallery } =
+ useImageDialog();
+
+ const [searchQuery, setSearchQuery] = useState("");
+ const [viewMode, setViewMode] = useState<"all" | "mine">("all");
+ const [selectedLibrary, setSelectedLibrary] = useState("all");
+ const [selectedImage, setSelectedImage] = useState(
+ null
+ );
+ const scrollRef = useRef(null);
+
+ // Fetch when dependencies change
+ useEffect(() => {
+ if (!configLoaded) return;
+ const libId = selectedLibrary === "all" ? null : parseInt(selectedLibrary);
+ fetchImages(true, searchQuery, viewMode, libId, similarImageId);
+ }, [viewMode, configLoaded, selectedLibrary, mode, similarImageId]); // Re-fetch when view mode changes or config is loaded
+
+ // Sync images to lightbox when they change
+ useEffect(() => {
+ if (currentGallery?.id === "virtual-gallery" && images.length > 0) {
+ const galleryImages = images.map((p) => ({
+ src: p.image_url,
+ title: p.prompt,
+ metadata: p,
+ }));
+ const totalImages = hasMore ? images.length + 100 : images.length;
+ setGalleryImages(galleryImages, true, undefined, totalImages);
+ }
+ }, [images, currentGallery?.id, setGalleryImages, hasMore]);
+
+ const handleSearch = (e: React.FormEvent) => {
+ e.preventDefault();
+ const libId = selectedLibrary === "all" ? null : parseInt(selectedLibrary);
+ fetchImages(true, searchQuery, viewMode, libId, similarImageId);
+ };
+
+ return (
+ ;
- loading: boolean;
- hasMore: boolean;
- onLoadMore: () => void;
- onSelect?: (image: PromptImageRead) => void;
- onSimilarSearch?: (imageId: number) => void;
- selectedId?: number;
- gridSize?: number;
- imagePreviewContain?: boolean;
+ images: Array;
+ loading: boolean;
+ hasMore: boolean;
+ onLoadMore: () => void;
+ onSelect?: (image: PromptImageRead) => void;
+ onRightClick: (image: PromptImageRead) => void;
+ onSimilarSearch?: (imageId: number) => void;
+ selectedId?: number;
+ gridSize?: number;
+ imagePreviewContain?: boolean;
+ scrollRef?: React.RefObject;
}
export function ImageGrid({
- images,
- loading,
- hasMore,
- onLoadMore,
- onSelect,
- onSimilarSearch,
- selectedId,
- gridSize = 3,
- imagePreviewContain = true,
+ images,
+ loading,
+ hasMore,
+ onLoadMore,
+ onSelect,
+ onRightClick,
+ onSimilarSearch,
+ selectedId,
+ gridSize = 3,
+ imagePreviewContain = true,
+ scrollRef,
}: ImageGridProps) {
- const observerTarget = useRef(null);
+ const observerTarget = useRef(null);
- useEffect(() => {
- const observer = new IntersectionObserver(
- (entries) => {
- if (entries[0].isIntersecting && hasMore && !loading) {
- onLoadMore();
- }
- },
- { threshold: 0, rootMargin: "200px" }
- );
-
- if (observerTarget.current) {
- observer.observe(observerTarget.current);
+ useEffect(() => {
+ const observer = new IntersectionObserver(
+ (entries) => {
+ if (entries[0].isIntersecting && hasMore && !loading) {
+ onLoadMore();
}
+ },
+ { threshold: 0, rootMargin: "200px" }
+ );
- return () => {
- if (observerTarget.current) {
- observer.unobserve(observerTarget.current);
- }
- };
- }, [hasMore, loading, onLoadMore]);
+ if (observerTarget.current) {
+ observer.observe(observerTarget.current);
+ }
- const handleDragStart = (e: React.DragEvent, imageUrl: string) => {
- e.dataTransfer.setData("text/plain", imageUrl);
- e.dataTransfer.setData("text/uri-list", imageUrl);
+ return () => {
+ if (observerTarget.current) {
+ observer.unobserve(observerTarget.current);
+ }
};
+ }, [hasMore, loading, onLoadMore]);
- return (
-
-
-
+ );
}
diff --git a/ui/components/panels/SearchBar.tsx b/ui/components/panels/SearchBar.tsx
deleted file mode 100644
index 395334c..0000000
--- a/ui/components/panels/SearchBar.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import React from "react";
-import { Input } from "@embeddr/react-ui/components/input";
-import { Button } from "@embeddr/react-ui/components/button";
-import { Globe, ScanEyeIcon, User } from "lucide-react";
-import type { ApiMode, LibraryPath } from "@types";
-
-interface SearchBarProps {
- searchQuery: string;
- setSearchQuery: (query: string) => void;
- onSearch: (e: React.FormEvent) => void;
- loading: boolean;
- similarImageId: number | null;
- setSimilarImageId: (id: number | null) => void;
- mode: ApiMode;
- selectedLibrary: string;
- setSelectedLibrary: (lib: string) => void;
- libraries: Array
- 
+ return (
+
- );
+
+
+
+
-
+ {selectedImage.prompt && (
+
+
- {selectedImage.prompt && (
-
+ 
- {/* Overlay Controls */}
-
+
- {/* Left: New Node / Smart Use */}
-
+ {/* Overlay Controls */}
+
+
+ {/* Left: New Node / Smart Use */}
+
- {/* Right: Actions & Nodes */}
-
+ {/* Target Nodes */}
+ {targetNodes.map((node) => (
+
+ ))}
+
- {/* Copy Prompt */}
- {selectedImage.prompt && (
-
- )}
+ {/* Right: Actions & Nodes */}
+
-
+ {/* Copy Prompt */}
+ {selectedImage.prompt && (
+
+ )}
- {/* Target Nodes */}
- {targetNodes.map((node) => (
-
- ))}
-
-
- {selectedImage.prompt}
-
- )}
-
+ {selectedImage.prompt}
+
+ )}
-
-
- {similarImageId && (
-
- );
-}
diff --git a/ui/components/tabs/ExploreTab.tsx b/ui/components/tabs/ExploreTab.tsx
new file mode 100644
index 0000000..73a1218
--- /dev/null
+++ b/ui/components/tabs/ExploreTab.tsx
@@ -0,0 +1,258 @@
+import React, { useEffect, useRef, useState } from "react";
+import { useImageDialog } from "@embeddr/react-ui";
+import {
+ ResizableHandle,
+ ResizablePanel,
+ ResizablePanelGroup,
+} from "@embeddr/react-ui/components/resizable";
+import { Search, Grid3X3 } from "lucide-react";
+import { Slider } from "@embeddr/react-ui/components/slider";
+import { ImageGrid } from "@components/ui/ImageGrid";
+import { useNodeScanner } from "@hooks/useNodeScanner";
+import { ImageDetails } from "../panels/ImageDetails";
+import { SearchBar } from "../ui/SearchBar";
+import type {
+ ApiMode,
+ LibraryPath,
+ PromptImageRead,
+} from "@hooks/useEmbeddrApi";
+
+interface ExploreTabProps {
+ images: Array
-
-
- )}
-
-
- {mode === "local" ? (
-
- ) : (
- <>
-
-
-
- )}
-
-
+
+
+ {
+ setSelectedImage(e);
+ }}
+ onLoadMore={() => {
+ const libId =
+ selectedLibrary === "all" ? null : parseInt(selectedLibrary);
+ fetchImages(
+ false,
+ searchQuery,
+ viewMode,
+ libId,
+ similarImageId
+ );
+ }}
+ onSimilarSearch={(image) => {
+ setSimilarImageId(image);
+ }}
+ onSelect={(image) => {
+ if (!image) return;
+ if (onImageSelect) {
+ onImageSelect(image);
+ return;
+ }
+ const galleryImages = images.map((p) => ({
+ src: p.image_url,
+ title: p.prompt,
+ metadata: p,
+ }));
+ const index = images.findIndex((p) => p.id === image.id);
+ const totalImages = hasMore
+ ? images.length + 100
+ : images.length;
+
+ openImage(
+ image.image_url,
+ {
+ id: "virtual-gallery",
+ name:
+ activeTab === "explore" ? "Explore" : "Search Results",
+ images: galleryImages,
+ totalImages: totalImages,
+ fetchMore: async (_dir: any, _offset: any) => {
+ if (hasMore) {
+ const libId =
+ selectedLibrary === "all"
+ ? null
+ : parseInt(selectedLibrary);
+ await fetchImages(
+ false,
+ searchQuery,
+ viewMode,
+ libId,
+ similarImageId
+ );
+ }
+ },
+ },
+ index >= 0 ? index : 0,
+ [
+ {
+ id: "search-by-image",
+ icon:
+ {selectedImage && (
+ <>
+
+
+
+ )}
+
+ ) : (
+
+ );
+}
diff --git a/ui/components/tabs/SettingsForm.tsx b/ui/components/tabs/SettingsForm.tsx
new file mode 100644
index 0000000..a0fff8a
--- /dev/null
+++ b/ui/components/tabs/SettingsForm.tsx
@@ -0,0 +1,147 @@
+import React from "react";
+import { Input } from "@embeddr/react-ui/components/input";
+import { Label } from "@embeddr/react-ui/components/label";
+import { Button } from "@embeddr/react-ui/components/button";
+import { Slider } from "@embeddr/react-ui/components/slider";
+import { Switch } from "@embeddr/react-ui/components/switch";
+
+import { Cloud, Moon, Server, Sun } from "lucide-react";
+// @ts-ignore
+import { app } from "../../../../scripts/app.js";
+import type { ApiMode } from "@hooks/useEmbeddrApi";
+
+interface SettingsFormProps {
+ endpoint: string;
+ setEndpoint: (endpoint: string) => void;
+ mode: ApiMode;
+ setMode: (mode: ApiMode) => void;
+ gridSize: number;
+ setGridSize: (size: number) => void;
+ gridPreviewContain: boolean;
+ setGridPreviewContain: (contain: boolean) => void;
+ theme: string;
+ setTheme: (theme: string) => void;
+ onSave: () => void;
+}
+
+export function SettingsForm({
+ endpoint,
+ setEndpoint,
+ mode,
+ setMode,
+ gridSize,
+ setGridSize,
+ gridPreviewContain,
+ setGridPreviewContain,
+ theme,
+ setTheme,
+ onSave,
+}: SettingsFormProps) {
+ return (
+
+
+
+ {configLoaded ? (
+
+
+
+ {
+ setSimilarImageId(id);
+ if (!id) {
+ scrollRef.current?.scrollTo({ top: 0 });
+ }
+ }}
+ mode={mode}
+ selectedLibrary={selectedLibrary}
+ setSelectedLibrary={setSelectedLibrary}
+ libraries={libraries}
+ viewMode={viewMode}
+ setViewMode={setViewMode}
+ />
+
+ {setGridSize && (
+
+ setGridSize(vals[0])}
+ className="flex-1"
+ />
+
+ )}
+
+ Loading configuration...
+
+ )}
+
+
+ );
+}
diff --git a/ui/components/ui/ImageGrid.tsx b/ui/components/ui/ImageGrid.tsx
index aadbcc3..05787be 100644
--- a/ui/components/ui/ImageGrid.tsx
+++ b/ui/components/ui/ImageGrid.tsx
@@ -2,121 +2,120 @@ import React, { useEffect, useRef } from "react";
import { ScrollArea } from "@embeddr/react-ui/components/scroll-area";
import { Eye, PenLineIcon } from "lucide-react";
import { Button } from "@embeddr/react-ui/components/button";
-import { cn } from "@embeddr/react-ui/lib/utils";
+import { cn } from "@embeddr/react-ui";
import type { PromptImageRead } from "@hooks/useEmbeddrApi";
interface ImageGridProps {
- images: Array
+
+
+
+
+
+
+
+
+ setEndpoint(e.target.value)}
+ />
+
+
+ + {mode !== "local" + ? "Change this if you are using a self-hosted instance or development server." + : "The URL of your local Embeddr instance."} +
+
+
+
+
+ setGridSize(value[0])}
+ />{" "}
+ {gridSize}
+
+ + Number of columns in the image grid. +
+
+
+
+
+ setGridPreviewContain(value)}
+ />
+
+ {gridPreviewContain ? "Contain" : "Cover"}
+
+
+ + Switch between contain and cover for image previews. +
+
+
+
+
+
+
+ setTheme(checked ? "dark" : "light")}
+ />
+
+ {theme === "dark" ? (
+ <>
+
+
- {images.map((image) => (
-
+
+ );
}
diff --git a/ui/components/ui/SearchBar.tsx b/ui/components/ui/SearchBar.tsx
new file mode 100644
index 0000000..feb9461
--- /dev/null
+++ b/ui/components/ui/SearchBar.tsx
@@ -0,0 +1,114 @@
+import React from "react";
+import { Input } from "@embeddr/react-ui/components/input";
+import { Button } from "@embeddr/react-ui/components/button";
+import { Spinner } from "@embeddr/react-ui/components/spinner";
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "@embeddr/react-ui/components/select";
+import { Globe, ScanEyeIcon, Search, User } from "lucide-react";
+import type { ApiMode, LibraryPath } from "@types";
+
+interface SearchBarProps {
+ searchQuery: string;
+ setSearchQuery: (query: string) => void;
+ onSearch: (e: React.FormEvent) => void;
+ loading: boolean;
+ similarImageId: number | null;
+ setSimilarImageId: (id: number | null) => void;
+ mode: ApiMode;
+ selectedLibrary: string;
+ setSelectedLibrary: (lib: string) => void;
+ libraries: Array;
+ viewMode: "all" | "mine";
+ setViewMode: (mode: "all" | "mine") => void;
+}
+
+export function SearchBar({
+ searchQuery,
+ setSearchQuery,
+ onSearch,
+ loading,
+ similarImageId,
+ setSimilarImageId,
+ mode,
+ selectedLibrary,
+ setSelectedLibrary,
+ libraries,
+ viewMode,
+ setViewMode,
+}: SearchBarProps) {
+ return (
+ >([]);
- const [loading, setLoading] = useState(false);
- const [page, setPage] = useState(1);
- const [hasMore, setHasMore] = useState(true);
- const [similarImageId, setSimilarImageId] = useState(null);
+ const [images, setImages] = useState>([]);
+ const [loading, setLoading] = useState(false);
+ const loadingRef = useRef(false);
+ const pageRef = useRef(1);
+ const [hasMore, setHasMore] = useState(true);
+ const [similarImageId, setSimilarImageId] = useState(null);
- const fetchImages = useCallback(
- async (
- reset = false,
- searchQuery = "",
- viewMode: "all" | "mine" = "all",
- libraryId?: number | null,
- similarId?: number | null
- ) => {
- if (!configLoaded) return;
- if (loading && !reset) return;
+ const fetchImages = useCallback(
+ async (
+ reset = false,
+ searchQuery = "",
+ viewMode: "all" | "mine" = "all",
+ libraryId?: number | null,
+ similarId?: number | null,
+ ) => {
+ if (!configLoaded) return;
+ if (loadingRef.current && !reset) return;
- setLoading(true);
- try {
- const headers: Record = {};
- const storedKey = localStorage.getItem("embeddr_api_key");
- if (storedKey) {
- headers["Authorization"] = `Bearer ${storedKey}`;
- }
+ loadingRef.current = true;
+ setLoading(true);
+ try {
+ const headers: Record = {};
+ const storedKey = localStorage.getItem("embeddr_api_key");
+ if (storedKey) {
+ headers["Authorization"] = `Bearer ${storedKey}`;
+ }
- const currentPage = reset ? 1 : page;
- const offset = (currentPage - 1) * 20;
+ const currentPage = reset ? 1 : pageRef.current;
+ const offset = (currentPage - 1) * 20;
- let baseUrl = apiBase;
- if (baseUrl.endsWith("/")) baseUrl = baseUrl.slice(0, -1);
+ let baseUrl = apiBase;
+ if (baseUrl.endsWith("/")) baseUrl = baseUrl.slice(0, -1);
- let url;
- const currentSimilarId =
- similarId !== undefined ? similarId : similarImageId;
+ let url;
+ const currentSimilarId =
+ similarId !== undefined ? similarId : similarImageId;
- if (currentSimilarId) {
- url = `${baseUrl}/images/${currentSimilarId}/similar?limit=20&skip=${offset}`;
- if (libraryId) {
- url += `&library_id=${libraryId}`;
- }
- } else if (mode === "local") {
- // Local API
- url = `${baseUrl}/images?limit=20&skip=${offset}`;
- if (libraryId) {
- url += `&library_id=${libraryId}`;
- }
- }
+ if (currentSimilarId) {
+ url = `${baseUrl}/images/${currentSimilarId}/similar?limit=20&skip=${offset}`;
+ if (libraryId) {
+ url += `&library_id=${libraryId}`;
+ }
+ } else if (mode === "local") {
+ // Local API
+ url = `${baseUrl}/images?limit=20&skip=${offset}`;
+ if (libraryId) {
+ url += `&library_id=${libraryId}`;
+ }
+ }
- if (searchQuery) {
- url += `&q=${encodeURIComponent(searchQuery)}`;
- }
+ if (searchQuery) {
+ url += `&q=${encodeURIComponent(searchQuery)}`;
+ }
- const response = await fetch(url, { headers });
+ const response = await fetch(url, { headers });
- if (response.ok) {
- const data = await response.json();
- let items: Array = [];
+ if (response.ok) {
+ const data = await response.json();
+ let items: Array = [];
- if (mode === "local") {
- // Local API returns { items: [], total: ... }
- items = data.items.map((item: any) => ({
- id: item.id,
- prompt: item.prompt, // Use filename as prompt for now
- image_url: `${baseUrl}/images/${item.id}/file`,
- thumb_url: `${baseUrl}/images/${item.id}/thumbnail`,
- created_at: item.created_at,
- like_count: 0,
- liked_by_me: false,
- // Local specific
- filename: item.filename,
- path: item.path,
- width: item.width,
- height: item.height,
- }));
- setHasMore(items.length === 20); // Simple check
- } else {
- // Cloud API returns array
- items = data;
- setHasMore(data.length === 20);
- }
+ if (mode === "local") {
+ // Local API returns { items: [], total: ... }
+ items = data.items.map((item: any) => ({
+ id: item.id,
+ prompt: item.prompt, // Use filename as prompt for now
+ image_url: `${baseUrl}/images/${item.id}/file`,
+ thumb_url: `${baseUrl}/images/${item.id}/thumbnail`,
+ created_at: item.created_at,
+ like_count: 0,
+ liked_by_me: false,
+ // Local specific
+ filename: item.filename,
+ path: item.path,
+ width: item.width,
+ height: item.height,
+ }));
+ setHasMore(items.length === 20); // Simple check
+ } else {
+ // Cloud API returns array
+ items = data;
+ setHasMore(data.length === 20);
+ }
- if (reset) {
- setImages(items);
- } else {
- setImages((prev) => [...prev, ...items]);
- }
- setPage(currentPage + 1);
- } else {
- throw new Error("Failed to fetch images");
- }
- } catch (error) {
- console.error("Error fetching images:", error);
- if (app.extensionManager?.toast) {
- app.extensionManager.toast.add({
- severity: "error",
- summary: "Fetch Failed",
- detail: "Could not load images. Check your API settings and connection.",
- life: 5000,
- });
- }
- } finally {
- setLoading(false);
- }
- },
- [apiBase, loading, page, configLoaded, mode, similarImageId]
- );
+ if (reset) {
+ setImages(items);
+ pageRef.current = 2;
+ } else {
+ setImages((prev) => [...prev, ...items]);
+ pageRef.current = currentPage + 1;
+ }
+ } else {
+ throw new Error("Failed to fetch images");
+ }
+ } catch (error) {
+ console.error("Error fetching images:", error);
+ if (app.extensionManager?.toast) {
+ app.extensionManager.toast.add({
+ severity: "error",
+ summary: "Fetch Failed",
+ detail:
+ "Could not load images. Check your API settings and connection.",
+ life: 5000,
+ });
+ }
+ } finally {
+ loadingRef.current = false;
+ setLoading(false);
+ }
+ },
+ [apiBase, configLoaded, mode, similarImageId],
+ );
- return {
- images,
- loading,
- hasMore,
- fetchImages,
- similarImageId,
- setSimilarImageId,
- };
+ return {
+ images,
+ loading,
+ hasMore,
+ fetchImages,
+ similarImageId,
+ setSimilarImageId,
+ };
}
diff --git a/ui/hooks/useEmbeddrLibraries.ts b/ui/hooks/useEmbeddrLibraries.ts
index 85ccead..da7315c 100644
--- a/ui/hooks/useEmbeddrLibraries.ts
+++ b/ui/hooks/useEmbeddrLibraries.ts
@@ -2,42 +2,42 @@ import { useEffect, useState } from "react";
import type { ApiMode, LibraryPath } from "@types";
interface UseEmbeddrLibrariesProps {
- apiBase: string;
- mode: ApiMode;
- configLoaded: boolean;
+ apiBase: string;
+ mode: ApiMode;
+ configLoaded: boolean;
}
export function useEmbeddrLibraries({
- apiBase,
- mode,
- configLoaded,
+ apiBase,
+ mode,
+ configLoaded,
}: UseEmbeddrLibrariesProps) {
- const [libraries, setLibraries] = useState>([]);
+ const [libraries, setLibraries] = useState>([]);
- const fetchLibraries = async () => {
- try {
- let baseUrl = apiBase;
- if (baseUrl.endsWith("/")) baseUrl = baseUrl.slice(0, -1);
+ const fetchLibraries = async () => {
+ try {
+ let baseUrl = apiBase;
+ if (baseUrl.endsWith("/")) baseUrl = baseUrl.slice(0, -1);
- const res = await fetch(`${baseUrl}/workspace/paths`);
- if (res.ok) {
- const data = await res.json();
- setLibraries(data);
- }
- } catch (e) {
- console.error("Failed to fetch libraries", e);
- }
- };
+ const res = await fetch(`${baseUrl}/workspace/paths`);
+ if (res.ok) {
+ const data = await res.json();
+ setLibraries(data);
+ }
+ } catch (e) {
+ console.error("Failed to fetch libraries", e);
+ }
+ };
- // Fetch libraries when in local mode
- useEffect(() => {
- if (configLoaded && mode === "local") {
- fetchLibraries();
- }
- }, [configLoaded, mode, apiBase]);
+ // Fetch libraries when in local mode
+ useEffect(() => {
+ if (configLoaded && mode === "local") {
+ fetchLibraries();
+ }
+ }, [configLoaded, mode, apiBase]);
- return {
- libraries,
- fetchLibraries,
- };
+ return {
+ libraries,
+ fetchLibraries,
+ };
}
diff --git a/ui/hooks/useEmbeddrSettings.ts b/ui/hooks/useEmbeddrSettings.ts
index 4cc9022..b90ab61 100644
--- a/ui/hooks/useEmbeddrSettings.ts
+++ b/ui/hooks/useEmbeddrSettings.ts
@@ -4,172 +4,174 @@ import { app } from "../../../scripts/app.js";
import type { ApiMode } from "@types";
interface UseEmbeddrSettingsProps {
- baseUrl?: string;
+ baseUrl?: string;
}
export function useEmbeddrSettings({
- baseUrl = "http://localhost:8003",
+ baseUrl = "http://localhost:8003",
}: UseEmbeddrSettingsProps = {}) {
- const [endpoint, setEndpoint] = useState(() => {
- const stored = localStorage.getItem("embeddr_endpoint");
- return stored || baseUrl;
- });
-
- const [mode, setMode] = useState(() => "local");
-
- const [gridSize, setGridSize] = useState(() =>
- parseInt(localStorage.getItem("embeddr_grid_size") || "3")
+ const [endpoint, setEndpoint] = useState(() => {
+ const stored = localStorage.getItem("embeddr_endpoint");
+ return stored || baseUrl;
+ });
+
+ const [mode, setMode] = useState(() => "local");
+
+ const [gridSize, setGridSize] = useState(() =>
+ parseInt(localStorage.getItem("embeddr_grid_size") || "3")
+ );
+
+ const [gridPreviewContain, setGridPreviewContain] = useState(
+ () => localStorage.getItem("embeddr_grid_preview_contain") === "true"
+ );
+
+ const [theme, setTheme] = useState(() => {
+ return localStorage.getItem("embeddr_theme") || "dark";
+ });
+
+ const [configLoaded, setConfigLoaded] = useState(false);
+
+ // computed API base for requests
+ const apiBase = useMemo(() => {
+ const url = endpoint.replace(/\/$/, ""); // remove trailing slash
+ return `${url}/api/v1`; // append API path automatically
+ }, [endpoint]);
+
+ // Apply theme
+ useEffect(() => {
+ const container = document.querySelector(".embeddr-sidebar-container");
+ if (container) {
+ if (theme === "dark") {
+ container.classList.add("dark");
+ } else {
+ container.classList.remove("dark");
+ }
+ }
+
+ // Also handle portals immediately
+ const portals = document.querySelectorAll(
+ "[data-radix-portal], [data-slot='dialog-content'], [data-slot='dialog-overlay'], [data-slot='select-content'], [data-slot='select-viewport'], [data-slot='popover-content'], [data-slot='dropdown-menu-content']"
);
+ portals.forEach((portal) => {
+ if (theme === "dark") {
+ portal.classList.add("dark");
+ } else {
+ portal.classList.remove("dark");
+ }
+ });
- const [gridPreviewContain, setGridPreviewContain] = useState(
- () => localStorage.getItem("embeddr_grid_preview_contain") === "true"
- );
+ localStorage.setItem("embeddr_theme", theme);
+ }, [theme]);
- const [theme, setTheme] = useState(() => {
- return localStorage.getItem("embeddr_theme") || "dark";
- });
+ // Load config on mount
+ useEffect(() => {
+ const loadConfig = async () => {
+ try {
+ const res = await fetch("/embeddr/config");
+ const data = await res.json();
- const [configLoaded, setConfigLoaded] = useState(false);
-
- // computed API base for requests
- const apiBase = useMemo(() => {
- const url = endpoint.replace(/\/$/, ""); // remove trailing slash
- return `${url}/api/v1`; // append API path automatically
- }, [endpoint]);
-
- // Apply theme
- useEffect(() => {
- const container = document.querySelector(".embeddr-sidebar-container");
- if (container) {
- if (theme === "dark") {
- container.classList.add("dark");
- } else {
- container.classList.remove("dark");
- }
+ if (data.endpoint) {
+ setEndpoint(new URL(data.endpoint).toString());
+ localStorage.setItem("embeddr_endpoint", data.endpoint);
}
- // Also handle portals immediately
- const portals = document.querySelectorAll("[data-radix-portal]");
- portals.forEach((portal) => {
- if (theme === "dark") {
- portal.classList.add("dark");
- } else {
- portal.classList.remove("dark");
- }
- });
-
- localStorage.setItem("embeddr_theme", theme);
- }, [theme]);
-
- // Load config on mount
- useEffect(() => {
- const loadConfig = async () => {
- try {
- const res = await fetch("/embeddr/config");
- const data = await res.json();
-
- if (data.endpoint) {
- setEndpoint(new URL(data.endpoint).toString());
- localStorage.setItem("embeddr_endpoint", data.endpoint);
- }
-
- if (data.mode) {
- setMode("local");
- localStorage.setItem("embeddr_mode", data.mode);
- }
-
- if (data.grid_preview_contain !== undefined) {
- setGridPreviewContain(data.grid_preview_contain);
- localStorage.setItem(
- "embeddr_grid_preview_contain",
- data.grid_preview_contain.toString()
- );
- }
- } catch (e) {
- console.error("Failed to load config", e);
- } finally {
- setConfigLoaded(true);
- }
- };
- loadConfig();
- }, []);
-
- const saveSettings = async (
- newEndpoint: string,
- newMode: ApiMode,
- newGridSize: number,
- newGridPreviewContain: boolean
- ) => {
- try {
- localStorage.setItem("embeddr_endpoint", newEndpoint);
- localStorage.setItem("embeddr_mode", newMode);
- localStorage.setItem("embeddr_grid_size", newGridSize.toString());
- localStorage.setItem(
- "embeddr_grid_preview_contain",
- newGridPreviewContain.toString()
- );
-
- const res = await fetch("/embeddr/config", {
- method: "POST",
- headers: { "Content-Type": "application/json" },
- body: JSON.stringify({
- endpoint: newEndpoint,
- mode: newMode,
- grid_size: newGridSize,
- grid_preview_contain: newGridPreviewContain,
- }),
- });
-
- if (!res.ok) {
- throw new Error(`Server returned ${res.status}`);
- }
-
- setEndpoint(newEndpoint);
- setMode(newMode);
- setGridSize(newGridSize);
- setGridPreviewContain(newGridPreviewContain);
-
- if (app.extensionManager?.toast) {
- app.extensionManager.toast.add({
- severity: "success",
- summary: "Settings Saved",
- detail: "Settings have been saved successfully.",
- life: 3000,
- });
- } else {
- alert("Settings saved!");
- }
-
- return true;
- } catch (e) {
- console.error("Failed to save settings", e);
- if (app.extensionManager?.toast) {
- app.extensionManager.toast.add({
- severity: "error",
- summary: "Save Failed",
- detail: "Failed to save settings to server. Check console.",
- life: 5000,
- });
- } else {
- alert("Failed to save settings.");
- }
- return false;
+ if (data.mode) {
+ setMode("local");
+ localStorage.setItem("embeddr_mode", data.mode);
}
- };
- return {
- endpoint,
- setEndpoint,
- mode,
- setMode,
- gridSize,
- setGridSize,
- gridPreviewContain,
- setGridPreviewContain,
- theme,
- setTheme,
- configLoaded,
- apiBase,
- saveSettings,
+ if (data.grid_preview_contain !== undefined) {
+ setGridPreviewContain(data.grid_preview_contain);
+ localStorage.setItem(
+ "embeddr_grid_preview_contain",
+ data.grid_preview_contain.toString()
+ );
+ }
+ } catch (e) {
+ console.error("Failed to load config", e);
+ } finally {
+ setConfigLoaded(true);
+ }
};
+ loadConfig();
+ }, []);
+
+ const saveSettings = async (
+ newEndpoint: string,
+ newMode: ApiMode,
+ newGridSize: number,
+ newGridPreviewContain: boolean
+ ) => {
+ try {
+ localStorage.setItem("embeddr_endpoint", newEndpoint);
+ localStorage.setItem("embeddr_mode", newMode);
+ localStorage.setItem("embeddr_grid_size", newGridSize.toString());
+ localStorage.setItem(
+ "embeddr_grid_preview_contain",
+ newGridPreviewContain.toString()
+ );
+
+ const res = await fetch("/embeddr/config", {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({
+ endpoint: newEndpoint,
+ mode: newMode,
+ grid_size: newGridSize,
+ grid_preview_contain: newGridPreviewContain,
+ }),
+ });
+
+ if (!res.ok) {
+ throw new Error(`Server returned ${res.status}`);
+ }
+
+ setEndpoint(newEndpoint);
+ setMode(newMode);
+ setGridSize(newGridSize);
+ setGridPreviewContain(newGridPreviewContain);
+
+ if (app.extensionManager?.toast) {
+ app.extensionManager.toast.add({
+ severity: "success",
+ summary: "Settings Saved",
+ detail: "Settings have been saved successfully.",
+ life: 3000,
+ });
+ } else {
+ alert("Settings saved!");
+ }
+
+ return true;
+ } catch (e) {
+ console.error("Failed to save settings", e);
+ if (app.extensionManager?.toast) {
+ app.extensionManager.toast.add({
+ severity: "error",
+ summary: "Save Failed",
+ detail: "Failed to save settings to server. Check console.",
+ life: 5000,
+ });
+ } else {
+ alert("Failed to save settings.");
+ }
+ return false;
+ }
+ };
+
+ return {
+ endpoint,
+ setEndpoint,
+ mode,
+ setMode,
+ gridSize,
+ setGridSize,
+ gridPreviewContain,
+ setGridPreviewContain,
+ theme,
+ setTheme,
+ configLoaded,
+ apiBase,
+ saveSettings,
+ };
}
diff --git a/ui/hooks/useNodeScanner.ts b/ui/hooks/useNodeScanner.ts
index 05fff5e..c85f560 100644
--- a/ui/hooks/useNodeScanner.ts
+++ b/ui/hooks/useNodeScanner.ts
@@ -3,119 +3,118 @@ import { useEffect, useState } from "react";
import { app } from "../../../scripts/app.js";
export interface TargetNode {
- id: number;
- title: string;
+ id: number;
+ title: string;
}
export function useNodeScanner() {
- const [targetNodes, setTargetNodes] = useState>([]);
+ const [targetNodes, setTargetNodes] = useState>([]);
- useEffect(() => {
- const scan = () => {
- if (!app.graph) return;
- const nodes = app.graph.findNodesByType
- ? app.graph.findNodesByType("embeddr.LoadImage")
- : [];
+ useEffect(() => {
+ const scan = () => {
+ if (!app.graph) return;
+ const nodes = app.graph.findNodesByType
+ ? app.graph.findNodesByType("embeddr.LoadImage")
+ : [];
- if (nodes) {
- const info = nodes.map((n: any) => ({
- id: n.id,
- title: n.title || `Node ${n.id}`,
- }));
+ if (nodes) {
+ const info = nodes.map((n: any) => ({
+ id: n.id,
+ title: n.title || `Node ${n.id}`,
+ }));
- // Sort alphabetically by title
- info.sort((a: any, b: any) => a.title.localeCompare(b.title));
+ // Sort alphabetically by title
+ info.sort((a: any, b: any) => a.title.localeCompare(b.title));
- setTargetNodes((prev) => {
- if (JSON.stringify(prev) !== JSON.stringify(info))
- return info;
- return prev;
- });
- }
- };
+ setTargetNodes((prev) => {
+ if (JSON.stringify(prev) !== JSON.stringify(info)) return info;
+ return prev;
+ });
+ }
+ };
- const interval = setInterval(scan, 1000);
- scan();
- return () => clearInterval(interval);
- }, []);
+ const interval = setInterval(scan, 1000);
+ scan();
+ return () => clearInterval(interval);
+ }, []);
- const handleLoadIntoNode = (nodeId: number, imageUrl: string) => {
- const node = app.graph.getNodeById(nodeId);
- if (node) {
- if (node.widgets && node.widgets[0]) {
- node.widgets[0].value = imageUrl;
- if (node.updatePreview) {
- node.updatePreview(imageUrl);
- }
- app.graph.setDirtyCanvas(true, true);
- if (app.extensionManager?.toast) {
- app.extensionManager.toast.add({
- severity: "info",
- summary: "Image Loaded",
- detail: `Updated ${node.title || "Node " + node.id}`,
- life: 1000,
- });
- }
- }
+ const handleLoadIntoNode = (nodeId: number, imageUrl: string) => {
+ const node = app.graph.getNodeById(nodeId);
+ if (node) {
+ if (node.widgets && node.widgets[0]) {
+ node.widgets[0].value = imageUrl;
+ if (node.updatePreview) {
+ node.updatePreview(imageUrl);
}
- };
+ app.graph.setDirtyCanvas(true, true);
+ if (app.extensionManager?.toast) {
+ app.extensionManager.toast.add({
+ severity: "info",
+ summary: "Image Loaded",
+ detail: `Updated ${node.title || "Node " + node.id}`,
+ life: 1000,
+ });
+ }
+ }
+ }
+ };
- const handleUseImage = (imageUrl: string) => {
- const selectedNodes = app.canvas.selected_nodes;
- let targetNode = null;
+ const handleUseImage = (imageUrl: string) => {
+ const selectedNodes = app.canvas.selected_nodes;
+ let targetNode = null;
- if (selectedNodes && Object.keys(selectedNodes).length > 0) {
- const firstNode = Object.values(selectedNodes)[0] as any;
- if (firstNode.type === "embeddr.LoadImage") {
- targetNode = firstNode;
- }
- }
+ if (selectedNodes && Object.keys(selectedNodes).length > 0) {
+ const firstNode = Object.values(selectedNodes)[0] as any;
+ if (firstNode.type === "embeddr.LoadImage") {
+ targetNode = firstNode;
+ }
+ }
- if (targetNode) {
- if (targetNode.widgets && targetNode.widgets[0]) {
- targetNode.widgets[0].value = imageUrl;
- // Trigger updatePreview if available
- if (targetNode.updatePreview) {
- targetNode.updatePreview(imageUrl);
- }
- app.graph.setDirtyCanvas(true, true);
- }
- } else {
- // @ts-ignore
- const LiteGraph = window.LiteGraph;
- const node = LiteGraph.createNode("embeddr.LoadImage");
- if (node) {
- node.pos = [
- app.canvas.graph_mouse[0] || 0,
- app.canvas.graph_mouse[1] || 0,
- ];
- if (node.widgets && node.widgets[0]) {
- node.widgets[0].value = imageUrl;
- }
- app.graph.add(node);
+ if (targetNode) {
+ if (targetNode.widgets && targetNode.widgets[0]) {
+ targetNode.widgets[0].value = imageUrl;
+ // Trigger updatePreview if available
+ if (targetNode.updatePreview) {
+ targetNode.updatePreview(imageUrl);
+ }
+ app.graph.setDirtyCanvas(true, true);
+ }
+ } else {
+ // @ts-ignore
+ const LiteGraph = window.LiteGraph;
+ const node = LiteGraph.createNode("embeddr.LoadImage");
+ if (node) {
+ node.pos = [
+ app.canvas.graph_mouse[0] || 0,
+ app.canvas.graph_mouse[1] || 0,
+ ];
+ if (node.widgets && node.widgets[0]) {
+ node.widgets[0].value = imageUrl;
+ }
+ app.graph.add(node);
- // Trigger updatePreview if available (must be after add?)
- // Actually updatePreview is on the prototype, so it should be available.
- if (node.updatePreview) {
- node.updatePreview(imageUrl);
- }
+ // Trigger updatePreview if available (must be after add?)
+ // Actually updatePreview is on the prototype, so it should be available.
+ if (node.updatePreview) {
+ node.updatePreview(imageUrl);
+ }
- app.graph.setDirtyCanvas(true, true);
- if (app.extensionManager?.toast) {
- app.extensionManager.toast.add({
- severity: "success",
- summary: "Node Created",
- detail: "Created new Embeddr Load Image node",
- life: 2000,
- });
- }
- }
+ app.graph.setDirtyCanvas(true, true);
+ if (app.extensionManager?.toast) {
+ app.extensionManager.toast.add({
+ severity: "success",
+ summary: "Node Created",
+ detail: "Created new Embeddr Load Image node",
+ life: 2000,
+ });
}
- };
+ }
+ }
+ };
- return {
- targetNodes,
- handleLoadIntoNode,
- handleUseImage,
- };
+ return {
+ targetNodes,
+ handleLoadIntoNode,
+ handleUseImage,
+ };
}
diff --git a/ui/main.tsx b/ui/main.tsx
index dd02c9b..0fbdeaa 100644
--- a/ui/main.tsx
+++ b/ui/main.tsx
@@ -1,81 +1,103 @@
import React from "react";
import ReactDOM from "react-dom/client";
+import { ImageDialogProvider } from "@embeddr/react-ui/providers/ImageDialogProvider";
+import { ExternalNavProvider } from "@embeddr/react-ui";
// @ts-ignore
import { app } from "../../../scripts/app.js";
import EmbeddrPanel from "./components/panels/EmbeddrPanel.js";
+import { GlobalDialog } from "./components/GlobalDialog";
import "./nodes/EmbeddrLoadImage.js";
// @ts-ignore
import "./globals.css";
-// Inject CSS for the sidebar icon
-const style = document.createElement("style");
-
-document.head.appendChild(style);
+// Mount Global Dialog
+const dialogContainer = document.createElement("div");
+dialogContainer.id = "embeddr-global-dialog-root";
+// Add tailwind class to ensure styles work if they rely on parent class
+dialogContainer.classList.add("tailwind");
+dialogContainer.classList.add("dark");
+document.body.appendChild(dialogContainer);
+const dialogRoot = ReactDOM.createRoot(dialogContainer);
+dialogRoot.render(
+
+
+
+
+);
// Register Embeddr Sidebar
app.extensionManager.registerSidebarTab({
- id: "embeddr",
- icon: "mdi mdi-cloud-search-outline", // Use the class name
- title: "Embeddr",
- type: "custom",
- render(container) {
- container.innerHTML = "";
- container.classList.add("tailwind");
- container.classList.add("embeddr-sidebar-container");
- // Default to dark, but let React handle it
- container.classList.add("dark");
- // Prevent the parent container from scrolling
- container.style.overflow = "hidden";
- container.style.height = "100%";
+ id: "embeddr",
+ icon: "mdi mdi-cloud-search-outline",
+ title: "Embeddr",
+ type: "custom",
+ render(container) {
+ document.documentElement.classList.add("dark", "tailwind");
- // Ensure any future portals get proper styling
- const observer = new MutationObserver((mutations) => {
- mutations.forEach((mutation) => {
- if (mutation.type === "childList") {
- const portals = document.querySelectorAll(
- "[data-radix-portal]"
- );
- const isDark = container.classList.contains("dark");
- portals.forEach((portal) => {
- if (!portal.classList.contains("tailwind")) {
- portal.classList.add("tailwind");
- }
- // Sync dark mode
- if (isDark) {
- portal.classList.add("dark");
- } else {
- portal.classList.remove("dark");
- }
- });
- }
- });
- });
- observer.observe(document.body, { childList: true, subtree: true });
+ container.innerHTML = "";
+ container.classList.add("tailwind");
+ container.classList.add("embeddr-sidebar-container");
+ // Default to dark, but let React handle it
+ container.classList.add("dark");
+ // Prevent the parent container from scrolling
+ container.style.overflow = "hidden";
+ container.style.height = "100%";
- const root = ReactDOM.createRoot(container);
- root.render(
+
+
+
+ );
+ return () => {
+ observer.disconnect();
+ root.unmount();
+ };
+ },
});
// Register Node Extension
app.registerExtension({
- name: "Embeddr.NodeHelper",
- aboutPageBadges: [
- {
- label: "Embeddr",
- url: "https://github.com/embeddr-net/embeddr-local",
- icon: "pi pi-globe",
- },
- ],
- async nodeCreated(node) {
- // Handle Embeddr Load Image Node
+ name: "Embeddr.NodeHelper",
+ aboutPageBadges: [
+ {
+ label: "Embeddr",
+ url: "https://github.com/embeddr-net/embeddr-local",
+ icon: "pi pi-globe",
},
+ ],
+ async nodeCreated(node) {
+ // Handle Embeddr Load Image Node
+ },
- async loadedGraphNode(node) {
- // No-op
- },
+ async loadedGraphNode(node) {
+ // No-op
+ },
});
diff --git a/ui/nodes/EmbeddrLoadImage.ts b/ui/nodes/EmbeddrLoadImage.ts
index e21dc9e..eb5f7d6 100644
--- a/ui/nodes/EmbeddrLoadImage.ts
+++ b/ui/nodes/EmbeddrLoadImage.ts
@@ -2,132 +2,34 @@
import { app } from "../../../scripts/app.js";
app.registerExtension({
- name: "Embeddr.LoadImage",
- async beforeRegisterNodeDef(nodeType: any, nodeData: any, app: any) {
- if (nodeData.name === "embeddr.LoadImage") {
- const hideWidget = (node: any) => {
- const urlWidget = node.widgets?.find(
- (w: any) => w.name === "image_url"
- );
- if (urlWidget) {
- urlWidget.type = "hidden";
- urlWidget.computeSize = () => [0, 0];
- if (urlWidget.inputEl) {
- urlWidget.inputEl.style.display = "none";
- urlWidget.inputEl.hidden = true;
- }
- }
- };
-
- // Add updatePreview method
- nodeType.prototype.updatePreview = function (url: string) {
- if (!url) return;
-
- hideWidget(this);
-
- const img = new Image();
- img.onload = () => {
- // Use a custom property to avoid conflict with ComfyUI's default preview
- this._embeddr_img = img;
- // Ensure node has some size if it collapsed
- if (this.size[0] < 64 || this.size[1] < 64) {
- this.setSize([256, 256]);
- }
- app.graph.setDirtyCanvas(true, true);
- };
- img.src = url;
- };
-
- const onNodeCreated = nodeType.prototype.onNodeCreated;
- nodeType.prototype.onNodeCreated = function () {
- const r = onNodeCreated
- ? onNodeCreated.apply(this, arguments)
- : undefined;
-
- hideWidget(this);
-
- const urlWidget = this.widgets?.find(
- (w: any) => w.name === "image_url"
- );
-
- // If we have a value initially, load it
- if (urlWidget && urlWidget.value) {
- this.updatePreview(urlWidget.value);
- }
-
- // Hook into widget callback
- if (urlWidget) {
- const originalCallback = urlWidget.callback;
- urlWidget.callback = (value: string) => {
- if (originalCallback) {
- originalCallback(value);
- }
- this.updatePreview(value);
- };
- }
-
- return r;
- };
-
- // Ensure widget is hidden when loading from workflow
- const onConfigure = nodeType.prototype.onConfigure;
- nodeType.prototype.onConfigure = function () {
- const r = onConfigure
- ? onConfigure.apply(this, arguments)
- : undefined;
- hideWidget(this);
- return r;
- };
-
- // Draw the image
- const onDrawBackground = nodeType.prototype.onDrawBackground;
- nodeType.prototype.onDrawBackground = function (ctx: any) {
- // Only draw if we have an image
- if (this._embeddr_img) {
- // Don't call original onDrawBackground to avoid double drawing
- // if the original one draws something that conflicts.
- // However, we might want to call it if it draws the node background color.
- // But usually onDrawBackground draws the content.
- // Let's try NOT calling it if we have an image.
-
- const img = this._embeddr_img;
-
- // Calculate available area
- const w = this.size[0];
- const h = this.size[1];
-
- // Draw
- ctx.save();
-
- // Better aspect ratio drawing (contain)
- const ratio = img.width / img.height;
- const nodeRatio = w / h;
-
- let drawW, drawH, drawX, drawY;
-
- if (ratio > nodeRatio) {
- // Image is wider
- drawW = w;
- drawH = w / ratio;
- drawX = 0;
- drawY = (h - drawH) / 2;
- } else {
- // Image is taller
- drawH = h;
- drawW = h * ratio;
- drawY = 0;
- drawX = (w - drawW) / 2;
- }
-
- ctx.drawImage(img, drawX, drawY, drawW, drawH);
-
- ctx.restore();
- } else {
- if (onDrawBackground) {
- onDrawBackground.apply(this, arguments);
- }
- }
- };
- }
- },
+ name: "Embeddr.LoadImage",
+ async beforeRegisterNodeDef(nodeType: any, nodeData: any, app: any) {
+ if (nodeData.name === "embeddr.LoadImage") {
+ // Add a button to open the dialog
+ const onNodeCreated = nodeType.prototype.onNodeCreated;
+ nodeType.prototype.onNodeCreated = function () {
+ const r = onNodeCreated
+ ? onNodeCreated.apply(this, arguments)
+ : undefined;
+
+ // Add button widget
+ this.addWidget("button", "Search Image", "search", () => {
+ // Dispatch event to open dialog
+ const event = new CustomEvent("embeddr-open-dialog", {
+ detail: { nodeId: this.id },
+ });
+ window.dispatchEvent(event);
+ });
+
+ return r;
+ };
+
+ // Handle image_id updates (if we want to preview)
+ // We can reuse the updatePreview logic from LoadImage if we want
+ // But here we might just want to show the ID or fetch the image.
+ // The python node returns the image, so ComfyUI will handle the preview if we return it in the output.
+ // But if we want to show it on the node before execution, we need to fetch it.
+ // For now, let's just handle the ID insertion.
+ }
+ },
});
diff --git a/ui/types.ts b/ui/types.ts
index d0f3fa2..b49534b 100644
--- a/ui/types.ts
+++ b/ui/types.ts
@@ -1,25 +1,25 @@
export interface PromptImageRead {
- id: number;
- prompt: string;
- image_url: string;
- thumb_url?: string;
- model?: string;
- created_at: string;
- author_name?: string;
- like_count: number;
- liked_by_me: boolean;
- // Local specific
- filename?: string;
- path?: string;
- width?: number;
- height?: number;
+ id: number;
+ prompt: string;
+ image_url: string;
+ thumb_url?: string;
+ model?: string;
+ created_at: string;
+ author_name?: string;
+ like_count: number;
+ liked_by_me: boolean;
+ // Local specific
+ filename?: string;
+ path?: string;
+ width?: number;
+ height?: number;
}
export interface LibraryPath {
- id: number;
- path: string;
- name: string | null;
- image_count: number;
+ id: number;
+ path: string;
+ name: string | null;
+ image_count: number;
}
export type ApiMode = "local";
diff --git a/uv.lock b/uv.lock
index 3a49bac..e1ff2f2 100644
--- a/uv.lock
+++ b/uv.lock
@@ -9,5 +9,5 @@ resolution-markers = [
[[package]]
name = "embeddr-extension"
-version = "1.1.1"
+version = "1.2.0"
source = { virtual = "." }
diff --git a/vite.config.mts b/vite.config.mts
index 4cb64c9..984c255 100644
--- a/vite.config.mts
+++ b/vite.config.mts
@@ -6,116 +6,116 @@ import tailwindcss from "@tailwindcss/vite";
// Plugin to inline CSS into JS
const inlineCssPlugin: any = {
- name: "inline-css",
- apply: "build" as const,
- enforce: "post",
- generateBundle(options: any, bundle: any) {
- let cssContent = "";
- const cssFiles: string[] = [];
+ name: "inline-css",
+ apply: "build" as const,
+ enforce: "post",
+ generateBundle(options: any, bundle: any) {
+ let cssContent = "";
+ const cssFiles: string[] = [];
- // Collect all CSS files
- for (const [fileName, asset] of Object.entries(bundle)) {
- if (fileName.endsWith(".css") && (asset as any).type === "asset") {
- cssContent += (asset as any).source;
- cssFiles.push(fileName);
- }
- }
+ // Collect all CSS files
+ for (const [fileName, asset] of Object.entries(bundle)) {
+ if (fileName.endsWith(".css") && (asset as any).type === "asset") {
+ cssContent += (asset as any).source;
+ cssFiles.push(fileName);
+ }
+ }
- // Inject CSS into main JS file
- if (cssContent && Object.keys(bundle).some((f) => f.endsWith(".js"))) {
- const jsFile = Object.keys(bundle).find(
- (f) => f.endsWith(".js") && f.startsWith("main")
- );
- if (jsFile) {
- const jsAsset = bundle[jsFile] as any;
+ // Inject CSS into main JS file
+ if (cssContent && Object.keys(bundle).some((f) => f.endsWith(".js"))) {
+ const jsFile = Object.keys(bundle).find(
+ (f) => f.endsWith(".js") && f.startsWith("main"),
+ );
+ if (jsFile) {
+ const jsAsset = bundle[jsFile] as any;
- // Wrap all CSS rules with a scoping selector
- const scopedCss = cssContent.replace(
- /([^{}]+){([^{}]*)}/g,
- (match, selector, rules) => {
- // Skip @rules (like @media, @keyframes, @import)
- if (selector.trim().startsWith("@")) {
- return match;
- }
+ // Wrap all CSS rules with a scoping selector
+ const scopedCss = cssContent.replace(
+ /([^{}]+){([^{}]*)}/g,
+ (match, selector, rules) => {
+ // Skip @rules (like @media, @keyframes, @import)
+ if (selector.trim().startsWith("@")) {
+ return match;
+ }
- // Skip if already scoped to avoid double scoping
- if (selector.includes(".tailwind")) {
- return match;
- }
+ // Skip if already scoped to avoid double scoping
+ if (selector.includes(".tailwind")) {
+ return match;
+ }
- // Handle :root selector specially
- if (selector.trim() === ":root") {
- return match; // Keep :root global
- }
+ // Handle :root selector specially
+ if (selector.trim() === ":root") {
+ return match; // Keep :root global
+ }
- // Add scoping to each selector
- const scopedSelectors = selector
- .split(",")
- .map((s) => {
- const trimmed = s.trim();
- // Don't scope html, body, or other global selectors that are already in your CSS
- if (
- trimmed === "html" ||
- trimmed === "body" ||
- trimmed === "*"
- ) {
- return `.tailwind ${trimmed}`;
- }
- return `.tailwind ${trimmed}`;
- })
- .join(", ");
- return `${scopedSelectors} { ${rules} }`;
- }
- );
+ // Add scoping to each selector
+ const scopedSelectors = selector
+ .split(",")
+ .map((s) => {
+ const trimmed = s.trim();
+ // Don't scope html, body, or other global selectors that are already in your CSS
+ if (
+ trimmed === "html" ||
+ trimmed === "body" ||
+ trimmed === "*"
+ ) {
+ return `.tailwind ${trimmed}`;
+ }
+ return `.tailwind ${trimmed}`;
+ })
+ .join(", ");
+ return `${scopedSelectors} { ${rules} }`;
+ },
+ );
- const styleInject = `(function(){const css=${JSON.stringify(
- scopedCss
- )};const style=document.createElement('style');style.setAttribute('data-extension','nynxz_custom_nodes');style.textContent=css;document.head.appendChild(style);})();`;
- jsAsset.code = styleInject + jsAsset.code;
- }
- }
+ const styleInject = `(function(){const css=${JSON.stringify(
+ scopedCss,
+ )};const style=document.createElement('style');style.setAttribute('data-extension','nynxz_custom_nodes');style.textContent=css;document.head.appendChild(style);})();`;
+ jsAsset.code = styleInject + jsAsset.code;
+ }
+ }
- // Remove CSS files from bundle
- for (const cssFile of cssFiles) {
- delete bundle[cssFile];
- }
- },
+ // Remove CSS files from bundle
+ for (const cssFile of cssFiles) {
+ delete bundle[cssFile];
+ }
+ },
};
export default defineConfig({
- plugins: [react(), tailwindcss(), inlineCssPlugin],
- resolve: {
- alias: {
- "@": fileURLToPath(new URL("./ui", import.meta.url)),
- "@components": path.resolve(__dirname, "ui/components"),
- "@hooks": path.resolve(__dirname, "ui/hooks"),
- },
+ plugins: [react(), tailwindcss(), inlineCssPlugin],
+ resolve: {
+ alias: {
+ "@": fileURLToPath(new URL("./ui", import.meta.url)),
+ "@components": path.resolve(__dirname, "ui/components"),
+ "@hooks": path.resolve(__dirname, "ui/hooks"),
},
- define: {
- "process.env": {}, // fixes 'process is not defined'
+ },
+ define: {
+ "process.env": {}, // fixes 'process is not defined'
+ },
+ build: {
+ lib: {
+ entry: "./ui/main.tsx",
+ formats: ["es"],
+ fileName: "main",
},
- build: {
- lib: {
- entry: "./ui/main.tsx",
- formats: ["es"],
- fileName: "main",
- },
- rollupOptions: {
- external: [
- "../../../scripts/app.js", // Comfy's app object
- "../../../../scripts/app.js", // Comfy's app object from components
- /^primevue\/?.*/,
- /^@primevue\/themes\/?.*/,
- ],
- output: {
- dir: "js",
- entryFileNames: "main.js",
- assetFileNames: "assets/[name].[ext]",
- },
- },
- outDir: "js",
- sourcemap: false,
- assetsInlineLimit: Infinity,
- cssCodeSplit: false,
+ rollupOptions: {
+ external: [
+ "../../../scripts/app.js", // Comfy's app object
+ "../../../../scripts/app.js", // Comfy's app object from components
+ /^primevue\/?.*/,
+ /^@primevue\/themes\/?.*/,
+ ],
+ output: {
+ dir: "js",
+ entryFileNames: "main.js",
+ assetFileNames: "assets/[name].[ext]",
+ },
},
+ outDir: "js",
+ sourcemap: false,
+ assetsInlineLimit: Infinity,
+ cssCodeSplit: false,
+ },
});
onSelect?.(image)}
- draggable
- onDragStart={(e) => handleDragStart(e, image.image_url)}
- >
- 
-
- ))}
+ const handleDragStart = (e: React.DragEvent, imageUrl: string) => {
+ e.dataTransfer.setData("text/plain", imageUrl);
+ e.dataTransfer.setData("text/uri-list", imageUrl);
+ };
-
+ return (
+
-
-
- {onSimilarSearch && (
-
- )}
-
- {image.prompt && (
-
+ {images.map((image) => (
+
+ {
+ e.preventDefault();
+ onRightClick(image);
+ }}
+ onClick={() => onSelect?.(image)}
+ draggable
+ onDragStart={(e) => handleDragStart(e, image.image_url)}
+ >
+
+
+ ))}
+
+
+
+
-
- );
+
+ {onSimilarSearch && (
+
+ )}
+
+ {image.prompt &&
+ {similarImageId ? (
+
+ );
+}
diff --git a/ui/components/ui/SettingsForm.tsx b/ui/components/ui/SettingsForm.tsx
deleted file mode 100644
index 042befd..0000000
--- a/ui/components/ui/SettingsForm.tsx
+++ /dev/null
@@ -1,155 +0,0 @@
-import React from "react";
-import { Input } from "@embeddr/react-ui/components/input";
-import { Label } from "@embeddr/react-ui/components/label";
-import { Button } from "@embeddr/react-ui/components/button";
-import { Slider } from "@embeddr/react-ui/components/slider";
-import { Switch } from "@embeddr/react-ui/components/switch";
-
-import { Cloud, Moon, Server, Sun } from "lucide-react";
-// @ts-ignore
-import { app } from "../../../../scripts/app.js";
-import type { ApiMode } from "@hooks/useEmbeddrApi";
-
-interface SettingsFormProps {
- endpoint: string;
- setEndpoint: (endpoint: string) => void;
- mode: ApiMode;
- setMode: (mode: ApiMode) => void;
- gridSize: number;
- setGridSize: (size: number) => void;
- gridPreviewContain: boolean;
- setGridPreviewContain: (contain: boolean) => void;
- theme: string;
- setTheme: (theme: string) => void;
- onSave: () => void;
-}
-
-export function SettingsForm({
- endpoint,
- setEndpoint,
- mode,
- setMode,
- gridSize,
- setGridSize,
- gridPreviewContain,
- setGridPreviewContain,
- theme,
- setTheme,
- onSave,
-}: SettingsFormProps) {
- return (
-
+
+
+ ) : (
+
+ )}
+
+
+ {mode === "local" ? (
+
+ ) : (
+ <>
+
+
+
+ )}
+
+
-
- );
-}
diff --git a/ui/globals.css b/ui/globals.css
index 7aa54c5..93b8ad8 100644
--- a/ui/globals.css
+++ b/ui/globals.css
@@ -1,292 +1,148 @@
@import "tailwindcss";
@source "../node_modules/@embeddr/react-ui/dist/**/*";
@import "tw-animate-css";
+@import "shadcn/tailwind.css";
@custom-variant dark (&:is(.dark *));
-/* Scope tailwind to the sidebar container */
@layer base {
- .tailwind {
- @apply border-border outline-ring/50;
- }
-
- .tailwind * {
- @apply border-border outline-ring/50;
- }
-
- .tailwind body {
- @apply bg-background text-foreground;
- }
-
- /* Ensure radix portals get proper styling */
- [data-radix-portal].tailwind,
- [data-radix-portal].tailwind.dark,
- [data-radix-popper-content-wrapper].tailwind,
- [data-radix-popper-content-wrapper].tailwind.dark {
- --background: var(--background);
- --foreground: var(--foreground);
- --card: var(--card);
- --card-foreground: var(--card-foreground);
- --popover: var(--popover);
- --popover-foreground: var(--popover-foreground);
- --primary: var(--primary);
- --primary-foreground: var(--primary-foreground);
- --secondary: var(--secondary);
- --secondary-foreground: var(--secondary-foreground);
- --muted: var(--muted);
- --muted-foreground: var(--muted-foreground);
- --accent: var(--accent);
- --accent-foreground: var(--accent-foreground);
- --destructive: var(--destructive);
- --destructive-foreground: var(--destructive-foreground);
- --border: var(--border);
- --input: var(--input);
- --ring: var(--ring);
- --radius: var(--radius);
- }
-
- /* Force styling even without our scoped classes as fallback */
- [data-radix-popper-content-wrapper] [data-slot="select-content"] {
- background: oklch(0.145 0 0) !important;
- color: oklch(0.985 0 0) !important;
- border: 1px solid oklch(0.269 0 0) !important;
- border-radius: 0.625rem !important;
- box-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1),
- 0 4px 6px -4px rgb(0 0 0 / 0.1) !important;
- }
-
- [data-radix-popper-content-wrapper] [data-slot="select-item"] {
- color: oklch(0.985 0 0) !important;
- }
-
- [data-radix-popper-content-wrapper] [data-slot="select-item"]:hover,
- [data-radix-popper-content-wrapper]
- [data-slot="select-item"][data-highlighted] {
- background: oklch(0.269 0 0) !important;
- color: oklch(0.985 0 0) !important;
- }
-
- [data-radix-popper-content-wrapper] [data-slot="select-label"] {
- color: oklch(0.708 0 0) !important;
- }
-
- /* Ensure select components in portals get dark mode styling */
- [data-radix-portal].tailwind.dark [data-slot="select-content"],
- [data-radix-popper-content-wrapper].tailwind.dark
- [data-slot="select-content"] {
- @apply bg-popover text-popover-foreground border border-border;
- }
-
- [data-radix-portal].tailwind.dark [data-slot="select-item"],
- [data-radix-popper-content-wrapper].tailwind.dark
- [data-slot="select-item"] {
- @apply text-popover-foreground;
- }
-
- [data-radix-portal].tailwind.dark [data-slot="select-item"]:hover,
- [data-radix-portal].tailwind.dark
- [data-slot="select-item"][data-highlighted],
- [data-radix-popper-content-wrapper].tailwind.dark
- [data-slot="select-item"]:hover,
- [data-radix-popper-content-wrapper].tailwind.dark
- [data-slot="select-item"][data-highlighted] {
- @apply bg-accent text-accent-foreground;
- }
-
- [data-radix-portal].tailwind.dark [data-slot="select-label"],
- [data-radix-popper-content-wrapper].tailwind.dark
- [data-slot="select-label"] {
- @apply text-muted-foreground;
- }
-}
-
-:root,
-.tailwind {
- --background: oklch(1 0 0);
- --foreground: oklch(0.145 0 0);
- --card: oklch(1 0 0);
- --card-foreground: oklch(0.145 0 0);
- --popover: oklch(1 0 0);
- --popover-foreground: oklch(0.145 0 0);
- --primary: oklch(0.205 0 0);
- --primary-foreground: oklch(0.985 0 0);
- --secondary: oklch(0.97 0 0);
- --secondary-foreground: oklch(0.205 0 0);
- --muted: oklch(0.97 0 0);
- --muted-foreground: oklch(0.556 0 0);
- --accent: oklch(0.97 0 0);
- --accent-foreground: oklch(0.205 0 0);
- --destructive: oklch(0.577 0.245 27.325);
- --destructive-foreground: oklch(0.577 0.245 27.325);
- --border: oklch(0.922 0 0);
- --input: oklch(0.922 0 0);
- --ring: oklch(0.708 0 0);
- --chart-1: oklch(0.646 0.222 41.116);
- --chart-2: oklch(0.6 0.118 184.704);
- --chart-3: oklch(0.398 0.07 227.392);
- --chart-4: oklch(0.828 0.189 84.429);
- --chart-5: oklch(0.769 0.188 70.08);
- --radius: 0.625rem;
- --sidebar: oklch(0.985 0 0);
- --sidebar-foreground: oklch(0.145 0 0);
- --sidebar-primary: oklch(0.205 0 0);
- --sidebar-primary-foreground: oklch(0.985 0 0);
- --sidebar-accent: oklch(0.97 0 0);
- --sidebar-accent-foreground: oklch(0.205 0 0);
- --sidebar-border: oklch(0.922 0 0);
- --sidebar-ring: oklch(0.708 0 0);
-}
-
-.dark,
-.tailwind.dark {
- --background: oklch(0.145 0 0);
- --foreground: oklch(0.985 0 0);
- --card: oklch(0.145 0 0);
- --card-foreground: oklch(0.985 0 0);
- --popover: oklch(0.145 0 0);
- --popover-foreground: oklch(0.985 0 0);
- --primary: oklch(0.985 0 0);
- --primary-foreground: oklch(0.205 0 0);
- --secondary: oklch(0.269 0 0);
- --secondary-foreground: oklch(0.985 0 0);
- --muted: oklch(0.269 0 0);
- --muted-foreground: oklch(0.708 0 0);
- --accent: oklch(0.269 0 0);
- --accent-foreground: oklch(0.985 0 0);
- --destructive: oklch(0.396 0.141 25.723);
- --destructive-foreground: oklch(0.637 0.237 25.331);
- --border: oklch(0.269 0 0);
- --input: oklch(0.269 0 0);
- --ring: oklch(0.439 0 0);
- --chart-1: oklch(0.488 0.243 264.376);
- --chart-2: oklch(0.696 0.17 162.48);
- --chart-3: oklch(0.769 0.188 70.08);
- --chart-4: oklch(0.627 0.265 303.9);
- --chart-5: oklch(0.645 0.246 16.439);
- --sidebar: oklch(0.205 0 0);
- --sidebar-foreground: oklch(0.985 0 0);
- --sidebar-primary: oklch(0.488 0.243 264.376);
- --sidebar-primary-foreground: oklch(0.985 0 0);
- --sidebar-accent: oklch(0.269 0 0);
- --sidebar-accent-foreground: oklch(0.985 0 0);
- --sidebar-border: oklch(0.269 0 0);
- --sidebar-ring: oklch(0.439 0 0);
+ /* Ensure dialogs are above ComfyUI UI (which can have high z-indices) */
+ .tailwind[data-slot="dialog-overlay"],
+ [data-slot="dialog-overlay"] {
+ z-index: 9999 !important;
+ }
+
+ .tailwind[data-slot="dialog-content"],
+ [data-slot="dialog-content"] {
+ z-index: 10000 !important;
+ }
+
+ .tailwind[data-slot="select-content"],
+ [data-slot="select-content"] {
+ z-index: 10000 !important;
+ background-color: var(--popover);
+ color: var(--popover-foreground);
+ }
+ .tailwind[data-slot="select-viewport"],
+ [data-slot="select-viewport"] {
+ z-index: 10000 !important;
+ }
}
@theme inline {
- --color-background: var(--background);
- --color-foreground: var(--foreground);
- --color-card: var(--card);
- --color-card-foreground: var(--card-foreground);
- --color-popover: var(--popover);
- --color-popover-foreground: var(--popover-foreground);
- --color-primary: var(--primary);
- --color-primary-foreground: var(--primary-foreground);
- --color-secondary: var(--secondary);
- --color-secondary-foreground: var(--secondary-foreground);
- --color-muted: var(--muted);
- --color-muted-foreground: var(--muted-foreground);
- --color-accent: var(--accent);
- --color-accent-foreground: var(--accent-foreground);
- --color-destructive: var(--destructive);
- --color-destructive-foreground: var(--destructive-foreground);
- --color-border: var(--border);
- --color-input: var(--input);
- --color-ring: var(--ring);
- --color-chart-1: var(--chart-1);
- --color-chart-2: var(--chart-2);
- --color-chart-3: var(--chart-3);
- --color-chart-4: var(--chart-4);
- --color-chart-5: var(--chart-5);
- --radius-sm: calc(var(--radius) - 4px);
- --radius-md: calc(var(--radius) - 2px);
- --radius-lg: var(--radius);
- --radius-xl: calc(var(--radius) + 4px);
- --color-sidebar: var(--sidebar);
- --color-sidebar-foreground: var(--sidebar-foreground);
- --color-sidebar-primary: var(--sidebar-primary);
- --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
- --color-sidebar-accent: var(--sidebar-accent);
- --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
- --color-sidebar-border: var(--sidebar-border);
- --color-sidebar-ring: var(--sidebar-ring);
+ --color-background: var(--background);
+ --color-foreground: var(--foreground);
+ --color-card: var(--card);
+ --color-card-foreground: var(--card-foreground);
+ --color-popover: var(--popover);
+ --color-popover-foreground: var(--popover-foreground);
+ --color-primary: var(--primary);
+ --color-primary-foreground: var(--primary-foreground);
+ --color-secondary: var(--secondary);
+ --color-secondary-foreground: var(--secondary-foreground);
+ --color-muted: var(--muted);
+ --color-muted-foreground: var(--muted-foreground);
+ --color-accent: var(--accent);
+ --color-accent-foreground: var(--accent-foreground);
+ --color-destructive: var(--destructive);
+ --color-destructive-foreground: var(--destructive-foreground);
+ --color-border: var(--border);
+ --color-input: var(--input);
+ --color-ring: var(--ring);
+ --color-chart-1: var(--chart-1);
+ --color-chart-2: var(--chart-2);
+ --color-chart-3: var(--chart-3);
+ --color-chart-4: var(--chart-4);
+ --color-chart-5: var(--chart-5);
+ --radius-sm: calc(var(--radius) - 4px);
+ --radius-md: calc(var(--radius) - 2px);
+ --radius-lg: var(--radius);
+ --radius-xl: calc(var(--radius) + 4px);
+ --color-sidebar: var(--sidebar);
+ --color-sidebar-foreground: var(--sidebar-foreground);
+ --color-sidebar-primary: var(--sidebar-primary);
+ --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
+ --color-sidebar-accent: var(--sidebar-accent);
+ --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
+ --color-sidebar-border: var(--sidebar-border);
+ --color-sidebar-ring: var(--sidebar-ring);
}
@layer base {
- * {
- @apply border-border outline-ring/50;
- }
+ * {
+ @apply border-border outline-ring/50;
+ }
- body {
- @apply bg-background text-foreground;
- }
+ body {
+ @apply bg-background text-foreground;
+ }
}
:root {
- --radius: 0.625rem;
- --background: oklch(1 0 0);
- --foreground: oklch(0.145 0 0);
- --card: oklch(1 0 0);
- --card-foreground: oklch(0.145 0 0);
- --popover: oklch(1 0 0);
- --popover-foreground: oklch(0.145 0 0);
- --primary: oklch(0.205 0 0);
- --primary-foreground: oklch(0.985 0 0);
- --secondary: oklch(0.97 0 0);
- --secondary-foreground: oklch(0.205 0 0);
- --muted: oklch(0.97 0 0);
- --muted-foreground: oklch(0.556 0 0);
- --accent: oklch(0.97 0 0);
- --accent-foreground: oklch(0.205 0 0);
- --destructive: oklch(0.577 0.245 27.325);
- --border: oklch(0.922 0 0);
- --input: oklch(0.922 0 0);
- --ring: oklch(0.708 0 0);
- --chart-1: oklch(0.646 0.222 41.116);
- --chart-2: oklch(0.6 0.118 184.704);
- --chart-3: oklch(0.398 0.07 227.392);
- --chart-4: oklch(0.828 0.189 84.429);
- --chart-5: oklch(0.769 0.188 70.08);
- --sidebar: oklch(0.985 0 0);
- --sidebar-foreground: oklch(0.145 0 0);
- --sidebar-primary: oklch(0.205 0 0);
- --sidebar-primary-foreground: oklch(0.985 0 0);
- --sidebar-accent: oklch(0.97 0 0);
- --sidebar-accent-foreground: oklch(0.205 0 0);
- --sidebar-border: oklch(0.922 0 0);
- --sidebar-ring: oklch(0.708 0 0);
+ --radius: 0.625rem;
+ --background: oklch(1 0 0);
+ --foreground: oklch(0.145 0 0);
+ --card: oklch(1 0 0);
+ --card-foreground: oklch(0.145 0 0);
+ --popover: oklch(1 0 0);
+ --popover-foreground: oklch(0.145 0 0);
+ --primary: oklch(0.205 0 0);
+ --primary-foreground: oklch(0.985 0 0);
+ --secondary: oklch(0.97 0 0);
+ --secondary-foreground: oklch(0.205 0 0);
+ --muted: oklch(0.97 0 0);
+ --muted-foreground: oklch(0.556 0 0);
+ --accent: oklch(0.97 0 0);
+ --accent-foreground: oklch(0.205 0 0);
+ --destructive: oklch(0.577 0.245 27.325);
+ --border: oklch(0.922 0 0);
+ --input: oklch(0.922 0 0);
+ --ring: oklch(0.708 0 0);
+ --chart-1: oklch(0.646 0.222 41.116);
+ --chart-2: oklch(0.6 0.118 184.704);
+ --chart-3: oklch(0.398 0.07 227.392);
+ --chart-4: oklch(0.828 0.189 84.429);
+ --chart-5: oklch(0.769 0.188 70.08);
+ --sidebar: oklch(0.985 0 0);
+ --sidebar-foreground: oklch(0.145 0 0);
+ --sidebar-primary: oklch(0.205 0 0);
+ --sidebar-primary-foreground: oklch(0.985 0 0);
+ --sidebar-accent: oklch(0.97 0 0);
+ --sidebar-accent-foreground: oklch(0.205 0 0);
+ --sidebar-border: oklch(0.922 0 0);
+ --sidebar-ring: oklch(0.708 0 0);
}
.dark {
- --background: oklch(0.145 0 0);
- --foreground: oklch(0.985 0 0);
- --card: oklch(0.205 0 0);
- --card-foreground: oklch(0.985 0 0);
- --popover: oklch(0.205 0 0);
- --popover-foreground: oklch(0.985 0 0);
- --primary: oklch(0.922 0 0);
- --primary-foreground: oklch(0.205 0 0);
- --secondary: oklch(0.269 0 0);
- --secondary-foreground: oklch(0.985 0 0);
- --muted: oklch(0.269 0 0);
- --muted-foreground: oklch(0.708 0 0);
- --accent: oklch(0.269 0 0);
- --accent-foreground: oklch(0.985 0 0);
- --destructive: oklch(0.704 0.191 22.216);
- --border: oklch(1 0 0 / 10%);
- --input: oklch(1 0 0 / 15%);
- --ring: oklch(0.556 0 0);
- --chart-1: oklch(0.488 0.243 264.376);
- --chart-2: oklch(0.696 0.17 162.48);
- --chart-3: oklch(0.769 0.188 70.08);
- --chart-4: oklch(0.627 0.265 303.9);
- --chart-5: oklch(0.645 0.246 16.439);
- --sidebar: oklch(0.205 0 0);
- --sidebar-foreground: oklch(0.985 0 0);
- --sidebar-primary: oklch(0.488 0.243 264.376);
- --sidebar-primary-foreground: oklch(0.985 0 0);
- --sidebar-accent: oklch(0.269 0 0);
- --sidebar-accent-foreground: oklch(0.985 0 0);
- --sidebar-border: oklch(1 0 0 / 10%);
- --sidebar-ring: oklch(0.556 0 0);
+ --background: oklch(0.145 0 0);
+ --foreground: oklch(0.985 0 0);
+ --card: oklch(0.205 0 0);
+ --card-foreground: oklch(0.985 0 0);
+ --popover: oklch(0.205 0 0);
+ --popover-foreground: oklch(0.985 0 0);
+ --primary: oklch(0.922 0 0);
+ --primary-foreground: oklch(0.205 0 0);
+ --secondary: oklch(0.269 0 0);
+ --secondary-foreground: oklch(0.985 0 0);
+ --muted: oklch(0.269 0 0);
+ --muted-foreground: oklch(0.708 0 0);
+ --accent: oklch(0.269 0 0);
+ --accent-foreground: oklch(0.985 0 0);
+ --destructive: oklch(0.704 0.191 22.216);
+ --border: oklch(1 0 0 / 10%);
+ --input: oklch(1 0 0 / 15%);
+ --ring: oklch(0.556 0 0);
+ --chart-1: oklch(0.488 0.243 264.376);
+ --chart-2: oklch(0.696 0.17 162.48);
+ --chart-3: oklch(0.769 0.188 70.08);
+ --chart-4: oklch(0.627 0.265 303.9);
+ --chart-5: oklch(0.645 0.246 16.439);
+ --sidebar: oklch(0.205 0 0);
+ --sidebar-foreground: oklch(0.985 0 0);
+ --sidebar-primary: oklch(0.488 0.243 264.376);
+ --sidebar-primary-foreground: oklch(0.985 0 0);
+ --sidebar-accent: oklch(0.269 0 0);
+ --sidebar-accent-foreground: oklch(0.985 0 0);
+ --sidebar-border: oklch(1 0 0 / 10%);
+ --sidebar-ring: oklch(0.556 0 0);
}
diff --git a/ui/hooks/useEmbeddrApi.ts b/ui/hooks/useEmbeddrApi.ts
index 721629c..5eb140d 100644
--- a/ui/hooks/useEmbeddrApi.ts
+++ b/ui/hooks/useEmbeddrApi.ts
@@ -6,29 +6,29 @@ import type { ApiMode, LibraryPath, PromptImageRead } from "@types";
export type { PromptImageRead, LibraryPath, ApiMode };
interface UseEmbeddrApiProps {
- baseUrl?: string;
+ baseUrl?: string;
}
export function useEmbeddrApi({
- baseUrl = "http://localhost:8003",
+ baseUrl = "http://localhost:8003",
}: UseEmbeddrApiProps = {}) {
- const settings = useEmbeddrSettings({ baseUrl });
+ const settings = useEmbeddrSettings({ baseUrl });
- const libraries = useEmbeddrLibraries({
- apiBase: settings.apiBase,
- mode: settings.mode,
- configLoaded: settings.configLoaded,
- });
+ const libraries = useEmbeddrLibraries({
+ apiBase: settings.apiBase,
+ mode: settings.mode,
+ configLoaded: settings.configLoaded,
+ });
- const images = useEmbeddrImages({
- apiBase: settings.apiBase,
- mode: settings.mode,
- configLoaded: settings.configLoaded,
- });
+ const images = useEmbeddrImages({
+ apiBase: settings.apiBase,
+ mode: settings.mode,
+ configLoaded: settings.configLoaded,
+ });
- return {
- ...settings,
- ...libraries,
- ...images,
- };
+ return {
+ ...settings,
+ ...libraries,
+ ...images,
+ };
}
diff --git a/ui/hooks/useEmbeddrImages.ts b/ui/hooks/useEmbeddrImages.ts
index 0404b67..d6448c3 100644
--- a/ui/hooks/useEmbeddrImages.ts
+++ b/ui/hooks/useEmbeddrImages.ts
@@ -1,132 +1,137 @@
-import { useCallback, useState } from "react";
+import { useCallback, useRef, useState } from "react";
// @ts-ignore
import { app } from "../../../scripts/app.js";
import type { ApiMode, PromptImageRead } from "@types";
interface UseEmbeddrImagesProps {
- apiBase: string;
- mode: ApiMode;
- configLoaded: boolean;
+ apiBase: string;
+ mode: ApiMode;
+ configLoaded: boolean;
}
export function useEmbeddrImages({
- apiBase,
- mode,
- configLoaded,
+ apiBase,
+ mode,
+ configLoaded,
}: UseEmbeddrImagesProps) {
- const [images, setImages] = useState
-
-
-
-
-
-
-
-
- setEndpoint(e.target.value)}
- />
-
-
- - {mode !== "local" - ? "Change this if you are using a self-hosted instance or development server." - : "The URL of your local Embeddr instance."} -
-
-
-
-
- setGridSize(value[0])}
- />{" "}
- {gridSize}
-
- - Number of columns in the image grid. -
-
-
-
-
-
- setGridPreviewContain(value)
- }
- />
-
- {gridPreviewContain ? "Contain" : "Cover"}
-
-
- - Switch between contain and cover for image previews. -
-
-
-
-
-
-
-
- setTheme(checked ? "dark" : "light")
- }
- />
-
- {theme === "dark" ? (
- <>
-
-