replace el-select

src/views/Feed/Feed.vue

@@ -14,19 +14,24 @@
                             <Switch v-model="feedTable.vip" @update:modelValue="feedTableLookup" />
                         </TooltipWrapper>
                     </div>
-                    <el-select
+                    <Select
-                        v-model="feedTable.filter"
                         multiple
-                        clearable
+                        :model-value="Array.isArray(feedTable.filter) ? feedTable.filter : []"
-                        style="flex: 1"
+                        @update:modelValue="handleFeedFilterChange">
-                        :placeholder="t('view.feed.filter_placeholder')"
+                        <SelectTrigger class="w-full" style="flex: 1">
-                        @change="feedTableLookup">
+                            <SelectValue :placeholder="t('view.feed.filter_placeholder')" />
-                        <el-option
+                        </SelectTrigger>
-                            v-for="type in ['GPS', 'Online', 'Offline', 'Status', 'Avatar', 'Bio']"
+                        <SelectContent>
-                            :key="type"
+                            <SelectGroup>
-                            :label="t('view.feed.filters.' + type)"
+                                <SelectItem
-                            :value="type"></el-option>
+                                    v-for="type in ['GPS', 'Online', 'Offline', 'Status', 'Avatar', 'Bio']"
-                    </el-select>
+                                    :key="type"
+                                    :value="type">
+                                    {{ t('view.feed.filters.' + type) }}
+                                </SelectItem>
+                            </SelectGroup>
+                        </SelectContent>
+                    </Select>
                     <InputGroupField
                         v-model="feedTable.search"
                         :placeholder="t('view.feed.search_placeholder')"
@@ -45,9 +50,17 @@
     import { storeToRefs } from 'pinia';
     import { useI18n } from 'vue-i18n';
 
+    import {
+        Select,
+        SelectContent,
+        SelectGroup,
+        SelectItem,
+        SelectTrigger,
+        SelectValue
+    } from '../../components/ui/select';
     import { useAppearanceSettingsStore, useFeedStore, useVrcxStore } from '../../stores';
-    import { InputGroupField } from '../../components/ui/input-group';
     import { DataTableLayout } from '../../components/ui/data-table';
+    import { InputGroupField } from '../../components/ui/input-group';
     import { Switch } from '../../components/ui/switch';
     import { columns as baseColumns } from './columns.jsx';
     import { useDataTableScrollHeight } from '../../composables/useDataTableScrollHeight';
@@ -105,6 +118,11 @@
         }
     };
 
