From 614bcbcdc63c771cbb2f513050f39d8aa703b7a1 Mon Sep 17 00:00:00 2001
From: Martichou <m@rtin.fyi>
Date: Mon, 8 Jul 2024 20:22:01 +0200
Subject: [PATCH] fix: avoid click propagation when clicking child

Signed-off-by: Martichou <m@rtin.fyi>
---
 app/legacy/src/components/HomePage.vue | 16 ++++++++--------
 app/legacy/vite.config.ts              |  9 +++++++++
 app/main/src/components/HomePage.vue   | 16 ++++++++--------
 app/main/vite.config.ts                |  4 ++--
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/app/legacy/src/components/HomePage.vue b/app/legacy/src/components/HomePage.vue
index cb2ba9b..024041f 100644
--- a/app/legacy/src/components/HomePage.vue
+++ b/app/legacy/src/components/HomePage.vue
@@ -241,12 +241,12 @@
 							</p>
 							<div class="flex flex-row justify-end gap-4 mt-1">
 								<p
-									@click="sendCmd(vm, item.id, 'AcceptTransfer')" class="btn px-3
+									@click.stop="sendCmd(vm, item.id, 'AcceptTransfer')" class="btn px-3
 									rounded-xl active:scale-95 transition duration-150 ease-in-out shadow-none">
 									Accept
 								</p>
 								<p
-									@click="sendCmd(vm, item.id, 'RejectTransfer')" class="btn px-3
+									@click.stop="sendCmd(vm, item.id, 'RejectTransfer')" class="btn px-3
 									rounded-xl active:scale-95 transition duration-150 ease-in-out shadow-none">
 									Decline
 								</p>
@@ -265,7 +265,7 @@
 							</p>
 							<div class="flex flex-row justify-end gap-4 mt-1">
 								<p
-									@click="sendCmd(vm, item.id, 'CancelTransfer')" class="btn px-3
+									@click.stop="sendCmd(vm, item.id, 'CancelTransfer')" class="btn px-3
 									rounded-xl active:scale-95 transition duration-150 ease-in-out shadow-none">
 									Cancel
 								</p>
@@ -284,12 +284,12 @@
 							</p>
 							<div class="flex flex-row justify-end gap-4 mt-1">
 								<p
-									v-if="item.destination" @click="invoke('open_url', { message: item.destination })"
+									v-if="item.destination" @click.stop="invoke('open_url', { message: item.destination })"
 									class="btn px-3 rounded-xl active:scale-95 transition duration-150 ease-in-out shadow-none">
 									Open
 								</p>
 								<p
-									@click="removeRequest(vm, item.id)" class="btn px-3
+									@click.stop="removeRequest(vm, item.id)" class="btn px-3
 									rounded-xl active:scale-95 transition duration-150 ease-in-out shadow-none">
 									Clear
 								</p>
@@ -302,7 +302,7 @@
 							</p>
 							<div class="flex flex-row justify-end gap-4 mt-1">
 								<p
-									@click="removeRequest(vm, item.id)" class="btn px-3
+									@click.stop="removeRequest(vm, item.id)" class="btn px-3
 									rounded-xl active:scale-95 transition duration-150 ease-in-out shadow-none">
 									Clear
 								</p>
@@ -315,7 +315,7 @@
 							</p>
 							<div class="flex flex-row justify-end gap-4 mt-1">
 								<p
-									@click="removeRequest(vm, item.id)" class="btn px-3
+									@click.stop="removeRequest(vm, item.id)" class="btn px-3
 									rounded-xl active:scale-95 transition duration-150 ease-in-out shadow-none">
 									Clear
 								</p>
@@ -328,7 +328,7 @@
 							</p>
 							<div class="flex flex-row justify-end gap-4 mt-1">
 								<p
-									@click="removeRequest(vm, item.id)" class="btn px-3
+									@click.stop="removeRequest(vm, item.id)" class="btn px-3
 									rounded-xl active:scale-95 transition duration-150 ease-in-out shadow-none">
 									Clear
 								</p>
diff --git a/app/legacy/vite.config.ts b/app/legacy/vite.config.ts
index e80eaf9..965d2cb 100644
--- a/app/legacy/vite.config.ts
+++ b/app/legacy/vite.config.ts
@@ -2,6 +2,7 @@ import vue from '@vitejs/plugin-vue'
 import { resolve } from 'path'
 import AutoImport from 'unplugin-auto-import/vite'
 import { defineConfig } from 'vitest/config'
