Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix: improve minimum width soup list ui (#5323)

Peter Chinman74124187ce12
diff --git a/apps/web/src/components/app/split-layout/SplitLayout.tsx b/apps/web/src/components/app/split-layout/SplitLayout.tsx
index ee6c519f45..4d4dbefa16 100644
--- a/apps/web/src/components/app/split-layout/SplitLayout.tsx
+++ b/apps/web/src/components/app/split-layout/SplitLayout.tsx
@@ -136,7 +136,9 @@ export function SplitLayoutContainer(props: SplitLayoutContainerProps) {
<Suspense>
<Resize.Panel
id={id}
- minSize={splitMinWidthForContent(handle().content())}
+ minSize={splitMinWidthForContent(handle().content(), {
+ isPreviewController: handle().isControllerSplit(),
+ })}
// A Preview Pair is one layout unit: its two splits
// share the space a single split would get. Both
// members key their group by the Controller's id.
diff --git a/apps/web/src/components/app/split-layout/components/CollapsibleHeaderItem.tsx b/apps/web/src/components/app/split-layout/components/CollapsibleHeaderItem.tsx
deleted file mode 100644
index 3c488e4c40..0000000000
--- a/apps/web/src/components/app/split-layout/components/CollapsibleHeaderItem.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { cn } from '@ui';
-import { createSignal, type JSX, Show } from 'solid-js';
-import { useRegisterCollapsibleHeaderItem } from '../layoutUtils';
-
-type CollapsibleHeaderItemProps = {
- id: string;
- priority: number;
- expanded: () => JSX.Element;
- collapsed: () => JSX.Element;
- onCollapsedChange?: (isCollapsed: boolean) => void;
- containerClass?: string;
-};
-
-export function CollapsibleHeaderItem(props: CollapsibleHeaderItemProps) {
- const [expandedRef, setExpandedRef] = createSignal<HTMLElement | null>(null);
- const [collapsedRef, setCollapsedRef] = createSignal<HTMLElement | null>(
- null
- );
-
- const isCollapsed = useRegisterCollapsibleHeaderItem({
- id: props.id,
- priority: props.priority,
- ref: expandedRef,
- collapsedRef: collapsedRef,
- onCollapsedChange: (v) => props.onCollapsedChange?.(v),
- });
-
- return (
- <>
- <Show when={!isCollapsed()}>
- <div
- ref={setExpandedRef}
- class={cn('flex items-center', props.containerClass)}
- >
- {props.expanded()}
- </div>
- </Show>
- <Show when={isCollapsed()}>
- <div
- ref={setCollapsedRef}
- class={cn('flex items-center', props.containerClass)}
- >
- {props.collapsed()}
- </div>
- </Show>
- </>
- );
-}
diff --git a/apps/web/src/components/app/split-layout/components/CollapsibleItem.tsx b/apps/web/src/components/app/split-layout/components/CollapsibleItem.tsx
new file mode 100644
index 0000000000..d5b4cad5a3
--- /dev/null
+++ b/apps/web/src/components/app/split-layout/components/CollapsibleItem.tsx
@@ -0,0 +1,42 @@
+import { cn } from '@ui';
+import type { Accessor, JSX } from 'solid-js';
+import {
+ useRegisterCollapsibleHeaderItem,
+ useRegisterCollapsibleToolbarItem,
+} from '../layoutUtils';
+
+type CollapsibleItemProps = {
+ id: string;
+ priority: number;
+ children: (isCollapsed: Accessor<boolean>) => JSX.Element;
+ onCollapsedChange?: (isCollapsed: boolean) => void;
+ containerClass?: string;
+};
+
+function CollapsibleItem(
+ props: CollapsibleItemProps & { region: 'header' | 'toolbar' }
+) {
+ const register =
+ props.region === 'header'
+ ? useRegisterCollapsibleHeaderItem
+ : useRegisterCollapsibleToolbarItem;
+ const isCollapsed = register({
+ id: props.id,
+ priority: props.priority,
+ onCollapsedChange: (v) => props.onCollapsedChange?.(v),
+ });
+
+ return (
+ <div class={cn('flex items-center', props.containerClass)}>
+ {props.children(isCollapsed)}
+ </div>
+ );
+}
+
+export function CollapsibleHeaderItem(props: CollapsibleItemProps) {
+ return <CollapsibleItem {...props} region="header" />;
+}
+
+export function CollapsibleToolbarItem(props: CollapsibleItemProps) {
+ return <CollapsibleItem {...props} region="toolbar" />;
+}
diff --git a/apps/web/src/components/app/split-layout/components/PopoverSplitRenderer.tsx b/apps/web/src/components/app/split-layout/components/PopoverSplitRenderer.tsx
index 28999b5938..fa6570e3ea 100644
--- a/apps/web/src/components/app/split-layout/components/PopoverSplitRenderer.tsx
+++ b/apps/web/src/components/app/split-layout/components/PopoverSplitRenderer.tsx
@@ -125,6 +125,7 @@ function PopoverSplitModal(props: {
titleFileMenuActions,
setTitleFileMenuActions,
headerCollapser: { register: () => () => {} },
+ toolbarCollapser: { register: () => () => {} },
};
const [bindHotKeyDom, scopeId] = useHotkeyDOMScope(
diff --git a/apps/web/src/components/app/split-layout/components/PreviewButton.tsx b/apps/web/src/components/app/split-layout/components/PreviewButton.tsx
index e4c8c957f7..0f90bc731a 100644
--- a/apps/web/src/components/app/split-layout/components/PreviewButton.tsx
+++ b/apps/web/src/components/app/split-layout/components/PreviewButton.tsx
@@ -14,6 +14,7 @@ export function PreviewButton(
disabledLabel?: string;
onEngage?: () => void;
onOpenChange?: (open: boolean) => void;
+ hideLabel?: boolean;
} = {}
) {
const panel = useSplitPanelOrThrow();
@@ -68,9 +69,12 @@ export function PreviewButton(
depth={2}
class="bg-surface"
disabled={!canEngage()}
+ aria-label={props.hideLabel ? 'Preview' : undefined}
>
{isController() ? <EyeSlashIcon /> : <EyeIcon />}
- <span>Preview</span>
+ <Show when={!props.hideLabel}>
+ <span>Preview</span>
+ </Show>
</Button>
</Tooltip>
</Show>
diff --git a/apps/web/src/components/app/split-layout/components/PriorityCollapseOverflowSensor.tsx b/apps/web/src/components/app/split-layout/components/PriorityCollapseOverflowSensor.tsx
new file mode 100644
index 0000000000..31ed31ec45
--- /dev/null
+++ b/apps/web/src/components/app/split-layout/components/PriorityCollapseOverflowSensor.tsx
@@ -0,0 +1,118 @@
+import { cn } from '@ui';
+import {
+ type Accessor,
+ createEffect,
+ createSignal,
+ type ParentProps,
+} from 'solid-js';
+import {
+ createPriorityCollapser,
+ type OverflowProbe,
+ type PriorityCollapser,
+} from '../utils/createPriorityCollapser';
+
+export type PriorityCollapseController = {
+ collapser: PriorityCollapser;
+ setRow: (element: HTMLElement) => void;
+ /** Set the sensor's width-constrained outer measurement element. */
+ setViewport: (element: HTMLElement) => void;
+ setContent: (element: HTMLElement) => void;
+};
+
+/** Adapt explicit row, available-space, and content elements to a probe. */
+export function createElementOverflowProbe(options: {
+ row: Accessor<HTMLElement | undefined>;
+ viewport: Accessor<HTMLElement | undefined>;
+ content: Accessor<HTMLElement | undefined>;
+}): OverflowProbe {
+ return {
+ measure: () => {
+ const row = options.row();
+ const viewport = options.viewport();
+ const content = options.content();
+ if (!row || !viewport || !content) return undefined;
+
+ return {
+ requiredWidth: content.scrollWidth,
+ availableWidth: viewport.clientWidth,
+ retryWidth: row.clientWidth,
+ };
+ },
+ observe: (onChange) => {
+ const observer = new ResizeObserver(onChange);
+
+ createEffect(() => {
+ const elements = [
+ options.row(),
+ options.viewport(),
+ options.content(),
+ ].filter((element): element is HTMLElement => element !== undefined);
+
+ observer.disconnect();
+ for (const element of new Set(elements)) {
+ observer.observe(element, { box: 'border-box' });
+ }
+ onChange();
+ });
+
+ return () => observer.disconnect();
+ },
+ };
+}
+
+/** Create the controller and element refs for one priority-collapse row. */
+export function createPriorityCollapseController(): PriorityCollapseController {
+ const [row, setRow] = createSignal<HTMLElement>();
+ const [viewport, setViewport] = createSignal<HTMLElement>();
+ const [content, setContent] = createSignal<HTMLElement>();
+ const probe = createElementOverflowProbe({ row, viewport, content });
+
+ return {
+ collapser: createPriorityCollapser(probe),
+ setRow,
+ setViewport,
+ setContent,
+ };
+}
+
+/**
+ * Overflow sensor for a priority-collapse row.
+ *
+ * The sensor's outer element is locally width-constrained; its `clientWidth`
+ * is the space available to the collapse group. The max-content inner
+ * element's `scrollWidth` is the space the group's intrinsic content requires.
+ *
+ * The row itself remains caller-owned; connect it with `controller.setRow`.
+ * The sensor's outer element acts as the pressure gauge for every item
+ * registered with the controller. Registered items do not need to be
+ * descendants of the sensor; they may live anywhere in the row, provided
+ * changing their collapsed state changes the sensor's available width. A
+ * region that can overflow without affecting the sensor needs its own
+ * controller and sensor.
+ *
+ * CSS sizing contract: the caller must constrain the sensor's outer element
+ * independently of its max-content child. In a flex or grid row, that usually
+ * means applying `min-w-0` together with an allocation rule such as `flex-1`
+ * or `shrink`.
+ */
+export function PriorityCollapseOverflowSensor(
+ props: ParentProps<{
+ controller: PriorityCollapseController;
+ class?: string;
+ contentClass?: string;
+ contentRef?: (element: HTMLDivElement) => void;
+ }>
+) {
+ const setContentRef = (element: HTMLDivElement) => {
+ props.controller.setContent(element);
+ props.contentRef?.(element);
+ };
+
+ return (
+ <div ref={props.controller.setViewport} class={props.class}>
+ <div ref={setContentRef} class={cn('w-max', props.contentClass)}>
+ {props.children}
+ </div>
+ </div>
+ );
+}
diff --git a/apps/web/src/components/app/split-layout/components/SplitHeader.tsx b/apps/web/src/components/app/split-layout/components/SplitHeader.tsx
index 7f889a2720..1c2f36a52c 100644
--- a/apps/web/src/components/app/split-layout/components/SplitHeader.tsx
+++ b/apps/web/src/components/app/split-layout/components/SplitHeader.tsx
@@ -43,6 +43,10 @@ import { SplitLayoutContext, SplitPanelContext } from '../context';
import type { SplitContent } from '../layoutManager';
import { canSpotlight } from '../utils/canSpotlight';
import { HeaderIsland } from './HeaderIsland';
+import {
+ type PriorityCollapseController,
+ PriorityCollapseOverflowSensor,
+} from './PriorityCollapseOverflowSensor';
function getEntitySplitContent(data: EntityDragEvent['draggable']['data']):
| {
@@ -121,7 +125,9 @@ function SidebarExpandButton() {
<div
class={cn(
'overflow-hidden transition-[width,opacity,margin] duration-[120ms] ease-in-out',
- visible() ? 'w-8 opacity-100 mr-1' : 'w-0 opacity-0 mr-0'
+ visible()
+ ? 'w-8 @max-[380px]/split-header:w-0 @max-[380px]/split-header:opacity-0 opacity-100 mr-1 @max-[380px]/split-header:mr-0'
+ : 'w-0 opacity-0 mr-0'
)}
aria-hidden={!visible()}
>
@@ -426,7 +432,10 @@ function SplitHeaderContextMenu(props: ParentProps) {
);
}
-export function SplitHeader(props: { ref: Setter<HTMLDivElement | null> }) {
+export function SplitHeader(props: {
+ ref: Setter<HTMLDivElement | null>;
+ collapseController: PriorityCollapseController;
+}) {
const panel = useContext(SplitPanelContext);
if (!panel) {
throw new Error('<SplitHeader> must be used within a <SplitLayout>');
@@ -501,7 +510,10 @@ export function SplitHeader(props: { ref: Setter<HTMLDivElement | null> }) {
</Portal>
)}
</Show>
- <div class="absolute inset-0 flex justify-start items-center mobile:px-(--mobile-chrome-gutter) mobile:gap-2">
+ <div
+ class="absolute inset-0 flex justify-start items-center mobile:px-(--mobile-chrome-gutter) mobile:gap-2"
+ ref={props.collapseController.setRow}
+ >
<Show
when={isMobile()}
fallback={
@@ -528,10 +540,12 @@ export function SplitHeader(props: { ref: Setter<HTMLDivElement | null> }) {
</HeaderIsland>
</Show>
- <div
- class="relative min-w-0 h-full shrink pl-2 flex items-center gap-0.5 mobile:pl-0 mobile:gap-2"
- ref={(ref) => {
- panel.layoutRefs.headerLeft = ref;
+ <PriorityCollapseOverflowSensor
+ controller={props.collapseController}
+ class="relative min-w-0 h-full shrink overflow-hidden mobile:overflow-visible"
+ contentClass="h-full flex items-center gap-0.5 pl-2 mobile:pl-0 mobile:gap-2"
+ contentRef={(element) => {
+ panel.layoutRefs.headerLeft = element;
}}
/>
diff --git a/apps/web/src/components/app/split-layout/components/SplitPanel.tsx b/apps/web/src/components/app/split-layout/components/SplitPanel.tsx
index a0897748d4..50ca31f2f5 100644
--- a/apps/web/src/components/app/split-layout/components/SplitPanel.tsx
+++ b/apps/web/src/components/app/split-layout/components/SplitPanel.tsx
@@ -33,7 +33,7 @@ import {
import { useSplitLayout } from '../layout';
import type { SplitHandle, SplitState } from '../layoutManager';
import { registerSplitHotkeys } from '../registerSplitHotkeys';
-import { createHeaderCollapser } from '../utils/createHeaderCollapser';
+import { createPriorityCollapseController } from './PriorityCollapseOverflowSensor';
import { SplitDrawerGroup } from './SplitDrawerContext';
import { SplitHeader } from './SplitHeader';
import { SplitToolbar } from './SplitToolbar';
@@ -69,10 +69,8 @@ export function SplitPanel(props: SplitPanelProps) {
const panelSize = createElementSize(panelRef);
const layoutRefs: SplitPanelContextType['layoutRefs'] = {};
- const headerCollapser = createHeaderCollapser(
- () => layoutRefs.headerLeft,
- () => panelSize.width
- );
+ const headerCollapseController = createPriorityCollapseController();
+ const toolbarCollapseController = createPriorityCollapseController();
const splitLayoutHelpers = useSplitLayout();
@@ -233,7 +231,8 @@ export function SplitPanel(props: SplitPanelProps) {
);
};
},
- headerCollapser,
+ headerCollapser: headerCollapseController.collapser,
+ toolbarCollapser: toolbarCollapseController.collapser,
layoutRefs,
titleFileMenuRef,
setTitleFileMenuRef,
@@ -327,7 +326,10 @@ export function SplitPanel(props: SplitPanelProps) {
shouldHideSplitHeader() && 'hidden'
)}
>
- <SplitHeader ref={setHeaderRef} />
+ <SplitHeader
+ ref={setHeaderRef}
+ collapseController={headerCollapseController}
+ />
</Panel.Header>
<Panel.Toolbar
@@ -338,7 +340,10 @@ export function SplitPanel(props: SplitPanelProps) {
'border-b-0'
)}
>
- <SplitToolbar ref={setToolbarRef} />
+ <SplitToolbar
+ ref={setToolbarRef}
+ collapseController={toolbarCollapseController}
+ />
</Panel.Toolbar>
<Panel.Body>
diff --git a/apps/web/src/components/app/split-layout/components/SplitToolbar.tsx b/apps/web/src/components/app/split-layout/components/SplitToolbar.tsx
index 67c639445b..1998988c78 100644
--- a/apps/web/src/components/app/split-layout/components/SplitToolbar.tsx
+++ b/apps/web/src/components/app/split-layout/components/SplitToolbar.tsx
@@ -1,3 +1,4 @@
+import { mergeRefs } from '@solid-primitives/refs';
import {
createRenderEffect,
createSignal,
@@ -7,8 +8,15 @@ import {
} from 'solid-js';
import { Portal } from 'solid-js/web';
import { useSplitPanelOrThrow } from '../layoutUtils';
+import {
+ type PriorityCollapseController,
+ PriorityCollapseOverflowSensor,
+} from './PriorityCollapseOverflowSensor';
-export function SplitToolbar(props: { ref: Setter<HTMLDivElement | null> }) {
+export function SplitToolbar(props: {
+ ref: Setter<HTMLDivElement | null>;
+ collapseController: PriorityCollapseController;
+}) {
const panel = useSplitPanelOrThrow();
// Layout / spacing / border / min-height live on <Panel.Toolbar> in
@@ -19,12 +27,14 @@ export function SplitToolbar(props: { ref: Setter<HTMLDivElement | null> }) {
<div
class="flex items-center justify-between w-full"
data-split-toolbar
- ref={props.ref}
+ ref={mergeRefs(props.collapseController.setRow, props.ref)}
>
- <div
- class="flex-1 flex items-center gap-1"
- ref={(ref) => {
- panel.layoutRefs.toolbarLeft = ref;
+ <PriorityCollapseOverflowSensor
+ controller={props.collapseController}
+ class="min-w-0 flex-1 overflow-hidden"
+ contentClass="flex items-center gap-1"
+ contentRef={(element) => {
+ panel.layoutRefs.toolbarLeft = element;
}}
/>
<div
diff --git a/apps/web/src/components/app/split-layout/context.ts b/apps/web/src/components/app/split-layout/context.ts
index e30ba208de..c8f496807a 100644
--- a/apps/web/src/components/app/split-layout/context.ts
+++ b/apps/web/src/components/app/split-layout/context.ts
@@ -7,27 +7,7 @@ import {
type Setter,
} from 'solid-js';
import type { SplitHandle, SplitManager } from './layoutManager';
-
-export type CollapsibleRegistration = {
- id: string;
- priority: number; // lower = higher priority to collapse first
- collapsed: Accessor<boolean>;
- // silent skips onCollapsedChange — used for pre-paint trial measurements
- setCollapsed: (value: boolean, opts?: { silent?: boolean }) => void;
- ref: Accessor<HTMLElement | null | undefined>; // uncollapsed element — measured before collapse
- collapsedRef?: Accessor<HTMLElement | null | undefined>; // collapsed element — measured while collapsed
-};
-
-export type CollapsibleItemInput = Omit<
- CollapsibleRegistration,
- 'collapsed' | 'setCollapsed'
-> & {
- onCollapsedChange?: (isCollapsed: boolean) => void;
-};
-
-export type HeaderCollapser = {
- register: (reg: CollapsibleRegistration) => () => void; // returns cleanup
-};
+import type { PriorityCollapser } from './utils/createPriorityCollapser';
export const SplitLayoutContext = createContext<{
manager: SplitManager;
@@ -93,7 +73,8 @@ export type SplitPanelContextType = {
setTitleFileMenuTrigger: Setter<(() => void) | undefined>;
titleFileMenuActions: Accessor<SplitFileMenuActionGroups | undefined>;
setTitleFileMenuActions: Setter<SplitFileMenuActionGroups | undefined>;
- headerCollapser: HeaderCollapser;
+ headerCollapser: PriorityCollapser;
+ toolbarCollapser: PriorityCollapser;
};
export const SplitPanelContext = createContext<SplitPanelContextType>();
diff --git a/apps/web/src/components/app/split-layout/layoutUtils.ts b/apps/web/src/components/app/split-layout/layoutUtils.ts
index 745ca9a811..413f2bbf50 100644
--- a/apps/web/src/components/app/split-layout/layoutUtils.ts
+++ b/apps/web/src/components/app/split-layout/layoutUtils.ts
@@ -10,17 +10,14 @@ import {
onCleanup,
useContext,
} from 'solid-js';
-import {
- type CollapsibleItemInput,
- SplitLayoutContext,
- SplitPanelContext,
-} from './context';
+import { SplitLayoutContext, SplitPanelContext } from './context';
import type {
SplitContent,
SplitContentType,
SplitHandle,
SplitManager,
} from './layoutManager';
+import type { CollapsibleItemInput } from './utils/createPriorityCollapser';
export function decodePairs(segments: string[]): SplitContent[] {
const pairs: SplitContent[] = [];
@@ -173,8 +170,9 @@ function _createIsActiveSplitContentMemo(
});
}
-export function useRegisterCollapsibleHeaderItem(
- input: CollapsibleItemInput
+function useRegisterCollapsibleItem(
+ input: CollapsibleItemInput,
+ region: 'header' | 'toolbar'
): Accessor<boolean> {
const [collapsed, setCollapsedInner] = createSignal(false);
const setCollapsed = (value: boolean, opts?: { silent?: boolean }) => {
@@ -183,7 +181,9 @@ export function useRegisterCollapsibleHeaderItem(
};
input.onCollapsedChange?.(false);
const ctx = useSplitPanelOrThrow();
- const cleanup = ctx.headerCollapser.register({
+ const collapser =
+ region === 'header' ? ctx.headerCollapser : ctx.toolbarCollapser;
+ const cleanup = collapser.register({
...input,
collapsed,
setCollapsed,
@@ -191,3 +191,15 @@ export function useRegisterCollapsibleHeaderItem(
onCleanup(cleanup);
return collapsed;
}
+
+export function useRegisterCollapsibleHeaderItem(
+ input: CollapsibleItemInput
+): Accessor<boolean> {
+ return useRegisterCollapsibleItem(input, 'header');
+}
+
+export function useRegisterCollapsibleToolbarItem(
+ input: CollapsibleItemInput
+): Accessor<boolean> {
+ return useRegisterCollapsibleItem(input, 'toolbar');
+}
diff --git a/apps/web/src/components/app/split-layout/previewController.ts b/apps/web/src/components/app/split-layout/previewController.ts
index 0bcb070473..1f8f8fd8d3 100644
--- a/apps/web/src/components/app/split-layout/previewController.ts
+++ b/apps/web/src/components/app/split-layout/previewController.ts
@@ -44,7 +44,7 @@ const PREVIEW_CONTROLLER_CONTENT_CONFIG: readonly PreviewControllerContentConfig
{
type: 'component',
id: LIST_VIEW_ID.channels,
- redistributionWidth: { preferredPx: 360 },
+ redistributionWidth: { preferredPx: 300 },
},
{
type: 'component',
@@ -56,7 +56,7 @@ const PREVIEW_CONTROLLER_CONTENT_CONFIG: readonly PreviewControllerContentConfig
id: LIST_VIEW_ID.companies,
redistributionWidth: {
preferredPx: 880,
- maxViewportFraction: 0.7,
+ maxViewportFraction: 0.6,
},
},
];
diff --git a/apps/web/src/components/app/split-layout/splitContentSizing.ts b/apps/web/src/components/app/split-layout/splitContentSizing.ts
index cbe9d994d5..3611906ae7 100644
--- a/apps/web/src/components/app/split-layout/splitContentSizing.ts
+++ b/apps/web/src/components/app/split-layout/splitContentSizing.ts
@@ -4,8 +4,15 @@ import type { SplitContent } from './layoutManager';
/** Default hard minimum width for split content without an override. */
export const DEFAULT_SPLIT_MIN_WIDTH = 400;
+type SplitContentSizingContext = {
+ isPreviewController: boolean;
+};
+
type SplitContentSizingConfig = {
- matches: (content: SplitContent) => boolean;
+ matches: (
+ content: SplitContent,
+ context: SplitContentSizingContext
+ ) => boolean;
minWidthPx: number;
};
@@ -15,16 +22,22 @@ type SplitContentSizingConfig = {
*/
const SPLIT_CONTENT_SIZING_CONFIG: readonly SplitContentSizingConfig[] = [
{
- matches: (content) =>
- content.type === 'component' && isListViewID(content.id),
- minWidthPx: 340,
+ matches: (content, context) =>
+ context.isPreviewController &&
+ content.type === 'component' &&
+ isListViewID(content.id),
+ // NOTE: 300 is as low as we can go without rethinking the layout.
+ minWidthPx: 300,
},
];
/** Resolve the hard minimum width for a split from its mounted content. */
-export function splitMinWidthForContent(content: SplitContent): number {
+export function splitMinWidthForContent(
+ content: SplitContent,
+ context: SplitContentSizingContext
+): number {
const config = SPLIT_CONTENT_SIZING_CONFIG.find((candidate) =>
- candidate.matches(content)
+ candidate.matches(content, context)
);
return config?.minWidthPx ?? DEFAULT_SPLIT_MIN_WIDTH;
}
diff --git a/apps/web/src/components/app/split-layout/tests/createPriorityCollapser.test.ts b/apps/web/src/components/app/split-layout/tests/createPriorityCollapser.test.ts
new file mode 100644
index 0000000000..7920520a1b
--- /dev/null
+++ b/apps/web/src/components/app/split-layout/tests/createPriorityCollapser.test.ts
@@ -0,0 +1,169 @@
+import { createRoot, createSignal } from 'solid-js';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import {
+ type CollapsibleRegistration,
+ createPriorityCollapser,
+ type OverflowProbe,
+} from '../utils/createPriorityCollapser';
+
+type TestItem = {
+ id: string;
+ collapsedWidth: number;
+ expandedWidth: number;
+ collapsed: () => boolean;
+};
+
+describe('createPriorityCollapser', () => {
+ let nextFrameId: number;
+ let frames: Map<number, FrameRequestCallback>;
+
+ beforeEach(() => {
+ nextFrameId = 0;
+ frames = new Map();
+ vi.stubGlobal(
+ 'requestAnimationFrame',
+ vi.fn((callback: FrameRequestCallback) => {
+ const id = ++nextFrameId;
+ frames.set(id, callback);
+ return id;
+ })
+ );
+ vi.stubGlobal(
+ 'cancelAnimationFrame',
+ vi.fn((id: number) => frames.delete(id))
+ );
+ });
+
+ afterEach(() => {
+ vi.unstubAllGlobals();
+ });
+
+ function flushAnimationFrames() {
+ while (frames.size > 0) {
+ const queued = [...frames.values()];
+ frames.clear();
+ for (const callback of queued) callback(0);
+ }
+ }
+
+ function createHarness() {
+ const items: TestItem[] = [];
+ const transitions: Array<{
+ id: string;
+ collapsed: boolean;
+ silent: boolean;
+ }> = [];
+ let availableWidth = 85;
+ let retryWidth = 100;
+ let invalidate = () => {};
+ let disposeRoot = () => {};
+
+ const probe: OverflowProbe = {
+ measure: () => ({
+ requiredWidth:
+ 20 +
+ items.reduce(
+ (width, item) =>
+ width +
+ (item.collapsed() ? item.collapsedWidth : item.expandedWidth),
+ 0
+ ),
+ availableWidth,
+ retryWidth,
+ }),
+ observe: (onChange) => {
+ invalidate = onChange;
+ return () => {};
+ },
+ };
+
+ const collapser = createRoot((dispose) => {
+ disposeRoot = dispose;
+ return createPriorityCollapser(probe);
+ });
+
+ const register = (
+ id: string,
+ priority: number,
+ expandedWidth: number,
+ collapsedWidth: number
+ ) => {
+ const [collapsed, setCollapsed] = createSignal(false);
+ items.push({ id, collapsed, expandedWidth, collapsedWidth });
+ collapser.register({
+ id,
+ priority,
+ collapsed,
+ setCollapsed: (value, options) => {
+ transitions.push({
+ id,
+ collapsed: value,
+ silent: options?.silent ?? false,
+ });
+ setCollapsed(value);
+ },
+ } satisfies CollapsibleRegistration);
+ return collapsed;
+ };
+
+ return {
+ dispose: disposeRoot,
+ invalidate: () => {
+ invalidate();
+ flushAnimationFrames();
+ },
+ register,
+ setAvailableWidth: (width: number) => {
+ availableWidth = width;
+ },
+ setRetryWidth: (width: number) => {
+ retryWidth = width;
+ },
+ transitions,
+ };
+ }
+
+ it('collapses the lowest-priority-number item first and stops once content fits', () => {
+ const harness = createHarness();
+ const first = harness.register('first', 1, 50, 20);
+ const second = harness.register('second', 2, 40, 15);
+
+ harness.invalidate();
+
+ expect(first()).toBe(true);
+ expect(second()).toBe(false);
+ expect(
+ harness.transitions
+ .filter(({ collapsed }) => collapsed)
+ .map(({ id }) => id)
+ ).toEqual(['first']);
+
+ harness.dispose();
+ });
+
+ it('expands in reverse priority order as space returns', () => {
+ const harness = createHarness();
+ const first = harness.register('first', 1, 50, 20);
+ const second = harness.register('second', 2, 40, 15);
+
+ harness.setAvailableWidth(60);
+ harness.invalidate();
+ expect(first()).toBe(true);
+ expect(second()).toBe(true);
+
+ harness.transitions.length = 0;
+ harness.setAvailableWidth(85);
+ harness.setRetryWidth(130);
+ harness.invalidate();
+
+ expect(first()).toBe(true);
+ expect(second()).toBe(false);
+ expect(harness.transitions).toContainEqual({
+ id: 'second',
+ collapsed: false,
+ silent: false,
+ });
+
+ harness.dispose();
+ });
+});
diff --git a/apps/web/src/components/app/split-layout/tests/layoutManager.test.ts b/apps/web/src/components/app/split-layout/tests/layoutManager.test.ts
index 85b8e7a207..5dee4687dd 100644
--- a/apps/web/src/components/app/split-layout/tests/layoutManager.test.ts
+++ b/apps/web/src/components/app/split-layout/tests/layoutManager.test.ts
@@ -8,6 +8,7 @@ import {
SplitEvent,
} from '../layoutManager';
import { createMobileSwipeLayout } from '../mobile/createMobileSwipeLayout';
+import { previewControllerWidthForContent } from '../previewController';
vi.mock('../componentRegistry', () => ({
resolveComponent: vi.fn((id: string, params: Record<string, string>) => ({
@@ -694,17 +695,19 @@ describe('layoutManager', () => {
});
});
- it('caps the Companies controller width at 70vw', () => {
+ it('uses the configured Companies controller width', () => {
createRoot((dispose) => {
- const manager = createSplitLayout(createMockOrchestrator(), [
- { type: 'component', id: 'companies' },
- ]);
+ const content = { type: 'component' as const, id: 'companies' };
+ const manager = createSplitLayout(createMockOrchestrator(), [content]);
const controllerId = manager.splits()[0].id;
manager.engagePreviewMode(controllerId);
- expect(manager.previewControllerWidth(controllerId, 1000)).toBe(700);
- expect(manager.previewControllerWidth(controllerId, 1600)).toBe(880);
+ for (const viewportWidth of [1000, 1600]) {
+ expect(
+ manager.previewControllerWidth(controllerId, viewportWidth)
+ ).toBe(previewControllerWidthForContent(content, viewportWidth));
+ }
dispose();
});
diff --git a/apps/web/src/components/app/split-layout/tests/previewController.test.ts b/apps/web/src/components/app/split-layout/tests/previewController.test.ts
index efdefff6ae..ef3aaede8e 100644
--- a/apps/web/src/components/app/split-layout/tests/previewController.test.ts
+++ b/apps/web/src/components/app/split-layout/tests/previewController.test.ts
@@ -3,7 +3,10 @@ import {
isPreviewControllerContent,
previewControllerWidthForContent,
} from '../previewController';
-import { splitMinWidthForContent } from '../splitContentSizing';
+import {
+ DEFAULT_SPLIT_MIN_WIDTH,
+ splitMinWidthForContent,
+} from '../splitContentSizing';
describe('preview controller content', () => {
it('explicitly recognizes configured content', () => {
@@ -20,30 +23,39 @@ describe('preview controller content', () => {
});
it('resolves default and content-specific widths from the same config', () => {
- expect(
- previewControllerWidthForContent({ type: 'component', id: 'inbox' })
- ).toBe(440);
- expect(
- previewControllerWidthForContent({ type: 'component', id: 'channels' })
- ).toBe(360);
- expect(
- previewControllerWidthForContent({ type: 'component', id: 'mail' })
- ).toBe(800);
- expect(
- previewControllerWidthForContent({ type: 'component', id: 'companies' })
- ).toBe(880);
- expect(
- previewControllerWidthForContent(
- { type: 'component', id: 'companies' },
- 1000
- )
- ).toBe(700);
- expect(
- previewControllerWidthForContent(
- { type: 'component', id: 'companies' },
- 1600
- )
- ).toBe(880);
+ const defaultWidth = previewControllerWidthForContent({
+ type: 'component',
+ id: 'inbox',
+ });
+ const channelsWidth = previewControllerWidthForContent({
+ type: 'component',
+ id: 'channels',
+ });
+ const mailWidth = previewControllerWidthForContent({
+ type: 'component',
+ id: 'mail',
+ });
+ const companiesWidth = previewControllerWidthForContent({
+ type: 'component',
+ id: 'companies',
+ });
+
+ expect(defaultWidth).toBeDefined();
+ expect(channelsWidth).not.toBe(defaultWidth);
+ expect(mailWidth).not.toBe(defaultWidth);
+ expect(companiesWidth).not.toBe(defaultWidth);
+
+ const companiesWidthInNarrowViewport = previewControllerWidthForContent(
+ { type: 'component', id: 'companies' },
+ 100
+ );
+ const companiesWidthInWideViewport = previewControllerWidthForContent(
+ { type: 'component', id: 'companies' },
+ 10_000
+ );
+ expect(companiesWidthInNarrowViewport).toBeLessThan(
+ companiesWidthInWideViewport!
+ );
expect(
previewControllerWidthForContent({ type: 'component', id: 'settings' })
).toBeUndefined();
@@ -52,19 +64,28 @@ describe('preview controller content', () => {
type: 'project',
id: 'project-1',
})
- ).toBe(440);
+ ).toBe(defaultWidth);
});
- it('uses the list-view minimum width with a 400px default', () => {
- expect(splitMinWidthForContent({ type: 'component', id: 'channels' })).toBe(
- 340
- );
- expect(splitMinWidthForContent({ type: 'component', id: 'inbox' })).toBe(
- 340
- );
- expect(splitMinWidthForContent({ type: 'component', id: 'settings' })).toBe(
- 400
+ it('uses the configured list-view minimum only for Preview Controllers', () => {
+ const previewController = { isPreviewController: true };
+ const standaloneSplit = { isPreviewController: false };
+ const listViewContent = { type: 'component' as const, id: 'inbox' };
+
+ expect(
+ splitMinWidthForContent(listViewContent, previewController)
+ ).not.toBe(DEFAULT_SPLIT_MIN_WIDTH);
+ expect(splitMinWidthForContent(listViewContent, standaloneSplit)).toBe(
+ DEFAULT_SPLIT_MIN_WIDTH
);
- expect(splitMinWidthForContent({ type: 'md', id: 'doc-1' })).toBe(400);
+ expect(
+ splitMinWidthForContent(
+ { type: 'component', id: 'settings' },
+ previewController
+ )
+ ).toBe(DEFAULT_SPLIT_MIN_WIDTH);
+ expect(
+ splitMinWidthForContent({ type: 'md', id: 'doc-1' }, previewController)
+ ).toBe(DEFAULT_SPLIT_MIN_WIDTH);
});
});
diff --git a/apps/web/src/components/app/split-layout/utils/createHeaderCollapser.ts b/apps/web/src/components/app/split-layout/utils/createHeaderCollapser.ts
deleted file mode 100644
index 45ecf79985..0000000000
--- a/apps/web/src/components/app/split-layout/utils/createHeaderCollapser.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-import { type Accessor, createEffect, onCleanup } from 'solid-js';
-import { createStore, produce } from 'solid-js/store';
-import type { CollapsibleRegistration, HeaderCollapser } from '../context';
-
-const OVERFLOW_EPSILON_PX = 2;
-const RETRY_PANEL_GROWTH_PX = 12;
-
-function getContentWidth(container: HTMLElement): number {
- let itemTotal = 0;
- let itemCount = 0;
- for (const child of Array.from(container.children) as HTMLElement[]) {
- if (getComputedStyle(child).display === 'contents') {
- for (const inner of Array.from(child.children) as HTMLElement[]) {
- itemTotal += inner.offsetWidth;
- itemCount++;
- }
- } else {
- itemTotal += child.offsetWidth;
- itemCount++;
- }
- }
- const style = getComputedStyle(container);
- const paddingLeft = parseFloat(style.paddingLeft) || 0;
- const paddingRight = parseFloat(style.paddingRight) || 0;
- const gap = parseFloat(style.columnGap) || 0;
- return (
- itemTotal + paddingLeft + paddingRight + gap * Math.max(0, itemCount - 1)
- );
-}
-
-export function createHeaderCollapser(
- getContainer: Accessor<HTMLElement | undefined>,
- panelSizeWidth: Accessor<number | null | undefined>
-): HeaderCollapser {
- const [items, setItems] = createStore<CollapsibleRegistration[]>([]);
- let observer: ResizeObserver | null = null;
- let rafId: number | null = null;
- let evaluateQueued = false;
- let lastFailedExpand: { contentWidth: number; panelWidth: number } | null =
- null;
-
- const scheduleEvaluate = () => {
- if (evaluateQueued) return;
- evaluateQueued = true;
- rafId = requestAnimationFrame(() => {
- evaluateQueued = false;
- rafId = null;
- evaluate();
- });
- };
-
- const overflows = (headerLeft: HTMLElement) =>
- getContentWidth(headerLeft) - headerLeft.offsetWidth > OVERFLOW_EPSILON_PX;
-
- const evaluate = () => {
- const headerLeft = getContainer();
- if (!headerLeft) return;
-
- if (!observer) {
- observer = new ResizeObserver(() => scheduleEvaluate());
- observer.observe(headerLeft);
- }
-
- if (items.length === 0) return;
-
- const contentWidth = getContentWidth(headerLeft);
- const availableWidth = headerLeft.offsetWidth;
- const panelWidth = panelSizeWidth() ?? availableWidth;
-
- if (contentWidth - availableWidth > OVERFLOW_EPSILON_PX) {
- const byCollapseOrder = items
- .filter((i) => !i.collapsed())
- .sort((a, b) => a.priority - b.priority);
- for (const item of byCollapseOrder) {
- item.setCollapsed(true);
- if (!overflows(headerLeft)) break;
- }
- lastFailedExpand = {
- contentWidth: getContentWidth(headerLeft),
- panelWidth,
- };
- return;
- }
-
- const byExpandOrder = items
- .filter((i) => i.collapsed())
- .sort((a, b) => b.priority - a.priority);
- if (byExpandOrder.length === 0) return;
-
- if (
- lastFailedExpand &&
- contentWidth === lastFailedExpand.contentWidth &&
- panelWidth < lastFailedExpand.panelWidth + RETRY_PANEL_GROWTH_PX
- ) {
- return;
- }
-
- // Trial expansion runs between layout and paint, so a reverted attempt is
- // never visible; silent keeps onCollapsedChange from firing for it.
- for (const item of byExpandOrder) {
- item.setCollapsed(false, { silent: true });
- if (overflows(headerLeft)) {
- item.setCollapsed(true, { silent: true });
- lastFailedExpand = {
- contentWidth: getContentWidth(headerLeft),
- panelWidth,
- };
- break;
- }
- item.setCollapsed(false);
- }
- };
-
- createEffect(() => {
- panelSizeWidth();
- scheduleEvaluate();
- });
-
- createEffect(() => {
- for (const item of items) {
- item.collapsed();
- }
- scheduleEvaluate();
- });
-
- onCleanup(() => {
- observer?.disconnect();
- if (rafId !== null) cancelAnimationFrame(rafId);
- });
-
- return {
- register(reg: CollapsibleRegistration) {
- setItems(produce((arr: CollapsibleRegistration[]) => arr.push(reg)));
- lastFailedExpand = null;
- return () => {
- setItems(
- produce((arr: CollapsibleRegistration[]) => {
- const idx = arr.findIndex((i) => i.id === reg.id);
- if (idx !== -1) arr.splice(idx, 1);
- })
- );
- lastFailedExpand = null;
- };
- },
- };
-}
diff --git a/apps/web/src/components/app/split-layout/utils/createPriorityCollapser.ts b/apps/web/src/components/app/split-layout/utils/createPriorityCollapser.ts
new file mode 100644
index 0000000000..30e488dece
--- /dev/null
+++ b/apps/web/src/components/app/split-layout/utils/createPriorityCollapser.ts
@@ -0,0 +1,169 @@
+import { type Accessor, createEffect, createSignal, onCleanup } from 'solid-js';
+
+const OVERFLOW_EPSILON_PX = 2;
+const RETRY_WIDTH_GROWTH_PX = 12;
+
+export type CollapsibleRegistration = {
+ id: string;
+ /** Lower numbers collapse first. */
+ priority: number;
+ collapsed: Accessor<boolean>;
+ /** `silent` suppresses callbacks during pre-paint trial measurements. */
+ setCollapsed: (value: boolean, options?: { silent?: boolean }) => void;
+};
+
+export type CollapsibleItemInput = Omit<
+ CollapsibleRegistration,
+ 'collapsed' | 'setCollapsed'
+> & {
+ onCollapsedChange?: (isCollapsed: boolean) => void;
+};
+
+export type PriorityCollapser = {
+ register: (registration: CollapsibleRegistration) => () => void;
+};
+
+/** Widths used by the priority-collapse policy. */
+export type OverflowMeasurement = {
+ /** Intrinsic width required by the flexible region's content. */
+ requiredWidth: number;
+ /** Width currently available to the flexible region. */
+ availableWidth: number;
+ /** Width whose growth should permit another failed expansion attempt. */
+ retryWidth: number;
+};
+
+/**
+ * Measurement boundary consumed by the priority-collapse policy.
+ *
+ * Implementations own all environment-specific observation and measurement;
+ * the controller only asks for a width snapshot and an invalidation callback.
+ */
+export type OverflowProbe = {
+ measure: () => OverflowMeasurement | undefined;
+ observe: (onChange: () => void) => () => void;
+};
+
+/**
+ * Collapse registered items in priority order until the supplied probe fits,
+ * and expand them in reverse order as space returns.
+ *
+ * This controller is headless: it has no DOM knowledge. The probe determines
+ * what constitutes required, available, and retry width.
+ */
+export function createPriorityCollapser(
+ probe: OverflowProbe
+): PriorityCollapser {
+ const [items, setItems] = createSignal<CollapsibleRegistration[]>([]);
+ let rafId: number | null = null;
+ let evaluateQueued = false;
+ let lastFailedExpand: {
+ requiredWidth: number;
+ retryWidth: number;
+ } | null = null;
+
+ const overflows = () => {
+ const measurement = probe.measure();
+ return (
+ measurement !== undefined &&
+ measurement.requiredWidth - measurement.availableWidth >
+ OVERFLOW_EPSILON_PX
+ );
+ };
+
+ const evaluate = () => {
+ const measurement = probe.measure();
+ if (!measurement || items().length === 0) return;
+
+ if (
+ measurement.requiredWidth - measurement.availableWidth >
+ OVERFLOW_EPSILON_PX
+ ) {
+ const byCollapseOrder = items()
+ .filter((item) => !item.collapsed())
+ .sort((a, b) => a.priority - b.priority);
+ for (const item of byCollapseOrder) {
+ item.setCollapsed(true);
+ if (!overflows()) break;
+ }
+
+ const collapsedMeasurement = probe.measure();
+ if (collapsedMeasurement) {
+ lastFailedExpand = {
+ requiredWidth: collapsedMeasurement.requiredWidth,
+ retryWidth: collapsedMeasurement.retryWidth,
+ };
+ }
+ return;
+ }
+
+ const byExpandOrder = items()
+ .filter((item) => item.collapsed())
+ .sort((a, b) => b.priority - a.priority);
+ if (byExpandOrder.length === 0) return;
+
+ if (
+ lastFailedExpand &&
+ measurement.requiredWidth === lastFailedExpand.requiredWidth &&
+ measurement.retryWidth <
+ lastFailedExpand.retryWidth + RETRY_WIDTH_GROWTH_PX
+ ) {
+ return;
+ }
+
+ // Trial expansion runs between layout and paint, so a reverted attempt is
+ // never visible; silent keeps onCollapsedChange from firing for it.
+ for (const item of byExpandOrder) {
+ item.setCollapsed(false, { silent: true });
+ if (overflows()) {
+ item.setCollapsed(true, { silent: true });
+ const collapsedMeasurement = probe.measure();
+ if (collapsedMeasurement) {
+ lastFailedExpand = {
+ requiredWidth: collapsedMeasurement.requiredWidth,
+ retryWidth: collapsedMeasurement.retryWidth,
+ };
+ }
+ break;
+ }
+ item.setCollapsed(false);
+ }
+ };
+
+ const scheduleEvaluate = () => {
+ if (evaluateQueued) return;
+ evaluateQueued = true;
+ rafId = requestAnimationFrame(() => {
+ evaluateQueued = false;
+ rafId = null;
+ evaluate();
+ });
+ };
+
+ const stopObserving = probe.observe(scheduleEvaluate);
+
+ createEffect(() => {
+ for (const item of items()) {
+ item.collapsed();
+ }
+ scheduleEvaluate();
+ });
+
+ onCleanup(() => {
+ stopObserving();
+ if (rafId !== null) cancelAnimationFrame(rafId);
+ });
+
+ return {
+ register(registration) {
+ setItems((registeredItems) => [...registeredItems, registration]);
+ lastFailedExpand = null;
+ return () => {
+ setItems((registeredItems) =>
+ registeredItems.filter((item) => item.id !== registration.id)
+ );
+ lastFailedExpand = null;
+ };
+ },
+ };
+}
diff --git a/apps/web/src/features/block-channel/component/Top.tsx b/apps/web/src/features/block-channel/component/Top.tsx
index c4ef2828ff..d430f8f5e0 100644
--- a/apps/web/src/features/block-channel/component/Top.tsx
+++ b/apps/web/src/features/block-channel/component/Top.tsx
@@ -1,5 +1,5 @@
import type { ChannelTabId } from '@channel/Channel/channel-tabs';
-import { CollapsibleHeaderItem } from '@components/app/split-layout/components/CollapsibleHeaderItem';
+import { CollapsibleHeaderItem } from '@components/app/split-layout/components/CollapsibleItem';
import { HeaderIsland } from '@components/app/split-layout/components/HeaderIsland';
import { HeaderTitleMenu } from '@components/app/split-layout/components/HeaderTitleMenu';
import { SplitHeaderLeft } from '@components/app/split-layout/components/SplitHeader';
@@ -113,25 +113,19 @@ export function ChannelTopLeft(props: ChannelTopLeftProps) {
id="channel-tabs"
priority={1}
containerClass="ph-no-capture min-w-0 shrink-0 h-full mx-2"
- expanded={() => (
+ >
+ {(isCollapsed) => (
<TabsInset
- list={[...(props.tabs ?? [])]}
- value={props.activeTab}
- onChange={(value) =>
- props.onTabChange?.(value as ChannelTabId)
+ list={
+ isCollapsed() ? iconTabList() : [...(props.tabs ?? [])]
}
- />
- )}
- collapsed={() => (
- <TabsInset
- list={iconTabList()}
value={props.activeTab}
onChange={(value) =>
props.onTabChange?.(value as ChannelTabId)
}
/>
)}
- />
+ </CollapsibleHeaderItem>
</Show>
</>
}
diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/group-dropdown.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/group-dropdown.tsx
index 4ab3f5ba4f..3ac10012d3 100644
--- a/apps/web/src/features/next-soup/soup-view/filters-bar/group-dropdown.tsx
+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/group-dropdown.tsx
@@ -4,7 +4,7 @@ import type {
} from '@app/features/next-soup/soup-view/group-options';
import StackSimpleIcon from '@phosphor/stack-simple.svg';
import { Dropdown, SingleSelectCheck, Tooltip } from '@ui';
-import { type Component, For } from 'solid-js';
+import { type Component, For, Show } from 'solid-js';
interface GroupDropdownProps {
value: () => GroupOptionId;
@@ -12,6 +12,7 @@ interface GroupDropdownProps {
options: GroupOption[];
open?: boolean;
onOpenChange?: (open: boolean) => void;
+ hideLabel?: boolean;
}
export const GroupDropdown: Component<GroupDropdownProps> = (props) => {
@@ -22,9 +23,15 @@ export const GroupDropdown: Component<GroupDropdownProps> = (props) => {
placement="bottom-start"
>
<Tooltip label="Group">
- <Dropdown.Trigger depth={2} class="bg-surface">
+ <Dropdown.Trigger
+ depth={2}
+ class="bg-surface"
+ aria-label={props.hideLabel ? 'Group' : undefined}
+ >
<StackSimpleIcon />
- <span>Group</span>
+ <Show when={!props.hideLabel}>
+ <span>Group</span>
+ </Show>
</Dropdown.Trigger>
</Tooltip>
<Dropdown.Content class="shadow-menu">
diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/inbox-selector.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/inbox-selector.tsx
index b8c387e7ef..92a1136ffc 100644
--- a/apps/web/src/features/next-soup/soup-view/filters-bar/inbox-selector.tsx
+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/inbox-selector.tsx
@@ -1,7 +1,7 @@
import { openAddInboxDialog } from '@app/features/inbox/AddInboxDialog';
import { useSoupView } from '@app/features/next-soup/soup-view/soup-view-context';
import { useFeatureFlag } from '@app/lib/analytics/posthog';
-import { CollapsibleHeaderItem } from '@components/app/split-layout/components/CollapsibleHeaderItem';
+import { CollapsibleHeaderItem } from '@components/app/split-layout/components/CollapsibleItem';
import { ENABLE_MULTI_INBOX_OVERRIDE } from '@core/constant/featureFlags';
import { useSettingsState } from '@core/constant/SettingsState';
import { Combobox } from '@kobalte/core/combobox';
@@ -111,17 +111,16 @@ export function InboxSelector() {
id="inbox-selector"
priority={3}
containerClass="h-full"
- expanded={() => (
- <Show when={showConnectButton()} fallback={<Selector />}>
- <ConnectAnotherEmail />
- </Show>
- )}
- collapsed={() => (
- <Show when={showConnectButton()} fallback={<Selector hideLabel />}>
- <ConnectAnotherEmail hideLabel />
+ >
+ {(isCollapsed) => (
+ <Show
+ when={showConnectButton()}
+ fallback={<Selector hideLabel={isCollapsed()} />}
+ >
+ <ConnectAnotherEmail hideLabel={isCollapsed()} />
</Show>
)}
- />
+ </CollapsibleHeaderItem>
</Show>
);
}
diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/soup-filters-bar.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/soup-filters-bar.tsx
index 82a5cadda4..997b3cbbf4 100644
--- a/apps/web/src/features/next-soup/soup-view/filters-bar/soup-filters-bar.tsx
+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/soup-filters-bar.tsx
@@ -4,7 +4,12 @@ import { SoupViewContextGroup } from '@app/features/next-soup/soup-view/filters-
import { SoupViewContextSort } from '@app/features/next-soup/soup-view/filters-bar/soup-view-context-sort';
import { UnifiedFilterDropdown } from '@app/features/next-soup/soup-view/filters-bar/unified-filter-dropdown';
import { useFilterRefinements } from '@app/features/next-soup/soup-view/filters-bar/use-filter-refinements';
+import {
+ CompanyDisplayMenu,
+ CompanyViewsMenu,
+} from '@app/features/next-soup/soup-view/views/companies/CompanyViewsMenu';
import { useFeatureFlag } from '@app/lib/analytics/posthog';
+import { CollapsibleToolbarItem } from '@components/app/split-layout/components/CollapsibleItem';
import { PreviewButton } from '@components/app/split-layout/components/PreviewButton';
import {
SplitToolbarLeft,
@@ -35,6 +40,10 @@ export function SoupFiltersBar(props: {
const content = panel.handle.content();
return content.type === 'component' && content.id === 'search';
});
+ const isCompaniesView = createMemo(() => {
+ const content = panel.handle.content();
+ return content.type === 'component' && content.id === 'companies';
+ });
const isTagView = createMemo(() => props.variant === 'tag');
// The new inbox hides sort (it's fixed to updated_at for this view).
@@ -50,39 +59,65 @@ export function SoupFiltersBar(props: {
);
});
+ const CollapsibleGroup = () => (
+ <CollapsibleToolbarItem id="soup-toolbar-group" priority={0}>
+ {(isCollapsed) => <SoupViewContextGroup hideLabel={isCollapsed()} />}
+ </CollapsibleToolbarItem>
+ );
+
+ const CollapsibleFilter = () => (
+ <CollapsibleToolbarItem id="soup-toolbar-filter" priority={1}>
+ {(isCollapsed) => (
+ <UnifiedFilterDropdown
+ open={filterDropdownOpen}
+ onOpenChange={setFilterDropdownOpen}
+ hideLabel={isCollapsed()}
+ />
+ )}
+ </CollapsibleToolbarItem>
+ );
+
return (
<Show when={!isMobile()}>
<SplitToolbarLeft>
- <div class="flex items-start gap-1 min-w-0 flex-1">
- <Show
- when={!isSearchView() && !isTagView()}
- fallback={
- <Show when={isTagView()} fallback={<SearchFiltersRow />}>
- <Show when={!isNewInbox()}>
- <SoupViewContextSort />
- </Show>
- <SoupViewContextGroup />
+ <Show
+ when={!isSearchView() && !isTagView()}
+ fallback={
+ <Show when={isTagView()} fallback={<SearchFiltersRow />}>
+ <Show when={!isNewInbox()}>
+ <SoupViewContextSort />
</Show>
- }
- >
- <Show when={!isNewInbox()}>
- <SoupViewContextSort />
+ <CollapsibleGroup />
</Show>
- <SoupViewContextGroup />
- <UnifiedFilterDropdown
- open={filterDropdownOpen}
- onOpenChange={setFilterDropdownOpen}
- />
+ }
+ >
+ <Show when={!isNewInbox()}>
+ <SoupViewContextSort />
</Show>
- </div>
+ <CollapsibleGroup />
+ <CollapsibleFilter />
+ <Show when={isCompaniesView()}>
+ <CompanyDisplayMenu />
+ </Show>
+ </Show>
</SplitToolbarLeft>
<SplitToolbarRight>
- <PreviewButton
- disabled={!props.hasPreviewItems}
- disabledLabel="No items to preview"
- onEngage={props.onPreviewEngage}
- onOpenChange={props.onPreviewOpenChange}
- />
+ <Show when={isCompaniesView()}>
+ <CollapsibleToolbarItem id="soup-toolbar-views" priority={2}>
+ {(isCollapsed) => <CompanyViewsMenu hideLabel={isCollapsed()} />}
+ </CollapsibleToolbarItem>
+ </Show>
+ <CollapsibleToolbarItem id="soup-toolbar-preview" priority={3}>
+ {(isCollapsed) => (
+ <PreviewButton
+ disabled={!props.hasPreviewItems}
+ disabledLabel="No items to preview"
+ onEngage={props.onPreviewEngage}
+ onOpenChange={props.onPreviewOpenChange}
+ hideLabel={isCollapsed()}
+ />
+ )}
+ </CollapsibleToolbarItem>
</SplitToolbarRight>
{/* Active filters bar - shown below the toolbar when there are filters */}
<Show when={!isSearchView() && !isTagView()}>
diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/soup-view-context-group.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/soup-view-context-group.tsx
index caa6a6ab0d..38a85cb58b 100644
--- a/apps/web/src/features/next-soup/soup-view/filters-bar/soup-view-context-group.tsx
+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/soup-view-context-group.tsx
@@ -12,7 +12,7 @@ import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
import { ENABLE_SOUP_GROUP_BY_OVERRIDE } from '@core/constant/featureFlags';
import { createMemo, createSignal, Show } from 'solid-js';
-export const SoupViewContextGroup = () => {
+export const SoupViewContextGroup = (props: { hideLabel?: boolean }) => {
const panel = useSplitPanelOrThrow();
const { soup, viewMode } = useSoupView();
const groupByEnabled = useFeatureFlag('enable-soup-group-by', {
@@ -54,6 +54,7 @@ export const SoupViewContextGroup = () => {
options={TASK_GROUP_OPTIONS}
open={groupOpen()}
onOpenChange={setGroupOpen}
+ hideLabel={props.hideLabel}
/>
</Show>
{/* The board is inherently grouped by stage columns, so grouping only
@@ -65,6 +66,7 @@ export const SoupViewContextGroup = () => {
options={COMPANY_GROUP_OPTIONS}
open={groupOpen()}
onOpenChange={setGroupOpen}
+ hideLabel={props.hideLabel}
/>
</Show>
<Show when={component() === 'tag'}>
@@ -74,6 +76,7 @@ export const SoupViewContextGroup = () => {
options={TAG_VIEW_GROUP_OPTIONS}
open={groupOpen()}
onOpenChange={setGroupOpen}
+ hideLabel={props.hideLabel}
/>
</Show>
</Show>
diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/unified-filter-dropdown.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/unified-filter-dropdown.tsx
index d0ca3fbe76..b8099ced3a 100644
--- a/apps/web/src/features/next-soup/soup-view/filters-bar/unified-filter-dropdown.tsx
+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/unified-filter-dropdown.tsx
@@ -486,6 +486,8 @@ interface UnifiedFilterDropdownProps {
customTrigger?: JSX.Element;
/** Hide the default trigger entirely (useful when controlling open state externally) */
hideTrigger?: boolean;
+ /** Hide the default trigger's text label while retaining its tooltip. */
+ hideLabel?: boolean;
}
const READ_FILTER_OPTIONS: { id: ReadFilter; label: string }[] = [
@@ -879,9 +881,15 @@ export const UnifiedFilterDropdown = (
<Match when={props.customTrigger}>{props.customTrigger}</Match>
<Match when={true}>
<Tooltip label="Filter" hotkey={TOKENS.soup.filter}>
- <Dropdown.Trigger depth={2} class="bg-surface">
+ <Dropdown.Trigger
+ depth={2}
+ class="bg-surface"
+ aria-label={props.hideLabel ? 'Filter' : undefined}
+ >
<FilterIcon />
- <span>Filter</span>
+ <Show when={!props.hideLabel}>
+ <span>Filter</span>
+ </Show>
</Dropdown.Trigger>
</Tooltip>
</Match>
diff --git a/apps/web/src/features/next-soup/soup-view/soup-view-create-button.tsx b/apps/web/src/features/next-soup/soup-view/soup-view-create-button.tsx
index 614b0cdf99..80dfe0f035 100644
--- a/apps/web/src/features/next-soup/soup-view/soup-view-create-button.tsx
+++ b/apps/web/src/features/next-soup/soup-view/soup-view-create-button.tsx
@@ -6,7 +6,7 @@ import {
import { openCreateCompanyModal } from '@app/features/companies/CreateCompanyModal';
import { useHandleFileUpload } from '@app/util/handleFileUpload';
import { openNewChannelModal } from '@channel/CreateChannelModal';
-import { CollapsibleHeaderItem } from '@components/app/split-layout/components/CollapsibleHeaderItem';
+import { CollapsibleHeaderItem } from '@components/app/split-layout/components/CollapsibleItem';
import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
import type { BlockAlias, BlockName } from '@core/block';
import { EntityIcon } from '@core/component/EntityIcon';
@@ -224,23 +224,16 @@ export const SoupViewCreateButton = () => {
<NewCallButton />
</Show>
<Show when={options().length > 0}>
- <CollapsibleHeaderItem
- id="create-button"
- priority={2}
- expanded={() => (
- <Show when={options().length > 1} fallback={<SingleOptionButton />}>
- <MultiOptionButton />
- </Show>
- )}
- collapsed={() => (
+ <CollapsibleHeaderItem id="create-button" priority={2}>
+ {(isCollapsed) => (
<Show
when={options().length > 1}
- fallback={<SingleOptionButton hideLabel />}
+ fallback={<SingleOptionButton hideLabel={isCollapsed()} />}
>
- <MultiOptionButton hideLabel />
+ <MultiOptionButton hideLabel={isCollapsed()} />
</Show>
)}
- />
+ </CollapsibleHeaderItem>
</Show>
</>
);
diff --git a/apps/web/src/features/next-soup/soup-view/soup-view.tsx b/apps/web/src/features/next-soup/soup-view/soup-view.tsx
index a0a7f0598b..ea789da98e 100644
--- a/apps/web/src/features/next-soup/soup-view/soup-view.tsx
+++ b/apps/web/src/features/next-soup/soup-view/soup-view.tsx
@@ -42,10 +42,6 @@ import { useIsNewInboxEnabled } from '@app/features/next-soup/soup-view/use-is-n
import { CompanyKanban } from '@app/features/next-soup/soup-view/views/companies/CompanyKanban';
import { CompanyListEntity } from '@app/features/next-soup/soup-view/views/companies/CompanyListEntity';
import { ResponsiveCompanyListHeader } from '@app/features/next-soup/soup-view/views/companies/CompanyListHeader';
-import {
- CompanyDisplayMenu,
- CompanyViewsMenu,
-} from '@app/features/next-soup/soup-view/views/companies/CompanyViewsMenu';
import { CrmDefaultViewLoader } from '@app/features/next-soup/soup-view/views/companies/CrmDefaultView';
import { DateGroupHeader } from '@app/features/next-soup/soup-view/views/inbox/date-group-header';
import { InboxListEntity } from '@app/features/next-soup/soup-view/views/inbox/InboxListEntity';
@@ -67,7 +63,7 @@ import { useGlobalNotificationSource } from '@components/app/GlobalAppState';
import { FloatRegion } from '@components/app/mobile/float-regions/FloatRegion';
import { PullToRefresh } from '@components/app/mobile/PullToRefresh';
import { SwipableRowProvider } from '@components/app/mobile/SwipableRow';
-import { CollapsibleHeaderItem } from '@components/app/split-layout/components/CollapsibleHeaderItem';
+import { CollapsibleHeaderItem } from '@components/app/split-layout/components/CollapsibleItem';
import {
SplitHeaderLeft,
SplitHeaderRight,
@@ -532,10 +528,13 @@ export const SoupView = (props: SoupViewProps) => {
<div class="flex flex-col w-full">
<SplitHeaderLeft>
<div
- class={cn('h-full flex gap-3 items-center', {
- 'shrink-0': !narrowSearchExpanded(),
- 'flex-1 min-w-0': narrowSearchExpanded(),
- })}
+ class={cn(
+ 'h-full flex gap-3 @max-[380px]/split-header:gap-2 items-center',
+ {
+ 'shrink-0': !narrowSearchExpanded(),
+ 'flex-1 min-w-0': narrowSearchExpanded(),
+ }
+ )}
>
<Show when={!isMobile() && !narrowSearchExpanded()}>
<div class="flex items-center gap-1">
@@ -561,12 +560,17 @@ export const SoupView = (props: SoupViewProps) => {
<CollapsibleHeaderItem
id="tabs"
priority={1}
- expanded={() => props.customTabs ?? <SoupViewTabs />}
- collapsed={() =>
- props.customTabs ?? <CollapsedSoupViewTabs />
- }
containerClass="h-full"
- />
+ >
+ {(isCollapsed) => (
+ <Show
+ when={!isCollapsed()}
+ fallback={props.customTabs ?? <CollapsedSoupViewTabs />}
+ >
+ {props.customTabs ?? <SoupViewTabs />}
+ </Show>
+ )}
+ </CollapsibleHeaderItem>
</Show>
</Show>
<Show
@@ -582,12 +586,6 @@ export const SoupView = (props: SoupViewProps) => {
</SplitHeaderLeft>
<Show when={!isMobile()}>
<SplitHeaderRight>
- <Show
- when={!narrowSearchExpanded() && isComponentListView('companies')}
- >
- <CompanyViewsMenu />
- <CompanyDisplayMenu />
- </Show>
<Show
when={
!narrowSearchExpanded() &&
@@ -631,29 +629,34 @@ export const SoupView = (props: SoupViewProps) => {
setSearchIsCollapsed(isCollapsed);
if (!isCollapsed) setNarrowSearchExpanded(false);
}}
- expanded={() => (
- <Layer depth={2}>
- <div class="w-60 ml-2">
- <SoupSearchbar
- variant="secondary"
- initialValue={props.initialSearchText}
- />
- </div>
- </Layer>
- )}
- collapsed={() => (
- <Tooltip label="Search" hotkey={TOKENS.soup.openSearch}>
- <Button
- variant="base"
- class="p-1 size-7 rounded-lg ml-2 bg-surface"
- onClick={() => setNarrowSearchExpanded(true)}
- depth={2}
- >
- <SearchIcon class="size-4 touch:size-6" />
- </Button>
- </Tooltip>
+ >
+ {(isCollapsed) => (
+ <Show
+ when={!isCollapsed()}
+ fallback={
+ <Tooltip label="Search" hotkey={TOKENS.soup.openSearch}>
+ <Button
+ variant="base"
+ class="p-1 size-7 rounded-lg ml-2 bg-surface"
+ onClick={() => setNarrowSearchExpanded(true)}
+ depth={2}
+ >
+ <SearchIcon class="size-4 touch:size-6" />
+ </Button>
+ </Tooltip>
+ }
+ >
+ <Layer depth={2}>
+ <div class="w-60 ml-2">
+ <SoupSearchbar
+ variant="secondary"
+ initialValue={props.initialSearchText}
+ />
+ </div>
+ </Layer>
+ </Show>
)}
- />
+ </CollapsibleHeaderItem>
</Show>
</Show>
</SplitHeaderRight>
diff --git a/apps/web/src/features/next-soup/soup-view/views/companies/CompanyViewsMenu.tsx b/apps/web/src/features/next-soup/soup-view/views/companies/CompanyViewsMenu.tsx
index 9e8bbc7027..f3f0577b3f 100644
--- a/apps/web/src/features/next-soup/soup-view/views/companies/CompanyViewsMenu.tsx
+++ b/apps/web/src/features/next-soup/soup-view/views/companies/CompanyViewsMenu.tsx
@@ -116,7 +116,7 @@ const EmptyViewsHint = (props: { children: JSX.Element }) => (
* list/board mode, stage/owner sub-filters, tab), plus share links that
* encode the same state into the URL (see `@companies/crm/saved-views`).
*/
-export function CompanyViewsMenu() {
+export function CompanyViewsMenu(props: { hideLabel?: boolean } = {}) {
const {
soup,
queryFilters,
@@ -190,9 +190,16 @@ export function CompanyViewsMenu() {
return (
<Dropdown open={open()} onOpenChange={handleOpenChange}>
- <Dropdown.Trigger depth={2} class="bg-surface">
+ <Dropdown.Trigger
+ depth={2}
+ class="bg-surface"
+ label={props.hideLabel ? 'Views' : undefined}
+ aria-label={props.hideLabel ? 'Views' : undefined}
+ >
<StackIcon />
- <span>Views</span>
+ <Show when={!props.hideLabel}>
+ <span>Views</span>
+ </Show>
</Dropdown.Trigger>
<Dropdown.Content class="w-64 shadow-menu">