From 44798ef17aefba6283f4ae9045425c5116289efa Mon Sep 17 00:00:00 2001
From: Chris Bongers <chrisbongers@gmail.com>
Date: Fri, 10 Jul 2026 14:40:03 +0200
Subject: [PATCH 1/2] feat(squads): add in-squad post search

Lets members and public visitors filter a squad's feed by text query via
a search field in the squad heading, mirroring the bookmarks in-feed
search pattern. Submitting writes `?q=` to the URL (shallow) and swaps
the feed to the new searchSourcePosts query; clearing restores the
default sourceFeed.

- Add SEARCH_SOURCE_POSTS_QUERY (mirrors SEARCH_BOOKMARKS_QUERY) and the
  search-squad feed page key
- Add opt-in `enableSuggestions` prop to PostsSearch so this
  source-scoped surface doesn't show wrong-scope Mimir suggestions
- Add opt-in `searchChildren` slot to SquadFeedHeading for the search
  field
- Wire the squad page to swap query/variables/feedQueryKey/emptyScreen
  based on `router.query.q`, and build the submit/clear handlers from
  `asPath` instead of `router.pathname` (the latter is the dynamic route
  pattern `/squads/[handle]` and breaks Next's router.replace when the
  `handle` param isn't in the query object)
---
 .../shared/src/components/PostsSearch.tsx     |  15 +-
 .../components/squads/SquadFeedHeading.tsx    |  14 +-
 packages/shared/src/graphql/feed.ts           |  24 +++
 packages/shared/src/lib/query.ts              |   1 +
 .../webapp/pages/squads/[handle]/index.tsx    | 150 ++++++++++++++++--
 5 files changed, 189 insertions(+), 15 deletions(-)

diff --git a/packages/shared/src/components/PostsSearch.tsx b/packages/shared/src/components/PostsSearch.tsx
index 221f1464c25..01272e07ffc 100644
--- a/packages/shared/src/components/PostsSearch.tsx
+++ b/packages/shared/src/components/PostsSearch.tsx
@@ -35,6 +35,13 @@ export type PostsSearchProps = {
     },
   ) => Promise<unknown>;
   onClearQuery?: () => Promise<unknown>;
