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.

feat(layout): front end tag nesting display (#6438)

Seamus357ef398c4af
diff --git a/apps/web/src/components/ui/components/TagDot.docs.tsx b/apps/web/src/components/ui/components/TagDot.docs.tsx
new file mode 100644
index 0000000000..9087105aa1
--- /dev/null
+++ b/apps/web/src/components/ui/components/TagDot.docs.tsx
@@ -0,0 +1,53 @@
+import { defineDoc } from '@app/features/ui-gallery/types';
+import { For } from 'solid-js';
+import { TagDot } from './TagDot';
+
+// #region demo:fills
+function FillsDemo() {
+ return (
+ <div class="flex items-center gap-4">
+ <TagDot fill="var(--color-blue)" />
+ <TagDot fills={['var(--color-blue)', 'var(--color-yellow)']} />
+ <TagDot
+ fills={[
+ 'var(--color-blue)',
+ 'var(--color-yellow)',
+ 'var(--color-red)',
+ 'var(--color-green)',
+ ]}
+ />
+ </div>
+ );
+}
+// #endregion
+
+// #region demo:sizes
+function SizesDemo() {
+ return (
+ <div class="flex items-center gap-4">
+ <For each={['sm', 'md', 'lg'] as const}>
+ {(size) => <TagDot size={size} fill="var(--color-blue)" />}
+ </For>
+ </div>
+ );
+}
+// #endregion
+
+export default defineDoc({
+ name: 'TagDot',
+ category: 'Data Display',
+ status: 'stable',
+ description:
+ 'A circular color marker. Supply one fill or a list for up to four pie slices. Repeated fills increase their share; distinct fills keep input order. Pair with a text label.',
+ exports: ['TagDot'],
+ import: "import { TagDot } from '@ui';",
+ demos: [
+ { id: 'fills', title: 'Single and multiple fills', render: FillsDemo },
+ {
+ id: 'sizes',
+ title: 'Sizes',
+ description: 'sm: 8px, md (default): 10px, lg: 12px.',
+ render: SizesDemo,
+ },
+ ],
+});
diff --git a/apps/web/src/components/ui/components/TagDot.tsx b/apps/web/src/components/ui/components/TagDot.tsx
new file mode 100644
index 0000000000..6a5b7ecaa3
--- /dev/null
+++ b/apps/web/src/components/ui/components/TagDot.tsx
@@ -0,0 +1,68 @@
+import { type ComponentProps, type JSX, splitProps } from 'solid-js';
+import { cn } from '../utils/classname';
+import { createVariants, type VariantProps } from '../utils/variants';
+
+const tagDotVariants = createVariants(
+ 'inline-block shrink-0 rounded-full',
+ { size: { sm: 'size-2', md: 'size-2.5', lg: 'size-3' } },
+ { size: 'md' }
+);
+
+export type TagDotSize = NonNullable<
+ VariantProps<typeof tagDotVariants>['size']
+>;
+export type TagDotProps = Omit<ComponentProps<'span'>, 'children' | 'style'> &
+ VariantProps<typeof tagDotVariants> &
+ (
+ | { fill?: string; fills?: never }
+ | { fill?: never; fills: readonly string[] }
+ );
+
+/** A color dot with up to four distinct fills, in input order.
+ * Repeating a fill increases its share of the pie.
+ *
+ * @do Pair the dot with a text label so color is not the only identifier.
+ * @do Put the parent tag's fill first when summarizing a tag branch.
+ */
+export function TagDot(props: TagDotProps) {
+ const [local, others] = splitProps(props, ['fill', 'fills', 'size', 'class']);
+ const fillStyle = (): JSX.CSSProperties => {
+ const counts = new Map<string, number>();
+ for (const fill of local.fills ?? []) {
+ if (counts.has(fill) || counts.size < 4) {
+ counts.set(fill, (counts.get(fill) ?? 0) + 1);
+ }
+ }
+ if (counts.size <= 1) {
+ return {
+ 'background-color':
+ counts.keys().next().value ??
+ local.fill ??
+ 'var(--color-ink-extra-muted)',
+ };
+ }
+ const total = [...counts.values()].reduce((sum, count) => sum + count, 0);
+ let start = 0;
+ return {
+ 'background-image': `conic-gradient(${[...counts]
+ .map(([fill, count]) => {
+ const end = start + (count / total) * 100;
+ const slice = `${fill} ${start}% ${end}%`;
+ start = end;
+ return slice;
+ })
+ .join(', ')})`,
+ };
+ };
+
+ return (
+ <span
+ aria-hidden="true"
+ {...others}
+ data-slot="tag-dot"
+ data-size={local.size ?? 'md'}
+ class={cn(tagDotVariants({ size: local.size }), local.class)}
+ style={fillStyle()}
+ />
+ );
+}
diff --git a/apps/web/src/components/ui/index.ts b/apps/web/src/components/ui/index.ts
index c98abe4c68..db6e1f5535 100644
--- a/apps/web/src/components/ui/index.ts
+++ b/apps/web/src/components/ui/index.ts
@@ -146,6 +146,7 @@ export { Surface } from './components/Surface';
export { TabbedControl } from './components/TabbedControl';
export type { TabItem, TabsProps } from './components/Tabs';
export { Tabs } from './components/Tabs';
+export { TagDot, type TagDotProps, type TagDotSize } from './components/TagDot';
export type {
TextFieldDescriptionProps,
TextFieldError,
diff --git a/apps/web/src/features/property/tags/SidebarTagsSection.tsx b/apps/web/src/features/property/tags/SidebarTagsSection.tsx
index 2bef1feeb0..19dae4ab87 100644
--- a/apps/web/src/features/property/tags/SidebarTagsSection.tsx
+++ b/apps/web/src/features/property/tags/SidebarTagsSection.tsx
@@ -2,10 +2,11 @@ import { CollapsibleSection, ViewSidebar } from '@app/components/view-shell';
import PlusIcon from '@phosphor/plus.svg';
import { useCurrentTeamQuery } from '@queries/team/teams';
import { Button } from '@ui';
-import { createSignal, For, Show } from 'solid-js';
-import { TagDot } from './TagDot';
+import { createSignal, Show } from 'solid-js';
+import { TagTree } from './components/tag-tree';
+import type { TagTreeNode } from './core/tag-tree';
import { TagEditorDialog } from './TagEditorDialog';
-import { useTagOptions } from './tag-options';
+import { useTagTree } from './tag-sets-context';
export type SidebarTagsSectionProps = {
/** Tag option ids the view is currently showing. */
@@ -38,12 +39,21 @@ export function selectSidebarTag(
* sets from the nearest `TagSetsProvider`.
*/
export function SidebarTagsSection(props: SidebarTagsSectionProps) {
- const tags = useTagOptions();
+ const tree = useTagTree();
+ const [expanded, setExpanded] = createSignal<Record<string, boolean>>({});
+ const containsActiveTag = (node: TagTreeNode): boolean =>
+ Boolean(node.tag && props.activeIds.includes(node.tag.id)) ||
+ node.children.some(containsActiveTag);
+ const isExpanded = (node: TagTreeNode): boolean =>
+ expanded()[node.id] ?? node.children.some(containsActiveTag);
+ const toggle = (node: TagTreeNode) => {
+ const nextOpen = !isExpanded(node);
+ setExpanded((current) => ({ ...current, [node.id]: nextOpen }));
+ };
const teamQuery = useCurrentTeamQuery();
const [creating, setCreating] = createSignal(false);
const teamAvailable = () =>
teamQuery.isSuccess && Boolean(teamQuery.data?.team);
- const isActive = (id: string) => props.activeIds.includes(id);
return (
<CollapsibleSection.Root
@@ -68,30 +78,22 @@ export function SidebarTagsSection(props: SidebarTagsSectionProps) {
</div>
<CollapsibleSection.Content>
<Show
- when={tags().length > 0}
+ when={tree().length > 0}
fallback={
<p class="px-3 py-2 text-sm text-ink-extra-muted">No tags yet</p>
}
>
<ViewSidebar.Nav aria-label="Tags">
- <For each={tags()}>
- {(tag) => (
- <ViewSidebar.Item
- active={isActive(tag.id)}
- onClick={() => {
- props.onActiveIdsChange(
- selectSidebarTag(props.activeIds, tag.id)
- );
- props.onNavigate?.();
- }}
- >
- <ViewSidebar.Icon>
- <TagDot color={tag.color} />
- </ViewSidebar.Icon>
- <span class="truncate">{tag.label}</span>
- </ViewSidebar.Item>
- )}
- </For>
+ <TagTree
+ nodes={tree()}
+ activeIds={props.activeIds}
+ isExpanded={isExpanded}
+ onToggle={toggle}
+ onSelect={(id) => {
+ props.onActiveIdsChange(selectSidebarTag(props.activeIds, id));
+ props.onNavigate?.();
+ }}
+ />
</ViewSidebar.Nav>
</Show>
</CollapsibleSection.Content>
diff --git a/apps/web/src/features/property/tags/TagDot.tsx b/apps/web/src/features/property/tags/TagDot.tsx
index c9b43122b4..57de44c287 100644
--- a/apps/web/src/features/property/tags/TagDot.tsx
+++ b/apps/web/src/features/property/tags/TagDot.tsx
@@ -1,11 +1,8 @@
-import { cn } from '@ui';
+import { TagDot as UiTagDot } from '@ui';
import { DEFAULT_TAG_COLOR } from './tagColors';
export function TagDot(props: { color?: string; class?: string }) {
return (
- <span
- class={cn('size-2.5 shrink-0 rounded-full', props.class)}
- style={{ 'background-color': props.color ?? DEFAULT_TAG_COLOR }}
- />
+ <UiTagDot fill={props.color ?? DEFAULT_TAG_COLOR} class={props.class} />
);
}
diff --git a/apps/web/src/features/property/tags/components/branch-tag-icon.tsx b/apps/web/src/features/property/tags/components/branch-tag-icon.tsx
new file mode 100644
index 0000000000..b6636ef385
--- /dev/null
+++ b/apps/web/src/features/property/tags/components/branch-tag-icon.tsx
@@ -0,0 +1,22 @@
+import { TagDot } from '@ui';
+import { createMemo } from 'solid-js';
+import type { TagTreeNode } from '../core/tag-tree';
+import { DEFAULT_TAG_COLOR } from '../tagColors';
+
+/** Include the parent first so adding children never replaces its color. */
+export function BranchTagIcon(props: { node: TagTreeNode }) {
+ const fills = createMemo(() => {
+ const colors: string[] = [];
+ const visit = (node: TagTreeNode) => {
+ if (node.tag) {
+ const color = node.tag.color ?? DEFAULT_TAG_COLOR;
+ colors.push(color);
+ }
+ node.children.forEach(visit);
+ };
+ visit(props.node);
+ return colors;
+ });
+
+ return <TagDot fills={fills()} />;
+}
diff --git a/apps/web/src/features/property/tags/components/tag-tree.tsx b/apps/web/src/features/property/tags/components/tag-tree.tsx
new file mode 100644
index 0000000000..fa77e52fa4
--- /dev/null
+++ b/apps/web/src/features/property/tags/components/tag-tree.tsx
@@ -0,0 +1,87 @@
+import { ViewSidebar } from '@app/components/view-shell';
+import CaretRightIcon from '@phosphor/caret-right.svg';
+import { Button, cn } from '@ui';
+import { For, Show } from 'solid-js';
+import type { TagTreeNode } from '../core/tag-tree';
+import { TagDot } from '../TagDot';
+import { BranchTagIcon } from './branch-tag-icon';
+
+export function TagTree(props: {
+ nodes: TagTreeNode[];
+ activeIds: readonly string[];
+ isExpanded: (node: TagTreeNode) => boolean;
+ onToggle: (node: TagTreeNode) => void;
+ onSelect: (id: string) => void;
+}) {
+ return (
+ <ul class="flex min-w-0 flex-col gap-0.5">
+ <For each={props.nodes}>
+ {(node) => {
+ const open = () => props.isExpanded(node);
+ const active = () =>
+ Boolean(node.tag && props.activeIds.includes(node.tag.id));
+ return (
+ <li class="min-w-0">
+ <div
+ class={cn(
+ 'flex min-w-0 items-center rounded-xl',
+ active() ? 'bg-active' : 'hover:bg-hover'
+ )}
+ >
+ <Show
+ when={node.children.length > 0}
+ fallback={<span class="w-6 shrink-0" />}
+ >
+ <Button
+ variant="ghost"
+ size="icon-sm"
+ class="size-6 shrink-0 rounded-lg not-disabled:hover:bg-transparent not-touch:not-disabled:hover:bg-none not-touch:not-disabled:active:bg-none"
+ aria-label={`${open() ? 'Collapse' : 'Expand'} ${node.path}`}
+ aria-expanded={open()}
+ onClick={() => props.onToggle(node)}
+ >
+ <CaretRightIcon
+ class={cn(
+ 'size-3 transition-transform',
+ open() && 'rotate-90'
+ )}
+ />
+ </Button>
+ </Show>
+ <ViewSidebar.Item
+ class={cn(
+ 'min-w-0 flex-1 justify-start px-2 font-normal bg-transparent not-disabled:hover:bg-transparent not-touch:not-disabled:hover:bg-none not-touch:not-disabled:active:bg-none',
+ active() && 'text-ink'
+ )}
+ title={node.path}
+ aria-current={active() ? 'page' : undefined}
+ aria-expanded={!node.tag ? open() : undefined}
+ onClick={() =>
+ node.tag
+ ? props.onSelect(node.tag.id)
+ : props.onToggle(node)
+ }
+ >
+ <ViewSidebar.Icon>
+ <Show
+ when={node.children.length > 0}
+ fallback={<TagDot color={node.tag?.color} />}
+ >
+ <BranchTagIcon node={node} />
+ </Show>
+ </ViewSidebar.Icon>
+ <span class="truncate">{node.name}</span>
+ </ViewSidebar.Item>
+ </div>
+ <Show when={open() && node.children.length > 0}>
+ <div class="ml-3 border-l border-edge pl-3">
+ <TagTree {...props} nodes={node.children} />
+ </div>
+ </Show>
+ </li>
+ );
+ }}
+ </For>
+ </ul>
+ );
+}
diff --git a/apps/web/src/features/property/tags/core/tag-tree.ts b/apps/web/src/features/property/tags/core/tag-tree.ts
new file mode 100644
index 0000000000..d68325f826
--- /dev/null
+++ b/apps/web/src/features/property/tags/core/tag-tree.ts
@@ -0,0 +1,47 @@
+/** The tree keeps stored tag names and identifiers intact. */
+export type TreeTag = {
+ id: string;
+ label: string;
+ color?: string;
+ scope: 'user' | 'team';
+ propertyDefinitionId: string;
+};
+
+export type TagTreeNode = {
+ id: string;
+ name: string;
+ path: string;
+ tag?: TreeTag;
+ children: TagTreeNode[];
+};
+
+/** One child level; remaining path segments stay in the child's label.
+ * Input order determines sibling order; scopes never share branches.
+ */
+export function buildTagTree(tags: readonly TreeTag[]): TagTreeNode[] {
+ const roots: TagTreeNode[] = [];
+ const byPath = new Map<string, TagTreeNode>();
+ for (const tag of tags) {
+ const parts = tag.label.split('/');
+ // Preserve unusual names verbatim rather than merging distinct tags or
+ // rendering unnamed branches for leading, trailing, or repeated slashes.
+ const segments =
+ parts.length > 1 && parts.every((part) => part.trim().length > 0)
+ ? [parts[0], parts.slice(1).join('/')]
+ : [tag.label];
+ let siblings = roots;
+ for (let index = 0; index < segments.length; index++) {
+ const path = segments.slice(0, index + 1).join('/');
+ const id = JSON.stringify([tag.scope, tag.propertyDefinitionId, path]);
+ let node = byPath.get(id);
+ if (!node) {
+ node = { id, name: segments[index], path, children: [] };
+ byPath.set(id, node);
+ siblings.push(node);
+ }
+ if (index === segments.length - 1) node.tag = tag;
+ siblings = node.children;
+ }
+ }
+ return roots;
+}
diff --git a/apps/web/src/features/property/tags/list-tag-options.ts b/apps/web/src/features/property/tags/list-tag-options.ts
new file mode 100644
index 0000000000..3399ae84f2
--- /dev/null
+++ b/apps/web/src/features/property/tags/list-tag-options.ts
@@ -0,0 +1,34 @@
+import type { TagScope } from '@service-properties/generated/schemas/tagScope';
+import type { TagSetResponse } from '@service-properties/generated/schemas/tagSetResponse';
+
+import type { TreeTag } from './core/tag-tree';
+
+/** A tag as list surfaces show it: the option plus its owning set. */
+export type TagOptionSummary = TreeTag;
+
+const SCOPE_ORDER: Record<TagScope, number> = { team: 0, user: 1 };
+
+/**
+ * Flattens tag sets into display order: the team set before the personal
+ * set, each in the order the user arranged it in Settings.
+ */
+export function listTagOptions(
+ tagSets: readonly TagSetResponse[]
+): TagOptionSummary[] {
+ return [...tagSets]
+ .sort((a, b) => SCOPE_ORDER[a.scope] - SCOPE_ORDER[b.scope])
+ .flatMap((set) =>
+ [...set.options]
+ .sort((a, b) => a.displayOrder - b.displayOrder)
+ .map(
+ (option): TagOptionSummary => ({
+ id: option.id,
+ label:
+ option.value.type === 'string' ? option.value.value : option.id,
+ color: option.color ?? undefined,
+ scope: set.scope,
+ propertyDefinitionId: option.propertyDefinitionId,
+ })
+ )
+ );
+}
diff --git a/apps/web/src/features/property/tags/tag-options.test.ts b/apps/web/src/features/property/tags/tag-options.test.ts
index 9e2117a791..cd24285565 100644
--- a/apps/web/src/features/property/tags/tag-options.test.ts
+++ b/apps/web/src/features/property/tags/tag-options.test.ts
@@ -17,7 +17,7 @@ const option = (
});
describe('listTagOptions', () => {
- it('lists personal tags before team tags, each in display order', () => {
+ it('lists team tags before personal tags, each in display order', () => {
const tagSets = [
{
scope: 'team',
@@ -35,6 +35,13 @@ describe('listTagOptions', () => {
] as TagSetResponse[];
expect(listTagOptions(tagSets)).toEqual([
+ {
+ id: 'launch',
+ label: 'Launch',
+ color: '#123',
+ scope: 'team',
+ propertyDefinitionId: 'team-definition',
+ },
{
id: 'urgent',
label: 'Urgent',
@@ -49,13 +56,6 @@ describe('listTagOptions', () => {
scope: 'user',
propertyDefinitionId: 'personal-definition',
},
- {
- id: 'launch',
- label: 'Launch',
- color: '#123',
- scope: 'team',
- propertyDefinitionId: 'team-definition',
- },
]);
});
diff --git a/apps/web/src/features/property/tags/tag-options.ts b/apps/web/src/features/property/tags/tag-options.ts
index 963a7bed40..1883e7dd9b 100644
--- a/apps/web/src/features/property/tags/tag-options.ts
+++ b/apps/web/src/features/property/tags/tag-options.ts
@@ -1,46 +1,6 @@
-import type { TagScope } from '@service-properties/generated/schemas/tagScope';
-import type { TagSetResponse } from '@service-properties/generated/schemas/tagSetResponse';
-import { type Accessor, createMemo } from 'solid-js';
-import { useTagSets } from './tag-sets-context';
+import { useTagOptionSummaries } from './tag-sets-context';
-/** A tag as list surfaces show it: the option plus the set it belongs to. */
-export type TagOptionSummary = {
- id: string;
- label: string;
- color?: string;
- scope: TagScope;
- propertyDefinitionId: string;
-};
+export { listTagOptions, type TagOptionSummary } from './list-tag-options';
-const SCOPE_ORDER: Record<TagScope, number> = { user: 0, team: 1 };
-
-/**
- * Flattens tag sets into display order: the personal set before the team
- * set, each in the order the user arranged it in Settings.
- */
-export function listTagOptions(
- tagSets: readonly TagSetResponse[]
-): TagOptionSummary[] {
- return [...tagSets]
- .sort((a, b) => SCOPE_ORDER[a.scope] - SCOPE_ORDER[b.scope])
- .flatMap((set) =>
- [...set.options]
- .sort((a, b) => a.displayOrder - b.displayOrder)
- .map(
- (option): TagOptionSummary => ({
- id: option.id,
- label:
- option.value.type === 'string' ? option.value.value : option.id,
- color: option.color ?? undefined,
- scope: set.scope,
- propertyDefinitionId: option.propertyDefinitionId,
- })
- )
- );
-}
-
-/** The provider's tag sets in display order. */
-export function useTagOptions(): Accessor<TagOptionSummary[]> {
- const tagSets = useTagSets();
- return createMemo(() => listTagOptions(tagSets()));
-}
+/** The provider-owned tag options in display order. */
+export const useTagOptions = useTagOptionSummaries;
diff --git a/apps/web/src/features/property/tags/tag-sets-context.tsx b/apps/web/src/features/property/tags/tag-sets-context.tsx
index 2817742bec..73f661b120 100644
--- a/apps/web/src/features/property/tags/tag-sets-context.tsx
+++ b/apps/web/src/features/property/tags/tag-sets-context.tsx
@@ -10,10 +10,15 @@ import {
useContext,
} from 'solid-js';
+import { buildTagTree, type TagTreeNode } from './core/tag-tree';
+import { listTagOptions, type TagOptionSummary } from './list-tag-options';
+
type TagSets = Accessor<TagSetResponse[]>;
type TagOption = { option: PropertyOptionResponse; scope: TagScope };
type TagSetsContextValue = {
tagSets: TagSets;
+ options: Accessor<TagOptionSummary[]>;
+ tree: Accessor<TagTreeNode[]>;
/** False only while the sets are still being fetched for the first time. */
ready: Accessor<boolean>;
optionById: Accessor<ReadonlyMap<string, TagOption>>;
@@ -29,6 +34,8 @@ export const TagSetsProvider: FlowComponent<{
/** Omit when the sets are caller-owned and available from the start. */
ready?: Accessor<boolean>;
}> = (props) => {
+ const options = createMemo(() => listTagOptions(props.tagSets()));
+ const tree = createMemo(() => buildTagTree(options()));
const optionById = createMemo(() => {
const options = new Map<string, TagOption>();
for (const set of props.tagSets()) {
@@ -43,6 +50,8 @@ export const TagSetsProvider: FlowComponent<{
<TagSetsContext.Provider
value={{
tagSets: props.tagSets,
+ options,
+ tree,
ready: () => props.ready?.() ?? ALWAYS_READY(),
optionById,
}}
@@ -92,3 +101,12 @@ export function useTagSetsReady(): Accessor<boolean> {
export function useTagOptionById() {
return useTagSetsContext().optionById;
}
+
+/** Shared display projections, rebuilt only when the catalog changes. */
+export function useTagOptionSummaries() {
+ return useTagSetsContext().options;
+}
+
+export function useTagTree() {
+ return useTagSetsContext().tree;
+}
diff --git a/docs/AGENT_GUIDE/surfaces.md b/docs/AGENT_GUIDE/surfaces.md
index 31a37e0165..0d858b6894 100644
--- a/docs/AGENT_GUIDE/surfaces.md
+++ b/docs/AGENT_GUIDE/surfaces.md
@@ -197,6 +197,10 @@ The mobile task drawer retains its existing layout.
## Email — `/app/component/mail`
+Email's Tags sidebar uses the same [nested tag tree as Tasks](tasks.md#nested-sidebar-tags).
+Carets and folder-only parents expand branches; actual tags select their exact ID
+and switch the mailbox to All. Parent selection does not include descendant tags.
+
Full email client. Tabs: `Signal` / `Noise` / `Sent` / `Calendar` / `Drafts` / `Shared` /
`All`. Compose via the `Email` button (or `Create` → `Email E`). On a fresh local user it
shows `Connect your email` (Gmail/Google Workspace OAuth) — most functionality needs a
diff --git a/docs/AGENT_GUIDE/tasks.md b/docs/AGENT_GUIDE/tasks.md
index e2daaa61d0..58ef1fcba8 100644
--- a/docs/AGENT_GUIDE/tasks.md
+++ b/docs/AGENT_GUIDE/tasks.md
@@ -53,3 +53,13 @@ Users with view or comment access see the same pills read-only.
In any channel composer, toggle the `Task` switch before sending to create a task from the
message.
+
+### Nested sidebar tags
+
+Tag names containing `/` render with one child level (for example, `Work/Urgent`).
+Deeper paths remain in the child label: `Work/Customers/Acme` appears as
+`Customers/Acme` under `Work`, alongside any actual `Customers` tag.
+Use the caret to expand or collapse a branch. A folder-only parent expands without
+filtering; clicking an actual tag selects only that tag, including when it has
+children. Personal and team paths stay separate. Ancestors of restored selected
+tags start expanded. Filter-menu options continue to show full tag names.
diff --git a/rules/ast-grep/ts-feature-components-presentational.yml b/rules/ast-grep/ts-feature-components-presentational.yml
index ed9049b98d..4fbc85c47c 100644
--- a/rules/ast-grep/ts-feature-components-presentational.yml
+++ b/rules/ast-grep/ts-feature-components-presentational.yml
@@ -12,6 +12,7 @@ note: |-
one sanctioned `queries/` import is `property-value`, which parses
untyped wire JSON for property-changed rows.
files:
+ - apps/web/src/features/property/tags/components/**
- apps/web/src/features/activity/components/**
- apps/web/src/features/drive-view/components/**
- apps/web/src/features/email-message/components/**
diff --git a/rules/ast-grep/ts-feature-core-pure.yml b/rules/ast-grep/ts-feature-core-pure.yml
index ebf792749e..10ae5e65c0 100644
--- a/rules/ast-grep/ts-feature-core-pure.yml
+++ b/rules/ast-grep/ts-feature-core-pure.yml
@@ -14,6 +14,7 @@ note: |-
is the documented exception for feed labels that must match soup views.
The shared @core/util/base64 codec is also pure and may be reused by email.
files:
+ - apps/web/src/features/property/tags/core/**
- apps/web/src/features/activity/core/**
- apps/web/src/features/drive-view/core/**
- apps/web/src/features/email-message/core/**
diff --git a/rules/ast-grep/ts-feature-data-no-ui.yml b/rules/ast-grep/ts-feature-data-no-ui.yml
index 5a65a2b28d..62b7c70fca 100644
--- a/rules/ast-grep/ts-feature-data-no-ui.yml
+++ b/rules/ast-grep/ts-feature-data-no-ui.yml
@@ -11,6 +11,8 @@ note: |-
with fake clients and controllers with fake capabilities; neither imports
rendering code.
files:
+ - apps/web/src/features/property/tags/queries/**
+ - apps/web/src/features/property/tags/primitives/**
- apps/web/src/features/activity/queries/**
- apps/web/src/features/drive-view/queries/**
- apps/web/src/features/activity/primitives/**
diff --git a/rules/ast-grep/ts-feature-layers-use-context.yml b/rules/ast-grep/ts-feature-layers-use-context.yml
index f445f0992c..f46a247db6 100644
--- a/rules/ast-grep/ts-feature-layers-use-context.yml
+++ b/rules/ast-grep/ts-feature-layers-use-context.yml
@@ -14,6 +14,10 @@ note: |-
`@core/user/macroId` identity helpers are a documented exception. Adopting features add their layer paths to
`files` in each ts-/tsx-feature-* rule.
files:
+ - apps/web/src/features/property/tags/components/**
+ - apps/web/src/features/property/tags/queries/**
+ - apps/web/src/features/property/tags/primitives/**
+ - apps/web/src/features/property/tags/views/**
- apps/web/src/features/activity/components/**
- apps/web/src/features/drive-view/components/**
- apps/web/src/features/activity/queries/**
diff --git a/rules/ast-grep/tsx-feature-components-presentational.yml b/rules/ast-grep/tsx-feature-components-presentational.yml
index 3a97bdefaa..178026c50d 100644
--- a/rules/ast-grep/tsx-feature-components-presentational.yml
+++ b/rules/ast-grep/tsx-feature-components-presentational.yml
@@ -12,6 +12,7 @@ note: |-
one sanctioned `queries/` import is `property-value`, which parses
untyped wire JSON for property-changed rows.
files:
+ - apps/web/src/features/property/tags/components/**
- apps/web/src/features/activity/components/**
- apps/web/src/features/drive-view/components/**
- apps/web/src/features/email-message/components/**
diff --git a/rules/ast-grep/tsx-feature-core-pure.yml b/rules/ast-grep/tsx-feature-core-pure.yml
index 01d610dc0a..d32870dfce 100644
--- a/rules/ast-grep/tsx-feature-core-pure.yml
+++ b/rules/ast-grep/tsx-feature-core-pure.yml
@@ -14,6 +14,7 @@ note: |-
is the documented exception for feed labels that must match soup views.
The shared @core/util/base64 codec is also pure and may be reused by email.
files:
+ - apps/web/src/features/property/tags/core/**
- apps/web/src/features/activity/core/**
- apps/web/src/features/drive-view/core/**
- apps/web/src/features/email-message/core/**
diff --git a/rules/ast-grep/tsx-feature-data-no-ui.yml b/rules/ast-grep/tsx-feature-data-no-ui.yml
index a45911b589..a3c35c03f6 100644
--- a/rules/ast-grep/tsx-feature-data-no-ui.yml
+++ b/rules/ast-grep/tsx-feature-data-no-ui.yml
@@ -11,6 +11,8 @@ note: |-
with fake clients and controllers with fake capabilities; neither imports
rendering code.
files:
+ - apps/web/src/features/property/tags/queries/**
+ - apps/web/src/features/property/tags/primitives/**
- apps/web/src/features/activity/queries/**
- apps/web/src/features/drive-view/queries/**
- apps/web/src/features/activity/primitives/**
diff --git a/rules/ast-grep/tsx-feature-layers-use-context.yml b/rules/ast-grep/tsx-feature-layers-use-context.yml
index d6ec50bee8..8bcf2253ee 100644
--- a/rules/ast-grep/tsx-feature-layers-use-context.yml
+++ b/rules/ast-grep/tsx-feature-layers-use-context.yml
@@ -14,6 +14,10 @@ note: |-
`@core/user/macroId` identity helpers are a documented exception. Adopting features add their layer paths to
`files` in each ts-/tsx-feature-* rule.
files:
+ - apps/web/src/features/property/tags/components/**
+ - apps/web/src/features/property/tags/queries/**
+ - apps/web/src/features/property/tags/primitives/**
+ - apps/web/src/features/property/tags/views/**
- apps/web/src/features/activity/components/**
- apps/web/src/features/drive-view/components/**
- apps/web/src/features/activity/queries/**