ywana-core8 0.0.327 → 0.0.330

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ywana-core8",
-  "version": "0.0.327",
+  "version": "0.0.330",
   "description": "ywana-core8",
   "author": "Ernesto Roldan Garcia",
   "license": "MIT",

package/src/site/dialog.js

@@ -10,15 +10,17 @@ import './dialog.css'
  */
 export const Dialog = (props) => {
     const site = useContext(SiteContext)
-    const { icon, title = "Dialog", children, onAction, actions, className } = props
+    const { icon, title = "Dialog", children, onAction, actions, className, eventPropagation = false } = props
     
     function close() {
         site.closeDialog()
     }
     
     function prevent(e) {
-        e.preventDefault()
-        e.stopPropagation()
+        if (!eventPropagation) {
+            e.preventDefault()
+            e.stopPropagation()
+        }
     }
     
     return (

package/src/widgets/login/ResetPasswordBox.js

@@ -42,7 +42,8 @@ export const ResetPasswordBox = ({ logo, title, children, onOK, onClose }) => {
                 { children }
             </header>
             <main>
-                <Text use="headline6">Change Password</Text>
+                <Text use="headline6">Change Password</Text>      
+                <TextField label={tx(userLabel)} value={user} onChange={changeUser} onEnter={ok} outlined />          
                 <TextField id="password1" outlined icon="lock" type="password" label="New Password" lapse={100} onChange={changeField} onEnter={ok}/>
                 <TextField id="password2" outlined icon="lock" type="password" label="Confirm New Password" lapse={100} onChange={changeField} onEnter={ok}/>
                 { error ? <div className="error">{error}</div> : null}

package/src/widgets/upload/Upload.test.js

@@ -26,7 +26,7 @@ const UploadProgressTest = (prop) => {
 const UploaderTest = (prop) => {
     return (
         <div style={{ padding: "1rem" }}>
-            <Uploader target="https://maso.developxp.com/kiosk/api/upload" />
+            <Uploader icon="cloud_upload" target="https://maso.developxp.com/kiosk/api/upload" />
         </div>
     )
 }

package/src/widgets/upload/UploadArea.js

@@ -12,7 +12,10 @@ export const UploadArea = (props) => {
 
     useEffect(() => {
         const { resumable } = props
-        if (resumable && areaElement) resumable.assignDrop(areaElement.current)
+        if (resumable && areaElement) {
+            resumable.assignDrop(areaElement.current)
+            resumable.assignBrowse(areaElement.current)
+        }
     }, [])
 
     const onDragOver = () => {
@@ -31,7 +34,7 @@ export const UploadArea = (props) => {
             onDragLeave={onDragLeave}
             ref={areaElement}
         >
-            <UploadIcon icon={icon} resumable={props.resumable} />
+            <Icon icon={icon} clickable eventPropagation={false}/>
             <label>{label}</label>
         </div>
     )
@@ -40,20 +43,20 @@ export const UploadArea = (props) => {
 /**
  * Upload Icon
  */
-const UploadIcon = ({ icon = "folder_open", resumable }) => {
+export const UploadIcon = ({ icon = "folder_open", resumable }) => {
 
     const iconElement = useRef()
 
     useEffect(() => {
         if (resumable && iconElement.current) {
-            console.log('UploadIcon.effect', resumable, iconElement.current)
             resumable.assignBrowse(iconElement.current)
+            console.log('uploadicon')
         }
     }, [iconElement])
 
     return (
         <div className="upload-icon" ref={iconElement}>
-            <Icon icon={icon} clickable eventPropagation={true}/>
+            <Icon icon={icon} clickable/>
         </div>
     )
 }

package/src/widgets/upload/UploadDialog.js

@@ -29,7 +29,7 @@ export const UploadDialog = ({ label, target, accept, onSuccess, onClose }) => {
 
     const title = <Text use="headline6">{label}</Text>
     return (
-        <Dialog title={title} open={true} onAction={onAction} actions={actions}>
+        <Dialog title={title} open={true} onAction={onAction} actions={actions} eventPropagation={true}>
             <Uploader label={label} accept={accept} target={target} onComplete={onComplete} />
         </Dialog>
     )

package/src/widgets/upload/Uploader.js

@@ -9,7 +9,7 @@ import './Uploader.css'
 /**
  * Uploader
  */
-export const Uploader = ({ label, target, accept, simultaneousUploads = 1, className, onProgress, onSuccess, onError, onComplete }) => {
+export const Uploader = ({ icon, label, target, accept, simultaneousUploads = 1, className, onProgress, onSuccess, onError, onComplete }) => {
 
         const resumable = useMemo(() => {
             const config = {
@@ -65,7 +65,7 @@ export const Uploader = ({ label, target, accept, simultaneousUploads = 1, class
 
         return (
             <div className={`uploader ${className}`}>
-                {state === UPLOAD_STATES.IDLE ? <UploadArea resumable={resumable} label={label}  /> : <UploadProgress files={files} /> }
+                {state === UPLOAD_STATES.IDLE ? <UploadArea resumable={resumable} icon={icon} label={label}  /> : <UploadProgress files={files} /> }
             </div>
         )
     }