+import path from 'path'
 
 // See https://vitejs.dev/config/
 export default defineConfig({
@@ -22,6 +23,14 @@ export default defineConfig({
 	server: {
 		port: 1420,
 		strictPort: true,
+		fs: {
+			allow: [
+				// Resolve the path dynamically
+				path.resolve(__dirname, '../common/vue_lib'),
+				// Optionally, include other directories
+				path.resolve(__dirname)
+			]
+		}
 	},
 	build: {
 		outDir: './dist',
diff --git a/app/main/src/components/HomePage.vue b/app/main/src/components/HomePage.vue
index fd09f0a..4732891 100644
--- a/app/main/src/components/HomePage.vue
+++ b/app/main/src/components/HomePage.vue
@@ -241,12 +241,12 @@
 							</p>
 							<div class="flex flex-row justify-end gap-4 mt-1">
 								<p
-									@click="sendCmd(vm, item.id, 'AcceptTransfer')" class="btn px-3
+									@click.stop="sendCmd(vm, item.id, 'AcceptTransfer')" class="btn px-3
 									rounded-xl active:scale-95 transition duration-150 ease-in-out shadow-none">
 									Accept
 								</p>
 								<p
-									@click="sendCmd(vm, item.id, 'RejectTransfer')" class="btn px-3
+									@click.stop="sendCmd(vm, item.id, 'RejectTransfer')" class="btn px-3
 									rounded-xl active:scale-95 transition duration-150 ease-in-out shadow-none">
 									Decline
 								</p>
@@ -265,7 +265,7 @@
 							</p>
 							<div class="flex flex-row justify-end gap-4 mt-1">
 								<p
-									@click="sendCmd(vm, item.id, 'CancelTransfer')" class="btn px-3
+									@click.stop="sendCmd(vm, item.id, 'CancelTransfer')" class="btn px-3
 									rounded-xl active:scale-95 transition duration-150 ease-in-out shadow-none">
 									Cancel
 								</p>
@@ -284,12 +284,12 @@
 							</p>
 							<div class="flex flex-row justify-end gap-4 mt-1">
 								<p
-									v-if="item.destination" @click="invoke('open_url', { message: item.destination })"
+									v-if="item.destination" @click.stop="invoke('open_url', { message: item.destination })"
 									class="btn px-3 rounded-xl active:scale-95 transition duration-150 ease-in-out shadow-none">
 									Open
 								</p>
 								<p
-									@click="removeRequest(vm, item.id)" class="btn px-3
+									@click.stop="removeRequest(vm, item.id)" class="btn px-3
 									rounded-xl active:scale-95 transition duration-150 ease-in-out shadow-none">
 									Clear
 								</p>
@@ -302,7 +302,7 @@
 							</p>
 							<div class="flex flex-row justify-end gap-4 mt-1">
 								<p
-									@click="removeRequest(vm, item.id)" class="btn px-3
+									@click.stop="removeRequest(vm, item.id)" class="btn px-3
 									rounded-xl active:scale-95 transition duration-150 ease-in-out shadow-none">
 									Clear
 								</p>
@@ -315,7 +315,7 @@
 							</p>
 							<div class="flex flex-row justify-end gap-4 mt-1">
 								<p
-									@click="removeRequest(vm, item.id)" class="btn px-3
+									@click.stop="removeRequest(vm, item.id)" class="btn px-3
 									rounded-xl active:scale-95 transition duration-150 ease-in-out shadow-none">
 									Clear
 								</p>
@@ -328,7 +328,7 @@
 							</p>
 							<div class="flex flex-row justify-end gap-4 mt-1">
 								<p
-									@click="removeRequest(vm, item.id)" class="btn px-3
+									@click.stop="removeRequest(vm, item.id)" class="btn px-3
 									rounded-xl active:scale-95 transition duration-150 ease-in-out shadow-none">
 									Clear
 								</p>
diff --git a/app/main/vite.config.ts b/app/main/vite.config.ts
index 0101d75..965d2cb 100644
--- a/app/main/vite.config.ts
+++ b/app/main/vite.config.ts
@@ -2,7 +2,7 @@ import vue from '@vitejs/plugin-vue'
 import { resolve } from 'path'
 import AutoImport from 'unplugin-auto-import/vite'
 import { defineConfig } from 'vitest/config'
-import path from 'path';
+import path from 'path'
 
 // See https://vitejs.dev/config/
 export default defineConfig({
@@ -26,7 +26,7 @@ export default defineConfig({
 		fs: {
 			allow: [
 				// Resolve the path dynamically
-				path.resolve(__dirname, '../common/vue_lib/assets'),
+				path.resolve(__dirname, '../common/vue_lib'),
 				// Optionally, include other directories
 				path.resolve(__dirname)
 			]