Skip to content

Commit

Permalink
feat(toolbar): add coming soon to group search input (#3658)
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonwoodland authored Jun 16, 2022
1 parent fda306f commit 5f43a3a
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 7 deletions.
29 changes: 22 additions & 7 deletions components/views/navigation/toolbar/Toolbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,28 @@
</UiComingSoon>

<div class="vertical-divider" v-if="!$device.isMobile"></div>
<SearchInput
v-if="!$device.isMobile"
@search="handleSearch"
@change="handleChange"
:placeholder="$t('search.search')"
:searchRecommend="searchRecommend"
/>
<template v-if="!$device.isMobile">
<UiComingSoon
v-if="isGroup"
:tooltipText="$t('coming_soon.group_chat_search')"
horizontal
tooltip-position="bottom"
>
<SearchInput
@search="handleSearch"
@change="handleChange"
:placeholder="$t('search.search')"
:searchRecommend="searchRecommend"
/>
</UiComingSoon>
<SearchInput
v-else
@search="handleSearch"
@change="handleChange"
:placeholder="$t('search.search')"
:searchRecommend="searchRecommend"
/>
</template>
<SearchResult
v-if="!$device.isMobile && searchQuery"
:searchQuery="searchQuery"
Expand Down
1 change: 1 addition & 0 deletions components/views/navigation/toolbar/Toolbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export default Vue.extend({
conversation: (state) => (state as RootState).conversation,
groups: (state) => (state as RootState).groups,
friends: (state) => (state as RootState).friends,
isGroup: (state) => (state as RootState).conversation.type === 'group',
}),
...mapGetters('ui', ['showSidebar', 'allUnseenNotifications']),
showSearchResult: {
Expand Down
1 change: 1 addition & 0 deletions locales/en-US.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export default {
archived: 'Archived Messages\nComing Soon',
group_call: 'Group Call\nComing Soon',
sidebar_search: 'Friends and Group Search\nComing Soon',
group_chat_search: 'Group Chat Search\nComing Soon',
},
global: {
name: 'Satellite.im',
Expand Down

0 comments on commit 5f43a3a

Please sign in to comment.