Bommels05/Modrinth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(theseus): Files drag & drop (#2499)

Browse Source 
Co-authored-by: Geometrically <18202329+Geometrically@users.noreply.github.com>
This commit is contained in:
Norbiros 2024-10-12 22:27:07 +02:00 committed by GitHub
parent f986dc5d11
commit 6716e2277d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/app-frontend/src/components/ui/InstanceCreationModal.vue
View File

@ -218,7 +218,6 @@ import { get_game_versions, get_loader_versions } from '@/helpers/metadata'
import { handleError } from '@/store/notifications.js' import { handleError } from '@/store/notifications.js'
import Multiselect from 'vue-multiselect' import Multiselect from 'vue-multiselect'
import { trackEvent } from '@/helpers/analytics' import { trackEvent } from '@/helpers/analytics'
import { listen } from '@tauri-apps/api/event'
import { install_from_file } from '@/helpers/pack.js' import { install_from_file } from '@/helpers/pack.js'
import { import {
get_default_launcher_path, get_default_launcher_path,
@ -226,6 +225,7 @@ import {
import_instance, import_instance,
} from '@/helpers/import.js' } from '@/helpers/import.js'
import ProgressBar from '@/components/ui/ProgressBar.vue' import ProgressBar from '@/components/ui/ProgressBar.vue'
import { getCurrentWebview } from '@tauri-apps/api/webview'
const profile_name = ref('') const profile_name = ref('')
const game_version = ref('') const game_version = ref('')
@ -255,13 +255,15 @@ defineExpose({
isShowing.value = true isShowing.value = true
modal.value.show() modal.value.show()
unlistener.value = await listen('tauri://file-drop', async (event) => { unlistener.value = await getCurrentWebview().onDragDropEvent(async (event) => {
// Only if modal is showing // Only if modal is showing
if (!isShowing.value) return if (!isShowing.value) return
if (event.payload.type !== 'drop') return
if (creationType.value !== 'from file') return if (creationType.value !== 'from file') return
hide() hide()
if (event.payload && event.payload.length > 0 && event.payload[0].endsWith('.mrpack')) { const { paths } = event.payload
await install_from_file(event.payload[0]).catch(handleError) if (paths && paths.length > 0 && paths[0].endsWith('.mrpack')) {
await install_from_file(paths[0]).catch(handleError)
trackEvent('InstanceCreate', { trackEvent('InstanceCreate', {
source: 'CreationModalFileDrop', source: 'CreationModalFileDrop',
}) })

8
apps/app-frontend/src/pages/instance/Mods.vue
View File

@ -378,7 +378,6 @@ import {
} from '@/helpers/profile.js' } from '@/helpers/profile.js'
import { handleError } from '@/store/notifications.js' import { handleError } from '@/store/notifications.js'
import { trackEvent } from '@/helpers/analytics' import { trackEvent } from '@/helpers/analytics'
import { listen } from '@tauri-apps/api/event'
import { highlightModInProfile } from '@/helpers/utils.js' import { highlightModInProfile } from '@/helpers/utils.js'
import { MenuIcon, ToggleIcon, TextInputIcon, AddProjectImage, PackageIcon } from '@/assets/icons' import { MenuIcon, ToggleIcon, TextInputIcon, AddProjectImage, PackageIcon } from '@/assets/icons'
import ExportModal from '@/components/ui/ExportModal.vue' import ExportModal from '@/components/ui/ExportModal.vue'
@ -393,6 +392,7 @@ import {
import { profile_listener } from '@/helpers/events.js' import { profile_listener } from '@/helpers/events.js'
import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue' import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
import ShareModalWrapper from '@/components/ui/modal/ShareModalWrapper.vue' import ShareModalWrapper from '@/components/ui/modal/ShareModalWrapper.vue'
import { getCurrentWebview } from '@tauri-apps/api/webview'
const props = defineProps({ const props = defineProps({
instance: { instance: {
@ -879,8 +879,10 @@ async function refreshProjects() {
refreshingProjects.value = false refreshingProjects.value = false
} }
const unlisten = await listen('tauri://file-drop', async (event) => { const unlisten = await getCurrentWebview().onDragDropEvent(async (event) => {
for (const file of event.payload) { if (event.payload.type !== 'drop') return
for (const file of event.payload.paths) {
if (file.endsWith('.mrpack')) continue if (file.endsWith('.mrpack')) continue
await add_project_from_path(props.instance.path, file).catch(handleError) await add_project_from_path(props.instance.path, file).catch(handleError)
} }