🎨 style: Ensure Side Panel state Remains on Refresh (#2210)

This commit is contained in:
Danny Avila 2024-03-26 05:21:40 -04:00 committed by GitHub
parent 718572b7c8
commit f55bd3d0e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 23 additions and 10 deletions

View file

@ -54,6 +54,7 @@ export default function Presentation({
const defaultLayout = resizableLayout ? JSON.parse(resizableLayout) : undefined; const defaultLayout = resizableLayout ? JSON.parse(resizableLayout) : undefined;
const defaultCollapsed = collapsedPanels ? JSON.parse(collapsedPanels) : undefined; const defaultCollapsed = collapsedPanels ? JSON.parse(collapsedPanels) : undefined;
const fullCollapse = localStorage.getItem('fullPanelCollapse') === 'true';
const layout = () => ( const layout = () => (
<div className="transition-width relative flex h-full w-full flex-1 flex-col items-stretch overflow-hidden bg-white pt-0 dark:bg-gray-800"> <div className="transition-width relative flex h-full w-full flex-1 flex-col items-stretch overflow-hidden bg-white pt-0 dark:bg-gray-800">
@ -70,7 +71,11 @@ export default function Presentation({
ref={drop} ref={drop}
className="relative flex w-full grow overflow-hidden bg-white dark:bg-gray-800" className="relative flex w-full grow overflow-hidden bg-white dark:bg-gray-800"
> >
<SidePanel defaultLayout={defaultLayout} defaultCollapsed={defaultCollapsed}> <SidePanel
defaultLayout={defaultLayout}
defaultCollapsed={defaultCollapsed}
fullPanelCollapse={fullCollapse}
>
<div className="flex h-full flex-col" role="presentation" tabIndex={0}> <div className="flex h-full flex-col" role="presentation" tabIndex={0}>
{children} {children}
{isActive && <DragDropOverlay />} {isActive && <DragDropOverlay />}

View file

@ -21,6 +21,7 @@ interface SidePanelProps {
defaultLayout?: number[] | undefined; defaultLayout?: number[] | undefined;
defaultCollapsed?: boolean; defaultCollapsed?: boolean;
navCollapsedSize?: number; navCollapsedSize?: number;
fullPanelCollapse?: boolean;
children: React.ReactNode; children: React.ReactNode;
} }
@ -29,13 +30,15 @@ const defaultMinSize = 20;
const SidePanel = ({ const SidePanel = ({
defaultLayout = [97, 3], defaultLayout = [97, 3],
defaultCollapsed = false, defaultCollapsed = false,
fullPanelCollapse = false,
navCollapsedSize = 3, navCollapsedSize = 3,
children, children,
}: SidePanelProps) => { }: SidePanelProps) => {
const [minSize, setMinSize] = useState(defaultMinSize);
const [isHovering, setIsHovering] = useState(false); const [isHovering, setIsHovering] = useState(false);
const [minSize, setMinSize] = useState(defaultMinSize);
const [newUser, setNewUser] = useLocalStorage('newUser', true); const [newUser, setNewUser] = useLocalStorage('newUser', true);
const [isCollapsed, setIsCollapsed] = useState(defaultCollapsed); const [isCollapsed, setIsCollapsed] = useState(defaultCollapsed);
const [fullCollapse, setFullCollapse] = useState(fullPanelCollapse);
const [collapsedSize, setCollapsedSize] = useState(navCollapsedSize); const [collapsedSize, setCollapsedSize] = useState(navCollapsedSize);
const { data: endpointsConfig = {} as TEndpointsConfig } = useGetEndpointsQuery(); const { data: endpointsConfig = {} as TEndpointsConfig } = useGetEndpointsQuery();
const { data: keyExpiry = { expiresAt: undefined } } = useUserKeyQuery(EModelEndpoint.assistants); const { data: keyExpiry = { expiresAt: undefined } } = useUserKeyQuery(EModelEndpoint.assistants);
@ -80,10 +83,11 @@ const SidePanel = ({
label: '', label: '',
icon: ArrowRightToLine, icon: ArrowRightToLine,
onClick: () => { onClick: () => {
console.log('hide-panel');
setIsCollapsed(true); setIsCollapsed(true);
setCollapsedSize(0); setCollapsedSize(0);
setMinSize(defaultMinSize - 1); setMinSize(defaultMinSize);
setFullCollapse(true);
localStorage.setItem('fullPanelCollapse', 'true');
panelRef.current?.collapse(); panelRef.current?.collapse();
}, },
id: 'hide-panel', id: 'hide-panel',
@ -105,15 +109,16 @@ const SidePanel = ({
setIsCollapsed(true); setIsCollapsed(true);
setCollapsedSize(0); setCollapsedSize(0);
setMinSize(defaultMinSize); setMinSize(defaultMinSize);
setFullCollapse(true);
localStorage.setItem('fullPanelCollapse', 'true');
panelRef.current?.collapse(); panelRef.current?.collapse();
return; return;
} else { } else {
setIsCollapsed(defaultCollapsed); setIsCollapsed(defaultCollapsed);
setCollapsedSize(navCollapsedSize); setCollapsedSize(navCollapsedSize);
setMinSize(defaultMinSize); setMinSize(defaultMinSize);
panelRef.current?.collapse();
} }
}, [isSmallScreen, defaultCollapsed, navCollapsedSize]); }, [isSmallScreen, defaultCollapsed, navCollapsedSize, fullPanelCollapse]);
const toggleNavVisible = useCallback(() => { const toggleNavVisible = useCallback(() => {
if (newUser) { if (newUser) {
@ -123,6 +128,8 @@ const SidePanel = ({
if (prev) { if (prev) {
setMinSize(defaultMinSize); setMinSize(defaultMinSize);
setCollapsedSize(navCollapsedSize); setCollapsedSize(navCollapsedSize);
setFullCollapse(false);
localStorage.setItem('fullPanelCollapse', 'false');
} }
return !prev; return !prev;
}); });
@ -158,8 +165,7 @@ const SidePanel = ({
setIsHovering={setIsHovering} setIsHovering={setIsHovering}
className={cn( className={cn(
'fixed top-1/2', 'fixed top-1/2',
(isCollapsed && (minSize === 0 || collapsedSize === 0)) || (isCollapsed && (minSize === 0 || collapsedSize === 0)) || fullCollapse
minSize === defaultMinSize - 1
? 'mr-9' ? 'mr-9'
: 'mr-16', : 'mr-16',
)} )}
@ -169,7 +175,7 @@ const SidePanel = ({
</div> </div>
</Tooltip> </Tooltip>
</TooltipProvider> </TooltipProvider>
{(!isCollapsed || (minSize > 0 && minSize !== defaultMinSize - 1)) && ( {(!isCollapsed || minSize > 0) && !isSmallScreen && !fullCollapse && (
<ResizableHandleAlt withHandle className="bg-transparent dark:text-white" /> <ResizableHandleAlt withHandle className="bg-transparent dark:text-white" />
)} )}
<ResizablePanel <ResizablePanel
@ -195,7 +201,7 @@ const SidePanel = ({
'sidenav hide-scrollbar border-l border-gray-200 bg-white transition-opacity dark:border-gray-800/50 dark:bg-gray-850', 'sidenav hide-scrollbar border-l border-gray-200 bg-white transition-opacity dark:border-gray-800/50 dark:bg-gray-850',
isCollapsed ? 'min-w-[50px]' : 'min-w-[340px] sm:min-w-[352px]', isCollapsed ? 'min-w-[50px]' : 'min-w-[340px] sm:min-w-[352px]',
(isSmallScreen && isCollapsed && (minSize === 0 || collapsedSize === 0)) || (isSmallScreen && isCollapsed && (minSize === 0 || collapsedSize === 0)) ||
minSize === defaultMinSize - 1 fullCollapse
? 'hidden min-w-0' ? 'hidden min-w-0'
: 'opacity-100', : 'opacity-100',
)} )}
@ -225,6 +231,8 @@ const SidePanel = ({
className={`nav-mask${!isCollapsed ? ' active' : ''}`} className={`nav-mask${!isCollapsed ? ' active' : ''}`}
onClick={() => { onClick={() => {
setIsCollapsed(() => { setIsCollapsed(() => {
localStorage.setItem('fullPanelCollapse', 'true');
setFullCollapse(true);
setCollapsedSize(0); setCollapsedSize(0);
setMinSize(0); setMinSize(0);
return false; return false;