Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat/fro preview multiple #2799

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Feat/fro preview multiple #2799

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bc8b0b
allowed multiple preview adding one by one
IdrisDY Dec 3, 2022
6e9eb16
Merge branch 'dev' of https://github.com/IdrisDY/zc_main into feat/FR…
IdrisDY Dec 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions packages/ui/src/message-pane-input/components/ToolbarBottom.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const ToolbarBottom = props => {
} = props;
const [focus, setFocus] = useState(false);
const toggleFocus = () => setFocus(!false);
const [attachedFile, setAttachedFile] = useState(null);
const [attachedFile, setAttachedFile] = useState([]);
const [inputKey, setInputKey] = useState("any-key-press");
const [showAttachInputBox, setshowAttachInputBox] = useState(false);
//const [preview, setPreview] = useState('')
Expand All @@ -81,13 +81,12 @@ const ToolbarBottom = props => {
//Handles sending of attachedfile
const handleAttachMedia = e => {
{
e.preventDefault();
// e.preventDefault();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove comment

//Post request is sent here
sendMessageHandler(attachedFile);

sendAttachedFileHandler(attachedFile);
//Then this is to clear the file from the state
props.sentAttachedFile(null);
clearAttached();
// props.sentAttachedFile(null);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comments

// clearAttached();
}
};

Expand All @@ -96,9 +95,10 @@ const ToolbarBottom = props => {
};

const handleSelectMedia = e => {
setAttachedFile(e.target.files);
props.sentAttachedFile(e.target.files);
setAttachedFile([e.target.files[0], ...attachedFile]);
props.sentAttachedFile([e.target.files[0], ...attachedFile]);
setshowAttachInputBox(false);
handleAttachMedia();
};

// on click clear attached file
Expand Down Expand Up @@ -222,7 +222,7 @@ const ToolbarBottom = props => {
</span>
</FormatContainer>
<SendContainer>
<UnstyledButton onClick={handleClickSendMessage || handleAttachMedia}>
<UnstyledButton onClick={handleClickSendMessage}>
<SendIcon />
</UnstyledButton>
</SendContainer>
Expand Down