Web: Files: moved isEdit, titleWithoutExt to inject
This commit is contained in:
parent
5322ed2cec
commit
62b4b55dca
@ -24,7 +24,7 @@ export default function withContent(WrappedContent) {
|
||||
super(props);
|
||||
|
||||
const { item, fileActionId, fileActionExt, fileActionTemplateId } = props;
|
||||
let titleWithoutExt = getTitleWithoutExst(item);
|
||||
let titleWithoutExt = props.titleWithoutExt;
|
||||
if (
|
||||
fileActionId === -1 &&
|
||||
item.id === fileActionId &&
|
||||
@ -42,7 +42,8 @@ export default function withContent(WrappedContent) {
|
||||
fileActionExt,
|
||||
setIsUpdatingRowItem,
|
||||
isUpdatingRowItem,
|
||||
item,
|
||||
isEdit,
|
||||
titleWithoutExt,
|
||||
} = this.props;
|
||||
if (fileActionId === -1 && fileActionExt !== prevProps.fileActionExt) {
|
||||
const itemTitle = getDefaultFileName(fileActionExt);
|
||||
@ -52,10 +53,6 @@ export default function withContent(WrappedContent) {
|
||||
isUpdatingRowItem && setIsUpdatingRowItem(false);
|
||||
}
|
||||
|
||||
const titleWithoutExt = getTitleWithoutExst(item);
|
||||
const isEdit =
|
||||
item.id === fileActionId && item.fileExst === fileActionExt;
|
||||
|
||||
if (!isEdit && titleWithoutExt !== this.state.itemTitle) {
|
||||
this.setState({ itemTitle: titleWithoutExt });
|
||||
}
|
||||
@ -381,8 +378,6 @@ export default function withContent(WrappedContent) {
|
||||
const { itemTitle } = this.state;
|
||||
const {
|
||||
element,
|
||||
fileActionExt,
|
||||
fileActionId,
|
||||
isDesktop,
|
||||
isTrashFolder,
|
||||
item,
|
||||
@ -392,6 +387,8 @@ export default function withContent(WrappedContent) {
|
||||
viewer,
|
||||
isUpdatingRowItem,
|
||||
passwordEntryProcess,
|
||||
isEdit,
|
||||
titleWithoutExt,
|
||||
} = this.props;
|
||||
const {
|
||||
access,
|
||||
@ -404,10 +401,6 @@ export default function withContent(WrappedContent) {
|
||||
updated,
|
||||
} = item;
|
||||
|
||||
const titleWithoutExt = getTitleWithoutExst(item);
|
||||
|
||||
const isEdit = id === fileActionId && fileExst === fileActionExt;
|
||||
|
||||
const updatedDate =
|
||||
viewAs === "table"
|
||||
? this.getTableStatusByDate(false)
|
||||
@ -481,7 +474,7 @@ export default function withContent(WrappedContent) {
|
||||
dialogsStore,
|
||||
uploadDataStore,
|
||||
},
|
||||
{}
|
||||
{ item }
|
||||
) => {
|
||||
const { editCompleteAction } = filesActionsStore;
|
||||
const {
|
||||
@ -520,6 +513,11 @@ export default function withContent(WrappedContent) {
|
||||
setFormCreationInfo,
|
||||
} = dialogsStore;
|
||||
|
||||
const isEdit =
|
||||
item.id === fileActionId && item.fileExst === fileActionExt;
|
||||
|
||||
const titleWithoutExt = getTitleWithoutExst(item);
|
||||
|
||||
return {
|
||||
createFile,
|
||||
createFolder,
|
||||
@ -552,6 +550,8 @@ export default function withContent(WrappedContent) {
|
||||
addActiveItems,
|
||||
clearActiveOperations,
|
||||
fileCopyAs,
|
||||
isEdit,
|
||||
titleWithoutExt,
|
||||
};
|
||||
}
|
||||
)(observer(WithContent));
|
||||
|
Loading…
Reference in New Issue
Block a user