5htp-core 0.4.8-1 → 0.4.8-2

package/package.json

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

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

@@ -60,7 +60,7 @@ export type Props = {
 
     // Input
     title: ComponentChild,
-    value?: FileToUpload,    
+    value?: string | FileToUpload, // string = already registered 
 
     // Display
     emptyText?: ComponentChild,
@@ -96,7 +96,7 @@ export default ({
 
     const [previewUrl, setPreviewUrl] = React.useState<string | undefined>(previewUrlInit);
 
-    className = 'input upload ' + (className === undefined ? '' : ' ' + className)
+    className = 'input upload ' + (className === undefined ? '' : ' ' + className);
 
     /*----------------------------------
     - ACTIONS
@@ -115,7 +115,7 @@ export default ({
     React.useEffect(() => {
 
         // Image = decode & display preview
-        if (file !== undefined && file.type.startsWith('image/'))
+        if (file !== undefined && typeof file === 'object' && file.type.startsWith('image/'))
             createImagePreview(file.data).then(setPreviewUrl);
         else 
             setPreviewUrl(undefined);
@@ -135,14 +135,20 @@ export default ({
 
                     {previewUrl ? (
                         <img src={previewUrl} />
-                    ) : file ? <>
+                    ) : typeof file === 'string' ? <>
+                        <strong>A file has been selected</strong>
+                    </> : file ? <>
                         <strong>{file.name}</strong>
                     </> : null}
                 </div>
 
                 <div class="row actions sp-05">
+
+                    {typeof file === 'string' && <>
+                        <Bouton type="secondary" icon="eye" shape="pill" size="s" link={file} />
+                    </>}
                     
-                    <Bouton class='fg error' icon="trash" shape="pill" size="s"  
+                    <Bouton class='bg error' icon="trash" shape="pill" size="s"  
                         async onClick={() => onChange(undefined)} />
                 </div>
             </>}

package/src/common/validation/validators.ts

@@ -402,14 +402,14 @@ export default class SchemaValidators {
 
     } = {}) => new Validator<FileToUpload>('file', (val, options, path) => {
 
-        if (!(val instanceof FileToUpload))
-            throw new InputError(`Must be a File (${typeof val} received)`);
-
         // Chaine = url ancien fichier = exclusion de la valeur pour conserver l'ancien fichier
         // NOTE: Si la valeur est présente mais undefined, alors on supprimera le fichier
         if (typeof val === 'string')
             return EXCLUDE_VALUE;
 
+        if (!(val instanceof FileToUpload))
+            throw new InputError(`Must be a File (${typeof val} received)`);
+
         // MIME
         if (type !== undefined) {