-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move search result section to component & hide thumbnail if error
The section that handles the search result list item is big and complex enough to have it's own component. Inside this component, a new method is added to hide the thumbnail preview if the image load errors out. Signed-off-by: fenn-cs <fenn25.fn@gmail.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
- Loading branch information
1 parent
8496762
commit 9903f35
Showing
4 changed files
with
168 additions
and
101 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,162 @@ | ||
| <template> | ||
| <NcListItem class="result-items__item" | ||
| :name="title ?? ''" | ||
| :bold="false" | ||
| @click="openResult(result)"> | ||
| <template #icon> | ||
| <div class="result-items__item-icon" | ||
| :class="{ | ||
| 'result-items__item-icon--rounded': rounded, | ||
| 'result-items__item-icon--no-preview': !isValidIconOrPreviewUrl(thumbnailUrl), | ||
| 'result-items__item-icon--with-thumbnail': isValidIconOrPreviewUrl(thumbnailUrl), | ||
| [icon]: !isValidIconOrPreviewUrl(icon), | ||
| }" | ||
| :style="{ | ||
| backgroundImage: isValidIconOrPreviewUrl(icon) ? `url(${icon})` : '', | ||
| }"> | ||
| <img v-if="isValidIconOrPreviewUrl(thumbnailUrl) && !thumbnailHasError" | ||
| :src="thumbnailUrl" | ||
| @error="thumbnailErrorHandler"> | ||
| </div> | ||
| </template> | ||
| <template #subname> | ||
| {{ subline }} | ||
| </template> | ||
| </NcListItem> | ||
| </template> | ||
|
|
||
| <script> | ||
| import NcListItem from '@nextcloud/vue/dist/Components/NcListItem.js' | ||
| export default { | ||
| name: 'SearchResult', | ||
| components: { | ||
| NcListItem, | ||
| }, | ||
| props: { | ||
| thumbnailUrl: { | ||
| type: String, | ||
| default: null, | ||
| }, | ||
| title: { | ||
| type: String, | ||
| required: true, | ||
| }, | ||
| subline: { | ||
| type: String, | ||
| default: null, | ||
| }, | ||
| resourceUrl: { | ||
| type: String, | ||
| default: null, | ||
| }, | ||
| icon: { | ||
| type: String, | ||
| default: '', | ||
| }, | ||
| rounded: { | ||
| type: Boolean, | ||
| default: false, | ||
| }, | ||
| query: { | ||
| type: String, | ||
| default: '', | ||
| }, | ||
| /** | ||
| * Only used for the first result as a visual feedback | ||
| * so we can keep the search input focused but pressing | ||
| * enter still opens the first result | ||
| */ | ||
| focused: { | ||
| type: Boolean, | ||
| default: false, | ||
| }, | ||
| }, | ||
| data() { | ||
| return { | ||
| thumbnailHasError: false, | ||
| } | ||
| }, | ||
| methods: { | ||
| isValidIconOrPreviewUrl(url) { | ||
| return /^https?:\/\//.test(url) || url.startsWith('/') | ||
| }, | ||
| thumbnailErrorHandler() { | ||
| this.thumbnailHasError = true | ||
| }, | ||
| }, | ||
| } | ||
| </script> | ||
|
|
||
| <style lang="scss" scoped> | ||
| @use "sass:math"; | ||
| $clickable-area: 44px; | ||
| $margin: 10px; | ||
| .result-items { | ||
| &__item { | ||
| ::v-deep a { | ||
| border-radius: 12px; | ||
| border: 2px solid transparent; | ||
| border-radius: var(--border-radius-large) !important; | ||
| &--focused { | ||
| background-color: var(--color-background-hover); | ||
| } | ||
| &:active, | ||
| &:hover, | ||
| &:focus { | ||
| background-color: var(--color-background-hover); | ||
| border: 2px solid var(--color-border-maxcontrast); | ||
| } | ||
| * { | ||
| cursor: pointer; | ||
| } | ||
| } | ||
| &-icon { | ||
| overflow: hidden; | ||
| width: $clickable-area; | ||
| height: $clickable-area; | ||
| border-radius: var(--border-radius); | ||
| background-repeat: no-repeat; | ||
| background-position: center center; | ||
| background-size: 32px; | ||
| &--rounded { | ||
| border-radius: math.div($clickable-area, 2); | ||
| } | ||
| &--no-preview { | ||
| background-size: 32px; | ||
| } | ||
| &--with-thumbnail { | ||
| background-size: cover; | ||
| } | ||
| &--with-thumbnail:not(&--rounded) { | ||
| // compensate for border | ||
| max-width: $clickable-area - 2px; | ||
| max-height: $clickable-area - 2px; | ||
| border: 1px solid var(--color-border); | ||
| } | ||
| img { | ||
| // Make sure to keep ratio | ||
| width: 100%; | ||
| height: 100%; | ||
| object-fit: cover; | ||
| object-position: center; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| </style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.