5htp-core 0.2.9-4 → 0.2.9-6

package/package.json

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

package/src/client/components/inputv3/index.tsx

@@ -58,7 +58,7 @@ export default ({
     - INIT
     ----------------------------------*/
 
-    const [{ value, focus, fieldProps }, setValue, commitValue, setState] = useInput(props, '');
+    const [{ value, focus, fieldProps }, setValue, commitValue, setState] = useInput(props, '' );
 
     // Trigger onchange oly when finished typing
     const refCommit = React.useRef<NodeJS.Timeout | null>(null);
@@ -71,7 +71,17 @@ export default ({
         
     }, [value]);
 
-    const updateValue = v => setValue( type === 'number' ? parseFloat(v) : v );
+    const updateValue = v => {
+        if (type === 'number') {
+
+            // Fix on Safari: the browser allows to input text in input number
+            const numberValue = parseFloat(v);
+            if (!Number.isNaN( numberValue ))
+                setValue(numberValue);
+
+        } else
+            setValue(v);
+    }
 
     const refInput = inputRef || React.useRef<HTMLInputElement>();
     
@@ -154,12 +164,12 @@ export default ({
                         // @ts-ignore: Property 'ref' does not exist on type 'IntrinsicAttributes'
                         ref={refInput}
                         value={value}
-
                         onFocus={() => setState({ focus: true })}
                         onBlur={() => setState({ focus: false })}
                         onChange={(e) => updateValue(e.target.value)}
 
-                        onKeyDown={(e) => {
+                        onKeyDown={(e: KeyboardEvent) => {
+
                             if (onPressEnter && e.key === 'Enter' && value !== undefined) {
                                 commitValue();
                                 onPressEnter(value)

package/src/server/services/database/index.ts

@@ -69,9 +69,6 @@ type TColsToUpsert<TData extends TObjetDonnees> = (
 
 const LogPrefix = '[database]'
 
-const equalities = (data: TObjetDonnees, keys = Object.keys(data)) => 
-    keys.map(k => '' + k + ' = ' + mysql.escape( data[k] ))
-
 /*----------------------------------
 - CORE
 ----------------------------------*/
@@ -191,7 +188,7 @@ export default class SQL extends Service<Config, Hooks, Application> {
 
                         const keyword = prefix === '&' ? ' AND ' : ', '
 
-                        value = Object.keys(value).length === 0 ? '1' : equalities(value).join( keyword );
+                        value = Object.keys(value).length === 0 ? '1' : this.equalities(value).join( keyword );
                         
                     // String: `SET :${column} = ${data}` => `SET balance = 10`
                     } else {
@@ -214,6 +211,9 @@ export default class SQL extends Service<Config, Hooks, Application> {
         }).join(' ').trim();
     }
 
+    public equalities = (data: TObjetDonnees, keys = Object.keys(data)) => 
+        keys.map(k => '' + k + ' = ' + mysql.escape( data[k] ))
+
     /*----------------------------------
     - OPERATIONS: LOW LEVELf
     ----------------------------------*/
@@ -336,8 +336,8 @@ export default class SQL extends Service<Config, Hooks, Application> {
         }
 
         // Create equalities
-        const egalitesData = equalities(data).join(', ')
-        const egalitesWhere = equalities(where).join(' AND ')
+        const egalitesData = this.equalities(data).join(', ')
+        const egalitesWhere = this.equalities(where).join(' AND ')
 
         // Build query
         return this.database.query(`
@@ -509,7 +509,7 @@ export default class SQL extends Service<Config, Hooks, Application> {
 
         const whereSql = typeof where === 'function' && where['string'] !== undefined
             ? where['string']
-            : equalities(where).join(' AND ');
+            : this.equalities(where).join(' AND ');
 
         return this.database.query(`DELETE FROM ${table} WHERE ${whereSql};`, opts);   
     }