+    function handleFeedFilterChange(value) {
+        feedTable.value.filter = Array.isArray(value) ? value : [];
+        feedTableLookup();
+    }
+
     watch(pageSize, (size) => {
         if (pagination.value.pageSize === size) {
             return;

src/views/FriendList/FriendList.vue

@@ -6,20 +6,32 @@
                     <TooltipWrapper side="bottom" :content="t('view.friend_list.favorites_only_tooltip')">
                         <Switch v-model="friendsListSearchFilterVIP" @update:modelValue="friendsListSearchChange" />
                     </TooltipWrapper>
-                    <el-select
+                    <Select
-                        v-model="friendsListSearchFilters"
                         multiple
-                        clearable
+                        :model-value="Array.isArray(friendsListSearchFilters) ? friendsListSearchFilters : []"
-                        collapse-tags
+                        @update:modelValue="handleFriendListFilterChange">
-                        style="margin: 0 10px; width: 150px"
+                        <SelectTrigger style="margin: 0 10px; width: 150px">
-                        :placeholder="t('view.friend_list.filter_placeholder')"
+                            <SelectValue :placeholder="t('view.friend_list.filter_placeholder')" />
-                        @change="friendsListSearchChange">
+                        </SelectTrigger>
-                        <el-option
+                        <SelectContent>
-                            v-for="type in ['Display Name', 'User Name', 'Rank', 'Status', 'Bio', 'Note', 'Memo']"
+                            <SelectGroup>
-                            :key="type"
+                                <SelectItem
-                            :label="type"
+                                    v-for="type in [
-                            :value="type"></el-option>
+                                        'Display Name',
-                    </el-select>
+                                        'User Name',
+                                        'Rank',
+                                        'Status',
+                                        'Bio',
+                                        'Note',
+                                        'Memo'
+                                    ]"
+                                    :key="type"
+                                    :value="type">
+                                    {{ type }}
+                                </SelectItem>
+                            </SelectGroup>
+                        </SelectContent>
+                    </Select>
                     <InputGroupField
                         v-model="friendsListSearch"
                         :placeholder="t('view.friend_list.search_placeholder')"
@@ -259,11 +271,12 @@
 </template>
 
 <script setup>
+    import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
     import { computed, nextTick, reactive, ref, watch } from 'vue';
     import { Button } from '@/components/ui/button';
+    import { ElMessageBox } from 'element-plus';
     import { InputGroupField } from '@/components/ui/input-group';
     import { Progress } from '@/components/ui/progress';
-    import { ElMessageBox } from 'element-plus';
     import { storeToRefs } from 'pinia';
     import { toast } from 'vue-sonner';
     import { useI18n } from 'vue-i18n';
@@ -568,6 +581,11 @@
 
         friendsListTable.data = sortedData;
     }
+
+    function handleFriendListFilterChange(value) {
+        friendsListSearchFilters.value = Array.isArray(value) ? value : [];
+        friendsListSearchChange();
+    }
 </script>
 
 <style scoped>

src/views/FriendLog/FriendLog.vue

@@ -8,26 +8,33 @@
             :on-page-size-change="handlePageSizeChange">
             <template #toolbar>
                 <div style="margin: 0 0 10px; display: flex; align-items: center">
-                    <el-select
+                    <Select
-                        v-model="friendLogTable.filters[0].value"
                         multiple
-                        clearable
+                        :model-value="
-                        style="flex: 1"
+                            Array.isArray(friendLogTable.filters?.[0]?.value) ? friendLogTable.filters[0].value : []
-                        :placeholder="t('view.friend_log.filter_placeholder')"
+                        "
-                        @change="saveTableFilters">
+                        @update:modelValue="handleFriendLogFilterChange">
-                        <el-option
+                        <SelectTrigger class="w-full" style="flex: 1">
-                            v-for="type in [
+                            <SelectValue :placeholder="t('view.friend_log.filter_placeholder')" />
-                                'Friend',
+                        </SelectTrigger>
-                                'Unfriend',
+                        <SelectContent>
-                                'FriendRequest',
+                            <SelectGroup>
-                                'CancelFriendRequest',
+                                <SelectItem
-                                'DisplayName',
+                                    v-for="type in [
-                                'TrustLevel'
+                                        'Friend',
-                            ]"
+                                        'Unfriend',
-                            :key="type"
+                                        'FriendRequest',
-                            :label="t('view.friend_log.filters.' + type)"
+                                        'CancelFriendRequest',
-                            :value="type" />
+                                        'DisplayName',
-                    </el-select>
+                                        'TrustLevel'
+                                    ]"
+                                    :key="type"
+                                    :value="type">
+                                    {{ t('view.friend_log.filters.' + type) }}
+                                </SelectItem>
+                            </SelectGroup>
+                        </SelectContent>
+                    </Select>
                     <InputGroupField
                         v-model="friendLogTable.filters[1].value"
                         :placeholder="t('view.friend_log.search_placeholder')"
@@ -46,6 +53,14 @@
 
     import dayjs from 'dayjs';
 
+    import {
+        Select,
+        SelectContent,
+        SelectGroup,
+        SelectItem,
+        SelectTrigger,
+        SelectValue
+    } from '../../components/ui/select';
     import { useAppearanceSettingsStore, useFriendStore, useVrcxStore } from '../../stores';
     import { DataTableLayout } from '../../components/ui/data-table';
     import { InputGroupField } from '../../components/ui/input-group';
@@ -129,6 +144,10 @@
     function saveTableFilters() {
         configRepository.setString('VRCX_friendLogTableFilters', JSON.stringify(friendLogTable.value.filters[0].value));
     }
