fix(boards): disable mobile sidebars (#6565)
This commit is contained in:
1 parent
3943741838
commit
4a4b04d471
3 files changed
+38
-2
No files matched your search
@@ -38,6 +38,22 @@ describe("board lanes", () => {
|
|||||||
expect(getBoardLaneColumnCount(layout, "right")).toBe(0);
|
expect(getBoardLaneColumnCount(layout, "right")).toBe(0);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("disables gutters for mobile layouts", () => {
|
||||||
|
const layout = {
|
||||||
|
id: "mobile",
|
||||||
|
name: "Mobile",
|
||||||
|
columnCount: 12,
|
||||||
|
leftGutterColumnCount: 2,
|
||||||
|
rightGutterColumnCount: 3,
|
||||||
|
breakpoint: 0,
|
||||||
|
role: "mobile",
|
||||||
|
} satisfies Board["layouts"][number];
|
||||||
|
|
||||||
|
expect(getBoardLaneColumnCount(layout, "left")).toBe(0);
|
||||||
|
expect(getBoardLaneColumnCount(layout, "main")).toBe(12);
|
||||||
|
expect(getBoardLaneColumnCount(layout, "right")).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
test("rejects ambiguous duplicate roots", () => {
|
test("rejects ambiguous duplicate roots", () => {
|
||||||
const board = new BoardMockBuilder()
|
const board = new BoardMockBuilder()
|
||||||
.addSection(new EmptySectionMockBuilder({ id: "main-a" }).build())
|
.addSection(new EmptySectionMockBuilder({ id: "main-a" }).build())
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import type { LayoutRole } from "./board";
|
||||||
|
|
||||||
export const sectionKinds = ["empty", "container"] as const;
|
export const sectionKinds = ["empty", "container"] as const;
|
||||||
export type SectionKind = (typeof sectionKinds)[number];
|
export type SectionKind = (typeof sectionKinds)[number];
|
||||||
|
|
||||||
@@ -21,12 +23,17 @@ export const getBoardLaneColumnCount = (
|
|||||||
columnCount: number;
|
columnCount: number;
|
||||||
leftGutterColumnCount?: number | null;
|
leftGutterColumnCount?: number | null;
|
||||||
rightGutterColumnCount?: number | null;
|
rightGutterColumnCount?: number | null;
|
||||||
|
role?: LayoutRole;
|
||||||
},
|
},
|
||||||
lane: BoardLane,
|
lane: BoardLane,
|
||||||
) => {
|
) => {
|
||||||
const total = Math.max(1, Math.floor(layout.columnCount));
|
const total = Math.max(1, Math.floor(layout.columnCount));
|
||||||
const left = Math.min(Math.max(0, Math.floor(layout.leftGutterColumnCount ?? 0)), total - 1);
|
const left =
|
||||||
const right = Math.min(Math.max(0, Math.floor(layout.rightGutterColumnCount ?? 0)), total - left - 1);
|
layout.role === "mobile" ? 0 : Math.min(Math.max(0, Math.floor(layout.leftGutterColumnCount ?? 0)), total - 1);
|
||||||
|
const right =
|
||||||
|
layout.role === "mobile"
|
||||||
|
? 0
|
||||||
|
: Math.min(Math.max(0, Math.floor(layout.rightGutterColumnCount ?? 0)), total - left - 1);
|
||||||
if (lane === "left") return left;
|
if (lane === "left") return left;
|
||||||
if (lane === "right") return right;
|
if (lane === "right") return right;
|
||||||
return total - left - right;
|
return total - left - right;
|
||||||
|
|||||||
@@ -42,4 +42,17 @@ describe("board layout gutters", () => {
|
|||||||
}).success,
|
}).success,
|
||||||
).toBe(false);
|
).toBe(false);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("rejects sidebars on mobile layouts", () => {
|
||||||
|
expect(
|
||||||
|
boardLayoutSchema.safeParse({
|
||||||
|
id: "mobile",
|
||||||
|
name: "Mobile",
|
||||||
|
columnCount: 6,
|
||||||
|
leftGutterColumnCount: 1,
|
||||||
|
breakpoint: 0,
|
||||||
|
role: "mobile",
|
||||||
|
}).success,
|
||||||
|
).toBe(false);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
Reference in new issue
Block a user