+  /**
+   * Autocomplete suggestions (Mimir-backed) are not scoped to the current
+   * feed/source. Surfaces that search within a narrower scope (e.g. a single
+   * squad) should opt out rather than show suggestions from the wrong scope.
+   * Defaults to `true` to preserve existing behavior.
+   */
+  enableSuggestions?: boolean;
 } & Pick<HTMLAttributes<HTMLInputElement>, 'onFocus'>;
 
 const SEARCH_TYPES = {
@@ -52,6 +59,7 @@ export default function PostsSearch({
   suggestionType = 'searchPostSuggestions',
   onFocus,
   onClearQuery,
+  enableSuggestions = true,
 }: PostsSearchProps): ReactElement {
   const { time, contentCurationFilter } = useSearchContextProvider();
   const searchBoxRef = useRef<HTMLDivElement>();
@@ -59,7 +67,10 @@ export default function PostsSearch({
   const [items, setItems] = useState<string[]>([]);
   const { value: searchVersion } = useConditionalFeature({
     feature: feature.searchVersion,
-    shouldEvaluate: !!query && suggestionType === 'searchPostSuggestions',
+    shouldEvaluate:
+      !!query &&
+      suggestionType === 'searchPostSuggestions' &&
+      enableSuggestions,
   });
   const SEARCH_URL = SEARCH_TYPES[suggestionType];
   const purify = useDomPurify();
@@ -72,7 +83,7 @@ export default function PostsSearch({
     queryKey: [suggestionType, query],
     queryFn: () =>
       gqlClient.request(SEARCH_URL, { query, version: searchVersion }),
-    enabled: !!query,
+    enabled: !!query && enableSuggestions,
     staleTime: StaleTime.Default,
   });
 
diff --git a/packages/shared/src/components/squads/SquadFeedHeading.tsx b/packages/shared/src/components/squads/SquadFeedHeading.tsx
index 0a3d60ebfd2..a0344accb95 100644
--- a/packages/shared/src/components/squads/SquadFeedHeading.tsx
+++ b/packages/shared/src/components/squads/SquadFeedHeading.tsx
@@ -1,4 +1,4 @@
-import type { ReactElement } from 'react';
+import type { ReactElement, ReactNode } from 'react';
 import React, { useContext, useMemo } from 'react';
 import { Button, ButtonVariant } from '../buttons/Button';
 import { PinIcon } from '../icons';
@@ -8,9 +8,14 @@ import { useSquadActions } from '../../hooks';
 
 interface SquadFeedHeadingProps {
   squad: Squad;
+  /** Optional search field rendered at the start of the heading row. */
+  searchChildren?: ReactNode;
 }
 
-function SquadFeedHeading({ squad }: SquadFeedHeadingProps): ReactElement {
+function SquadFeedHeading({
+  squad,
+  searchChildren,
+}: SquadFeedHeadingProps): ReactElement {
   const { items } = useContext(ActiveFeedContext);
   const { collapseSquadPinnedPosts, expandSquadPinnedPosts } = useSquadActions({
     squad,
@@ -38,6 +43,11 @@ function SquadFeedHeading({ squad }: SquadFeedHeadingProps): ReactElement {
 
   return (
     <div className="flex w-full flex-row flex-wrap items-center justify-end gap-4 px-6 pb-6 laptop:px-0">
+      {searchChildren && (
+        <div className="min-w-[12rem] max-w-[20rem] flex-1">
+          {searchChildren}
+        </div>
+      )}
       <span className="ml-auto flex flex-row gap-3 border-l border-border-subtlest-tertiary pl-3">
         {isSquadMember && (
           <Button
diff --git a/packages/shared/src/graphql/feed.ts b/packages/shared/src/graphql/feed.ts
index f904eee7dd8..d47bb460688 100644
--- a/packages/shared/src/graphql/feed.ts
+++ b/packages/shared/src/graphql/feed.ts
@@ -680,6 +680,30 @@ export const SEARCH_BOOKMARKS_QUERY = gql`
   ${FEED_POST_CONNECTION_FRAGMENT}
 `;
 
+export const SEARCH_SOURCE_POSTS_QUERY = gql`
+  query SearchSourcePosts(
+    $loggedIn: Boolean! = false
+    $first: Int
+    $after: String
+    $source: ID!
+    $query: String!
+    $supportedTypes: [String!]
+    $version: Int
+  ) {
+    page: searchSourcePosts(
+      first: $first
+      after: $after
+      source: $source
+      query: $query
+      supportedTypes: $supportedTypes
+      version: $version
+    ) {
+      ...FeedPostConnection
+    }
+  }
+  ${FEED_POST_CONNECTION_FRAGMENT}
+`;
+
 export const SEARCH_BOOKMARKS_SUGGESTIONS = gql`
   query SearchBookmarksSuggestions($query: String!) {
     searchBookmarksSuggestions(query: $query) {
diff --git a/packages/shared/src/lib/query.ts b/packages/shared/src/lib/query.ts
index 70830b11a98..0a980337583 100644
--- a/packages/shared/src/lib/query.ts
+++ b/packages/shared/src/lib/query.ts
@@ -47,6 +47,7 @@ export enum OtherFeedPage {
   BookmarkLater = 'bookmarkslater',
   BookmarkFolder = 'bookmarks[folderId]',
   SearchBookmarks = 'search-bookmarks',
+  SearchSquad = 'search-squad',
   Preview = 'preview',
   Author = 'author',
   UserUpvoted = 'user-upvoted',
diff --git a/packages/webapp/pages/squads/[handle]/index.tsx b/packages/webapp/pages/squads/[handle]/index.tsx
index 0fd1e345330..c5e17e6a5fb 100644
--- a/packages/webapp/pages/squads/[handle]/index.tsx
+++ b/packages/webapp/pages/squads/[handle]/index.tsx
@@ -1,15 +1,26 @@
 import type { GetServerSidePropsContext, GetServerSidePropsResult } from 'next';
 import type { ParsedUrlQuery } from 'querystring';
 import type { ReactElement } from 'react';
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
 import type { NextSeoProps } from 'next-seo';
 import Head from 'next/head';
 import Feed from '@dailydotdev/shared/src/components/Feed';
+import type { FeedProps } from '@dailydotdev/shared/src/components/Feed';
 import { BellIcon } from '@dailydotdev/shared/src/components/icons';
 import {
+  SEARCH_SOURCE_POSTS_QUERY,
   SOURCE_FEED_QUERY,
   supportedTypesForPrivateSources,
 } from '@dailydotdev/shared/src/graphql/feed';
+import { SearchProviderEnum } from '@dailydotdev/shared/src/graphql/search';
+import { useFeaturesReadyContext } from '@dailydotdev/shared/src/components/GrowthBookProvider';
+import { feature } from '@dailydotdev/shared/src/lib/featureManagement';
 import { useAuthContext } from '@dailydotdev/shared/src/contexts/AuthContext';
 import { SquadPageHeader } from '@dailydotdev/shared/src/components/squads/SquadPageHeader';
 import { SquadHeaderBar } from '@dailydotdev/shared/src/components/squads/SquadHeaderBar';
@@ -98,6 +109,21 @@ const SquadEmptyScreen = dynamic(
     ),
 );
 
+const SearchEmptyScreen = dynamic(
+  () =>
+    import(
+      /* webpackChunkName: "searchEmptyScreen" */ '@dailydotdev/shared/src/components/SearchEmptyScreen'
+    ),
+);
+
+const PostsSearch = dynamic(
+  () =>
+    import(
+      /* webpackChunkName: "postsSearch" */ '@dailydotdev/shared/src/components/PostsSearch'
+    ),
+  { ssr: false },
+);
+
 const SquadLoading = dynamic(
   () =>
     import(
@@ -360,6 +386,101 @@ const SquadPage = ({
     [squadId],
   );
 
+  const searchQuery =
+    typeof router.query?.q === 'string' ? router.query.q.trim() : '';
+  const isSearching = searchQuery.length > 0;
+  const { getFeatureValue } = useFeaturesReadyContext();
+
+  const feedProps = useMemo<FeedProps<unknown>>(() => {
+    if (isSearching) {
+      return {
+        feedName: OtherFeedPage.SearchSquad,
+        feedQueryKey: [
+          'searchSourcePosts',
+          user?.id ?? 'anonymous',
+          squadId,
+          searchQuery,
+        ],
+        query: SEARCH_SOURCE_POSTS_QUERY,
+        variables: {
+          source: squadId,
+          query: searchQuery,
+          supportedTypes: supportedTypesForPrivateSources,
+          version: getFeatureValue(feature.searchVersion),
+        },
+        emptyScreen: <SearchEmptyScreen />,
+      };
+    }
+
+    return {
+      feedName: OtherFeedPage.Squads,
+      feedQueryKey: [
+        'sourceFeed',
+        user?.id ?? 'anonymous',
+        Object.values(queryVariables),
+      ],
+      query: SOURCE_FEED_QUERY,
+      variables: queryVariables,
+      emptyScreen: <SquadEmptyScreen />,
+    };
+  }, [
+    isSearching,
+    searchQuery,
+    squadId,
+    queryVariables,
+    user?.id,
+    getFeatureValue,
+  ]);
+
+  // Search submit/clear write `q` to the URL. Cannot reuse `router.pathname`
+  // here (`/squads/[handle]`) the way RouterPostsSearch does for static
+  // routes — Next's router.replace throws/produces a literal
+  // "/squads/[handle]" href when the dynamic segment isn't present in the
+  // provided query object, so we build the concrete path from `asPath`.
+  const onSubmitSquadSearch = useCallback(
+    (query: string) => {
+      logEvent({
+        event_name: LogEvent.SubmitSearch,
+        extra: JSON.stringify({
+          query,
+          provider: SearchProviderEnum.Posts,
+          squad: squadId,
+        }),
+      });
+
+      const basePath = router.asPath.split('?')[0];
+      const searchParams = new URLSearchParams(window.location.search);
+      if (query) {
+        searchParams.set('q', query);
+      } else {
+        searchParams.delete('q');
+      }
+
+      return router.replace(
+        getPathnameWithQuery(basePath, searchParams),
+        undefined,
+        { shallow: true },
+      );
+    },
+    [logEvent, router, squadId],
+  );
+
+  const onClearSquadSearch = useCallback(() => {
+    const basePath = router.asPath.split('?')[0];
+    const searchParams = new URLSearchParams(window.location.search);
+    searchParams.delete('q');
+
+    return router.replace(
+      getPathnameWithQuery(basePath, searchParams),
+      undefined,
+      { shallow: true },
+    );
+  }, [router]);
+
+  const onFocusSquadSearch = useCallback(() => {
+    logEvent({ event_name: LogEvent.FocusSearch });
+  }, [logEvent]);
+
   useEffect(() => {
     if (!isForbidden) {
       return;
@@ -464,18 +585,25 @@ const SquadPage = ({
         <FeedPageComponent>
           <Feed
             className={classNames(shouldUseListFeedLayout ? 'px-0' : 'px-6')}
-            feedName={OtherFeedPage.Squads}
-            feedQueryKey={[
-              'sourceFeed',
-              user?.id ?? 'anonymous',
-              Object.values(queryVariables),
-            ]}
-            query={SOURCE_FEED_QUERY}
-            variables={queryVariables}
+            {...feedProps}
             showSearch={false}
-            emptyScreen={<SquadEmptyScreen />}
             options={{ refetchOnMount: true }}
-            header={<SquadFeedHeading squad={squad} />}
+            header={
+              <SquadFeedHeading
+                squad={squad}
+                searchChildren={
+                  <PostsSearch
+                    autoFocus={false}
+                    enableSuggestions={false}
+                    placeholder="Search this squad"
+                    initialQuery={searchQuery}
+                    onSubmitQuery={onSubmitSquadSearch}
+                    onClearQuery={onClearSquadSearch}
+                    onFocus={onFocusSquadSearch}
+                  />
+                }
+              />
+            }
             inlineHeader
             allowPin
           />

From 7ac2e52b80382ce1129f617194197b0579bdc824 Mon Sep 17 00:00:00 2001
From: Chris Bongers <chrisbongers@gmail.com>
Date: Fri, 10 Jul 2026 15:32:49 +0200
Subject: [PATCH 2/2] fix(squads): tidy squad search layout and strict-mode
 errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- SquadFeedHeading: match the bookmarks CustomFeedHeader idiom — the
  search field now fills the heading row with the pinned-posts toggle
  directly after it (no dead gap), wrapping below on narrow widths.
  Field medium size matches the button's h-10/rounded-12 scale exactly.
- Fix all strict-mode errors in the touched shared files so
  typecheck-strict-changed passes: typed suggestionType as a key of
  SEARCH_TYPES, null-initialized searchBoxRef, guarded the optional
  querySelector/focus chain and query fallback in PostsSearch; fail-fast
  guard for the optional pinned-posts mutations and squad id in
  SquadFeedHeading.
---
 .../shared/src/components/PostsSearch.tsx     | 20 +++++------
 .../components/squads/SquadFeedHeading.tsx    | 33 ++++++++++++++-----
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/packages/shared/src/components/PostsSearch.tsx b/packages/shared/src/components/PostsSearch.tsx
index 01272e07ffc..f552f2d8dd0 100644
--- a/packages/shared/src/components/PostsSearch.tsx
+++ b/packages/shared/src/components/PostsSearch.tsx
@@ -22,10 +22,16 @@ import { PopoverContent } from './popover/Popover';
 import { SearchIcon } from './icons';
 import { StaleTime } from '../lib/query';
 
+const SEARCH_TYPES = {
+  searchPostSuggestions: SEARCH_POST_SUGGESTIONS,
+  searchBookmarksSuggestions: SEARCH_BOOKMARKS_SUGGESTIONS,
+  searchReadingHistorySuggestions: SEARCH_READING_HISTORY_SUGGESTIONS,
+};
+
 export type PostsSearchProps = {
   initialQuery?: string;
   placeholder?: string;
-  suggestionType?: string;
+  suggestionType?: keyof typeof SEARCH_TYPES;
   autoFocus?: boolean;
   className?: string;
   onSubmitQuery: (
@@ -44,12 +50,6 @@ export type PostsSearchProps = {
   enableSuggestions?: boolean;
 } & Pick<HTMLAttributes<HTMLInputElement>, 'onFocus'>;
 
-const SEARCH_TYPES = {
-  searchPostSuggestions: SEARCH_POST_SUGGESTIONS,
-  searchBookmarksSuggestions: SEARCH_BOOKMARKS_SUGGESTIONS,
-  searchReadingHistorySuggestions: SEARCH_READING_HISTORY_SUGGESTIONS,
-};
-
 export default function PostsSearch({
   initialQuery: initialQueryProp,
   autoFocus = true,
@@ -62,7 +62,7 @@ export default function PostsSearch({
   enableSuggestions = true,
 }: PostsSearchProps): ReactElement {
   const { time, contentCurationFilter } = useSearchContextProvider();
-  const searchBoxRef = useRef<HTMLDivElement>();
+  const searchBoxRef = useRef<HTMLDivElement>(null);
   const [query, setQuery] = useState<string>();
   const [items, setItems] = useState<string[]>([]);
   const { value: searchVersion } = useConditionalFeature({
@@ -99,7 +99,7 @@ export default function PostsSearch({
 
   const submitQuery = async (item?: string) => {
     const itemQuery = item?.replace?.(sanitizeSearchTitleMatch, '');
-    await onSubmitQuery(itemQuery || query, {
+    await onSubmitQuery(itemQuery || query || '', {
       filters: {
         time: time.toString(),
         contentCuration: contentCurationFilter,
@@ -137,7 +137,7 @@ export default function PostsSearch({
 
   useEffect(() => {
     if (autoFocus) {
-      searchBoxRef.current?.querySelector('input').focus();
+      searchBoxRef.current?.querySelector('input')?.focus();
     }
   }, [searchBoxRef, autoFocus]);
 
diff --git a/packages/shared/src/components/squads/SquadFeedHeading.tsx b/packages/shared/src/components/squads/SquadFeedHeading.tsx
index a0344accb95..bdd1c3b1020 100644
--- a/packages/shared/src/components/squads/SquadFeedHeading.tsx
+++ b/packages/shared/src/components/squads/SquadFeedHeading.tsx
@@ -25,9 +25,17 @@ function SquadFeedHeading({
   const isSquadMember = !!squad.currentMember;
 
   const onClick = async () => {
-    return collapsePinnedPosts
-      ? await expandSquadPinnedPosts(squad.id)
-      : await collapseSquadPinnedPosts(squad.id);
+    const togglePinnedPosts = collapsePinnedPosts
+      ? expandSquadPinnedPosts
+      : collapseSquadPinnedPosts;
+
+    if (!togglePinnedPosts || !squad.id) {
+      throw new Error(
+        'SquadFeedHeading: pinned posts toggle requires a squad id and mutation',
+      );
+    }
+
+    return togglePinnedPosts(squad.id);
   };
 
   const pinnedPostsCount = useMemo(
@@ -43,13 +51,22 @@ function SquadFeedHeading({
 
   return (
     <div className="flex w-full flex-row flex-wrap items-center justify-end gap-4 px-6 pb-6 laptop:px-0">
+      {/* Mirrors the bookmarks CustomFeedHeader idiom: the search field fills
+          the row and the action buttons sit directly after it, so there is no
+          dead gap between the two. */}
       {searchChildren && (
-        <div className="min-w-[12rem] max-w-[20rem] flex-1">
+        <div className="flex min-w-[12rem] flex-1 items-center">
           {searchChildren}
         </div>
       )}
-      <span className="ml-auto flex flex-row gap-3 border-l border-border-subtlest-tertiary pl-3">
-        {isSquadMember && (
+      {isSquadMember && (
+        <span
+          className={
+            searchChildren
+              ? 'flex flex-row gap-3'
+              : 'ml-auto flex flex-row gap-3 border-l border-border-subtlest-tertiary pl-3'
+          }
+        >
           <Button
             variant={ButtonVariant.Float}
             onClick={onClick}
@@ -59,8 +76,8 @@ function SquadFeedHeading({
               ? `Show pinned posts (${pinnedPostsCount})`
               : 'Hide pinned posts'}
           </Button>
-        )}
-      </span>
+        </span>
+      )}
     </div>
   );
 }