BuzzbeeSCD/openchamber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ui): prevent revert dock from occluding pending changes popover (#1286)

Browse Source 
* fix(ui): use absolute positioning for pending changes popover to prevent z-index occlusion by revert dock

* refactor(ui): reuse changedFilesPopover constants instead of inlining styles
This commit is contained in:
youfch
2026-05-17 14:47:56 +03:00
committed by GitHub
parent e1977bbe63
commit fec4846ce5
1 changed files with 59 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/ui/src/components/chat/PendingChangesBar.tsx
+59 -40
View File
@@ -1,5 +1,4 @@
import React from 'react';
import { Popover } from '@base-ui/react/popover';
import { useDirectoryStore } from '@/stores/useDirectoryStore';
import { useGitStore, useIsGitRepo } from '@/stores/useGitStore';
import { useUIStore } from '@/stores/useUIStore';
@@ -7,6 +6,7 @@ import { RuntimeAPIContext } from '@/contexts/runtimeAPIContext';
import { sessionEvents } from '@/lib/sessionEvents';
import { normalizePath } from '@/components/session/sidebar/utils';
import { Icon } from "@/components/icon/Icon";
import { cn } from '@/lib/utils';
import {
type ChangedFileEntry,
type GitChangedFile,
@@ -20,6 +20,7 @@ import { useI18n } from '@/lib/i18n';
export const PendingChangesBar: React.FC = React.memo(() => {
const { t } = useI18n();
const [isExpanded, setIsExpanded] = React.useState(false);
const popoverRef = React.useRef<HTMLDivElement>(null);
const currentDirectory = useDirectoryStore((s) => s.currentDirectory);
const runtime = React.useContext(RuntimeAPIContext);
const isGitRepo = useIsGitRepo(currentDirectory);
@@ -29,6 +30,20 @@ export const PendingChangesBar: React.FC = React.memo(() => {
const ensureStatus = useGitStore((s) => s.ensureStatus);
const fetchStatus = useGitStore((s) => s.fetchStatus);
// Close popover when clicking outside
React.useEffect(() => {
if (!isExpanded) return;
const handleClickOutside = (event: MouseEvent) => {
if (popoverRef.current && !popoverRef.current.contains(event.target as Node)) {
setIsExpanded(false);
}
};
document.addEventListener("mousedown", handleClickOutside);
return () => document.removeEventListener("mousedown", handleClickOutside);
}, [isExpanded]);
// Seed git store for currentDirectory so the bar can render independently of
// DiffView/GitView/right-sidebar mounting. ensureStatus has a 5s staleness
// gate and inFlightStatusFetchesByDirectory dedupes against concurrent callers.
@@ -96,45 +111,49 @@ export const PendingChangesBar: React.FC = React.memo(() => {
: t('chat.pendingChanges.fileCountPlural', { count: fileCount });
return (
<Popover.Root open={isExpanded} onOpenChange={setIsExpanded}>
<Popover.Trigger
render={
<button
type="button"
className="flex min-w-0 max-w-full items-center gap-1 text-left text-muted-foreground"
>
<Icon name="file-edit" className="h-3.5 w-3.5 flex-shrink-0 text-[var(--status-warning)]" />
<span className="min-w-0 typography-ui-label text-foreground flex-shrink-0">{labelHead}</span>
<span className="status-row__changed-label min-w-0 typography-ui-label text-foreground truncate">
{t('chat.pendingChanges.changedInWorkspace')}
</span>
<span className="text-[0.75rem] tabular-nums inline-flex items-baseline gap-1 flex-shrink-0">
{totalAdded > 0 ? <span style={{ color: 'var(--status-success)' }}>+{totalAdded}</span> : null}
{totalRemoved > 0 ? <span style={{ color: 'var(--status-error)' }}>-{totalRemoved}</span> : null}
</span>
{isExpanded ? (
<Icon name="arrow-up-s" className="h-3.5 w-3.5 flex-shrink-0" />
) : (
<Icon name="arrow-down-s" className="h-3.5 w-3.5 flex-shrink-0" />
)}
</button>
}
/>
<Popover.Portal>
<Popover.Positioner side="top" align="start" sideOffset={4} collisionPadding={8}>
<Popover.Popup
style={changedFilesPopoverStyle}
className={`${changedFilesPopoverClassName} transition-all duration-150 ease-out data-[starting-style]:opacity-0 data-[starting-style]:scale-95 data-[ending-style]:opacity-0 data-[ending-style]:scale-95`}
>
<ChangedFilesList
files={gitChangedFiles}
currentDirectory={currentDirectory}
onOpenFile={handleOpenFile}
/>
</Popover.Popup>
</Popover.Positioner>
</Popover.Portal>
</Popover.Root>
<div className="relative" ref={popoverRef}>
<button
type="button"
className="flex min-w-0 max-w-full items-center gap-1 text-left text-muted-foreground"
onClick={() => setIsExpanded((value) => !value)}
aria-expanded={isExpanded}
>
<Icon name="file-edit" className="h-3.5 w-3.5 flex-shrink-0 text-[var(--status-warning)]" />
<span className="min-w-0 typography-ui-label text-foreground flex-shrink-0">{labelHead}</span>
<span className="status-row__changed-label min-w-0 typography-ui-label text-foreground truncate">
{t('chat.pendingChanges.changedInWorkspace')}
</span>
<span className="text-[0.75rem] tabular-nums inline-flex items-baseline gap-1 flex-shrink-0">
{totalAdded > 0 ? <span style={{ color: 'var(--status-success)' }}>+{totalAdded}</span> : null}
{totalRemoved > 0 ? <span style={{ color: 'var(--status-error)' }}>-{totalRemoved}</span> : null}
</span>
{isExpanded ? (
<Icon name="arrow-up-s" className="h-3.5 w-3.5 flex-shrink-0" />
) : (
<Icon name="arrow-down-s" className="h-3.5 w-3.5 flex-shrink-0" />
)}
</button>
{isExpanded && (
<div
style={{
...changedFilesPopoverStyle,
maxWidth: 'min(28rem, calc(100cqw - 4ch))',
}}
className={cn(
changedFilesPopoverClassName,
"absolute left-0 bottom-full mb-1 z-50",
"animate-in fade-in-0 zoom-in-95 slide-in-from-bottom-2",
"duration-150"
)}
>
<ChangedFilesList
files={gitChangedFiles}
currentDirectory={currentDirectory}
onOpenFile={handleOpenFile}
/>
</div>
)}
</div>
);
});