Skip to content

Commit 09e6f58

Browse files
matt-aitkenmatt-aitken
committed
Revert "ElectricSQL run page and react-window-splitter (triggerdotdev#1277)"
This reverts commit 5231381. # Conflicts: # pnpm-lock.yaml
1 parent aa79b01 commit 09e6f58

File tree

36 files changed

+2346
-2696
lines changed

36 files changed

+2346
-2696
lines changed

‎.env.example‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ DIRECT_URL=${DATABASE_URL}
1010
REMIX_APP_PORT=3030
1111
APP_ENV=development
1212
APP_ORIGIN=http://localhost:3030
13-
ELECTRIC_ORIGIN=http://localhost:3060
1413
NODE_ENV=development
1514
V3_ENABLED=true
1615

‎apps/webapp/app/components/code/CodeBlock.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Clipboard, ClipboardCheck } from "lucide-react";
22
import type { Language, PrismTheme } from "prism-react-renderer";
33
import { Highlight, Prism } from "prism-react-renderer";
4-
import { forwardRef, ReactNode, useCallback, useState } from "react";
4+
import { forwardRef, useCallback, useState } from "react";
55
import { cn } from "~/utils/cn";
66
import { Paragraph } from "../primitives/Paragraph";
77
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "../primitives/Tooltip";
@@ -385,7 +385,7 @@ function Chrome({ title }: { title?: string }) {
385385
);
386386
}
387387

388-
export function TitleRow({ title }: { title: ReactNode }) {
388+
export function TitleRow({ title }: { title: string }) {
389389
return (
390390
<div className="flex items-center justify-between px-3">
391391
<Paragraph variant="small/bright" className="w-full border-b border-grid-dimmed py-2">

‎apps/webapp/app/components/code/InlineCode.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { cn } from "~/utils/cn";
22

33
const inlineCode =
4-
"px-1 py-0.5 rounded border border-charcoal-700 bg-charcoal-800 text-charcoal-200 font-mono text-wrap";
4+
"px-1 py-0.5 rounded border border-charcoal-700 bg-charcoal-800 text-charcoal-200 font-mono";
55

66
const variants = {
77
"extra-extra-small": "text-xxs",

‎apps/webapp/app/components/primitives/Resizable.tsx‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,32 @@
11
"use client";
22

3-
import React from "react";
4-
import { PanelGroup, Panel, PanelResizer } from "react-window-splitter";
3+
import * as ResizablePrimitive from "react-resizable-panels";
54
import { cn } from "~/utils/cn";
65

7-
const ResizablePanelGroup = ({ className, ...props }: React.ComponentProps<typeof PanelGroup>) => (
8-
<PanelGroup
9-
className={cn(
10-
"flex w-full overflow-hidden data-[panel-group-direction=vertical]:flex-col",
11-
className
12-
)}
13-
autosaveStrategy={props.autosaveId ? "cookie" : undefined}
6+
const ResizablePanelGroup = ({
7+
className,
8+
...props
9+
}: React.ComponentProps<typeof ResizablePrimitive.PanelGroup>) => (
10+
<ResizablePrimitive.PanelGroup
11+
className={cn("flex w-full data-[panel-group-direction=vertical]:flex-col", className)}
1412
{...props}
1513
/>
1614
);
1715

18-
const ResizablePanel = Panel;
16+
const ResizablePanel = ResizablePrimitive.Panel;
1917

2018
const ResizableHandle = ({
21-
withHandle = true,
19+
withHandle,
2220
className,
2321
...props
24-
}: React.ComponentProps<typeof PanelResizer> & {
22+
}: React.ComponentProps<typeof ResizablePrimitive.PanelResizeHandle> & {
2523
withHandle?: boolean;
2624
}) => (
27-
<PanelResizer
25+
<ResizablePrimitive.PanelResizeHandle
2826
className={cn(
29-
"focus-visible:ring-ring group relative flex w-0.75 items-center justify-center after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2 data-[panel-group-direction=vertical]:h-px data-[panel-group-direction=vertical]:w-full data-[panel-group-direction=vertical]:after:left-0 data-[panel-group-direction=vertical]:after:h-1 data-[panel-group-direction=vertical]:after:w-full data-[panel-group-direction=vertical]:after:-translate-y-1/2 data-[panel-group-direction=vertical]:after:translate-x-0 hover:w-0.75 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-secondary/50 focus-visible:ring-offset-0 [&[data-panel-group-direction=vertical]>div]:rotate-90",
27+
"focus-visible:ring-ring group relative flex w-0.75 items-center justify-center after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2 data-[panel-group-direction=vertical]:h-px data-[panel-group-direction=vertical]:w-full data-[panel-group-direction=vertical]:after:left-0 data-[panel-group-direction=vertical]:after:h-1 data-[panel-group-direction=vertical]:after:w-full data-[panel-group-direction=vertical]:after:-translate-y-1/2 data-[panel-group-direction=vertical]:after:translate-x-0 hover:w-0.75 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-offset-1 [&[data-panel-group-direction=vertical]>div]:rotate-90",
3028
className
3129
)}
32-
size="3px"
3330
{...props}
3431
>
3532
<div className="absolute left-[0.0625rem] top-0 h-full w-px bg-grid-bright transition group-hover:left-0 group-hover:w-0.75 group-hover:bg-lavender-500" />
@@ -40,9 +37,7 @@ const ResizableHandle = ({
4037
))}
4138
</div>
4239
)}
43-
</PanelResizer>
40+
</ResizablePrimitive.PanelResizeHandle>
4441
);
4542

4643
export { ResizableHandle, ResizablePanel, ResizablePanelGroup };
47-
48-
export type ResizableSnapshot = React.ComponentProps<typeof PanelGroup>["snapshot"];

‎apps/webapp/app/components/primitives/TreeView/TreeView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ export function useTree<TData, TFilterValue>({
241241
index,
242242
});
243243
},
244-
overscan: 50,
244+
overscan: 20,
245245
});
246246

247247
const scrollToNodeFn = useCallback(

‎apps/webapp/app/components/runs/v3/InspectorTimeline.tsx‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)