Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
feat(ripple): integrate Ripple sidebar into browser layout
- Add 5-slot ResizablePanelGroup layout (Ripple left, main sidebar left,
  content, main sidebar right, Ripple right) in main.tsx
- Create RippleSidebarGate wrapper to read rippleEnabled setting and pass
  isEnabled prop to RippleSidebarProvider
- Gate PresenceRippleSidebar rendering on isEnabled
- Send ripple sidebar params (width, visible, animating) in
  BrowserContent's setLayoutParams call
  • Loading branch information
iamEvanYT committed Mar 3, 2026
commit 9a4ff511e70e2a41c74675d6e0bd895862d02b95
35 changes: 31 additions & 4 deletions src/renderer/src/components/browser-ui/browser-content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { memo, useLayoutEffect, useRef } from "react";
import { PageLayoutParams } from "~/flow/types";
import { cn } from "@/lib/utils";
import { useBrowserSidebar } from "@/components/browser-ui/browser-sidebar/provider";
import { useRippleSidebar } from "@/components/browser-ui/ripple-sidebar/provider";
import { useAdaptiveTopbar } from "@/components/browser-ui/adaptive-topbar";

/**
Expand All @@ -20,6 +21,12 @@ import { useAdaptiveTopbar } from "@/components/browser-ui/adaptive-topbar";
*/
function BrowserContent() {
const { mode, recordedSidebarSizeRef, isAnimating, attachedDirection, onSidebarResize } = useBrowserSidebar();
const {
isVisible: rippleVisible,
isAnimating: rippleAnimating,
recordedSidebarSizeRef: rippleSizeRef,
onSidebarResize: onRippleResize
} = useRippleSidebar();
const { topbarHeight, topbarVisible, contentTopOffset } = useAdaptiveTopbar();

// Derive sidebar visibility from the mode.
Expand All @@ -32,25 +39,37 @@ function BrowserContent() {
const sidebarSide = attachedDirection;

// Helper: build and send layout params to the main process.
const sendLayoutParams = (sidebarWidth: number) => {
const sendLayoutParams = (sidebarWidth: number, rippleWidth?: number) => {
const params: PageLayoutParams = {
topbarHeight,
topbarVisible,
sidebarWidth,
sidebarSide,
sidebarVisible,
sidebarAnimating: isAnimating,
contentTopOffset
contentTopOffset,
rippleSidebarWidth: rippleWidth ?? rippleSizeRef.current,
rippleSidebarVisible: rippleVisible,
rippleSidebarAnimating: rippleAnimating
};
flow.page.setLayoutParams(params);
};

// Send layout params whenever reactive state changes (visibility, animation,
// topbar, direction). Uses the ref for sidebarWidth since it's always current.
useLayoutEffect(() => {
sendLayoutParams(recordedSidebarSizeRef.current);
sendLayoutParams(recordedSidebarSizeRef.current, rippleSizeRef.current);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [topbarHeight, topbarVisible, sidebarVisible, sidebarSide, isAnimating, contentTopOffset]);
}, [
topbarHeight,
topbarVisible,
sidebarVisible,
sidebarSide,
isAnimating,
contentTopOffset,
rippleVisible,
rippleAnimating
]);

// Subscribe to sidebar resize (drag) events. The callback fires outside
// the React render cycle, so it doesn't cause re-renders of any consumer.
Expand All @@ -59,12 +78,20 @@ function BrowserContent() {
const sendLayoutParamsRef = useRef(sendLayoutParams);
sendLayoutParamsRef.current = sendLayoutParams;

// Subscribe to main sidebar resize
useLayoutEffect(() => {
return onSidebarResize((width) => {
sendLayoutParamsRef.current(width);
});
}, [onSidebarResize]);

// Subscribe to Ripple sidebar resize
useLayoutEffect(() => {
return onRippleResize((width) => {
sendLayoutParamsRef.current(recordedSidebarSizeRef.current, width);
});
}, [onRippleResize, recordedSidebarSizeRef]);

return (
<div className={cn("rounded-lg", "flex-1 relative remove-app-drag", "bg-white/20", "shadow-xl shadow-black/20")} />
);
Expand Down
85 changes: 66 additions & 19 deletions src/renderer/src/components/browser-ui/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ import {
useBrowserSidebar
} from "@/components/browser-ui/browser-sidebar/provider";
import { BrowserSidebar } from "@/components/browser-ui/browser-sidebar/component";
import { RippleSidebarProvider, useRippleSidebar } from "@/components/browser-ui/ripple-sidebar/provider";
import { RippleSidebar } from "@/components/browser-ui/ripple-sidebar/component";
import { AnimatePresence, motion } from "motion/react";
import { memo, useEffect, useLayoutEffect, useRef, useState } from "react";
import { SettingsProvider } from "@/components/providers/settings-provider";
import { SettingsProvider, useSettings } from "@/components/providers/settings-provider";
import { ResizableHandle, ResizablePanel } from "@/components/ui/resizable";
import { ResizablePanelGroupWithProvider } from "@/components/ui/resizable-extras";
import { UpdateEffect } from "@/components/browser-ui/update-effect";
Expand Down Expand Up @@ -97,6 +99,23 @@ export function PresenceSidebar({ sidebarMode, targetSidebarModes, direction, or
);
}

interface PresenceRippleSidebarProps {
direction: "left" | "right";
order: number;
}
function PresenceRippleSidebar({ direction, order }: PresenceRippleSidebarProps) {
const { isVisible, isEnabled } = useRippleSidebar();

// Don't render anything when Ripple is disabled in settings.
if (!isEnabled) return null;

return (
<AnimatePresence>
{isVisible && <RippleSidebar key="ripple-attached" direction={direction} order={order} />}
</AnimatePresence>
);
}

// --- Isolated tab-dependent components --- //
// These subscribe to useTabs() independently so the main layout tree
// does NOT rerender on every tab data update (loading, title, url, etc.)
Expand Down Expand Up @@ -229,10 +248,15 @@ function InternalBrowserUI({ isReady, type }: { isReady: boolean; type: BrowserU
// NOTE: No useTabs() here! Tab-dependent logic is isolated in the
// components above to prevent the entire layout from rerendering.
const { mode: sidebarMode, attachedDirection } = useBrowserSidebar();
const { isVisible: rippleVisible, side: rippleSide, isEnabled: rippleEnabled } = useRippleSidebar();
const { topbarVisible, topbarHeight } = useAdaptiveTopbar();

const hasSidebar = type === "main";

// Determine which sidebars are attached on each side for resize handle logic.
const hasAttachedLeft = sidebarMode === "attached-left" || (rippleVisible && rippleSide === "left");
const hasAttachedRight = sidebarMode === "attached-right" || (rippleVisible && rippleSide === "right");

return (
<FullscreenGuard>
<MinimalToastProvider sidebarSide={attachedDirection}>
Expand All @@ -254,6 +278,11 @@ function InternalBrowserUI({ isReady, type }: { isReady: boolean; type: BrowserU
className={cn("w-full h-[calc(100vh-var(--topbar-height))] flex flex-row items-center justify-center")}
style={{ "--topbar-height": `${topbarHeight}px` } as React.CSSProperties}
>
{/* Ripple sidebar on the left (when main sidebar is on the right) */}
{hasSidebar && rippleEnabled && rippleSide === "left" && (
<PresenceRippleSidebar direction="left" order={0} />
)}

{hasSidebar && (
<PresenceSidebar
sidebarMode={sidebarMode}
Expand All @@ -268,10 +297,10 @@ function InternalBrowserUI({ isReady, type }: { isReady: boolean; type: BrowserU
className={cn("flex-1 h-full py-3 overflow-visible!", topbarVisible && "pt-0")}
>
<div className="w-full h-full flex items-center justify-center remove-app-drag">
{sidebarMode !== "attached-left" ? (
<div className="w-3" />
) : (
{hasAttachedLeft ? (
<SidebarResizeHandle key="left-sidebar-resize-handle" />
) : (
<div className="w-3" />
)}

<div className="relative w-full h-full flex flex-col">
Expand All @@ -281,10 +310,10 @@ function InternalBrowserUI({ isReady, type }: { isReady: boolean; type: BrowserU
<BrowserContent />
</div>

{sidebarMode !== "attached-right" ? (
<div className="w-3" />
) : (
{hasAttachedRight ? (
<SidebarResizeHandle key="right-sidebar-resize-handle" />
) : (
<div className="w-3" />
)}
</div>
</ResizablePanel>
Expand All @@ -296,6 +325,11 @@ function InternalBrowserUI({ isReady, type }: { isReady: boolean; type: BrowserU
order={3}
/>
)}

{/* Ripple sidebar on the right (when main sidebar is on the left) */}
{hasSidebar && rippleEnabled && rippleSide === "right" && (
<PresenceRippleSidebar direction="right" order={4} />
)}
</div>
</ResizablePanelGroupWithProvider>

Expand All @@ -307,6 +341,17 @@ function InternalBrowserUI({ isReady, type }: { isReady: boolean; type: BrowserU
);
}

/**
* Wrapper that reads the `rippleEnabled` setting and passes it to
* RippleSidebarProvider. Must be rendered inside SettingsProvider +
* BrowserSidebarProvider since both contexts are required.
*/
function RippleSidebarGate({ children }: { children: React.ReactNode }) {
const { getSetting } = useSettings();
const isEnabled = getSetting<boolean>("rippleEnabled") ?? false;
return <RippleSidebarProvider isEnabled={isEnabled}>{children}</RippleSidebarProvider>;
}

export function BrowserUI({ type }: { type: BrowserUIType }) {
const [isReady, setIsReady] = useState(false);

Expand All @@ -320,18 +365,20 @@ export function BrowserUI({ type }: { type: BrowserUIType }) {
<AppUpdatesProvider>
<SettingsProvider>
<BrowserSidebarProvider hasSidebar={type === "main"}>
<AdaptiveTopbarProvider>
<SpacesProvider windowType={type}>
<TabsProvider>
<BrowserActionProvider>
<ExtensionsProviderWithSpaces>
<TabDisabler />
<InternalBrowserUI isReady={isReady} type={type} />
</ExtensionsProviderWithSpaces>
</BrowserActionProvider>
</TabsProvider>
</SpacesProvider>
</AdaptiveTopbarProvider>
<RippleSidebarGate>
<AdaptiveTopbarProvider>
<SpacesProvider windowType={type}>
<TabsProvider>
<BrowserActionProvider>
<ExtensionsProviderWithSpaces>
<TabDisabler />
<InternalBrowserUI isReady={isReady} type={type} />
</ExtensionsProviderWithSpaces>
</BrowserActionProvider>
</TabsProvider>
</SpacesProvider>
</AdaptiveTopbarProvider>
</RippleSidebarGate>
</BrowserSidebarProvider>
</SettingsProvider>
</AppUpdatesProvider>
Expand Down