Open platform to collect and prioritize feedback
enhancement: component to upload multiple images (#703)
Guilherme Oenning8334f664db41
diff --git a/public/components/common/Modal.scss b/public/components/common/Modal.scssindex 7b4ce9b9a..12ec29fc3 100644--- a/public/components/common/Modal.scss+++ b/public/components/common/Modal.scss@@ -48,16 +48,17 @@border-radius: 3px;-webkit-box-shadow: 1px 3px 3px 0 rgba(0,0,0,.2), 1px 3px 15px 2px rgba(0,0,0,.2);box-shadow: 1px 3px 3px 0 rgba(0,0,0,.2), 1px 3px 15px 2px rgba(0,0,0,.2);- width: 100%;animation: windowfadeIn 0.5s;&.m-small {+ width: 100%;@include media(">=md") {width: 500px;}}&.m-large {+ width: 100%;@include media(">=md") {width: 750px;}@@ -76,6 +77,10 @@.c-modal-content {padding: 15px 20px;+ img {+ max-width: 90vw;+ max-height: 80vh;+ }}.c-modal-footer {diff --git a/public/components/common/Modal.tsx b/public/components/common/Modal.tsxindex 55af08b95..257512ee5 100644--- a/public/components/common/Modal.tsx+++ b/public/components/common/Modal.tsx@@ -7,7 +7,7 @@ import { classSet } from "@fider/services";interface ModalWindowProps {className?: string;isOpen: boolean;- size?: "small" | "large";+ size?: "small" | "large" | "fluid";canClose?: boolean;center?: boolean;onClose?: () => void;diff --git a/public/components/common/form/ImageUploader.scss b/public/components/common/form/ImageUploader.scssindex be157e2e9..2c4c2e7d3 100644--- a/public/components/common/form/ImageUploader.scss+++ b/public/components/common/form/ImageUploader.scss@@ -18,6 +18,7 @@img {padding: 5px;border: 1px solid $gray-light;+ cursor: pointer;}.c-button {font-weight: 600;diff --git a/public/components/common/form/ImageUploader.tsx b/public/components/common/form/ImageUploader.tsxindex 47f98177e..135ce3dda 100644--- a/public/components/common/form/ImageUploader.tsx+++ b/public/components/common/form/ImageUploader.tsx@@ -4,30 +4,34 @@ import React from "react";import { ValidationContext } from "./Form";import { DisplayError, hasError } from "./DisplayError";import { classSet, fileToBase64, uploadedImageURL } from "@fider/services";-import { Button, ButtonClickEvent } from "@fider/components";+import { Button, ButtonClickEvent, Modal } from "@fider/components";import { FaRegImage } from "react-icons/fa";import { ImageUpload } from "@fider/models";interface ImageUploaderProps {+ instanceId?: string;field: string;label?: string;bkey?: string;disabled?: boolean;previewMaxWidth: number;- onChange(state: ImageUpload, previewURL?: string): void;+ onChange(state: ImageUpload, instanceId?: string): void;}interface ImageUploaderState extends ImageUpload {previewURL?: string;+ showModal: boolean;}export class ImageUploader extends React.Component<ImageUploaderProps, ImageUploaderState> {private fileSelector?: HTMLInputElement | null;+constructor(props: ImageUploaderProps) {super(props);this.state = {upload: undefined,remove: false,+ showModal: false,previewURL: uploadedImageURL(this.props.bkey, this.props.previewMaxWidth)};}@@ -49,7 +53,7 @@ export class ImageUploader extends React.Component<ImageUploaderProps, ImageUplopreviewURL: `data:${file.type};base64,${base64}`},() => {- this.props.onChange(this.state, this.state.previewURL);+ this.props.onChange(this.state, this.props.instanceId);});}@@ -68,7 +72,7 @@ export class ImageUploader extends React.Component<ImageUploaderProps, ImageUplopreviewURL: undefined},() => {- this.props.onChange(this.state, this.state.previewURL);+ this.props.onChange(this.state, this.props.instanceId);});};@@ -79,6 +83,30 @@ export class ImageUploader extends React.Component<ImageUploaderProps, ImageUplo}};+ private openModal = () => {+ this.setState({ showModal: true });+ };++ private closeModal = async () => {+ this.setState({ showModal: false });+ };++ private modal() {+ return (+ <Modal.Window isOpen={this.state.showModal} center={false} size="fluid">+ <Modal.Content>+ <img src={this.state.previewURL} />+ </Modal.Content>++ <Modal.Footer>+ <Button color="cancel" onClick={this.closeModal}>+ Close+ </Button>+ </Modal.Footer>+ </Modal.Window>+ );+ }+public render() {const isUploading = !!this.state.upload;const hasFile = (!this.state.remove && this.props.bkey) || isUploading;@@ -97,11 +125,12 @@ export class ImageUploader extends React.Component<ImageUploaderProps, ImageUplo"m-error": hasError(this.props.field, ctx.error)})}>+ {this.modal()}<label htmlFor={`input-${this.props.field}`}>{this.props.label}</label>{hasFile && (<div className="preview">- <img src={this.state.previewURL} style={imgStyles} />+ <img onClick={this.openModal} src={this.state.previewURL} style={imgStyles} />{!this.props.disabled && (<Button onClick={this.removeFile} color="danger">Xdiff --git a/public/components/common/form/MultiImageUploader.scss b/public/components/common/form/MultiImageUploader.scssnew file mode 100644index 000000000..de154f94e--- /dev/null+++ b/public/components/common/form/MultiImageUploader.scss@@ -0,0 +1,7 @@+.c-multi-image-uploader {+ display: flex;+ flex-wrap: wrap;+ .c-image-upload {+ margin-right: 10px;+ }+}\ No newline at end of filediff --git a/public/components/common/form/MultiImageUploader.tsx b/public/components/common/form/MultiImageUploader.tsxnew file mode 100644index 000000000..a83effad5--- /dev/null+++ b/public/components/common/form/MultiImageUploader.tsx@@ -0,0 +1,82 @@+import React from "react";+import { ImageUploader } from "./ImageUploader";+import "./MultiImageUploader.scss";+import { ImageUpload } from "@fider/models";++interface MultiImageUploaderProps {+ maxUploads: number;+ previewMaxWidth: number;+ onChange?: (uploads: ImageUpload[]) => void;+}++interface MultiImageUploaderInstances {+ [key: string]: {+ element: JSX.Element;+ upload?: ImageUpload;+ };+}++interface MultiImageUploaderState {+ count: number;+ instances: MultiImageUploaderInstances;+}++export class MultiImageUploader extends React.Component<MultiImageUploaderProps, MultiImageUploaderState> {+ constructor(props: MultiImageUploaderProps) {+ super(props);++ const instances = {};+ this.addNewElement(instances);+ this.state = {+ instances,+ count: 1+ };+ }++ private imageUploaded = (upload: ImageUpload, instanceId: string) => {+ const instances = { ...this.state.instances };+ let count = this.state.count;+ if (upload.remove) {+ delete instances[instanceId];+ if (--count === this.props.maxUploads) {+ this.addNewElement(instances);+ }+ } else {+ instances[instanceId].upload = upload;+ count++;+ if (count <= this.props.maxUploads) {+ this.addNewElement(instances);+ }+ }+ this.setState({ instances, count }, this.triggerOnChange);+ };++ private triggerOnChange() {+ if (this.props.onChange) {+ const uploads = Object.keys(this.state.instances)+ .map(k => this.state.instances[k].upload)+ .filter(x => !!x) as ImageUpload[];+ this.props.onChange(uploads);+ }+ }++ private addNewElement(instances: MultiImageUploaderInstances) {+ const id = btoa(Math.random().toString());+ instances[id] = {+ element: (+ <ImageUploader+ key={id}+ instanceId={id}+ field="attachment"+ previewMaxWidth={this.props.previewMaxWidth}+ onChange={this.imageUploaded}+ />+ )+ };+ }++ public render() {+ const elements = Object.keys(this.state.instances).map(k => this.state.instances[k].element);+ return <div className="c-multi-image-uploader">{elements}</div>;+ }+}diff --git a/public/components/common/index.tsx b/public/components/common/index.tsxindex 5a3b6c1f4..10c91c961 100644--- a/public/components/common/index.tsx+++ b/public/components/common/index.tsx@@ -2,6 +2,7 @@ export * from "./Button";export * from "./form/Form";export * from "./form/Input";export * from "./form/ImageUploader";+export * from "./form/MultiImageUploader";export * from "./form/TextArea";export * from "./form/RadioButton";export * from "./form/DisplayError";