+    function handleFriendLogFilterChange(value) {
+        friendLogTable.value.filters[0].value = Array.isArray(value) ? value : [];
+        saveTableFilters();
+    }
     function deleteFriendLogPrompt(row) {
         ElMessageBox.confirm('Continue? Delete Log', 'Confirm', {
             confirmButtonText: 'Confirm',

src/views/GameLog/GameLog.vue

@@ -14,28 +14,33 @@
                             <Switch v-model="gameLogTable.vip" @update:modelValue="gameLogTableLookup" />
                         </TooltipWrapper>
                     </div>
-                    <el-select
+                    <Select
-                        v-model="gameLogTable.filter"
                         multiple
-                        clearable
+                        :model-value="Array.isArray(gameLogTable.filter) ? gameLogTable.filter : []"
-                        style="flex: 1"
+                        @update:modelValue="handleGameLogFilterChange">
-                        :placeholder="t('view.game_log.filter_placeholder')"
+                        <SelectTrigger class="w-full" style="flex: 1">
-                        @change="gameLogTableLookup">
+                            <SelectValue :placeholder="t('view.game_log.filter_placeholder')" />
-                        <el-option
+                        </SelectTrigger>
-                            v-for="type in [
+                        <SelectContent>
-                                'Location',
+                            <SelectGroup>
-                                'OnPlayerJoined',
+                                <SelectItem
-                                'OnPlayerLeft',
+                                    v-for="type in [
-                                'VideoPlay',
+                                        'Location',
-                                'Event',
+                                        'OnPlayerJoined',
-                                'External',
+                                        'OnPlayerLeft',
-                                'StringLoad',
+                                        'VideoPlay',
-                                'ImageLoad'
+                                        'Event',
-                            ]"
+                                        'External',
-                            :key="type"
+                                        'StringLoad',
-                            :label="t('view.game_log.filters.' + type)"
+                                        'ImageLoad'
-                            :value="type"></el-option>
+                                    ]"
-                    </el-select>
+                                    :key="type"
+                                    :value="type">
+                                    {{ t('view.game_log.filters.' + type) }}
+                                </SelectItem>
+                            </SelectGroup>
+                        </SelectContent>
+                    </Select>
                     <InputGroupField
                         v-model="gameLogTable.search"
                         :placeholder="t('view.game_log.search_placeholder')"
@@ -50,6 +55,7 @@
 </template>
 
 <script setup>
+    import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
     import { computed, ref, watch } from 'vue';
     import { ElMessageBox } from 'element-plus';
     import { Switch } from '@/components/ui/switch';
@@ -152,6 +158,11 @@
         onDeletePrompt: deleteGameLogEntryPrompt
     });
 
+    function handleGameLogFilterChange(value) {
+        gameLogTable.value.filter = Array.isArray(value) ? value : [];
+        gameLogTableLookup();
+    }
+
     const pageSizes = computed(() => appearanceSettingsStore.tablePageSizes);
     const pageSize = computed(() =>
         gameLogTable.value.pageSizeLinked ? appearanceSettingsStore.tablePageSize : gameLogTable.value.pageSize

src/views/Moderation/Moderation.vue

@@ -1,19 +1,25 @@
 <template>
     <div class="x-container" ref="moderationRef">
         <div class="tool-slot">
-            <el-select
+            <Select
-                v-model="playerModerationTable.filters[0].value"
-                @change="saveTableFilters()"
                 multiple
-                clearable
+                :model-value="
-                style="flex: 1"
+                    Array.isArray(playerModerationTable.filters?.[0]?.value)
-                :placeholder="t('view.moderation.filter_placeholder')">
+                        ? playerModerationTable.filters[0].value
-                <el-option
+                        : []
-                    v-for="item in moderationTypes"
+                "
-                    :key="item"
+                @update:modelValue="handleModerationFilterChange">
-                    :label="t('view.moderation.filters.' + item)"
+                <SelectTrigger class="w-full" style="flex: 1">
-                    :value="item" />
+                    <SelectValue :placeholder="t('view.moderation.filter_placeholder')" />
-            </el-select>
+                </SelectTrigger>
+                <SelectContent>
+                    <SelectGroup>
+                        <SelectItem v-for="item in moderationTypes" :key="item" :value="item">
+                            {{ t('view.moderation.filters.' + item) }}
+                        </SelectItem>
+                    </SelectGroup>
+                </SelectContent>
+            </Select>
             <InputGroupField
                 v-model="playerModerationTable.filters[1].value"
                 :placeholder="t('view.moderation.search_placeholder')"
@@ -42,10 +48,11 @@
 </template>
 
 <script setup>
+    import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
     import { computed, ref, watch } from 'vue';
     import { Button } from '@/components/ui/button';
-    import { InputGroupField } from '@/components/ui/input-group';
     import { ElMessageBox } from 'element-plus';
+    import { InputGroupField } from '@/components/ui/input-group';
     import { Refresh } from '@element-plus/icons-vue';
     import { Spinner } from '@/components/ui/spinner';
     import { storeToRefs } from 'pinia';
@@ -89,6 +96,11 @@
         );
     }
 
