Skip to content

Commit fe44d83

Browse files
committed
fix(web): scope workspace footer alignment by surface
1 parent 9a7f2ea commit fe44d83

3 files changed

Lines changed: 7 additions & 1 deletion

File tree

packages/web/src/features/workspace/index.test.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,9 @@ describe("WorkspacePage", () => {
122122
document.querySelector(".workspace-status-bar .git-panel-status-strip__branch-text")
123123
).toHaveTextContent("feature/refactor-ts");
124124
expect(document.querySelector(".workspace-page > .workspace-status-bar")).not.toBeNull();
125+
expect(document.querySelector(".workspace-status-bar .git-panel-status-strip")).toHaveClass(
126+
"git-panel-status-strip--start"
127+
);
125128
expect(document.querySelector(".workspace-sidebar-panel__tab-count")).toBeNull();
126129
});
127130

packages/web/src/features/workspace/views/desktop/workspace-desktop-view.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ export const WorkspaceDesktopView: FC = () => {
218218
</div>
219219

220220
<WorkspaceStatusBar
221+
align="start"
221222
workspaceId={workspace.id}
222223
gitState={gitState}
223224
onOpenBranchSwitcher={handleOpenBranchSwitcher}

packages/web/src/features/workspace/views/shared/workspace-status-bar.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,20 @@ interface WorkspaceStatusBarProps {
66
gitState: GitStatus | null | undefined;
77
onOpenBranchSwitcher?: () => void;
88
flush?: boolean;
9+
align?: "start" | "end";
910
}
1011

1112
export function WorkspaceStatusBar({
1213
workspaceId,
1314
gitState,
1415
onOpenBranchSwitcher,
1516
flush = false,
17+
align = "end",
1618
}: WorkspaceStatusBarProps) {
1719
return (
1820
<div className={`workspace-status-bar${flush ? " workspace-status-bar--flush" : ""}`}>
1921
<GitPanelStatusStrip
20-
align={flush ? "end" : "start"}
22+
align={align}
2123
workspaceId={workspaceId}
2224
gitState={gitState}
2325
onOpenBranchSwitcher={onOpenBranchSwitcher}

0 commit comments

Comments
 (0)