smooth resize tab resizing

This commit is contained in:
Red Adaya 2024-11-26 19:14:11 +08:00
parent 97d5071308
commit b71db296d9
4 changed files with 98 additions and 87 deletions

View File

@ -48,54 +48,64 @@ const isPopoverContent = (
return element.type === PopoverContent; return element.type === PopoverContent;
}; };
const Popover = memo(({ children, className, placement = "bottom-start", offset = 3, onDismiss }: PopoverProps) => { const Popover = memo(
const [isOpen, setIsOpen] = useState(false); forwardRef<HTMLDivElement, PopoverProps>(
({ children, className, placement = "bottom-start", offset = 3, onDismiss }, ref) => {
const [isOpen, setIsOpen] = useState(false);
const handleOpenChange = (open: boolean) => { const handleOpenChange = (open: boolean) => {
setIsOpen(open); setIsOpen(open);
if (!open && onDismiss) { if (!open && onDismiss) {
onDismiss(); onDismiss();
}
};
const { refs, floatingStyles, context } = useFloating({
placement,
open: isOpen,
onOpenChange: handleOpenChange,
middleware: [offsetMiddleware(offset)],
whileElementsMounted: autoUpdate,
});
const click = useClick(context);
const dismiss = useDismiss(context);
const { getReferenceProps, getFloatingProps } = useInteractions([click, dismiss]);
const renderChildren = Children.map(children, (child) => {
if (isValidElement(child)) {
if (isPopoverButton(child)) {
return cloneElement(child as any, {
isActive: isOpen,
ref: refs.setReference,
getReferenceProps,
// Do not overwrite onClick
});
}
if (isPopoverContent(child)) {
return isOpen
? cloneElement(child as any, {
ref: refs.setFloating,
style: floatingStyles,
getFloatingProps,
})
: null;
}
}
return child;
});
return (
<div ref={ref} className={clsx("popover", className)}>
{renderChildren}
</div>
);
} }
}; )
);
const { refs, floatingStyles, context } = useFloating({ Popover.displayName = "Popover";
placement,
open: isOpen,
onOpenChange: handleOpenChange,
middleware: [offsetMiddleware(offset)],
whileElementsMounted: autoUpdate,
});
const click = useClick(context);
const dismiss = useDismiss(context);
const { getReferenceProps, getFloatingProps } = useInteractions([click, dismiss]);
const renderChildren = Children.map(children, (child) => {
if (isValidElement(child)) {
if (isPopoverButton(child)) {
return cloneElement(child as any, {
isActive: isOpen,
ref: refs.setReference,
getReferenceProps,
// Do not overwrite onClick
});
}
if (isPopoverContent(child)) {
return isOpen
? cloneElement(child as any, {
ref: refs.setFloating,
style: floatingStyles,
getFloatingProps,
})
: null;
}
}
return child;
});
return <div className={clsx("popover", className)}>{renderChildren}</div>;
});
interface PopoverButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> { interface PopoverButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
isActive?: boolean; isActive?: boolean;

View File

@ -8,12 +8,13 @@ import "./windowdrag.scss";
interface WindowDragProps { interface WindowDragProps {
className?: string; className?: string;
style?: React.CSSProperties;
children?: React.ReactNode; children?: React.ReactNode;
} }
const WindowDrag = forwardRef<HTMLDivElement, WindowDragProps>(({ children, className }, ref) => { const WindowDrag = forwardRef<HTMLDivElement, WindowDragProps>(({ children, className, style }, ref) => {
return ( return (
<div ref={ref} className={clsx(`window-drag`, className)}> <div ref={ref} className={clsx(`window-drag`, className)} style={style}>
{children} {children}
</div> </div>
); );

View File

@ -103,10 +103,7 @@ const TabBar = React.memo(({ workspace }: TabBarProps) => {
const [dragStartPositions, setDragStartPositions] = useState<number[]>([]); const [dragStartPositions, setDragStartPositions] = useState<number[]>([]);
const [draggingTab, setDraggingTab] = useState<string>(); const [draggingTab, setDraggingTab] = useState<string>();
const [tabsLoaded, setTabsLoaded] = useState({}); const [tabsLoaded, setTabsLoaded] = useState({});
// const [scrollable, setScrollable] = useState(false);
// const [tabWidth, setTabWidth] = useState(TAB_DEFAULT_WIDTH);
const [newTabId, setNewTabId] = useState<string | null>(null); const [newTabId, setNewTabId] = useState<string | null>(null);
// const [hoveredTabId, setHoveredTabId] = useState<string | null>(null);
const tabbarWrapperRef = useRef<HTMLDivElement>(null); const tabbarWrapperRef = useRef<HTMLDivElement>(null);
const tabBarRef = useRef<HTMLDivElement>(null); const tabBarRef = useRef<HTMLDivElement>(null);
@ -126,6 +123,9 @@ const TabBar = React.memo(({ workspace }: TabBarProps) => {
const osInstanceRef = useRef<OverlayScrollbars>(null); const osInstanceRef = useRef<OverlayScrollbars>(null);
const draggerRightRef = useRef<HTMLDivElement>(null); const draggerRightRef = useRef<HTMLDivElement>(null);
const draggerLeftRef = useRef<HTMLDivElement>(null); const draggerLeftRef = useRef<HTMLDivElement>(null);
const workspaceSwitcherRef = useRef<HTMLDivElement>(null);
const devLabelRef = useRef<HTMLDivElement>(null);
const appMenuButtonRef = useRef<HTMLDivElement>(null);
const tabWidthRef = useRef<number>(TAB_DEFAULT_WIDTH); const tabWidthRef = useRef<number>(TAB_DEFAULT_WIDTH);
const scrollableRef = useRef<boolean>(false); const scrollableRef = useRef<boolean>(false);
const updateStatusButtonRef = useRef<HTMLButtonElement>(null); const updateStatusButtonRef = useRef<HTMLButtonElement>(null);
@ -185,33 +185,31 @@ const TabBar = React.memo(({ workspace }: TabBarProps) => {
const addBtnWidth = addBtnRef.current.getBoundingClientRect().width; const addBtnWidth = addBtnRef.current.getBoundingClientRect().width;
const updateStatusLabelWidth = updateStatusButtonRef.current?.getBoundingClientRect().width ?? 0; const updateStatusLabelWidth = updateStatusButtonRef.current?.getBoundingClientRect().width ?? 0;
const configErrorWidth = configErrorButtonRef.current?.getBoundingClientRect().width ?? 0; const configErrorWidth = configErrorButtonRef.current?.getBoundingClientRect().width ?? 0;
const spaceForTabs = const appMenuButtonWidth = appMenuButtonRef.current?.getBoundingClientRect().width ?? 0;
tabbarWrapperWidth - const workspaceSwitcherWidth = workspaceSwitcherRef.current?.getBoundingClientRect().width ?? 0;
(windowDragLeftWidth + DRAGGER_RIGHT_MIN_WIDTH + addBtnWidth + updateStatusLabelWidth + configErrorWidth); const devLabelWidth = devLabelRef.current?.getBoundingClientRect().width ?? 0;
const nonTabElementsWidth =
windowDragLeftWidth +
DRAGGER_RIGHT_MIN_WIDTH +
addBtnWidth +
updateStatusLabelWidth +
configErrorWidth +
appMenuButtonWidth +
workspaceSwitcherWidth +
devLabelWidth;
const spaceForTabs = tabbarWrapperWidth - nonTabElementsWidth;
const numberOfTabs = tabIds.length; const numberOfTabs = tabIds.length;
const totalDefaultTabWidth = numberOfTabs * TAB_DEFAULT_WIDTH;
const minTotalTabWidth = numberOfTabs * TAB_MIN_WIDTH;
const tabWidth = tabWidthRef.current;
const scrollable = scrollableRef.current;
let newTabWidth = tabWidth;
let newScrollable = scrollable;
if (spaceForTabs < totalDefaultTabWidth && spaceForTabs > minTotalTabWidth) { // Compute the ideal width per tab by dividing the available space by the number of tabs
newTabWidth = TAB_MIN_WIDTH; let idealTabWidth = spaceForTabs / numberOfTabs;
} else if (minTotalTabWidth > spaceForTabs) {
// Case where tabs cannot shrink further, make the tab bar scrollable // Apply min/max constraints
newTabWidth = TAB_MIN_WIDTH; idealTabWidth = Math.max(TAB_MIN_WIDTH, Math.min(idealTabWidth, TAB_DEFAULT_WIDTH));
newScrollable = true;
} else if (totalDefaultTabWidth > spaceForTabs) { // Determine if the tab bar needs to be scrollable
// Case where resizing is needed due to limited container width const newScrollable = idealTabWidth * numberOfTabs > spaceForTabs;
newTabWidth = spaceForTabs / numberOfTabs;
newScrollable = false;
} else {
// Case where tabs were previously shrunk or there is enough space for default width tabs
newTabWidth = TAB_DEFAULT_WIDTH;
newScrollable = false;
}
// Apply the calculated width and position to all tabs // Apply the calculated width and position to all tabs
tabRefs.current.forEach((ref, index) => { tabRefs.current.forEach((ref, index) => {
@ -221,20 +219,22 @@ const TabBar = React.memo(({ workspace }: TabBarProps) => {
} else { } else {
ref.current.classList.remove("animate"); ref.current.classList.remove("animate");
} }
ref.current.style.width = `${newTabWidth}px`; ref.current.style.width = `${idealTabWidth}px`;
ref.current.style.transform = `translate3d(${index * newTabWidth}px,0,0)`; ref.current.style.transform = `translate3d(${index * idealTabWidth}px,0,0)`;
ref.current.style.opacity = "1"; ref.current.style.opacity = "1";
} }
}); });
// Update the state with the new tab width if it has changed // Update the state with the new tab width if it has changed
if (newTabWidth !== tabWidth) { if (idealTabWidth !== tabWidthRef.current) {
tabWidthRef.current = newTabWidth; tabWidthRef.current = idealTabWidth;
} }
// Update the state with the new scrollable state if it has changed // Update the state with the new scrollable state if it has changed
if (newScrollable !== scrollable) { if (newScrollable !== scrollableRef.current) {
scrollableRef.current = newScrollable; scrollableRef.current = newScrollable;
} }
// Initialize/destroy overlay scrollbars // Initialize/destroy overlay scrollbars
if (newScrollable) { if (newScrollable) {
osInstanceRef.current = OverlayScrollbars(tabBarRef.current, { ...(OS_OPTIONS as any) }); osInstanceRef.current = OverlayScrollbars(tabBarRef.current, { ...(OS_OPTIONS as any) });
@ -530,13 +530,13 @@ const TabBar = React.memo(({ workspace }: TabBarProps) => {
const tabsWrapperWidth = tabIds.length * tabWidthRef.current; const tabsWrapperWidth = tabIds.length * tabWidthRef.current;
const devLabel = isDev() ? ( const devLabel = isDev() ? (
<div className="dev-label"> <div ref={devLabelRef} className="dev-label">
<i className="fa fa-brands fa-dev fa-fw" /> <i className="fa fa-brands fa-dev fa-fw" />
</div> </div>
) : undefined; ) : undefined;
const appMenuButton = const appMenuButton =
PLATFORM !== "darwin" && !settings["window:showmenubar"] ? ( PLATFORM !== "darwin" && !settings["window:showmenubar"] ? (
<div className="app-menu-button" onClick={onEllipsisClick}> <div ref={appMenuButtonRef} className="app-menu-button" onClick={onEllipsisClick}>
<i className="fa fa-ellipsis" /> <i className="fa fa-ellipsis" />
</div> </div>
) : undefined; ) : undefined;
@ -545,7 +545,7 @@ const TabBar = React.memo(({ workspace }: TabBarProps) => {
<WindowDrag ref={draggerLeftRef} className="left" /> <WindowDrag ref={draggerLeftRef} className="left" />
{appMenuButton} {appMenuButton}
{devLabel} {devLabel}
{isDev() ? <WorkspaceSwitcher></WorkspaceSwitcher> : null} {isDev() ? <WorkspaceSwitcher ref={workspaceSwitcherRef}></WorkspaceSwitcher> : null}
<div className="tab-bar" ref={tabBarRef} data-overlayscrollbars-initialize> <div className="tab-bar" ref={tabBarRef} data-overlayscrollbars-initialize>
<div className="tabs-wrapper" ref={tabsWrapperRef} style={{ width: `${tabsWrapperWidth}px` }}> <div className="tabs-wrapper" ref={tabsWrapperRef} style={{ width: `${tabsWrapperWidth}px` }}>
{tabIds.map((tabId, index) => { {tabIds.map((tabId, index) => {
@ -572,7 +572,7 @@ const TabBar = React.memo(({ workspace }: TabBarProps) => {
<div ref={addBtnRef} className="add-tab-btn" onClick={handleAddTab}> <div ref={addBtnRef} className="add-tab-btn" onClick={handleAddTab}>
<i className="fa fa-solid fa-plus fa-fw" /> <i className="fa fa-solid fa-plus fa-fw" />
</div> </div>
<WindowDrag ref={draggerRightRef} className="right" /> <WindowDrag ref={draggerRightRef} className="right" style={{ minWidth: DRAGGER_RIGHT_MIN_WIDTH }} />
<UpdateStatusBanner buttonRef={updateStatusButtonRef} /> <UpdateStatusBanner buttonRef={updateStatusButtonRef} />
<ConfigErrorIcon buttonRef={configErrorButtonRef} /> <ConfigErrorIcon buttonRef={configErrorButtonRef} />
</div> </div>

View File

@ -19,7 +19,7 @@ import clsx from "clsx";
import { colord } from "colord"; import { colord } from "colord";
import { atom, useAtom } from "jotai"; import { atom, useAtom } from "jotai";
import { OverlayScrollbarsComponent } from "overlayscrollbars-react"; import { OverlayScrollbarsComponent } from "overlayscrollbars-react";
import { memo, useEffect, useRef } from "react"; import { forwardRef, memo, useEffect, useRef } from "react";
import WorkspaceSVG from "../asset/workspace.svg"; import WorkspaceSVG from "../asset/workspace.svg";
import "./workspaceswitcher.scss"; import "./workspaceswitcher.scss";
@ -180,7 +180,7 @@ const workspaceData: WorkspaceDataType[] = [
export const menuDataAtom = atom<WorkspaceDataType[]>(workspaceData); export const menuDataAtom = atom<WorkspaceDataType[]>(workspaceData);
const WorkspaceSwitcher = () => { const WorkspaceSwitcher = forwardRef<HTMLDivElement, {}>(({}, ref) => {
const [menuData, setMenuData] = useAtom(menuDataAtom); const [menuData, setMenuData] = useAtom(menuDataAtom);
const handleTitleChange = (id: string, newTitle: string) => { const handleTitleChange = (id: string, newTitle: string) => {
@ -399,7 +399,7 @@ const WorkspaceSwitcher = () => {
} }
return ( return (
<Popover className="workspace-switcher-popover"> <Popover ref={ref} className="workspace-switcher-popover">
<PopoverButton className="workspace-switcher-button grey" as="div"> <PopoverButton className="workspace-switcher-button grey" as="div">
<span className="workspace-icon">{workspaceIcon}</span> <span className="workspace-icon">{workspaceIcon}</span>
{/* <span className="divider" /> {/* <span className="divider" />
@ -426,6 +426,6 @@ const WorkspaceSwitcher = () => {
</PopoverContent> </PopoverContent>
</Popover> </Popover>
); );
}; });
export { WorkspaceSwitcher }; export { WorkspaceSwitcher };