diff --git a/composables/settings/definition.ts b/composables/settings/definition.ts index 98f3c337..fb240eec 100644 --- a/composables/settings/definition.ts +++ b/composables/settings/definition.ts @@ -27,6 +27,7 @@ export interface PreferencesSettings { enableDataSaving: boolean enablePinchToZoom: boolean useStarFavoriteIcon: boolean + useExplorePageForSearch: boolean zenMode: boolean experimentalVirtualScroller: boolean experimentalGitHubCards: boolean @@ -83,6 +84,7 @@ export const DEFAULT__PREFERENCES_SETTINGS: PreferencesSettings = { enableDataSaving: false, enablePinchToZoom: false, useStarFavoriteIcon: false, + useExplorePageForSearch: false, zenMode: false, experimentalVirtualScroller: true, experimentalGitHubCards: true, diff --git a/locales/en.json b/locales/en.json index b7ac956e..6f9a45a5 100644 --- a/locales/en.json +++ b/locales/en.json @@ -561,6 +561,7 @@ "label": "Preferences", "optimize_for_low_performance_device": "Optimize for low performance device", "title": "Experimental Features", + "use_explore_page_for_search": "Use Explore page for Search", "use_star_favorite_icon": "Use star favorite icon", "user_picker": "User Picker", "user_picker_description": "Displays all avatars of logged accounts in the bottom-left so you can switch quickly between them.", diff --git a/pages/[[server]]/explore.vue b/pages/[[server]]/explore.vue index cfede990..f819d0f4 100644 --- a/pages/[[server]]/explore.vue +++ b/pages/[[server]]/explore.vue @@ -3,19 +3,7 @@ import type { CommonRouteTabOption } from '~/types' const { t } = useI18n() -const search = ref<{ input?: HTMLInputElement }>() -const route = useRoute() -watchEffect(() => { - if (isMediumOrLargeScreen && route.name === 'explore' && search.value?.input) - search.value?.input?.focus() -}) -onActivated(() => - search.value?.input?.focus(), -) -onDeactivated(() => search.value?.input?.blur()) - const userSettings = useUserSettings() - const tabs = computed(() => [ { to: isHydrated.value ? `/${currentServer.value}/explore` : '/explore', @@ -37,6 +25,8 @@ const tabs = computed(() => [ disabled: !isHydrated.value || !currentUser.value, }, ]) + +const useExplorePageForSearch = usePreferences('useExplorePageForSearch') diff --git a/pages/settings/preferences/index.vue b/pages/settings/preferences/index.vue index c0d7be72..3a27d958 100644 --- a/pages/settings/preferences/index.vue +++ b/pages/settings/preferences/index.vue @@ -78,6 +78,12 @@ const userSettings = useUserSettings() > {{ $t('settings.preferences.use_star_favorite_icon') }} + + {{ $t('settings.preferences.use_explore_page_for_search') }} +