+    function handleModerationFilterChange(value) {
+        playerModerationTable.value.filters[0].value = Array.isArray(value) ? value : [];
+        saveTableFilters();
+    }
+
     async function deletePlayerModeration(row) {
         const args = await playerModerationRequest.deletePlayerModeration({
             moderated: row.targetUserId,

src/views/Notifications/Notification.vue

@@ -9,39 +9,48 @@
             :on-page-size-change="handlePageSizeChange">
             <template #toolbar>
                 <div style="margin: 0 0 10px; display: flex; align-items: center">
-                    <el-select
+                    <Select
-                        v-model="notificationTable.filters[0].value"
                         multiple
-                        clearable
+                        :model-value="
-                        style="flex: 1"
+                            Array.isArray(notificationTable.filters?.[0]?.value)
-                        :placeholder="t('view.notification.filter_placeholder')"
+                                ? notificationTable.filters[0].value
-                        @change="saveTableFilters">
+                                : []
-                        <el-option
+                        "
-                            v-for="type in [
+                        @update:modelValue="handleNotificationFilterChange">
-                                'requestInvite',
+                        <SelectTrigger class="w-full" style="flex: 1">
-                                'invite',
+                            <SelectValue :placeholder="t('view.notification.filter_placeholder')" />
-                                'requestInviteResponse',
+                        </SelectTrigger>
-                                'inviteResponse',
+                        <SelectContent>
-                                'friendRequest',
+                            <SelectGroup>
-                                'ignoredFriendRequest',
+                                <SelectItem
-                                'message',
+                                    v-for="type in [
-                                'boop',
+                                        'requestInvite',
-                                'event.announcement',
+                                        'invite',
-                                'groupChange',
+                                        'requestInviteResponse',
-                                'group.announcement',
+                                        'inviteResponse',
-                                'group.informative',
+                                        'friendRequest',
-                                'group.invite',
+                                        'ignoredFriendRequest',
-                                'group.joinRequest',
+                                        'message',
-                                'group.transfer',
+                                        'boop',
-                                'group.queueReady',
+                                        'event.announcement',
-                                'moderation.warning.group',
+                                        'groupChange',
-                                'moderation.report.closed',
+                                        'group.announcement',
-                                'instance.closed'
+                                        'group.informative',
-                            ]"
+                                        'group.invite',
-                            :key="type"
+                                        'group.joinRequest',
-                            :label="t('view.notification.filters.' + type)"
+                                        'group.transfer',
-                            :value="type" />
+                                        'group.queueReady',
-                    </el-select>
+                                        'moderation.warning.group',
+                                        'moderation.report.closed',
+                                        'instance.closed'
+                                    ]"
+                                    :key="type"
+                                    :value="type">
+                                    {{ t('view.notification.filters.' + type) }}
+                                </SelectItem>
+                            </SelectGroup>
+                        </SelectContent>
+                    </Select>
                     <InputGroupField
                         v-model="notificationTable.filters[1].value"
                         :placeholder="t('view.notification.search_placeholder')"
@@ -73,10 +82,11 @@
 </template>
 
 <script setup>
+    import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
     import { computed, ref, watch } from 'vue';
     import { Button } from '@/components/ui/button';
-    import { InputGroupField } from '@/components/ui/input-group';
     import { ElMessageBox } from 'element-plus';
+    import { InputGroupField } from '@/components/ui/input-group';
     import { Refresh } from '@element-plus/icons-vue';
     import { Spinner } from '@/components/ui/spinner';
     import { storeToRefs } from 'pinia';
@@ -272,6 +282,11 @@
         );
     }
 
