Web: Files: removed someDialogIsOpen
This commit is contained in:
parent
e0b4b232df
commit
84f77d3b3d
@ -56,7 +56,6 @@ const FilesMediaViewer = (props) => {
|
|||||||
activeFiles,
|
activeFiles,
|
||||||
activeFolders,
|
activeFolders,
|
||||||
onClickDownloadAs,
|
onClickDownloadAs,
|
||||||
someDialogIsOpen,
|
|
||||||
} = props;
|
} = props;
|
||||||
|
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
@ -194,7 +193,6 @@ const FilesMediaViewer = (props) => {
|
|||||||
<MediaViewer
|
<MediaViewer
|
||||||
t={t}
|
t={t}
|
||||||
userAccess={userAccess}
|
userAccess={userAccess}
|
||||||
someDialogIsOpen={someDialogIsOpen}
|
|
||||||
currentFileId={currentMediaFileId}
|
currentFileId={currentMediaFileId}
|
||||||
visible={visible}
|
visible={visible}
|
||||||
playlist={playlist}
|
playlist={playlist}
|
||||||
@ -313,7 +311,6 @@ export default inject(
|
|||||||
extsMediaPreviewed,
|
extsMediaPreviewed,
|
||||||
setRemoveMediaItem: dialogsStore.setRemoveMediaItem,
|
setRemoveMediaItem: dialogsStore.setRemoveMediaItem,
|
||||||
deleteDialogVisible: dialogsStore.deleteDialogVisible,
|
deleteDialogVisible: dialogsStore.deleteDialogVisible,
|
||||||
someDialogIsOpen: dialogsStore.someDialogIsOpen,
|
|
||||||
fetchFiles,
|
fetchFiles,
|
||||||
previewFile,
|
previewFile,
|
||||||
setIsLoading,
|
setIsLoading,
|
||||||
|
@ -17,8 +17,6 @@ export interface MediaViewerProps {
|
|||||||
extsMediaPreviewed: string[];
|
extsMediaPreviewed: string[];
|
||||||
extsImagePreviewed: string[];
|
extsImagePreviewed: string[];
|
||||||
|
|
||||||
someDialogIsOpen: boolean;
|
|
||||||
|
|
||||||
deleteDialogVisible: boolean;
|
deleteDialogVisible: boolean;
|
||||||
errorLabel: string;
|
errorLabel: string;
|
||||||
isPreviewFile: boolean;
|
isPreviewFile: boolean;
|
||||||
|
@ -137,7 +137,6 @@ function MediaViewer({
|
|||||||
props.files.length,
|
props.files.length,
|
||||||
playlistPos,
|
playlistPos,
|
||||||
props.deleteDialogVisible,
|
props.deleteDialogVisible,
|
||||||
props.someDialogIsOpen,
|
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const getContextModel = () => {
|
const getContextModel = () => {
|
||||||
@ -257,7 +256,7 @@ function MediaViewer({
|
|||||||
|
|
||||||
const onKeydown = (event: KeyboardEvent) => {
|
const onKeydown = (event: KeyboardEvent) => {
|
||||||
const { code, ctrlKey } = event;
|
const { code, ctrlKey } = event;
|
||||||
if (props.deleteDialogVisible || props.someDialogIsOpen) return;
|
if (props.deleteDialogVisible) return;
|
||||||
|
|
||||||
if (code in KeyboardEventKeys) {
|
if (code in KeyboardEventKeys) {
|
||||||
const includesKeyboardCode = [
|
const includesKeyboardCode = [
|
||||||
@ -397,7 +396,6 @@ function MediaViewer({
|
|||||||
errorTitle={props.t("Common:MediaError")}
|
errorTitle={props.t("Common:MediaError")}
|
||||||
headerIcon={headerIcon}
|
headerIcon={headerIcon}
|
||||||
audioIcon={audioIcon}
|
audioIcon={audioIcon}
|
||||||
someDialogIsOpen={props.someDialogIsOpen}
|
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
|
@ -12,7 +12,6 @@ interface ImageViewerProps {
|
|||||||
isFistImage: boolean;
|
isFistImage: boolean;
|
||||||
isLastImage: boolean;
|
isLastImage: boolean;
|
||||||
panelVisible: boolean;
|
panelVisible: boolean;
|
||||||
someDialogIsOpen: boolean;
|
|
||||||
mobileDetails: JSX.Element;
|
mobileDetails: JSX.Element;
|
||||||
toolbar: ReturnType<typeof getCustomToolbar>;
|
toolbar: ReturnType<typeof getCustomToolbar>;
|
||||||
|
|
||||||
|
@ -54,7 +54,6 @@ function ImageViewer({
|
|||||||
isTiff,
|
isTiff,
|
||||||
contextModel,
|
contextModel,
|
||||||
errorTitle,
|
errorTitle,
|
||||||
someDialogIsOpen,
|
|
||||||
}: ImageViewerProps) {
|
}: ImageViewerProps) {
|
||||||
const imgRef = useRef<HTMLImageElement>(null);
|
const imgRef = useRef<HTMLImageElement>(null);
|
||||||
const imgWrapperRef = useRef<HTMLDivElement>(null);
|
const imgWrapperRef = useRef<HTMLDivElement>(null);
|
||||||
@ -107,7 +106,7 @@ function ImageViewer({
|
|||||||
return () => {
|
return () => {
|
||||||
document.removeEventListener("keydown", onKeyDown);
|
document.removeEventListener("keydown", onKeyDown);
|
||||||
};
|
};
|
||||||
}, [someDialogIsOpen]);
|
}, []);
|
||||||
|
|
||||||
const restartScaleAndSize = () => {
|
const restartScaleAndSize = () => {
|
||||||
if (!imgRef.current || style.scale.isAnimating) return;
|
if (!imgRef.current || style.scale.isAnimating) return;
|
||||||
@ -546,8 +545,6 @@ function ImageViewer({
|
|||||||
const onKeyDown = (event: KeyboardEvent) => {
|
const onKeyDown = (event: KeyboardEvent) => {
|
||||||
const { code, ctrlKey } = event;
|
const { code, ctrlKey } = event;
|
||||||
|
|
||||||
if (someDialogIsOpen) return;
|
|
||||||
|
|
||||||
switch (code) {
|
switch (code) {
|
||||||
case KeyboardEventKeys.ArrowLeft:
|
case KeyboardEventKeys.ArrowLeft:
|
||||||
case KeyboardEventKeys.ArrowRight:
|
case KeyboardEventKeys.ArrowRight:
|
||||||
|
@ -10,7 +10,6 @@ interface ViewerProps {
|
|||||||
visible: boolean;
|
visible: boolean;
|
||||||
isImage: boolean;
|
isImage: boolean;
|
||||||
isPdf: boolean;
|
isPdf: boolean;
|
||||||
someDialogIsOpen: boolean;
|
|
||||||
|
|
||||||
playlist: PlaylistType[];
|
playlist: PlaylistType[];
|
||||||
inactive: boolean;
|
inactive: boolean;
|
||||||
|
@ -209,7 +209,6 @@ function Viewer(props: ViewerProps) {
|
|||||||
resetToolbarVisibleTimer={resetToolbarVisibleTimer}
|
resetToolbarVisibleTimer={resetToolbarVisibleTimer}
|
||||||
contextModel={props.contextModel}
|
contextModel={props.contextModel}
|
||||||
errorTitle={props.errorTitle}
|
errorTitle={props.errorTitle}
|
||||||
someDialogIsOpen={props.someDialogIsOpen}
|
|
||||||
/>,
|
/>,
|
||||||
containerRef.current
|
containerRef.current
|
||||||
)
|
)
|
||||||
|
@ -16,7 +16,6 @@ interface ViewerWrapperProps {
|
|||||||
isVideo: boolean;
|
isVideo: boolean;
|
||||||
isPdf: boolean;
|
isPdf: boolean;
|
||||||
isPreviewFile: boolean;
|
isPreviewFile: boolean;
|
||||||
someDialogIsOpen: boolean;
|
|
||||||
|
|
||||||
archiveRoom: boolean;
|
archiveRoom: boolean;
|
||||||
|
|
||||||
|
@ -124,7 +124,6 @@ function ViewerWrapper(props: ViewerWrapperProps) {
|
|||||||
onDownloadClick={props.onDownloadClick}
|
onDownloadClick={props.onDownloadClick}
|
||||||
generateContextMenu={generateContextMenu}
|
generateContextMenu={generateContextMenu}
|
||||||
onSetSelectionFile={props.onSetSelectionFile}
|
onSetSelectionFile={props.onSetSelectionFile}
|
||||||
someDialogIsOpen={props.someDialogIsOpen}
|
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user