mirror of
https://github.com/Xevion/factorio-achievements-fixer.git
synced 2026-01-31 08:24:15 -06:00
Minor item reorganize, improve HoverState to offer rejection reasons, remove light mode classes
This commit is contained in:
+3
-3
@@ -27,16 +27,16 @@ body {
|
|||||||
|
|
||||||
/* Track */
|
/* Track */
|
||||||
::-webkit-scrollbar-track {
|
::-webkit-scrollbar-track {
|
||||||
@apply bg-zinc-200 dark:bg-zinc-700 rounded-lg;
|
@apply bg-zinc-700 rounded-lg;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Handle */
|
/* Handle */
|
||||||
::-webkit-scrollbar-thumb {
|
::-webkit-scrollbar-thumb {
|
||||||
@apply bg-zinc-400 dark:bg-zinc-500 rounded-xl;
|
@apply bg-zinc-500 rounded-xl;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Handle on hover */
|
/* Handle on hover */
|
||||||
::-webkit-scrollbar-thumb:hover {
|
::-webkit-scrollbar-thumb:hover {
|
||||||
@apply bg-zinc-500 dark:bg-zinc-400 rounded-lg;
|
@apply bg-zinc-400 rounded-lg;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,20 +13,33 @@ interface DragAndDropProps {
|
|||||||
onFile: (path: string) => void;
|
onFile: (path: string) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
type HoverState = "off" | "valid" | "invalid";
|
|
||||||
|
|
||||||
export default function DragAndDrop({ className, onFile }: DragAndDropProps) {
|
export default function DragAndDrop({ className, onFile }: DragAndDropProps) {
|
||||||
const [isHovering, setIsHovering] = useState<HoverState>("off");
|
const [hoverState, setIsHovering] = useState<
|
||||||
|
| {
|
||||||
|
state: "off" | "valid";
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
state: "invalid";
|
||||||
|
detail: string;
|
||||||
|
}
|
||||||
|
>({ state: "off" });
|
||||||
|
|
||||||
async function isValid(paths: string[]): Promise<boolean> {
|
async function isValid(
|
||||||
return paths.length === 1 && paths[0].endsWith(".zip") && exists(paths[0]);
|
paths: string[]
|
||||||
|
): Promise<{ valid: true } | { valid: false; detail: string }> {
|
||||||
|
if (paths.length !== 1) return { valid: false, detail: "Only one file" };
|
||||||
|
if (!paths[0].endsWith(".zip"))
|
||||||
|
return { valid: false, detail: "Not a .zip file" };
|
||||||
|
if (!(await exists(paths[0])))
|
||||||
|
return { valid: false, detail: "File does not exist" };
|
||||||
|
return { valid: true };
|
||||||
}
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const unlistenDrop = listen<DragDropEvent & { type: "drop" }>(
|
const unlistenDrop = listen<DragDropEvent & { type: "drop" }>(
|
||||||
"tauri://drag-drop",
|
"tauri://drag-drop",
|
||||||
async (event) => {
|
async (event) => {
|
||||||
setIsHovering("off");
|
setIsHovering({ state: "off" });
|
||||||
if (await isValid(event.payload.paths)) {
|
if (await isValid(event.payload.paths)) {
|
||||||
onFile(event.payload.paths[0]);
|
onFile(event.payload.paths[0]);
|
||||||
}
|
}
|
||||||
@@ -36,13 +49,14 @@ export default function DragAndDrop({ className, onFile }: DragAndDropProps) {
|
|||||||
const unlistenEnter = listen<DragDropEvent & { type: "enter" }>(
|
const unlistenEnter = listen<DragDropEvent & { type: "enter" }>(
|
||||||
"tauri://drag-enter",
|
"tauri://drag-enter",
|
||||||
async (event) => {
|
async (event) => {
|
||||||
if (await isValid(event.payload.paths)) setIsHovering("valid");
|
const result = await isValid(event.payload.paths);
|
||||||
else setIsHovering("invalid");
|
if (result.valid) setIsHovering({ state: "valid" });
|
||||||
|
else setIsHovering({ state: "invalid", detail: result.detail });
|
||||||
}
|
}
|
||||||
).then((fn) => fn);
|
).then((fn) => fn);
|
||||||
|
|
||||||
const unlistenLeave = listen("tauri://drag-leave", () => {
|
const unlistenLeave = listen("tauri://drag-leave", () => {
|
||||||
setIsHovering("off");
|
setIsHovering({ state: "off" });
|
||||||
}).then((fn) => fn);
|
}).then((fn) => fn);
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
@@ -86,22 +100,29 @@ export default function DragAndDrop({ className, onFile }: DragAndDropProps) {
|
|||||||
className={cn(
|
className={cn(
|
||||||
"flex flex-col items-center justify-center w-full h-64 border-2 border-dashed rounded-lg cursor-pointer bg-zinc-700 border-zinc-600",
|
"flex flex-col items-center justify-center w-full h-64 border-2 border-dashed rounded-lg cursor-pointer bg-zinc-700 border-zinc-600",
|
||||||
{
|
{
|
||||||
"hover:bg-zinc-800 hover:border-zinc-500": isHovering === "off",
|
"hover:bg-zinc-800 hover:border-zinc-500":
|
||||||
"bg-zinc-800 border-zinc-500": isHovering === "valid",
|
hoverState.state === "off",
|
||||||
|
"bg-zinc-800 border-zinc-500": hoverState.state === "valid",
|
||||||
"bg-red-800/25 border-red-700/25 cursor-not-allowed":
|
"bg-red-800/25 border-red-700/25 cursor-not-allowed":
|
||||||
isHovering === "invalid",
|
hoverState.state === "invalid",
|
||||||
}
|
}
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<div className="flex flex-col items-center justify-center pt-5 pb-6">
|
<div className="flex flex-col items-center justify-center pt-5 pb-6">
|
||||||
<FolderArrowDownIcon className="w-8 h-8 mb-4 text-zinc-500 dark:text-zinc-400" />
|
<FolderArrowDownIcon className="w-8 h-8 mb-4 text-zinc-400" />
|
||||||
<p className="mb-2 text-sm text-zinc-500 dark:text-zinc-400">
|
{hoverState.state !== "invalid" ? (
|
||||||
<span className="font-semibold">Click to select</span> or drag and
|
<>
|
||||||
drop a save file
|
<p className="mb-2 text-sm text-zinc-400">
|
||||||
|
<span className="font-semibold">Click to select</span> or drag
|
||||||
|
and drop a save file
|
||||||
</p>
|
</p>
|
||||||
<p className="text-xs text-zinc-500 dark:text-zinc-400">
|
<p className="text-xs text-zinc-400">
|
||||||
<Monoblock>.zip</Monoblock> files only
|
<Monoblock>.zip</Monoblock> files only
|
||||||
</p>
|
</p>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<p className="text-sm text-red-400">{hoverState.detail}</p>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -21,14 +21,7 @@ export default function SaveSelector() {
|
|||||||
});
|
});
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
return (
|
function Item({ file }: { file: SaveFile }) {
|
||||||
<>
|
|
||||||
<DragAndDrop className="mr-1.5 bg-red-500!" onFile={() => {}} />
|
|
||||||
<div className="mt-1 text-center select-none text-zinc-300 text-[0.85rem]">
|
|
||||||
Or, select a save file from below
|
|
||||||
</div>
|
|
||||||
<div className="mt-1.5 overflow-y-auto overflow-x-hidden pr-1.5 space-y-2">
|
|
||||||
{saveFiles.map((file) => {
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
class="flex items-center justify-between p-1 hover:cursor-pointer bg-zinc-700 rounded hover:bg-zinc-600 group"
|
class="flex items-center justify-between p-1 hover:cursor-pointer bg-zinc-700 rounded hover:bg-zinc-600 group"
|
||||||
@@ -45,6 +38,17 @@ export default function SaveSelector() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<DragAndDrop className="mr-1.5 bg-red-500!" onFile={() => {}} />
|
||||||
|
<div className="mt-1 text-center select-none text-zinc-300 text-[0.85rem]">
|
||||||
|
Or, select a save file from below
|
||||||
|
</div>
|
||||||
|
<div className="mt-1.5 overflow-y-auto overflow-x-hidden pr-2 space-y-2">
|
||||||
|
{saveFiles.map((file) => {
|
||||||
|
return <Item file={file} />;
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
|
|||||||
Reference in New Issue
Block a user