5htp-core 0.6.0-94 → 0.6.0-95

package/client/components/Button.tsx

@@ -236,9 +236,19 @@ export default ({
             if (disabled)
                 return false;
 
+            // Custom event
+            if (props.onClick !== undefined) {
+
+                const returned = props.onClick(e);
+                if (async && returned?.then) {
+                    setLoading(true);
+                    returned.finally(() => setLoading(false));
+                }
+            }
+
             // Link
             let nativeEvent: boolean = false;
-            if ('link' in props) {
+            if (('link' in props) && !e.defaultPrevented) {
 
                 // Nouvelle fenetre = event par defaut
                 if (props.target === '_blank') {
@@ -257,16 +267,6 @@ export default ({
                 }
             }
 
-            // Custom event
-            if (props.onClick !== undefined) {
-
-                const returned = props.onClick(e);
-                if (async && returned?.then) {
-                    setLoading(true);
-                    returned.finally(() => setLoading(false));
-                }
-            }
-
             if (!nativeEvent) {
                 e.preventDefault();
                 return false;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.6.0-94",
+	"version": "0.6.0-95",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",

package/server/services/router/index.ts

@@ -637,7 +637,9 @@ export default class ServerRouter
 
             // Don't exose technical errors to users
             if (this.app.env.profile === 'prod')
-                e.message = "We encountered an internal error, and our team has just been notified. Sorry for the inconvenience.";
+                e = new Error(
+                    "We encountered an internal error, and our team has just been notified. Sorry for the inconvenience."
+                );
 
         } else {