Skip to content
Snippets Groups Projects
Commit 38dca17c authored by Jose Manuel Serrano Amaut's avatar Jose Manuel Serrano Amaut
Browse files

[WIP]: Refactor some components that shpuld be in the return statement instead...

[WIP]: Refactor some components that shpuld be in the return statement instead of being created every render. Missing refactor code that is too large
parent c323d7ca
No related branches found
No related tags found
No related merge requests found
import * as React from "react";
interface DropzoneActionButtonsProps {}
const DropzoneActionButtons: React.FC<DropzoneActionButtonsProps> = (
props: DropzoneActionButtonsProps
) => {
return <div>DropzoneActionButtons</div>;
};
export default DropzoneActionButtons;
...@@ -53,6 +53,7 @@ const DropzoneButtons: React.FC<DropzoneButtonsProps> = ( ...@@ -53,6 +53,7 @@ const DropzoneButtons: React.FC<DropzoneButtonsProps> = (
containerClassName containerClassName
); );
return ( return (
<div className={finalClassName} style={containerStyle}> <div className={finalClassName} style={containerStyle}>
{actionButtonsList.map( {actionButtonsList.map(
......
...@@ -675,7 +675,24 @@ const Dropzone: React.FC<DropzoneProps> = (props: DropzoneProps) => { ...@@ -675,7 +675,24 @@ const Dropzone: React.FC<DropzoneProps> = (props: DropzoneProps) => {
if (!dropzoneClassName) return <></>; if (!dropzoneClassName) return <></>;
return ( return (
<React.Fragment> <React.Fragment>
<DropzoneActionButtons visible={actionButtonsPosition === "top"} /> {actionButtonsPosition === "top" && (
<DropzoneButtons
abortButton={isUploading ? abortButton : undefined}
onAbort={handleAbortUpload}
deleteButton={deleteButton}
onDelete={!isUploading ? handleReset : undefined}
uploadButton={!isUploading && !autoUpload ? uploadButton : undefined}
onUpload={!autoUpload ? () => uploadfiles(localFiles) : undefined}
cleanButton={
validateFilesFlag && !isUploading && !autoClean
? cleanButton
: undefined
}
onClean={handleClean}
style={containerStyle}
className={containerClassName}
/>
)}
<div <div
style={style} style={style}
className={dropzoneClassName} className={dropzoneClassName}
...@@ -752,7 +769,24 @@ const Dropzone: React.FC<DropzoneProps> = (props: DropzoneProps) => { ...@@ -752,7 +769,24 @@ const Dropzone: React.FC<DropzoneProps> = (props: DropzoneProps) => {
<DropzoneDisabledLayer open={disabled} /> <DropzoneDisabledLayer open={disabled} />
</div> </div>
<DropzoneActionButtons visible={actionButtonsPosition === "bottom"} /> {actionButtonsPosition === "bottom" && (
<DropzoneButtons
abortButton={isUploading ? abortButton : undefined}
onAbort={handleAbortUpload}
deleteButton={deleteButton}
onDelete={!isUploading ? handleReset : undefined}
uploadButton={!isUploading && !autoUpload ? uploadButton : undefined}
onUpload={!autoUpload ? () => uploadfiles(localFiles) : undefined}
cleanButton={
validateFilesFlag && !isUploading && !autoClean
? cleanButton
: undefined
}
onClean={handleClean}
style={containerStyle}
className={containerClassName}
/>
)}
</React.Fragment> </React.Fragment>
); );
}; };
......
...@@ -135,10 +135,10 @@ const FileMosaicUploadLayer: React.FC<FileMosaicUploadLayerProps> = ( ...@@ -135,10 +135,10 @@ const FileMosaicUploadLayer: React.FC<FileMosaicUploadLayerProps> = (
const StatusSelector = (status: UPLOADSTATUS | undefined) => { const StatusSelector = (status: UPLOADSTATUS | undefined) => {
switch (status) { switch (status) {
case "preparing": /* case "preparing":
return <PreparingStatus />; return <PreparingStatus />;
case "uploading": case "uploading":
return <UploadingStatus />; return <UploadingStatus />; */
case "error": case "error":
return <ErrorStatus />; return <ErrorStatus />;
case "success": case "success":
...@@ -157,7 +157,34 @@ const FileMosaicUploadLayer: React.FC<FileMosaicUploadLayerProps> = ( ...@@ -157,7 +157,34 @@ const FileMosaicUploadLayer: React.FC<FileMosaicUploadLayerProps> = (
{statusHistory.map((status, index) => { {statusHistory.map((status, index) => {
return ( return (
<div className="elevation-item" key={index + 1}> <div className="elevation-item" key={index + 1}>
{StatusSelector(status)} {status === "preparing" ? (
<React.Fragment>
<InfiniteLoader onClick={onCancel} size={65} />
<span>{FileItemStatusLocalizer.preparing as string}</span>
</React.Fragment>
) : status === "uploading" ? (
<React.Fragment>
{progress !== undefined ? (
<DynamicLoader
size={70}
x={35}
y={35}
radius={32}
percentage={progress}
width={6}
hidePerncentage={
progress === undefined || onAbort !== undefined
}
onClick={onAbort}
/>
) : (
<InfiniteLoader onClick={onAbort} size={70} />
)}
<span> {FileItemStatusLocalizer.uploading as string}</span>
</React.Fragment>
) : (
StatusSelector(status)
)}
</div> </div>
); );
})} })}
......
...@@ -47,6 +47,7 @@ const MaterialButton: React.FC<MaterialButtonProps> = ( ...@@ -47,6 +47,7 @@ const MaterialButton: React.FC<MaterialButtonProps> = (
onClick?.(e as React.MouseEvent<HTMLButtonElement, MouseEvent>); onClick?.(e as React.MouseEvent<HTMLButtonElement, MouseEvent>);
} }
if (materialButtonClassName!==undefined || resetStyles) if (materialButtonClassName!==undefined || resetStyles)
return React.createElement(href ? "a" : "button", { return React.createElement(href ? "a" : "button", {
className: resetStyles && className ? className : materialButtonClassName, className: resetStyles && className ? className : materialButtonClassName,
......
...@@ -12,6 +12,8 @@ const useMaterialButtonClassName = ( ...@@ -12,6 +12,8 @@ const useMaterialButtonClassName = (
idClassName?: number | string, idClassName?: number | string,
resetStyles?: boolean resetStyles?: boolean
): string | undefined => { ): string | undefined => {
console.log("useMaterialButtonClassName", variant, disabled, color, textColor,
textDecoration, className, idClassName, resetStyles);
const baseClassName: string = "material-button-root material-button"; const baseClassName: string = "material-button-root material-button";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment