Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
"@tiptap/react": "^3.22.5",
"@tiptap/starter-kit": "^3.22.5",
"check-password-strength": "^2.0.10",
"cmdk": "^1.0.0",
"emojibase-data": "^17.0.0",
"fetch-event-stream": "^0.1.6",
"graphql-ws": "^5.5.5",
Expand Down
7 changes: 6 additions & 1 deletion packages/shared/src/components/MainLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ import { AuthTriggers } from '../lib/auth';
import PlusMobileEntryBanner from './marketing/banners/PlusMobileEntryBanner';
import usePlusEntry from '../hooks/usePlusEntry';
import { SearchProvider } from '../contexts/search/SearchContext';
import { SpotlightProvider } from './spotlight/SpotlightContext';
import { SpotlightHost } from './spotlight/SpotlightHost';
import { FeedbackWidget } from './feedback';
import { isExtension } from '../lib/func';

Expand Down Expand Up @@ -185,6 +187,7 @@ function MainLayoutComponent({
<PromptElement />
<Toast autoDismissNotifications={autoDismissNotifications} />
<BootPopups />
<SpotlightHost />
<StreakMilestonePopup />
{plusEntryAnnouncementBar && (
<PlusMobileEntryBanner
Expand Down Expand Up @@ -230,7 +233,9 @@ function MainLayoutComponent({
const MainLayout = (props: MainLayoutProps): ReactElement => (
<ActiveFeedNameContextProvider>
<SearchProvider>
<MainLayoutComponent {...props} />
<SpotlightProvider>
<MainLayoutComponent {...props} />
</SpotlightProvider>
</SearchProvider>
</ActiveFeedNameContextProvider>
);
Expand Down
28 changes: 14 additions & 14 deletions packages/shared/src/components/layout/MainLayoutHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ export interface MainLayoutHeaderProps {
onLogoClick?: (e: React.MouseEvent) => unknown;
}

const SearchPanel = dynamic(
const SpotlightTrigger = dynamic(
() =>
import(
/* webpackChunkName: "searchPanel" */ '../search/SearchPanel/SearchPanel'
/* webpackChunkName: "spotlightTrigger" */ '../spotlight/SpotlightTrigger'
),
);

Expand Down Expand Up @@ -76,18 +76,18 @@ function MainLayoutHeader({
const renderSearchPanel = useCallback(
() =>
shouldUseLoadedSettings && (
<SearchPanel
className={{
container: classNames(
'left-0 top-0 z-header items-center py-3 tablet:left-16 laptop:left-0',
isSearchPage
? 'relative right-0 tablet:!left-0 laptop:top-0'
: 'hidden laptop:flex',
hasBanner && 'tablet:top-18',
),
field: 'mx-2 laptop:mx-auto',
}}
/>
<div
className={classNames(
'left-0 top-0 z-header items-center py-3 tablet:left-16 laptop:left-0',
isSearchPage
? 'relative right-0 tablet:!left-0 laptop:top-0'
: 'hidden laptop:flex',
hasBanner && 'tablet:top-18',
'mx-2 laptop:mx-auto',
)}
>
<SpotlightTrigger />
</div>
),
[shouldUseLoadedSettings, isSearchPage, hasBanner],
);
Expand Down
131 changes: 0 additions & 131 deletions packages/shared/src/components/search/SearchPanel/SearchPanel.tsx

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading