IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed opening on context menu click

Browse Source
This commit is contained in:
mushka 2022-03-05 13:11:14 +03:00
parent 384a92c30f
commit 0ac0f8f508
5 changed files with 36 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
products/ASC.Files/Client/src/HOCs/withContextOptions.js
View File

@ -54,11 +54,9 @@ export default function withContextOptions(WrappedComponent) {
const locationId = !fileExst ? parentId : folderId;
openLocationAction(locationId, !fileExst);
};
onSetInfoPanelVisible = () => {
this.props.setIsVisible(true);
};
onOwnerChange = () => {
const { setChangeOwnerPanelVisible } = this.props;
setChangeOwnerPanelVisible(true);
@ -397,16 +395,13 @@ export default function withContextOptions(WrappedComponent) {
onClick: this.onOpenFolder,
disabled: false,
},
// case "show-info":
// return {
// key: option,
// label: t("InfoPanel:Info"),
// icon: "images/info.react.svg",
// onClick: this.onSetInfoPanelVisible,
// disabled: false,
// };
{
key: "show-info",
label: t("InfoPanel:Info"),
icon: "images/info.react.svg",
onClick: this.onSetInfoPanelVisible,
disabled: false,
},
{
key: "fill-form",
label: t("Common:FillFormButton"),
@ -647,7 +642,6 @@ export default function withContextOptions(WrappedComponent) {
const { setAction, type, extension, id } = fileActionStore;
const { setMediaViewerData } = mediaViewerDataStore;
const { copyAsAction } = uploadDataStore;
const { formfillingDocs } = formatsStore.docserviceStore;
const { extsWebRestrictedEditing } = settingsStore;
const { isRecycleBinFolder, isShare } = treeFoldersStore;

21
products/ASC.Files/Client/src/HOCs/withFileActions.js
View File

@ -6,6 +6,7 @@ import { AppServerConfig, FileStatus } from "@appserver/common/constants";
import { combineUrl } from "@appserver/common/utils";
import config from "../../package.json";
import { isMobile } from "react-device-detect";
import { isDesktop } from "@appserver/components/utils/device";
export default function withFileActions(WrappedFileItem) {
class WithFileActions extends React.Component {
@ -17,13 +18,12 @@ export default function withFileActions(WrappedFileItem) {
const { selectRowAction, infoPanelIsVisible, showInfoPanel } = this.props;
if (!file || file.id === -1) return;
selectRowAction(checked, file);
if (!infoPanelIsVisible) showInfoPanel();
if (!infoPanelIsVisible && isDesktop()) showInfoPanel();
};
fileContextClick = () => {
if (!this.props.infoPanelIsVisible) this.props.showInfoPanel();
const { onSelectItem, item } = this.props;
const { onSelectItem, item, infoPanelIsVisible, showInfoPanel } = this.props;
const { id, isFolder } = item;
id !== -1 && onSelectItem({ id, isFolder });
@ -108,17 +108,18 @@ export default function withFileActions(WrappedFileItem) {
showInfoPanel,
} = this.props;
if (
e.target.closest(".checkbox") ||
if(
e.target.tagName === "INPUT" ||
e.target.tagName === "SPAN" ||
e.target.tagName === "A" ||
e.target.closest(".expandButton") ||
e.target.closest(".badges") ||
e.target.closest(".checkbox") ||
e.button !== 0 ||
e.target.closest('.expandButton') ||
e.target.querySelector('.expandButton') ||
e.target.closest(".badges") ||
e.target.closest(".not-selectable")
)
return;
return
if (viewAs === "tile") {
if (e.target.closest(".edit-button") || e.target.tagName === "IMG")
@ -129,7 +130,7 @@ export default function withFileActions(WrappedFileItem) {
this.fileContextClick();
}
if (!infoPanelIsVisible) showInfoPanel();
if (!infoPanelIsVisible && isDesktop()) showInfoPanel();
};
onFilesClick = (e) => {
const {

7
products/ASC.Files/Client/src/pages/Home/InfoPanel/Body/index.js
View File

@ -49,7 +49,7 @@ const InfoPanelBodyContent = ({
export default inject(
({
filesStore,
formatsStore,
settingsStore,
filesActionsStore,
dialogsStore,
treeFoldersStore,
@ -58,9 +58,10 @@ export default inject(
const bufferSelectedItem = JSON.parse(
JSON.stringify(filesStore.bufferSelection)
);
const { getFolderInfo, getShareUsers } = filesStore;
const { getIcon, getFolderIcon } = formatsStore.iconFormatsStore;
//console.log(settin);
const { getFolderInfo, getShareUsers } = filesStore;
const { getIcon, getFolderIcon } = settingsStore;
const { onSelectItem } = filesActionsStore;
const { setSharingPanelVisible } = dialogsStore;
const { isRecycleBinFolder } = treeFoldersStore;

1
products/ASC.Files/Client/src/store/FilesStore.js
View File

@ -11,7 +11,6 @@ import {
import history from "@appserver/common/history";
import { combineUrl } from "@appserver/common/utils";
import { updateTempContent } from "@appserver/common/utils";
import { makeAutoObservable } from "mobx";
import { isMobile } from "react-device-detect";
import toastr from "studio/toastr";

38
products/ASC.Files/Client/src/store/index.js
View File

@ -1,31 +1,25 @@
import store from "studio/store";
import DialogsStore from "./DialogsStore";
import docserviceStore from "./DocserviceStore";
import fileActionStore from "./FileActionStore";
import FilesActionsStore from "./FilesActionsStore";
import FilesStore from "./FilesStore";
import FormatsStore from "./FormatsStore";
import iconFormatsStore from "./IconFormatsStore";
import InfoPanelStore from "./InfoPanelStore";
import MediaViewerDataStore from "./MediaViewerDataStore";
import mediaViewersFormatsStore from "./MediaViewersFormatsStore";
import PrimaryProgressDataStore from "./PrimaryProgressDataStore";
import SecondaryProgressDataStore from "./SecondaryProgressDataStore";
import selectedFilesStore from "./SelectedFilesStore";
import selectedFolderStore from "./SelectedFolderStore";
import SettingsStore from "./SettingsStore";
import thirdPartyStore from "./ThirdPartyStore";
import fileActionStore from "./FileActionStore";
import SelectedFolderStore from "./SelectedFolderStore";
import TreeFoldersStore from "./TreeFoldersStore";
import thirdPartyStore from "./ThirdPartyStore";
import SettingsStore from "./SettingsStore";
import FilesActionsStore from "./FilesActionsStore";
import MediaViewerDataStore from "./MediaViewerDataStore";
import UploadDataStore from "./UploadDataStore";
import SecondaryProgressDataStore from "./SecondaryProgressDataStore";
import PrimaryProgressDataStore from "./PrimaryProgressDataStore";
import VersionHistoryStore from "./VersionHistoryStore";
import DialogsStore from "./DialogsStore";
import selectedFilesStore from "./SelectedFilesStore";
import store from "studio/store";
import InfoPanelStore from "./InfoPanelStore";
const selectedFolderStore = new SelectedFolderStore(store.auth.settingsStore);
const treeFoldersStore = new TreeFoldersStore(selectedFolderStore);
const settingsStore = new SettingsStore(thirdPartyStore, treeFoldersStore);
const filesStore = new FilesStore(
store.auth,
store.auth.settingsStore,
@ -33,7 +27,6 @@ const filesStore = new FilesStore(
fileActionStore,
selectedFolderStore,
treeFoldersStore,
formatsStore,
settingsStore,
selectedFilesStore
);
@ -41,10 +34,8 @@ const mediaViewerDataStore = new MediaViewerDataStore(
filesStore,
settingsStore
);
const secondaryProgressDataStore = new SecondaryProgressDataStore();
const primaryProgressDataStore = new PrimaryProgressDataStore();
const dialogsStore = new DialogsStore(
store.auth,
treeFoldersStore,
@ -76,7 +67,6 @@ const filesActionsStore = new FilesActionsStore(
);
const versionHistoryStore = new VersionHistoryStore(filesStore);
//const selectedFilesStore = new SelectedFilesStore(selectedFilesStore);
const stores = {
filesStore,
@ -92,4 +82,4 @@ const stores = {
infoPanelStore,
};
export default stores;
export default stores;