Fixes for double event bug

invoiceninja · Oct 31, 2024 · 7fa82c2 · 7fa82c2
1 parent e010105
commit 7fa82c2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/src/pages/settings/tax-settings/components/calculate-taxes/components/AURegions.tsx b/src/pages/settings/tax-settings/components/calculate-taxes/components/AURegions.tsx
@@ -93,11 +93,15 @@ export function AURegions() {
           >
             <div
               className="flex col-span-1 items-center justify-start pl-5"
-              onClick={() =>
+              onClick={(e) => {
+                if (e.target instanceof HTMLInputElement) {
+                  return;
+                }
+
                 divClickIntercept(
                   `tax_data.regions.AU.subregions.${value[0]}.apply_tax`
-                )
-              }
+                );
+              }}
             >
               <Checkbox
                 id={`tax_data.regions.AU.subregions.${value[0]}`}

diff --git a/src/pages/settings/tax-settings/components/calculate-taxes/components/EURegions.tsx b/src/pages/settings/tax-settings/components/calculate-taxes/components/EURegions.tsx
@@ -48,6 +48,8 @@ export function EURegions() {
   };
 
   const divClickIntercept = (id: string) => {
+    console.log(id);
+
     const checkbox = document.getElementById(id.replace('.apply_tax', ''));
     checkbox?.click();
   };
@@ -95,15 +97,19 @@ export function EURegions() {
         regions?.map((value: [string, TaxSetting], index) => (
           <div
             key={index}
-            className="border py-4 sm:py-3 sm:grid sm:grid-cols-3 sm:gap-10 flex flex-col lg:flex-row undefined px-5 sm:px-6 lg:items-center"
+            className="border py-4 sm:py-3 sm:grid sm:grid-cols-3 sm:gap-10 flex flex-col lg:flex-row undefined px-5 sm:px-6 lg:items-center text-sm"
           >
             <div
               className="flex col-span-1 items-center justify-start pl-5"
-              onClick={() =>
+              onClick={(e) => {
+                if (e.target instanceof HTMLInputElement) {
+                  return;
+                }
+
                 divClickIntercept(
                   `tax_data.regions.EU.subregions.${value[0]}.apply_tax`
-                )
-              }
+                );
+              }}
             >
               <Checkbox
                 id={`tax_data.regions.EU.subregions.${value[0]}`}

diff --git a/src/pages/settings/tax-settings/components/calculate-taxes/components/USRegions.tsx b/src/pages/settings/tax-settings/components/calculate-taxes/components/USRegions.tsx
@@ -98,11 +98,15 @@ export function USRegions() {
           >
             <div
               className="flex col-span-1 items-center justify-start pl-5"
-              onClick={() =>
+              onClick={(e) => {
+                if (e.target instanceof HTMLInputElement) {
+                  return;
+                }
+
                 divClickIntercept(
                   `tax_data.regions.US.subregions.${value[0]}.apply_tax`
-                )
-              }
+                );
+              }}
             >
               <Checkbox
                 id={`tax_data.regions.US.subregions.${value[0]}`}