5htp-core 0.6.0-94 → 0.6.0-96

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/client/components/containers/Popover/index.tsx

@@ -20,13 +20,16 @@ export type Props = JSX.HTMLAttributes<HTMLDivElement> & {
     id?: string,
 
     // Display
+    mode: 'hide' | 'remove',
     content?: ComponentChild | JSX.Element
     state?: [boolean, StateUpdater<boolean>],
     width?: number | string,
     disable?: boolean
+    
     // Position
     frame?: HTMLElement,
     side?: TSide,
+
     // Tag
     children: JSX.Element | [JSX.Element],
     tag?: string,
@@ -45,7 +48,7 @@ export default (props: Props) => {
     let {
         id,
 
-        content, state, width, disable,
+        mode = 'remove', content, state, width, disable,
 
         frame, side = 'bottom',
 
@@ -108,7 +111,7 @@ export default (props: Props) => {
     const Tag = tag || 'div';
 
     let renderedContent: ComponentChild;
-    if (active) {
+    if (active || mode === 'hide') {
         //content = typeof content === 'function' ? React.createElement(content) : content;
         renderedContent = React.cloneElement( 
             content, 
@@ -124,13 +127,24 @@ export default (props: Props) => {
 
                 style: {
                     ...(content.props.style || {}),
+
+                    ...(!active && mode === 'hide' ? {
+                        display: 'none'
+                    } : {}),
+
+                    // Positionning
                     ...(position ? {
                         top: position.css.top,
                         left: position.css.left,
                         right: position.css.right,
                         bottom: position.css.bottom,
-                    } : {}),
-                    ...(width !== undefined ? { width: typeof width === 'number' ? width + 'rem' : width } : {})
+                    } :  {}),
+
+                    ...(width !== undefined ? { 
+                        width: typeof width === 'number' 
+                            ? width + 'rem' 
+                            : width 
+                    } : {})
                 }
             }
         )
@@ -157,6 +171,7 @@ export default (props: Props) => {
                 onClick: (e) => {
                     show(isShown => !isShown);
                     e.stopPropagation();
+                    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-96",
 	"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 {