+    function handleNotificationFilterChange(value) {
+        notificationTable.value.filters[0].value = Array.isArray(value) ? value : [];
+        saveTableFilters();
+    }
+
     function openNotificationLink(link) {
         if (!link) {
             return;

src/views/Sidebar/Sidebar.vue

@@ -1,45 +1,63 @@
 <template>
     <div class="x-aside-container">
         <div style="display: flex; align-items: baseline">
-            <el-select
+            <div style="flex: 1; padding: 10px; padding-left: 0">
-                clearable
+                <Popover v-model:open="isQuickSearchOpen">
-                :placeholder="t('side_panel.search_placeholder')"
+                    <PopoverTrigger as-child>
-                filterable
+                        <Input
-                remote
+                            v-model="quickSearchQuery"
-                :remote-method="quickSearchRemoteMethod"
+                            :placeholder="t('side_panel.search_placeholder')"
-                popper-class="x-quick-search"
+                            @focus="handleQuickSearchFocus" />
-                style="flex: 1; padding: 10px; padding-left: 0"
+                    </PopoverTrigger>
-                @change="quickSearchChange">
+                    <PopoverContent
-                <el-option v-for="item in quickSearchItems" :key="item.value" :value="item.value" :label="item.label">
+                        side="bottom"
-                    <div class="x-friend-item">
+                        align="start"
-                        <template v-if="item.ref">
+                        class="x-quick-search-popover w-(--reka-popover-trigger-width) p-2"
-                            <div class="detail">
+                        @open-auto-focus.prevent
-                                <span class="name" :style="{ color: item.ref.$userColour }">{{
+                        @close-auto-focus.prevent>
-                                    item.ref.displayName
+                        <div class="max-h-80 overflow-auto">
-                                }}</span>
+                            <button
-                                <span v-if="!item.ref.isFriend" class="extra"></span>
+                                v-for="item in quickSearchItems"
-                                <span v-else-if="item.ref.state === 'offline'" class="extra">{{
+                                :key="item.value"
-                                    t('side_panel.search_result_active')
+                                type="button"
-                                }}</span>
+                                class="w-full bg-transparent p-0 text-left"
-                                <span v-else-if="item.ref.state === 'active'" class="extra">{{
+                                @mousedown.prevent
-                                    t('side_panel.search_result_offline')
+                                @click="handleQuickSearchSelect(item.value)">
-                                }}</span>
+                                <div class="x-friend-item">
-                                <Location
+                                    <template v-if="item.ref">
-                                    v-else
+                                        <div class="detail">
-                                    class="extra"
+                                            <span class="name" :style="{ color: item.ref.$userColour }">{{
-                                    :location="item.ref.location"
+                                                item.ref.displayName
-                                    :traveling="item.ref.travelingToLocation"
+                                            }}</span>
-                                    :link="false" />
+                                            <span v-if="!item.ref.isFriend" class="extra"></span>
+                                            <span v-else-if="item.ref.state === 'offline'" class="extra">{{
+                                                t('side_panel.search_result_active')
+                                            }}</span>
+                                            <span v-else-if="item.ref.state === 'active'" class="extra">{{
+                                                t('side_panel.search_result_offline')
+                                            }}</span>
+                                            <Location
+                                                v-else
+                                                class="extra"
+                                                :location="item.ref.location"
+                                                :traveling="item.ref.travelingToLocation"
+                                                :link="false" />
+                                        </div>
+                                        <img :src="userImage(item.ref)" class="avatar" loading="lazy" />
+                                    </template>
+                                    <span v-else>
+                                        {{ t('side_panel.search_result_more') }}
+                                        <span style="font-weight: bold">{{ item.label }}</span>
+                                    </span>
+                                </div>
+                            </button>
+                            <div v-if="quickSearchItems.length === 0" class="px-2 py-2 text-xs opacity-70">
+                                No results
                             </div>
-                            <img :src="userImage(item.ref)" class="avatar" loading="lazy" />
+                        </div>
-                        </template>
+                    </PopoverContent>
-                        <span v-else>
+                </Popover>
-                            {{ t('side_panel.search_result_more') }}
+            </div>
-                            <span style="font-weight: bold">{{ item.label }}</span>
-                        </span>
-                    </div>
-                </el-option>
-            </el-select>
             <div>
                 <TooltipWrapper side="bottom" :content="t('side_panel.refresh_tooltip')">
                     <Button
@@ -76,7 +94,10 @@
 </template>
 
 <script setup>
+    import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
+    import { ref, watch } from 'vue';
     import { Button } from '@/components/ui/button';
+    import { Input } from '@/components/ui/input';
     import { Refresh } from '@element-plus/icons-vue';
     import { Spinner } from '@/components/ui/spinner';
     import { storeToRefs } from 'pinia';
@@ -94,6 +115,31 @@
     const { quickSearchItems } = storeToRefs(useSearchStore());
     const { inGameGroupOrder, groupInstances } = storeToRefs(useGroupStore());
     const { t } = useI18n();
+
+    const quickSearchQuery = ref('');
+    const isQuickSearchOpen = ref(false);
+
+    watch(
+        quickSearchQuery,
+        (value) => {
+            quickSearchRemoteMethod(String(value ?? ''));
+        },
+        { immediate: true }
+    );
+
+    function handleQuickSearchFocus() {
+        isQuickSearchOpen.value = true;
+        quickSearchRemoteMethod(String(quickSearchQuery.value ?? ''));
+    }
+
+    function handleQuickSearchSelect(value) {
+        if (!value) {
+            return;
+        }
+        isQuickSearchOpen.value = false;
+        quickSearchQuery.value = '';
+        quickSearchChange(String(value));
+    }
 </script>
 
 <style scoped>