Skip to content
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.

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

Update recent searches to match updated mockups #3796

Merged
merged 8 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from 7 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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
aria-label="inputmodal"
@close="deactivate"
>
<div class="flex w-full" :class="{ 'px-2': isRecentSearchesModalOpen }">
<div class="flex w-full" :class="{ 'px-3': isRecentSearchesModalOpen }">
<!-- Form action is a fallback for when JavaScript is disabled. -->
<form
action="/search"
Expand Down
7 changes: 7 additions & 0 deletions frontend/src/components/VHeader/VSearchBar/VSearchBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
:class="recentClasses"
@select="handleSelect"
@clear="handleClear"
@clear-single="handleClearSingle"
@keydown.tab.native="hideRecentSearches"
/>
</ClientOnly>
Expand Down Expand Up @@ -227,6 +228,11 @@ export default defineComponent({
inputFieldRef.value?.focusInput()
searchStore.clearRecentSearches()
}
/* Clear a specific recent search from the store. */
const handleClearSingle = (idx: number) => {
inputFieldRef.value?.focusInput()
searchStore.clearRecentSearch(idx)
}

return {
searchBarEl,
Expand All @@ -247,6 +253,7 @@ export default defineComponent({
handleKeydown,
handleSelect,
handleClear,
handleClearSingle,
}
},
})
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/VModal/VInputModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div
ref="dialogRef"
v-bind="$attrs"
class="flex w-full flex-col px-4 py-4"
class="flex w-full flex-col px-3 py-4"
role="dialog"
aria-modal="true"
@keydown="onKeyDown"
Expand Down
41 changes: 32 additions & 9 deletions frontend/src/components/VRecentSearches/VRecentSearches.vue
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<template>
<div
class="flex flex-col gap-1 rounded-sm border bg-white"
:class="bordered ? 'border-dark-charcoal-20 p-4 shadow-el-2' : 'border-tx'"
class="flex flex-col rounded-sm bg-white"
:class="{ 'border border-dark-charcoal-20 p-2 shadow-el-2': bordered }"
data-testid="recent-searches"
>
<div
class="flex flex-row items-center justify-between py-2"
:class="{ 'pe-2': !bordered }"
class="flex h-10 flex-row items-center justify-between ps-3"
:class="{ 'pe-1': !bordered }"
>
<!-- Left margin to align with the text of recent searches. -->
<span class="category mx-2 my-1">
<span class="category">
{{ $t("recentSearches.heading") }}
</span>
<VButton
Expand Down Expand Up @@ -37,20 +37,36 @@
:id="`option-${idx}`"
:key="idx"
role="option"
class="description-regular my-1 rounded-sm border-1.5 p-2 hover:bg-dark-charcoal-10"
class="group/entry label-regular flex h-10 flex-row items-center gap-2 rounded-sm border-1.5 pe-1 ps-2 hover:bg-dark-charcoal-10"
:class="idx === selectedIdx ? 'border-pink' : 'border-tx'"
:aria-selected="idx === selectedIdx"
@click="handleClick(idx)"
>
<VIcon name="search" />
{{ entry }}
<VIconButton
variant="transparent-gray"
:icon-props="{ name: 'close-small' }"
size="small"
:label="$t('recentSearches.clearSingle.label', { entry }).toString()"
class="ms-auto group-hover/entry:flex"
:class="{ hidden: bordered }"
@click.stop="handleClearSingle(idx)"
/>
</li>
<!-- eslint-enable -->
</ul>
<span v-else class="description-regular mx-2 my-3">
<span
v-else
class="description-regular flex h-10 flex-row items-center ps-3"
:class="{ 'pe-1': !bordered }"
>
{{ $t("recentSearches.none") }}
</span>

<span class="caption-regular mx-2 my-3 text-dark-charcoal-70">
<span
class="mt-auto p-3 text-sm leading-close text-dark-charcoal-70 lg:leading-snug"
>
{{ $t("recentSearches.disclaimer") }}
</span>
</div>
Expand All @@ -62,14 +78,16 @@ import { defineComponent, type PropType } from "vue"
import { defineEvent } from "~/types/emits"

import VButton from "~/components/VButton.vue"
import VIcon from "~/components/VIcon/VIcon.vue"
import VIconButton from "~/components/VIconButton/VIconButton.vue"

/**
* List the recent searches of the user allowing them to go back to a previous
* search. These searches are saved locally and never shared with the server.
*/
export default defineComponent({
name: "VRecentSearches",
components: { VButton },
components: { VIconButton, VIcon, VButton },
props: {
/**
* the list of saved past searches
Expand All @@ -95,6 +113,7 @@ export default defineComponent({
emits: {
select: defineEvent<[number]>(),
clear: defineEvent(),
"clear-single": defineEvent<[number]>(),
},
setup(_, { emit }) {
const handleClick = (idx: number) => {
Expand All @@ -103,10 +122,14 @@ export default defineComponent({
const handleClear = () => {
emit("clear")
}
const handleClearSingle = (idx: number) => {
emit("clear-single", idx)
}

return {
handleClick,
handleClear,
handleClearSingle,
}
},
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ import VRecentSearches from "~/components/VRecentSearches/VRecentSearches.vue"
clear: {
action: "clear",
},
clearSingle: {
action: "clearSingle",
},
}}
/>

Expand Down
3 changes: 3 additions & 0 deletions frontend/src/locales/scripts/en.json5
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,9 @@
text: "Clear",
label: "Clear recent searches",
},
clearSingle: {
label: "Clear recent search '{entry}'",
},
none: "No recent searches to show.",
disclaimer: "Openverse does not store your recent searches, this information is kept locally in your browser.",
},
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/stores/search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,9 @@ export const useSearchStore = defineStore("search", {
clearRecentSearches() {
this.recentSearches = []
},
clearRecentSearch(idx: number) {
this.recentSearches.splice(idx, 1)
},
/**
* Initial filters do not include the provider filters. We create the provider filters object
* when we fetch the provider data on the Nuxt server initialization.
Expand Down
1 change: 1 addition & 0 deletions frontend/tailwind.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ export default {
relaxed: "1.8",
large: "1.7",
normal: "1.5",
close: "1.4",
snug: "1.3",
tight: "1.2",
none: "1.0",
Expand Down
Loading