Skip to content

feat(ui): add interactive hover focus and disabled states to loading … #354

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
iamTissan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(ui): add interactive hover focus and disabled states to loading … #354

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
72 changes: 72 additions & 0 deletions __tests__/loading_spinner_skeleton.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
import React from "react";
import { describe, it, expect, vi } from "vitest";
import { render, screen, fireEvent } from "@testing-library/react";
import LoadingSkeleton from "../app/components/LoadingSkeleton";
import ButtonSpinner from "../app/components/ButtonSpinner";

describe("LoadingSkeleton Component", () => {
it("renders with default status role and polite aria-live", () => {
render(<LoadingSkeleton />);
const skeleton = screen.getByRole("status");
expect(skeleton).toBeInTheDocument();
expect(skeleton).toHaveAttribute("aria-live", "polite");
expect(screen.getByText("Loading job data...")).toBeInTheDocument();
});

it("applies interactive hover, transition, and focus-visible classes when interactive is true", () => {
render(<LoadingSkeleton interactive />);
const buttonElement = screen.getByRole("button");
expect(buttonElement).toBeInTheDocument();
expect(buttonElement).toHaveClass("cursor-pointer");
expect(buttonElement).toHaveClass("hover:border-gray-700");
expect(buttonElement).toHaveClass("focus-visible:ring-2");
expect(buttonElement).toHaveClass("focus-visible:ring-blue-500");
});

it("handles click and keyboard events when interactive", () => {
const handleClick = vi.fn();
render(<LoadingSkeleton interactive onClick={handleClick} />);
const buttonElement = screen.getByRole("button");

fireEvent.click(buttonElement);
expect(handleClick).toHaveBeenCalledTimes(1);

fireEvent.keyDown(buttonElement, { key: "Enter", code: "Enter" });
expect(handleClick).toHaveBeenCalledTimes(2);

fireEvent.keyDown(buttonElement, { key: " ", code: "Space" });
expect(handleClick).toHaveBeenCalledTimes(3);
});

it("applies disabled classes and disables interactions when disabled is true", () => {
const handleClick = vi.fn();
render(<LoadingSkeleton interactive disabled onClick={handleClick} />);
const buttonElement = screen.getByRole("button", { hidden: true });

expect(buttonElement).toHaveClass("opacity-50");
expect(buttonElement).toHaveClass("cursor-not-allowed");
expect(buttonElement).toHaveAttribute("aria-disabled", "true");
expect(buttonElement).toHaveAttribute("tabIndex", "-1");

fireEvent.click(buttonElement);
expect(handleClick).not.toHaveBeenCalled();
});
});

describe("ButtonSpinner Component", () => {
it("renders spinner SVG with default classes", () => {
render(<ButtonSpinner />);
const spinner = screen.getByTestId("button-spinner");
expect(spinner).toBeInTheDocument();
expect(spinner).toHaveClass("animate-spin");
expect(spinner).toHaveClass("h-3.5");
expect(spinner).toHaveClass("w-3.5");
});

it("applies disabled classes when disabled prop is provided", () => {
render(<ButtonSpinner disabled />);
const spinner = screen.getByTestId("button-spinner");
expect(spinner).toHaveClass("opacity-50");
expect(spinner).toHaveClass("cursor-not-allowed");
});
});
21 changes: 16 additions & 5 deletions app/components/ButtonSpinner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,40 @@
import React from "react";

interface Props {
className?: string;
disabled?: boolean;
}

