-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into feature/OPHKIOS-100
- Loading branch information
Showing
48 changed files
with
843 additions
and
1,031 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 27 additions & 7 deletions
34
frontend/packages/shared/src/components/FileUpload/FileUpload.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,68 @@ | ||
| import FileUploadIcon from '@mui/icons-material/FileUpload'; | ||
| import { Button } from '@mui/material'; | ||
| import { ChangeEvent, FC } from 'react'; | ||
| import { ChangeEvent, DragEvent, FC } from 'react'; | ||
|
|
||
| import './FileUpload.scss'; | ||
| import { Text } from '../../components'; | ||
| import { Color, Variant } from '../../enums'; | ||
| import { useWindowProperties } from '../../hooks'; | ||
|
|
||
| type FileUploadProps = { | ||
| accept?: string; | ||
| error?: boolean; | ||
| onChange: (files: FileList) => void; | ||
| labelText: string; | ||
| buttonText: string; | ||
| dropZoneText: string; | ||
| }; | ||
|
|
||
| export const FileUpload: FC<FileUploadProps> = ({ | ||
| accept, | ||
| onChange, | ||
| error, | ||
| labelText, | ||
| buttonText, | ||
| dropZoneText, | ||
| }) => { | ||
| const handleChange = (event: ChangeEvent<HTMLInputElement>) => { | ||
| if (event.target.files) { | ||
| onChange(event.target.files); | ||
| } | ||
| }; | ||
| const { isPhone } = useWindowProperties(); | ||
|
|
||
| return ( | ||
| <div | ||
| className={ | ||
| error ? 'custom-fileupload file-upload-error' : 'custom-fileupload' | ||
| } | ||
| className={`columns custom-fileupload ${ | ||
| error ? 'file-upload-error' : '' | ||
| }`} | ||
| > | ||
| <Button | ||
| component="label" | ||
| variant={Variant.Contained} | ||
| color={error ? Color.Error : Color.Secondary} | ||
| startIcon={<FileUploadIcon />} | ||
| > | ||
| {labelText} | ||
| {buttonText} | ||
| <input | ||
| id="custom-fileupload" | ||
| accept={accept} | ||
| type="file" | ||
| onChange={handleChange} | ||
| /> | ||
| </Button> | ||
| {!isPhone && ( | ||
| <div | ||
| className="file-dropzone" | ||
| onDragOver={(e: DragEvent<HTMLDivElement>) => { | ||
| e.preventDefault(); | ||
| }} | ||
| onDrop={(e: DragEvent<HTMLDivElement>) => { | ||
| e.preventDefault(); | ||
| onChange(e.dataTransfer.files); | ||
| }} | ||
| > | ||
| <Text>{dropZoneText}</Text> | ||
| </div> | ||
| )} | ||
| </div> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,6 +26,6 @@ | |
| }, | ||
| "dependencies": { | ||
| "reduxjs-toolkit-persist": "^7.2.1", | ||
| "shared": "npm:@opetushallitus/[email protected].7" | ||
| "shared": "npm:@opetushallitus/[email protected].8" | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.