also handle backdrop click as canceling running upload
This commit is contained in:
parent
a32a5d6985
commit
cc0b51e2a1
|
@ -19,7 +19,7 @@ export interface CollectionSelectorAttributes {
|
|||
|
||||
interface Props {
|
||||
open: boolean;
|
||||
onClose: (closeBtnClick?: boolean) => void;
|
||||
onClose: () => void;
|
||||
attributes: CollectionSelectorAttributes;
|
||||
collections: Collection[];
|
||||
collectionSummaries: CollectionSummaries;
|
||||
|
@ -62,18 +62,18 @@ function CollectionSelector({
|
|||
props.onClose();
|
||||
};
|
||||
|
||||
const onCloseButtonClick = () => {
|
||||
const onUserTriggeredClose = () => {
|
||||
attributes.onCancel?.();
|
||||
props.onClose(true);
|
||||
props.onClose();
|
||||
};
|
||||
|
||||
return (
|
||||
<AllCollectionDialog
|
||||
onClose={props.onClose}
|
||||
onClose={onUserTriggeredClose}
|
||||
open={props.open}
|
||||
position="center"
|
||||
fullScreen={appContext.isMobile}>
|
||||
<DialogTitleWithCloseButton onClose={onCloseButtonClick}>
|
||||
<DialogTitleWithCloseButton onClose={onUserTriggeredClose}>
|
||||
{attributes.title}
|
||||
</DialogTitleWithCloseButton>
|
||||
<DialogContent>
|
||||
|
|
|
@ -142,6 +142,7 @@ export default function Uploader(props: Props) {
|
|||
};
|
||||
const handleCollectionSelectorCancel = () => {
|
||||
uploadRunning.current = false;
|
||||
appContext.resetSharedFiles();
|
||||
};
|
||||
|
||||
const handleUserNameInputDialogClose = () => {
|
||||
|
|
|
@ -525,13 +525,6 @@ export default function Gallery() {
|
|||
}
|
||||
};
|
||||
|
||||
const closeCollectionSelector = (closeBtnClick?: boolean) => {
|
||||
if (closeBtnClick === true) {
|
||||
appContext.resetSharedFiles();
|
||||
}
|
||||
setCollectionSelectorView(false);
|
||||
};
|
||||
|
||||
const fixTimeHelper = async () => {
|
||||
const selectedFiles = getSelectedFiles(selected, files);
|
||||
setFixCreationTimeAttributes({ files: selectedFiles });
|
||||
|
@ -555,6 +548,10 @@ export default function Gallery() {
|
|||
setUploadTypeSelectorView(true);
|
||||
};
|
||||
|
||||
const closeCollectionSelector = () => {
|
||||
setCollectionSelectorView(false);
|
||||
};
|
||||
|
||||
return (
|
||||
<GalleryContext.Provider
|
||||
value={{
|
||||
|
|
Loading…
Reference in a new issue