Skip to content

Commit 4f08e42

Browse files
committed
fixup! feat(web): add all-except project filtering (#1663)
Fork-Domain: workspaces Fork-Tier: qol
1 parent 2fac01b commit 4f08e42

3 files changed

Lines changed: 22 additions & 33 deletions

File tree

‎apps/web/src/components/CommandPalette.fork.tsx‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -122,17 +122,14 @@ export function useCommandPaletteProjectScopeFork(): CommandPaletteProjectScope
122122
const label = chooser?.label ?? null;
123123
const groups = chooser?.groups;
124124
const [searchAll, setSearchAll] = useState(false);
125-
const filterKeys = useMemo(
126-
() =>
127-
filter === null
128-
? null
129-
: projectFilterProjectKeys(
130-
filter,
131-
groups?.flatMap((group) => group.memberProjectRefs),
132-
),
133-
[filter, groups],
134-
);
135-
return useMemo(() => {
125+
const filterKeys =
126+
filter === null
127+
? null
128+
: projectFilterProjectKeys(
129+
filter,
130+
groups?.flatMap((group) => group.memberProjectRefs),
131+
);
132+
return (() => {
136133
if (filterKeys === null || label === null) return { projectKeys: null, toggle: null };
137134
const toggle: CommandPaletteActionItem = searchAll
138135
? {

‎apps/web/src/components/sidebar/SidebarProjectChooser.fork.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// value and change handler, the trigger's label and icon, and the row extras.
55
import type { ProjectFilter } from "@t3tools/client-runtime/state/project-filter";
66
import { CheckIcon, FocusIcon, FolderIcon, FoldersIcon, MinusIcon } from "lucide-react";
7-
import { useCallback, useMemo, useRef, type MouseEvent as ReactMouseEvent } from "react";
7+
import { useLayoutEffect, useRef, type MouseEvent as ReactMouseEvent } from "react";
88

99
import { cn } from "~/lib/utils";
1010
import {

‎apps/web/src/windowProjectFilter.fork.ts‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
reconcileProjectFilter,
99
} from "@t3tools/client-runtime/state/project-filter";
1010
import type { EnvironmentId, ProjectId, ScopedProjectRef } from "@t3tools/contracts";
11-
import { useEffect, useMemo, useSyncExternalStore } from "react";
11+
import { useEffect, useSyncExternalStore } from "react";
1212

1313
import { useAllEnvironmentProjectSnapshotsReady, useProjects } from "./state/entities";
1414
import { pendingWindowScopeSeed, windowProjectFilterState } from "./windowSidebarScope.fork";
@@ -42,15 +42,14 @@ export function useWindowProjectFilter(
4242
scopeKey: projectFilterScopeKey(filter),
4343
projectKeys: projectFilterProjectKeys(
4444
filter,
45-
setFilter: state.set,
46-
scopeKey: projectFilterScopeKey(filter),
47-
projectKeys: projectFilterProjectKeys(
48-
filter,
49-
groups.flatMap((group) => group.members),
50-
),
51-
}),
52-
[filter, groups, state],
53-
);
45+
groups.flatMap((group) => group.members),
46+
),
47+
};
48+
}
49+
50+
/** Runs `onChange` after every write to this window's filter. */
51+
export function useWindowProjectFilterChange(onChange: () => void) {
52+
useEffect(() => windowProjectFilterState().subscribe(onChange), [onChange]);
5453
}
5554

5655
interface WindowFilterableProject {
@@ -74,13 +73,9 @@ export function useWindowProjectKeys(): ReadonlySet<string> | null {
7473
const state = windowProjectFilterState();
7574
const stored = useSyncExternalStore(state.subscribe, state.get);
7675
const projects = useProjects();
77-
return useMemo(
78-
() =>
79-
projectFilterProjectKeys(
80-
stored,
81-
projects.map((project) => scopeProjectRef(project.environmentId, project.id)),
82-
),
83-
[stored, projects],
76+
return projectFilterProjectKeys(
77+
stored,
78+
projects.map((project) => scopeProjectRef(project.environmentId, project.id)),
8479
);
8580
}
8681

@@ -157,8 +152,5 @@ export function useWindowLandingProjects<Project extends WindowFilterableProject
157152
// Read on each change of the inputs: the seed only ever goes from pending to
158153
// applied, and applying it changes `projectKeys`.
159154
const pendingSeed = pendingWindowScopeSeed();
160-
return useMemo(
161-
() => windowLandingProjects(projects, projectKeys, pendingSeed, fallbackToAll),
162-
[pendingSeed, projectKeys, projects, fallbackToAll],
163-
);
155+
return windowLandingProjects(projects, projectKeys, pendingSeed, fallbackToAll);
164156
}

0 commit comments

Comments
 (0)