Skip to content

Revert UX: header search mobile support #32748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 15, 2025
Merged

Revert UX: header search mobile support #32748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44bb733
Revert "UX: header search mobile support - follow up (#32306)"
yuriyaran May 15, 2025
fa35a36
Revert "UX: header search mobile support (#31711)"
yuriyaran May 15, 2025
9191455
DEV: lints gjs export template
yuriyaran May 15, 2025
dc58be4
DEV: lints gjs export template 2
yuriyaran May 15, 2025
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
46 changes: 17 additions & 29 deletions app/assets/javascripts/discourse/app/components/header.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import PluginOutlet from "discourse/components/plugin-outlet";
import DAG from "discourse/lib/dag";
import scrollLock from "discourse/lib/scroll-lock";
import { scrollTop } from "discourse/lib/scroll-top";
import delayedDestroy from "discourse/modifiers/delayed-destroy";
import DiscourseURL from "discourse/lib/url";
import AuthButtons from "./header/auth-buttons";
import Contents from "./header/contents";
import HamburgerDropdownWrapper from "./header/hamburger-dropdown-wrapper";
Expand Down Expand Up @@ -48,7 +48,7 @@ export default class GlimmerHeader extends Component {
@service appEvents;
@service header;

@tracked hasClosingAnimation = false;
@tracked skipSearchContext = this.site.mobileView;

appEventsListeners = modifierFn(() => {
this.appEvents.on(
Expand Down Expand Up @@ -112,13 +112,6 @@ export default class GlimmerHeader extends Component {
};
});

@action
handleAnimationComplete() {
this.hasClosingAnimation = false;
this.search.visible = false;
this.toggleBodyScrolling(false);
}

@action
closeCurrentMenu() {
if (this.search.visible) {
Expand Down Expand Up @@ -160,23 +153,23 @@ export default class GlimmerHeader extends Component {

@action
toggleSearchMenu() {
if (
this.site.mobileView &&
this.router.currentRouteName === "full-page-search"
) {
scrollTop();
document.querySelector(".full-page-search").focus();
return false;
}
if (this.site.mobileView) {
const context = this.search.searchContext;
let params = "";
if (context) {
params = `?context=${context.type}&context_id=${context.id}&skip_context=${this.skipSearchContext}`;
}

if (this.site.mobileView && this.search.visible) {
// hide is delayed for the duration of `search-slide-out` animation
this.hasClosingAnimation = true;
} else {
this.search.visible = !this.search.visible;
this.toggleBodyScrolling(true);
if (this.router.currentRouteName === "full-page-search") {
scrollTop();
document.querySelector(".full-page-search").focus();
return false;
} else {
return DiscourseURL.routeTo("/search" + params);
}
}

this.search.visible = !this.search.visible;
if (!this.search.visible) {
this.search.highlightTerm = "";
this.search.inTopicContext = false;
Expand Down Expand Up @@ -303,13 +296,8 @@ export default class GlimmerHeader extends Component {
{{#if this.search.visible}}
<SearchMenuWrapper
@closeSearchMenu={{this.toggleSearchMenu}}
@searchInputId="icon-search-input"
{{this.handleFocus}}
{{delayedDestroy
animate=this.hasClosingAnimation
elementSelector=".menu-panel.search-menu-panel.slide-in"
onComplete=this.handleAnimationComplete
}}
@searchInputId="icon-search-input"
/>
{{else if this.header.hamburgerVisible}}
<HamburgerDropdownWrapper
Expand Down
1 change: 0 additions & 1 deletion app/assets/javascripts/discourse/app/components/menu-panel.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import concatClass from "discourse/helpers/concat-class";
<div
class={{concatClass "menu-panel" @panelClass @animationClass}}
data-max-width="500"
data-test-selector="menu-panel"
>
<div class="panel-body">
<div class="panel-body-contents">
Expand Down
7 changes: 1 addition & 6 deletions app/assets/javascripts/discourse/app/components/search-menu-panel.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ import Component from "@glimmer/component";
import { service } from "@ember/service";
import MenuPanel from "discourse/components/menu-panel";
import SearchMenu from "discourse/components/search-menu";
import concatClass from "discourse/helpers/concat-class";

export default class SearchMenuPanel extends Component {
@service search;
@service site;

get animationClass() {
Expand All @@ -17,10 +15,7 @@ export default class SearchMenuPanel extends Component {
<template>
<MenuPanel
@animationClass={{this.animationClass}}
@panelClass={{concatClass
"search-menu-panel"
(unless this.search.activeGlobalSearchTerm "empty-panel")
}}
@panelClass="search-menu-panel"
>
<SearchMenu
@onClose={{@closeSearchMenu}}
Expand Down
155 changes: 61 additions & 94 deletions app/assets/javascripts/discourse/app/components/search-menu.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ import { Promise } from "rsvp";
import DButton from "discourse/components/d-button";
import MenuPanel from "discourse/components/menu-panel";
import PluginOutlet from "discourse/components/plugin-outlet";
import ActiveFilters from "discourse/components/search-menu/active-filters";
import AdvancedButton from "discourse/components/search-menu/advanced-button";
import ClearButton from "discourse/components/search-menu/clear-button";
import MobileSearchButton from "discourse/components/search-menu/mobile-search-button";
import Results from "discourse/components/search-menu/results";
import SearchTerm from "discourse/components/search-menu/search-term";
import concatClass from "discourse/helpers/concat-class";
Expand All @@ -31,7 +29,6 @@ import {
} from "discourse/lib/search";
import DiscourseURL from "discourse/lib/url";
import userSearch from "discourse/lib/user-search";
import { i18n } from "discourse-i18n";

const CATEGORY_SLUG_REGEXP = /(\#[a-zA-Z0-9\-:]*)$/gi;
const USERNAME_REGEXP = /(\@[a-zA-Z0-9\-\_]*)$/gi;
Expand All @@ -42,12 +39,12 @@ export const DEFAULT_TYPE_FILTER = "exclude_topics";
export default class SearchMenu extends Component {
@service search;
@service currentUser;
@service site;
@service siteSettings;
@service appEvents;

@tracked loading = false;
@tracked inPMInboxContext = this.search.contextType === "private_messages";
@tracked
inPMInboxContext = this.search.searchContext?.type === "private_messages";
@tracked typeFilter = DEFAULT_TYPE_FILTER;
@tracked suggestionKeyword = false;
@tracked suggestionResults = [];
Expand Down Expand Up @@ -116,10 +113,6 @@ export default class SearchMenu extends Component {
return false;
}

get inHeaderMobileView() {
return this.args.location === "header" && this.site.mobileView;
}

@action
onKeydown(event) {
if (event.key === "Escape") {
Expand Down Expand Up @@ -188,7 +181,9 @@ export default class SearchMenu extends Component {
}

@bind
clearSearch() {
clearSearch(e) {
e.stopPropagation();
e.preventDefault();
this.search.activeGlobalSearchTerm = "";
this.search.focusSearchInput();
this.triggerSearch();
Expand All @@ -213,12 +208,6 @@ export default class SearchMenu extends Component {
}
}

@action
mobileSearch() {
this.updateTypeFilter(null);
this.triggerSearch();
}

@action
updateTypeFilter(value) {
this.typeFilter = value;
Expand All @@ -230,19 +219,8 @@ export default class SearchMenu extends Component {
}

@action
cancelMobileSearch() {
this.close();

if (this.search.inTopicContext) {
this.search.inTopicContext = false;
}

this.clearPMInboxContext();

if (this.search.activeGlobalSearchTerm) {
this.search.activeGlobalSearchTerm = "";
this.triggerSearch();
}
clearTopicContext() {
this.search.inTopicContext = false;
}

// for cancelling debounced search
Expand Down Expand Up @@ -309,14 +287,17 @@ export default class SearchMenu extends Component {
this.suggestionKeyword = false;

if (!this.search.activeGlobalSearchTerm) {
this.abortPerform({
noResults: this.site.mobileView,
invalidTerm: false,
});
this.search.noResults = false;
this.search.results = {};
this.loading = false;
this.invalidTerm = false;
} else if (
!isValidSearchTerm(this.search.activeGlobalSearchTerm, this.siteSettings)
) {
this.abortPerform({ noResults: true, invalidTerm: true });
this.search.noResults = true;
this.search.results = {};
this.loading = false;
this.invalidTerm = true;
} else {
this.loading = true;
this.invalidTerm = false;
Expand Down Expand Up @@ -377,14 +358,6 @@ export default class SearchMenu extends Component {
return false;
}

abortPerform({ noResults, invalidTerm }) {
this.search.noResults = noResults;
this.invalidTerm = invalidTerm;
this.search.results = {};
this.loading = false;
this.typeFilter = DEFAULT_TYPE_FILTER;
}

@action
triggerSearch() {
this.search.noResults = false;
Expand Down Expand Up @@ -418,60 +391,58 @@ export default class SearchMenu extends Component {
{{! template-lint-disable no-invalid-interactive }}
{{on "keydown" this.onKeydown}}
>
<div class="search-input-wrapper">
<div
class={{concatClass
"search-input"
(concat "search-input--" @location)
}}
>
{{#if this.inHeaderMobileView}}
<MobileSearchButton @onTap={{this.mobileSearch}} />
{{else}}
<ActiveFilters
@inPMInboxContext={{this.inPMInboxContext}}
@clearPMInboxContext={{this.clearPMInboxContext}}
/>
{{/if}}

<PluginOutlet
@name="search-menu-before-term-input"
@outletArgs={{hash openSearchMenu=this.open}}
<div
class={{concatClass "search-input" (concat "search-input--" @location)}}
>
{{#if this.search.inTopicContext}}
<DButton
@icon="xmark"
@label="search.in_this_topic"
@title="search.in_this_topic_tooltip"
@action={{this.clearTopicContext}}
class="btn-small search-context"
/>

<SearchTerm
@searchTermChanged={{this.searchTermChanged}}
@typeFilter={{this.typeFilter}}
@updateTypeFilter={{this.updateTypeFilter}}
@triggerSearch={{this.triggerSearch}}
@fullSearch={{this.fullSearch}}
@clearPMInboxContext={{this.clearPMInboxContext}}
@closeSearchMenu={{this.close}}
@openSearchMenu={{this.open}}
@autofocus={{@autofocusInput}}
@inputId={{this.searchInputId}}
data-test-input="search-term"
{{else if this.inPMInboxContext}}
<DButton
@icon="xmark"
@label="search.in_messages"
@title="search.in_messages_tooltip"
@action={{this.clearPMInboxContext}}
class="btn-small search-context"
/>
{{/if}}

<PluginOutlet
@name="search-menu-before-term-input"
@outletArgs={{hash openSearchMenu=this.open}}
/>

<SearchTerm
@searchTermChanged={{this.searchTermChanged}}
@typeFilter={{this.typeFilter}}
@updateTypeFilter={{this.updateTypeFilter}}
@triggerSearch={{this.triggerSearch}}
@fullSearch={{this.fullSearch}}
@clearPMInboxContext={{this.clearPMInboxContext}}
@clearTopicContext={{this.clearTopicContext}}
@closeSearchMenu={{this.close}}
@openSearchMenu={{this.open}}
@autofocus={{@autofocusInput}}
@inputId={{this.searchInputId}}
/>

{{#if this.loading}}
<div class="searching">
{{#if this.loading}}
{{loadingSpinner}}
{{else}}
<PluginOutlet @name="search-menu-before-advanced-search" />
{{#if this.search.activeGlobalSearchTerm}}
<ClearButton @clearSearch={{this.clearSearch}} />
{{/if}}
<AdvancedButton @openAdvancedSearch={{this.openAdvancedSearch}} />
{{loadingSpinner}}
</div>
{{else}}
<div class="searching">
<PluginOutlet @name="search-menu-before-advanced-search" />
{{#if this.search.activeGlobalSearchTerm}}
<ClearButton @clearSearch={{this.clearSearch}} />
{{/if}}
<AdvancedButton @openAdvancedSearch={{this.openAdvancedSearch}} />
</div>
</div>
{{#if this.inHeaderMobileView}}
<DButton
@action={{this.cancelMobileSearch}}
@translatedLabel={{i18n "cancel_value"}}
class="btn-flat btn-cancel-mobile-search"
data-test-button="cancel-mobile-search"
/>
{{/if}}
</div>

Expand All @@ -484,8 +455,6 @@ export default class SearchMenu extends Component {
@suggestionResults={{this.suggestionResults}}
@searchTopics={{this.includesTopics}}
@inPMInboxContext={{this.inPMInboxContext}}
@inHeaderMobileView={{this.inHeaderMobileView}}
@clearPMInboxContext={{this.clearPMInboxContext}}
@triggerSearch={{this.triggerSearch}}
@updateTypeFilter={{this.updateTypeFilter}}
@closeSearchMenu={{this.close}}
Expand All @@ -502,8 +471,6 @@ export default class SearchMenu extends Component {
@suggestionResults={{this.suggestionResults}}
@searchTopics={{this.includesTopics}}
@inPMInboxContext={{this.inPMInboxContext}}
@inHeaderMobileView={{this.inHeaderMobileView}}
@clearPMInboxContext={{this.clearPMInboxContext}}
@triggerSearch={{this.triggerSearch}}
@updateTypeFilter={{this.updateTypeFilter}}
@closeSearchMenu={{this.close}}
Expand Down
Loading
Loading