Skip to content
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

Centralize color logic #266

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Centralize color logic #266

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
33 changes: 3 additions & 30 deletions packages/nameguard-react/src/components/RatedBox/RatedBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,16 @@
import React, { ReactNode } from "react";
import cc from "classcat";
import { Rating } from "@namehash/nameguard";

function borderColor(rating: Rating) {
switch (rating) {
case Rating.alert: {
return "border-red-200";
}
case Rating.pass: {
return "border-green-200";
}
case Rating.warn: {
return "border-yellow-200";
}
}
}

function shadowColor(rating: Rating) {
switch (rating) {
case Rating.alert: {
return "shadow-red-50";
}
case Rating.pass: {
return "shadow-green-50";
}
case Rating.warn: {
return "shadow-yellow-50";
}
}
}
import { ratingBorderColor, ratingShadowColor } from "../../utils/colors";

type RatedBoxProps = {
rating?: Rating;
children: ReactNode;
};

export const RatedBox = ({ rating, children }: RatedBoxProps) => {
const border = borderColor(rating);
const shadow = shadowColor(rating);
const border = ratingBorderColor(rating);
const shadow = ratingShadowColor(rating);

const wrapperClass = cc(["rounded-xl border shadow-xl", border, shadow]);

Expand Down
2 changes: 1 addition & 1 deletion packages/nameguard-react/src/components/Report/Banner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { RatingIcon, RatingIconSize } from "./RatingIcon";
import { RatedBox } from "../RatedBox/RatedBox";
import { ReportChangesApplied } from "./ReportChangesApplied";
import { ReportFormattedDisplayName } from "./ReportFormattedName";
import { ratingTextColor } from "../../utils/text";
import { ratingTextColor } from "../../utils/colors";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should create an alias for @ if it doesn't already exist so we can remove the relative imports once and for all.


type Props = {
report?: NameGuardReport;
Expand Down
2 changes: 1 addition & 1 deletion packages/nameguard-react/src/components/Report/LabelListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React, { Fragment } from "react";
import { GraphemeList } from "./GraphemeList";
import { NoGraphemesWarning } from "./NoGraphemesWarning";
import { CheckResultCode, NameGuardReport, Rating } from "@namehash/nameguard";
import { checkResultCodeTextColor } from "../../utils/text";
import { checkResultCodeTextColor } from "../../utils/colors";
import { RatingIcon } from "./RatingIcon";

type LabelListItemProps = {
Expand Down
2 changes: 1 addition & 1 deletion packages/nameguard-react/src/components/Report/NoGraphemesWarning.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from "react";
import cc from "classcat";
import { CheckResultCodeIcon } from "./CheckResultCodeIcon";
import { CheckResultCode } from "@namehash/nameguard";
import { checkResultCodeTextColor } from "../../utils/text";
import { checkResultCodeTextColor } from "../../utils/colors";
import { ShieldExclamationIcon } from "@heroicons/react/20/solid";

type Props = {
Expand Down
2 changes: 1 addition & 1 deletion packages/nameguard-react/src/components/Report/Report.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { useGraphemeModalStore } from "../../stores/grapheme";
import { ReportError } from "./ReportError";
import { ExternalLinks } from "../ExternalLinks/ExternalLinks";
import { Share } from "../Share/Share";
import { ratingTextColor } from "../../utils/text";
import { ratingTextColor } from "../../utils/colors";

type ReportProps = {
data?: NameGuardReport;
Expand Down
2 changes: 1 addition & 1 deletion packages/nameguard-react/src/components/Report/ReportError.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { RatedBox } from "../RatedBox/RatedBox";

import cc from "classcat";
import { CheckResultCode } from "@namehash/nameguard";
import { checkResultCodeTextColor } from "../../utils/text";
import { checkResultCodeTextColor } from "../../utils/colors";

export const ReportError = () => {
const [isOnline, setIsOnline] = useState(navigator.onLine);
Expand Down
2 changes: 1 addition & 1 deletion packages/nameguard-react/src/components/ReportIcon/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import cc from "classcat";
import { Tooltip } from "../Tooltip/Tooltip";
import { RatingLoadingIcon } from "../icons/RatingLoadingIcon";
import { RatingIcon, RatingIconSize } from "../Report/RatingIcon";
import { checkResultCodeTextColor, ratingTextColor } from "../../utils/text";
import { checkResultCodeTextColor, ratingTextColor } from "../../utils/colors";
import { ENSName } from "@namehash/ens-utils";
import { UnknownReportIcon } from "../UnknownReportIcon/UnknownReportIcon";

Expand Down
2 changes: 1 addition & 1 deletion packages/nameguard-react/src/components/Share/Share.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { toast } from "sonner";
import cc from "classcat";
import { Tooltip } from "../Tooltip/Tooltip";
import { CheckResultCode } from "@namehash/nameguard";
import { checkResultCodeTextColor } from "../../utils/text";
import { checkResultCodeTextColor } from "../../utils/colors";

type ShareProps = {
name?: string;
Expand Down
2 changes: 1 addition & 1 deletion packages/nameguard-react/src/components/icons/CheckResultCodeAlertIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from "react";
import cc from "classcat";
import { checkResultCodeTextColor } from "../../utils/text";
import { checkResultCodeTextColor } from "../../utils/colors";
import { CheckResultCode } from "@namehash/nameguard";

export const CheckResultCodeAlertIcon = ({
Expand Down
2 changes: 1 addition & 1 deletion packages/nameguard-react/src/components/icons/CheckResultCodeInfoIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from "react";
import cc from "classcat";
import { checkResultCodeTextColor } from "../../utils/text";
import { checkResultCodeTextColor } from "../../utils/colors";
import { CheckResultCode } from "@namehash/nameguard";

export const CheckResultCodeInfoIcon = ({
Expand Down
2 changes: 1 addition & 1 deletion packages/nameguard-react/src/components/icons/CheckResultCodePassIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from "react";
import cc from "classcat";
import { checkResultCodeTextColor } from "../../utils/text";
import { checkResultCodeTextColor } from "../../utils/colors";
import { CheckResultCode } from "@namehash/nameguard";

export const CheckResultCodePassIcon = ({
Expand Down
2 changes: 1 addition & 1 deletion packages/nameguard-react/src/components/icons/CheckResultCodeSkipIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from "react";
import cc from "classcat";
import { checkResultCodeTextColor } from "../../utils/text";
import { checkResultCodeTextColor } from "../../utils/colors";
import { CheckResultCode } from "@namehash/nameguard";

export const CheckResultCodeSkipIcon = ({
Expand Down
2 changes: 1 addition & 1 deletion packages/nameguard-react/src/components/icons/CheckResultCodeWarnIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from "react";
import cc from "classcat";
import { checkResultCodeTextColor } from "../../utils/text";
import { checkResultCodeTextColor } from "../../utils/colors";
import { CheckResultCode } from "@namehash/nameguard";

export const CheckResultCodeWarnIcon = ({
Expand Down
2 changes: 1 addition & 1 deletion packages/nameguard-react/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export { ratingTextColor, checkResultCodeTextColor } from "./utils/text";
export { ratingTextColor, checkResultCodeTextColor } from "./utils/colors";
export { Tooltip } from "./components/Tooltip/Tooltip";
export { Search } from "./components/Search/Search";
export { Report } from "./components/Report/Report";
Expand Down
55 changes: 34 additions & 21 deletions packages/nameguard-react/src/utils/text.ts → packages/nameguard-react/src/utils/colors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,62 +4,75 @@ export function checkResultCodeTextColor(
check: CheckResultCode,
isInteractive = false,
): string {
let color: string | null = null;

switch (check) {
case CheckResultCode.alert: {
color = isInteractive
return isInteractive
? "text-red-600 hover:text-red-700"
: "text-red-600";
break;
}
case CheckResultCode.pass: {
color = isInteractive
return isInteractive
? "text-emerald-600 hover:text-emerald-800"
: "text-emerald-600";
break;
}
case CheckResultCode.warn: {
color = isInteractive
return isInteractive
? "text-yellow-600 hover:text-yellow-700"
: "text-yellow-600";
break;
}
case CheckResultCode.info:
case CheckResultCode.skip: {
color = isInteractive
return isInteractive
? "text-gray-400 hover:text-gray-500"
: "text-gray-400";
break;
}
}

return color;
}

export function ratingTextColor(rating: Rating, isInteractive = false): string {
let color: string | null = null;

switch (rating) {
case Rating.alert: {
color = isInteractive
return isInteractive
? "text-red-600 hover:text-red-700"
: "text-red-600";
break;
}
case Rating.pass: {
color = isInteractive
return isInteractive
? "text-emerald-600 hover:text-emerald-800"
: "text-emerald-600";
break;
}
case Rating.warn: {
color = isInteractive
return isInteractive
? "text-yellow-600 hover:text-yellow-700"
: "text-yellow-600";
break;
}
}
}

export function ratingBorderColor(rating: Rating): string {
switch (rating) {
case Rating.alert: {
return "border-red-200";
}
case Rating.pass: {
return "border-green-200";
}
case Rating.warn: {
return "border-yellow-200";
}
}
}

return color;
export function ratingShadowColor(rating: Rating): string {
switch (rating) {
case Rating.alert: {
return "shadow-red-50";
}
case Rating.pass: {
return "shadow-green-50";
}
case Rating.warn: {
return "shadow-yellow-50";
}
}
}
Loading