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.

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

feat: changes overlay settings #1409

Merged
merged 1 commit into from
Nov 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions apps/frontend/src/containers/Team/SubscribeDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
DialogTitle,
DialogTrigger,
} from "@/ui/Dialog";
import { FormLabel } from "@/ui/FormLabel";
import { Label } from "@/ui/Label";
import { Modal } from "@/ui/Modal";
import { StripeCheckoutButton } from "@/ui/StripeLink";

Expand Down Expand Up @@ -80,7 +80,7 @@ export function TeamSubscribeDialog({
<DialogTitle>Subscribe to Pro plan</DialogTitle>

<div className="my-4">
<FormLabel>Team to subscribe</FormLabel>
<Label>Team to subscribe</Label>
<AccountSelector
accounts={sortedTeams}
disabledAccountIds={disabledAccountIds}
Expand Down
55 changes: 43 additions & 12 deletions apps/frontend/src/pages/Build/BuildDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ import { useScrollListener } from "@/ui/useScrollListener";
import { useColoredRects } from "@/util/color-detection/hook";

import { BuildDetailToolbar } from "./BuildDetailToolbar";
import {
useBuildDiffColorState,
useBuildDiffColorStyle,
} from "./BuildDiffColorState";
import {
BuildDiffFitStateProvider,
useBuildDiffFitState,
Expand Down Expand Up @@ -175,14 +179,17 @@ function getImageScale(element: HTMLImageElement) {
return element.height / element.naturalHeight;
}

function ScreenshotPicture(
props: Omit<React.ComponentProps<typeof TwicPicture>, "width" | "height"> & {
src: string;
width?: number | null | undefined;
height?: number | null | undefined;
onScaleChange?: (scale: number | null) => void;
},
) {
type ScreenshotPictureProps = Omit<
React.ComponentProps<typeof TwicPicture>,
"width" | "height"
> & {
src: string;
width?: number | null | undefined;
height?: number | null | undefined;
onScaleChange?: (scale: number | null) => void;
};

function ScreenshotPicture(props: ScreenshotPictureProps) {
const { src, style, width, height, onScaleChange, ...attrs } = props;
const transform = useZoomTransform();
const ref = useRef<HTMLImageElement>(null);
Expand Down Expand Up @@ -413,7 +420,7 @@ const CompareScreenshot = ({
}) => {
const { visible } = useBuildDiffVisibleState();
const { contained } = useBuildDiffFitState();
const opacity = visible ? "" : "opacity-0";
const opacity = visible ? "opacity-70" : "opacity-0";
switch (diff.status) {
case ScreenshotDiffStatus.Added: {
return (
Expand Down Expand Up @@ -550,7 +557,7 @@ function CompareScreenshotChanged(props: {
)}
{...getScreenshotPictureProps(diff.compareScreenshot!)}
/>
<ScreenshotPicture
<ChangesScreenshotPicture
className={clsx(
opacity,
"relative z-10",
Expand All @@ -575,6 +582,17 @@ function CompareScreenshotChanged(props: {
);
}

function ChangesScreenshotPicture(props: ScreenshotPictureProps) {
const style = useBuildDiffColorStyle();
return (
<ScreenshotPicture
alt="Changes screenshot"
{...props}
style={{ ...props.style, ...style }}
/>
);
}

/**
* Detects colored areas in the image provided by the URL.
*/
Expand Down Expand Up @@ -607,9 +625,9 @@ function DiffIndicator(props: {
style={{ transform: `scaleY(${props.scale})` }}
>
{rects.map((rect, index) => (
<div
<DiffIndicatorRect
key={index}
className="bg-danger-solid absolute w-1.5"
className="absolute w-1.5"
style={{
top: rect.y,
height: rect.height,
Expand All @@ -623,6 +641,19 @@ function DiffIndicator(props: {
);
}

function DiffIndicatorRect(props: React.ComponentPropsWithoutRef<"div">) {
const { color } = useBuildDiffColorState();
return (
<div
{...props}
style={{
backgroundColor: color,
...props.style,
}}
/>
);
}

const BuildScreenshots = memo(
(props: { diff: Diff; build: BuildFragmentDocument }) => {
const { viewMode } = useBuildDiffViewModeState();
Expand Down
3 changes: 3 additions & 0 deletions apps/frontend/src/pages/Build/BuildDetailToolbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { ViewportIndicator } from "./metadata/ViewportIndicator";
import { FitToggle } from "./toolbar/FitToggle";
import { NextButton, PreviousButton } from "./toolbar/NavButtons";
import { OverlayToggle } from "./toolbar/OverlayToggle";
import { SettingsButton } from "./toolbar/SettingsButton";
import { TrackButtons } from "./toolbar/TrackButtons";
import { SplitViewToggle, ViewToggle } from "./toolbar/ViewToggle";

Expand Down Expand Up @@ -145,6 +146,8 @@ export const BuildDetailToolbar = memo(function BuildDetailToolbar({
</>
)}
/>
<Separator orientation="vertical" className="mx-1 !h-6" />
<SettingsButton />
</div>
</div>
);
Expand Down
54 changes: 54 additions & 0 deletions apps/frontend/src/pages/Build/BuildDiffColorState.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import { createContext, useContext, useMemo } from "react";
import { invariant } from "@argos/util/invariant";

import { useStorageState } from "@/util/useStorageState";

type DiffColorContextValue = {
color: string;
setColor: React.Dispatch<React.SetStateAction<string>>;
opacity: number;
setOpacity: React.Dispatch<React.SetStateAction<number>>;
};

const DiffColorContext = createContext<DiffColorContextValue | null>(null);

export function useBuildDiffColorState() {
const context = useContext(DiffColorContext);
invariant(
context,
"useBuildDiffColorState must be used within a BuildDiffColorStateProvider",
);
return context;
}

export function useBuildDiffColorStyle() {
const { color, opacity } = useBuildDiffColorState();
return {
filter: `drop-shadow(0 2000px 0 ${color})`,
transform: "translateY(-2000px)",
overflow: "hidden",
opacity,
};
}

export function BuildDiffColorStateProvider(props: {
children: React.ReactNode;
}) {
const [color, setColor] = useStorageState(
"preferences.overlay.color",
"#FD3A4A",
);
const [opacity, setOpacity] = useStorageState(
"preferences.overlay.opacity",
0.8,
);
const value = useMemo(
(): DiffColorContextValue => ({ color, setColor, opacity, setOpacity }),
[color, setColor, opacity, setOpacity],
);
return (
<DiffColorContext.Provider value={value}>
{props.children}
</DiffColorContext.Provider>
);
}
13 changes: 9 additions & 4 deletions apps/frontend/src/pages/Build/BuildDiffList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ import { Badge } from "@/ui/Badge";
import { Button, ButtonIcon, ButtonProps } from "@/ui/Button";
import { HotkeyTooltip } from "@/ui/HotkeyTooltip";
import { Truncable } from "@/ui/Truncable";
import { TwicPicture } from "@/ui/TwicPicture";
import { TwicPicture, TwicPictureProps } from "@/ui/TwicPicture";

import { useBuildDiffColorStyle } from "./BuildDiffColorState";
import { getGroupLabel } from "./BuildDiffGroup";
import {
Diff,
Expand Down Expand Up @@ -309,10 +310,9 @@ const DiffImage = memo(({ diff }: { diff: Diff }) => {
<TwicPicture
key={compareKey}
{...compareAttrs}
className="absolute w-full"
className="opacity-disabled absolute w-full"
/>
<div className="bg-app absolute inset-0 opacity-70" />
<TwicPicture
<DiffPicture
key={diffKey}
{...diffAttrs}
className="relative z-10 max-h-full w-full"
Expand All @@ -326,6 +326,11 @@ const DiffImage = memo(({ diff }: { diff: Diff }) => {
}
});

function DiffPicture(props: TwicPictureProps) {
const style = useBuildDiffColorStyle();
return <TwicPicture {...props} style={{ ...style, ...props.style }} />;
}

const CardStack = ({
isFirst,
isLast,
Expand Down
6 changes: 6 additions & 0 deletions apps/frontend/src/pages/Build/BuildHotkeys.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,12 @@ export function useBuildHotkey(
return;
}

if (
document.getElementById("root")?.getAttribute("aria-hidden") === "true"
) {
return;
}

// Ignore key events from menu & menuitem elements
if (
event.target instanceof HTMLElement &&
Expand Down
65 changes: 34 additions & 31 deletions apps/frontend/src/pages/Build/BuildPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { PaymentBanner } from "@/containers/PaymentBanner";
import { graphql } from "@/gql";

import { BuildContextProvider } from "./BuildContext";
import { BuildDiffColorStateProvider } from "./BuildDiffColorState";
import { BuildDiffProvider } from "./BuildDiffState";
import { BuildHotkeysDialog } from "./BuildHotkeys";
import { useBuildHotkeysDialogState } from "./BuildHotkeysDialogState";
Expand Down Expand Up @@ -83,39 +84,41 @@ export const BuildPage = ({ params }: { params: BuildParams }) => {
return (
<BuildContextProvider permissions={data?.project?.permissions ?? null}>
<BuildDiffProvider params={params} build={build}>
<BuildReviewStateProvider
params={params}
buildStatus={data?.project?.build?.status ?? null}
>
<BuildReviewDialogProvider project={data?.project ?? null}>
{hotkeysDialog && <BuildHotkeysDialog state={hotkeysDialog} />}
<div className="flex h-screen min-h-0 flex-col">
{data?.project?.account && (
<>
<PaymentBanner account={data.project.account} />
<OvercapacityBanner
account={data.project.account}
accountSlug={params.accountSlug}
/>
</>
)}
<BuildHeader
buildNumber={params.buildNumber}
accountSlug={params.accountSlug}
projectName={params.projectName}
build={build}
project={data?.project ?? null}
/>
{project && build ? (
<BuildWorkspace
params={params}
<BuildDiffColorStateProvider>
<BuildReviewStateProvider
params={params}
buildStatus={data?.project?.build?.status ?? null}
>
<BuildReviewDialogProvider project={data?.project ?? null}>
{hotkeysDialog && <BuildHotkeysDialog state={hotkeysDialog} />}
<div className="flex h-screen min-h-0 flex-col">
{data?.project?.account && (
<>
<PaymentBanner account={data.project.account} />
<OvercapacityBanner
account={data.project.account}
accountSlug={params.accountSlug}
/>
</>
)}
<BuildHeader
buildNumber={params.buildNumber}
accountSlug={params.accountSlug}
projectName={params.projectName}
build={build}
project={project}
project={data?.project ?? null}
/>
) : null}
</div>
</BuildReviewDialogProvider>
</BuildReviewStateProvider>
{project && build ? (
<BuildWorkspace
params={params}
build={build}
project={project}
/>
) : null}
</div>
</BuildReviewDialogProvider>
</BuildReviewStateProvider>
</BuildDiffColorStateProvider>
</BuildDiffProvider>
</BuildContextProvider>
);
Expand Down
Loading