export default function ButtonSpinner({ className = "h-3.5 w-3.5" }: Props) {
export default function ButtonSpinner({
className = "h-3.5 w-3.5",
disabled = false,
}: Props) {
const disabledClasses = disabled
? "opacity-50 cursor-not-allowed"
: "opacity-100 hover:opacity-90";

return (
<svg
className={`animate-spin ${className}`}
className={`animate-spin transition-opacity duration-200 ease-in-out ${disabledClasses} ${className}`}
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
aria-hidden="true"
data-testid="button-spinner"
>
<circle
className="opacity-25"
className="opacity-25 transition-colors duration-200"
cx="12"
cy="12"
r="10"
stroke="currentColor"
strokeWidth="4"
/>
<path
className="opacity-75"
className="opacity-75 transition-colors duration-200"
fill="currentColor"
d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
/>
</svg>
);
}
}
123 changes: 85 additions & 38 deletions app/components/LoadingSkeleton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,86 @@
export default function LoadingSkeleton() {
return (
<div className="animate-pulse" role="status" aria-live="polite">
<span className="sr-only">Loading job data…</span>
<div className="border border-gray-800 rounded-xl bg-gray-900 p-6 space-y-6" aria-hidden="true">
<div className="flex items-center justify-between mb-6">
<div>
<div className="h-6 w-32 bg-gray-800 rounded mb-2"></div>
<div className="h-4 w-24 bg-gray-800 rounded"></div>
</div>
</div>
<div className="grid grid-cols-1 md:grid-cols-3 gap-4 mb-6">
<div className="bg-gray-800 rounded-lg p-3">
<div className="h-4 w-12 bg-gray-700 rounded mb-2"></div>
<div className="h-4 w-28 bg-gray-700 rounded"></div>
</div>
<div className="bg-gray-800 rounded-lg p-3">
<div className="h-4 w-12 bg-gray-700 rounded mb-2"></div>
<div className="h-4 w-28 bg-gray-700 rounded"></div>
</div>
<div className="bg-gray-800 rounded-lg p-3">
<div className="h-4 w-12 bg-gray-700 rounded mb-2"></div>
<div className="h-4 w-28 bg-gray-700 rounded"></div>
</div>
</div>
<div className="space-y-4">
<div className="border border-gray-800 rounded-lg p-4 bg-gray-900">
<div className="h-4 w-24 bg-gray-800 rounded mb-2"></div>
<div className="h-4 w-32 bg-gray-800 rounded"></div>
</div>
<div className="border border-gray-800 rounded-lg p-4 bg-gray-900">
<div className="h-4 w-24 bg-gray-800 rounded mb-2"></div>
<div className="h-4 w-32 bg-gray-800 rounded"></div>
</div>
</div>
</div>
</div>
);
import React from "react";

interface LoadingSkeletonProps {
className?: string;
interactive?: boolean;
disabled?: boolean;
onClick?: () => void;
"aria-label"?: string;
tabIndex?: number;
}

export default function LoadingSkeleton({
className = "",
interactive = false,
disabled = false,
onClick,
"aria-label": ariaLabel,
tabIndex,
}: LoadingSkeletonProps) {
const interactiveClasses = interactive
? "cursor-pointer transition-all duration-200 ease-in-out hover:border-gray-700 hover:bg-gray-900/90 hover:shadow-lg hover:shadow-gray-950/50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-blue-500 focus-visible:ring-offset-2 focus-visible:ring-offset-gray-950"
: "";

const disabledClasses = disabled
? "opacity-50 cursor-not-allowed pointer-events-none"
: "";

return (
<div
className={`animate-pulse ${interactiveClasses} ${disabledClasses} ${className}`}
role={interactive ? "button" : "status"}
aria-live={interactive ? undefined : "polite"}
aria-disabled={disabled ? "true" : undefined}
tabIndex={interactive ? (disabled ? -1 : tabIndex ?? 0) : undefined}
onClick={!disabled ? onClick : undefined}
onKeyDown={
interactive && !disabled && onClick
? (e) => {
if (e.key === "Enter" || e.key === " ") {
e.preventDefault();
onClick();
}
}
: undefined
}
aria-label={ariaLabel}
>
<span className="sr-only">Loading job data...</span>
<div
className="border border-gray-800 rounded-xl bg-gray-900 p-6 space-y-6 transition-colors duration-200"
aria-hidden="true"
>
<div className="flex items-center justify-between mb-6">
<div>
<div className="h-6 w-32 bg-gray-800 rounded mb-2 transition-colors duration-200"></div>
<div className="h-4 w-24 bg-gray-800 rounded transition-colors duration-200"></div>
</div>
</div>
<div className="grid grid-cols-1 md:grid-cols-3 gap-4 mb-6">
<div className="bg-gray-800 rounded-lg p-3 transition-colors duration-200 hover:bg-gray-750">
<div className="h-4 w-12 bg-gray-700 rounded mb-2"></div>
<div className="h-4 w-28 bg-gray-700 rounded"></div>
</div>
<div className="bg-gray-800 rounded-lg p-3 transition-colors duration-200 hover:bg-gray-750">
<div className="h-4 w-12 bg-gray-700 rounded mb-2"></div>
<div className="h-4 w-28 bg-gray-700 rounded"></div>
</div>
<div className="bg-gray-800 rounded-lg p-3 transition-colors duration-200 hover:bg-gray-750">
<div className="h-4 w-12 bg-gray-700 rounded mb-2"></div>
<div className="h-4 w-28 bg-gray-700 rounded"></div>
</div>
</div>
<div className="space-y-4">
<div className="border border-gray-800 rounded-lg p-4 bg-gray-900 transition-colors duration-200 hover:border-gray-700">
<div className="h-4 w-24 bg-gray-800 rounded mb-2"></div>
<div className="h-4 w-32 bg-gray-800 rounded"></div>
</div>
<div className="border border-gray-800 rounded-lg p-4 bg-gray-900 transition-colors duration-200 hover:border-gray-700">
<div className="h-4 w-24 bg-gray-800 rounded mb-2"></div>
<div className="h-4 w-32 bg-gray-800 rounded"></div>
</div>
</div>
</div>
</div>
);
}