Replace dropdownbutton

theseus_gui/src/App.vue

@@ -434,7 +434,7 @@ command_listener(async (e) => {
     background-color: var(--color-raised-bg);
     color: var(--color-base);
     border-radius: 0;
-    height: 3.25rem;
+    height: var(--appbar-height);
 
     &.close {
       &:hover,
@@ -483,7 +483,7 @@ command_listener(async (e) => {
 
     .router-view {
       width: 100%;
-      height: calc(100% - 3.125rem);
+      height: calc(100% - var(--appbar-height));
       overflow: auto;
       overflow-x: hidden;
       background-color: var(--color-bg);

theseus_gui/src/pages/instance/Mods.vue

@@ -43,23 +43,27 @@
       Update all
     </Button>
 
-    <!-- <DropdownButton
+    <div v-if="!isPackLocked" class="joined-buttons">
-      v-if="!isPackLocked"
+      <Button color="primary" @click="onSearchContent">
-      :options="['search', 'from_file']"
-      default-value="search"
-      name="add-content-dropdown"
-      color="primary"
-      @option-click="handleContentOptionClick"
-    >
-      <template #search>
         <SearchIcon />
-        <span class="no-wrap"> Add content </span>
+        Add content
-      </template>
+      </Button>
-      <template #from_file>
+      <OverflowMenu
-        <FolderOpenIcon />
+        :options="[
-        <span class="no-wrap"> Add from file </span>
+          {
-      </template>
+            id: 'file',
-    </DropdownButton> -->
+            action: onFileContent,
+          },
+        ]"
+        class="btn btn-primary btn-dropdown-animation icon-only"
+      >
+        <DropdownIcon />
+        <template #file>
+          <FolderOpenIcon />
+          Add from file
+        </template>
+      </OverflowMenu>
+    </div>
   </Card>
   <Pagination
     v-if="projects.length > 0"
@@ -283,26 +287,26 @@
     </div>
     <h3>No projects found</h3>
     <p class="empty-subtitle">Add a project to get started</p>
-    <div class="empty-action">
+    <div v-if="!isPackLocked" class="joined-buttons">
-      <div class="joined-buttons">
+      <Button color="primary" @click="onSearchContent">
-        <Button color="primary"> Search </Button>
+        <SearchIcon />
-      </div>
+        Add content
-      <!-- <DropdownButton
+      </Button>
-        :options="['search', 'from_file']"
+      <OverflowMenu
-        default-value="search"
+        :options="[
-        name="add-content-dropdown-from-empty"
+          {
-        color="primary"
+            id: 'file',
-        @option-click="handleContentOptionClick"
+            action: onFileContent,
+          },
+        ]"
+        class="btn btn-primary btn-dropdown-animation icon-only"
       >
-        <template #search>
+        <DropdownIcon />
-          <SearchIcon />
+        <template #file>
-          <span class="no-wrap"> Add content </span>
-        </template>
-        <template #from_file>
           <FolderOpenIcon />
-          <span class="no-wrap"> Add from file </span>
+          Add from file
         </template>
-      </DropdownButton> -->
+      </OverflowMenu>
     </div>
   </div>
   <Pagination
@@ -393,9 +397,10 @@ import {
   CodeIcon,
   Pagination,
   DropdownSelect,
+  OverflowMenu,
 } from 'omorphia'
 import { computed, onUnmounted, ref, watch } from 'vue'
-// import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import {
   add_project_from_path,
   get,
@@ -406,7 +411,7 @@ import {
 } from '@/helpers/profile.js'
 import { handleError } from '@/store/notifications.js'
 import { mixpanel_track } from '@/helpers/mixpanel'
-// import { open } from '@tauri-apps/api/dialog'
+import { open } from '@tauri-apps/api/dialog'
 import { listen } from '@tauri-apps/api/event'
 import { convertFileSrc } from '@tauri-apps/api/tauri'
 import { highlightModInProfile } from '@/helpers/utils.js'
@@ -414,7 +419,7 @@ import { MenuIcon, ToggleIcon, TextInputIcon, AddProjectImage, PackageIcon } fro
 import ExportModal from '@/components/ui/ExportModal.vue'
 import ModpackVersionModal from '@/components/ui/ModpackVersionModal.vue'
 
-// const router = useRouter()
+const router = useRouter()
 
 const props = defineProps({
   instance: {
@@ -846,22 +851,22 @@ const handleRightClick = (event, mod) => {
   }
 }
 
-// const handleContentOptionClick = async (args) => {
+const onSearchContent = async () => {
-//   if (args.option === 'search') {
+  await router.push({
-//     await router.push({
+    path: `/browse/${props.instance.metadata.loader === 'vanilla' ? 'datapack' : 'mod'}`,
-//       path: `/browse/${props.instance.metadata.loader === 'vanilla' ? 'datapack' : 'mod'}`,
+    query: { i: props.instance.path },
-//       query: { i: props.instance.path },
+  })
-//     })
+}
-//   } else if (args.option === 'from_file') {
-//     const newProject = await open({ multiple: true })
-//     if (!newProject) return
 
-//     for (const project of newProject) {
+const onFileContent = async () => {
-//       await add_project_from_path(props.instance.path, project, 'mod').catch(handleError)
+  const newProject = await open({ multiple: true })
-//     }
+  if (!newProject) return
-//     initProjects(await get(props.instance.path).catch(handleError))
+
-//   }
+  for (const project of newProject) {
-// }
+    await add_project_from_path(props.instance.path, project, 'mod').catch(handleError)
+  }
+  initProjects(await get(props.instance.path).catch(handleError))
+}
 
 watch(selectAll, () => {
   for (const [key, value] of Array.from(selectionMap.value)) {
@@ -961,9 +966,17 @@ onUnmounted(() => {
   white-space: nowrap;
   align-items: center;
 
-  :deep(.dropdown-row) {
+  :deep {
-    .btn {
+    .popup-container {
-      height: 2.5rem !important;
+      .btn {
+        height: 2.5rem !important;
+      }
+    }
+
+    .dropdown-row {
+      .btn {
+        height: 2.5rem !important;
+      }
     }
   }