88 reconcileProjectFilter ,
99} from "@t3tools/client-runtime/state/project-filter" ;
1010import type { EnvironmentId , ProjectId , ScopedProjectRef } from "@t3tools/contracts" ;
11- import { useEffect , useMemo , useSyncExternalStore } from "react" ;
11+ import { useEffect , useSyncExternalStore } from "react" ;
1212
13- import { useAllEnvironmentProjectSnapshotsReady } from "./state/entities" ;
13+ import { useAllEnvironmentProjectSnapshotsReady , useProjects } from "./state/entities" ;
1414import { pendingWindowScopeSeed , windowProjectFilterState } from "./windowSidebarScope.fork" ;
1515
1616/**
@@ -43,12 +43,15 @@ export function useWindowProjectFilter(
4343 scopeKey : projectFilterScopeKey ( filter ) ,
4444 projectKeys : projectFilterProjectKeys (
4545 filter ,
46- setFilter : state . set ,
47- scopeKey : projectFilterScopeKey ( filter ) ,
48- projectKeys : projectFilterProjectKeys ( filter ) ,
49- } ) ,
50- [ filter , state ] ,
51- ) ;
46+ groups . flatMap ( ( group ) => group . members ) ,
47+ ) ,
48+ } ;
49+ }
50+
51+ /** Runs `onChange` after every write to this window's filter. */
52+ export function useWindowProjectFilterChange ( onChange : ( ) => void ) {
53+ // oxlint-disable-next-line t3code/react-effect-budget -- subscribes to the external window filter store.
54+ useEffect ( ( ) => windowProjectFilterState ( ) . subscribe ( onChange ) , [ onChange ] ) ;
5255}
5356
5457interface WindowFilterableProject {
@@ -71,7 +74,11 @@ export function filterProjectsToWindow<Project extends WindowFilterableProject>(
7174export function useWindowProjectKeys ( ) : ReadonlySet < string > | null {
7275 const state = windowProjectFilterState ( ) ;
7376 const stored = useSyncExternalStore ( state . subscribe , state . get ) ;
74- return useMemo ( ( ) => projectFilterProjectKeys ( stored ) , [ stored ] ) ;
77+ const projects = useProjects ( ) ;
78+ return projectFilterProjectKeys (
79+ stored ,
80+ projects . map ( ( project ) => scopeProjectRef ( project . environmentId , project . id ) ) ,
81+ ) ;
7582}
7683
7784/** A project a link names explicitly; `environmentId` is absent on older links. */
@@ -121,6 +128,7 @@ export function windowLandingProjects<Project extends WindowFilterableProject>(
121128 projects : ReadonlyArray < Project > ,
122129 projectKeys : ReadonlySet < string > | null ,
123130 pendingSeed : ScopedProjectRef | null ,
131+ fallbackToAll = true ,
124132) : ReadonlyArray < Project > {
125133 const seeded =
126134 pendingSeed === null
@@ -132,19 +140,19 @@ export function windowLandingProjects<Project extends WindowFilterableProject>(
132140 ) ;
133141 if ( seeded . length > 0 ) return seeded ;
134142 const shown = filterProjectsToWindow ( projects , projectKeys ) ;
135- return shown . length > 0 ? shown : projects ;
143+ return shown . length > 0 || ! fallbackToAll ? shown : projects ;
136144}
137145
138146/** `windowLandingProjects` for this window. */
139147export function useWindowLandingProjects < Project extends WindowFilterableProject > (
140148 projects : ReadonlyArray < Project > ,
141149) : ReadonlyArray < Project > {
142150 const projectKeys = useWindowProjectKeys ( ) ;
151+ const state = windowProjectFilterState ( ) ;
152+ const filter = useSyncExternalStore ( state . subscribe , state . get ) ;
153+ const fallbackToAll = filter . mode !== "exclude" ;
143154 // Read on each change of the inputs: the seed only ever goes from pending to
144155 // applied, and applying it changes `projectKeys`.
145156 const pendingSeed = pendingWindowScopeSeed ( ) ;
146- return useMemo (
147- ( ) => windowLandingProjects ( projects , projectKeys , pendingSeed ) ,
148- [ pendingSeed , projectKeys , projects ] ,
149- ) ;
157+ return windowLandingProjects ( projects , projectKeys , pendingSeed , fallbackToAll ) ;
150158}
0 commit comments