Skip to content
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
2 changes: 1 addition & 1 deletion frontend/components/animate-ui/radix/dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ function DialogContent({
initial={{opacity: 0}}
animate={{opacity: 1}}
exit={{opacity: 0}}
transition={{duration: 0.15, ease: 'easeOut'}}
transition={{duration: 0}}
/>
</DialogOverlay>
<DialogPrimitive.Content asChild forceMount {...props}>
Expand Down
10 changes: 5 additions & 5 deletions frontend/components/animate-ui/radix/tabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,10 @@ function TabsContent({
data-slot="tabs-content"
className={cn('flex-1 outline-none', className)}
layout
initial={{opacity: 0, y: -10}}
animate={{opacity: 1, y: 0}}
exit={{opacity: 0, y: 10}}
transition={{...transition, duration: 0.1}}
initial={{opacity: 0}}
animate={{opacity: 1}}
exit={{opacity: 0}}
transition={transition}
{...props}
>
{children}
Expand All @@ -188,7 +188,7 @@ function TabsContents({
}: TabsContentsProps) {
const containerRef = React.useRef<HTMLDivElement | null>(null);

const [height, setHeight] = React.useState(0);
const [height, setHeight] = React.useState<number | 'auto'>('auto');

React.useEffect(() => {
if (!containerRef.current) return;
Expand Down
40 changes: 34 additions & 6 deletions frontend/components/common/layout/ManagementBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,12 @@ type DockPosition = {
y: number;
};

type DockPositions = Partial<Record<DockViewport, DockPosition>>;
type StoredDockPosition = DockPosition & {
viewportWidth?: number;
viewportHeight?: number;
};

type DockPositions = Partial<Record<DockViewport, StoredDockPosition>>;

/**
* 获取信任等级对应的文本描述
Expand Down Expand Up @@ -123,7 +128,11 @@ export function ManagementBar() {

const nextPositions = {
...readDockPositions(),
[viewport]: position,
[viewport]: {
...position,
viewportWidth: window.innerWidth,
viewportHeight: window.innerHeight,
},
};

window.localStorage.setItem(DOCK_STORAGE_KEY, JSON.stringify(nextPositions));
Expand Down Expand Up @@ -167,6 +176,25 @@ export function ManagementBar() {
return clampDockPosition(basePosition);
}, [clampDockPosition, getDockRect]);

const getScaledDockPosition = useCallback((position: StoredDockPosition): DockPosition => {
if (typeof window === 'undefined' || !position.viewportWidth || !position.viewportHeight) {
return clampDockPosition(position);
}

const {width, height} = getDockRect();
const oldMaxX = Math.max(DOCK_MARGIN, position.viewportWidth - width - DOCK_MARGIN);
const oldMaxY = Math.max(DOCK_MARGIN, position.viewportHeight - height - DOCK_MARGIN);
const nextMaxX = Math.max(DOCK_MARGIN, window.innerWidth - width - DOCK_MARGIN);
const nextMaxY = Math.max(DOCK_MARGIN, window.innerHeight - height - DOCK_MARGIN);
const xRatio = oldMaxX === DOCK_MARGIN ? 0 : (position.x - DOCK_MARGIN) / (oldMaxX - DOCK_MARGIN);
const yRatio = oldMaxY === DOCK_MARGIN ? 0 : (position.y - DOCK_MARGIN) / (oldMaxY - DOCK_MARGIN);

return clampDockPosition({
x: DOCK_MARGIN + xRatio * (nextMaxX - DOCK_MARGIN),
y: DOCK_MARGIN + yRatio * (nextMaxY - DOCK_MARGIN),
});
}, [clampDockPosition, getDockRect]);

const syncDockPosition = useCallback((nextViewport?: DockViewport) => {
if (typeof window === 'undefined') return;

Expand All @@ -175,9 +203,9 @@ export function ManagementBar() {
setDockViewport(viewport);

const savedPosition = readDockPositions()[viewport];
const nextPosition = clampDockPosition(savedPosition ?? getDefaultDockPosition(viewport));
const nextPosition = savedPosition ? getScaledDockPosition(savedPosition) : getDefaultDockPosition(viewport);
setDockPosition(nextPosition);
}, [clampDockPosition, getDefaultDockPosition, getViewport, readDockPositions]);
}, [getDefaultDockPosition, getScaledDockPosition, getViewport, readDockPositions]);

useEffect(() => {
setMounted(true);
Expand Down Expand Up @@ -206,7 +234,7 @@ export function ManagementBar() {

dockViewportRef.current = viewport;
setDockViewport(viewport);
setDockPosition((current) => clampDockPosition(savedPosition ?? current ?? getDefaultDockPosition(viewport)));
setDockPosition(savedPosition ? getScaledDockPosition(savedPosition) : getDefaultDockPosition(viewport));
});
};

Expand All @@ -216,7 +244,7 @@ export function ManagementBar() {
window.cancelAnimationFrame(frameId);
window.removeEventListener('resize', handleResize);
};
}, [clampDockPosition, getDefaultDockPosition, getViewport, mounted, readDockPositions, syncDockPosition]);
}, [getDefaultDockPosition, getScaledDockPosition, getViewport, mounted, readDockPositions, syncDockPosition]);

useEffect(() => {
const handleOpenPaymentSettings = () => {
Expand Down
Loading