Merge pull request #3313 from haiwen/fix-bug

handle delete item then details panel bug

frontend/src/pages/lib-content-view/lib-content-container.js

@@ -84,6 +84,7 @@ const propTypes = {
   closeDirentDetail: PropTypes.func.isRequired,
   showDirentDetail: PropTypes.func.isRequired,
   onDeleteRepoTag: PropTypes.func.isRequired,
+  updateDetail: PropTypes.bool.isRequired,
 };
 
 class LibContentContainer extends React.Component {
@@ -98,7 +99,7 @@ class LibContentContainer extends React.Component {
   }
 
   componentWillReceiveProps(nextProps) {
-    if (nextProps.path !== this.props.path) {
+    if (nextProps.path !== this.props.path || nextProps.updateDetail !== this.props.updateDetail) {
       this.setState({currentDirent: null});
     }
   }
@@ -124,6 +125,13 @@ class LibContentContainer extends React.Component {
     this.props.onItemSelected(dirent);
   }
 
+  onItemDelete = (dirent) => {
+    if (dirent.name === this.state.currentDirent.name) {
+      this.setState({currentDirent: null});
+    }
+    this.props.onItemDelete(dirent);
+  }
+
   render() {
     let { path, repoID, usedRepoTags, readmeMarkdown, draftCounts } = this.props;
     let isRepoInfoBarShow = false;
@@ -177,7 +185,7 @@ class LibContentContainer extends React.Component {
                     onAddFile={this.props.onAddFile}
                     onItemClick={this.onItemClick}
                     onItemSelected={this.onItemSelected}
-                    onItemDelete={this.props.onItemDelete}
+                    onItemDelete={this.onItemDelete}
                     onItemRename={this.props.onItemRename}
                     onItemMove={this.props.onItemMove}
                     onItemCopy={this.props.onItemCopy}
@@ -241,7 +249,7 @@ class LibContentContainer extends React.Component {
                     onAddFile={this.props.onAddFile}
                     onItemClick={this.onItemClick}
                     onItemSelected={this.onItemSelected}
-                    onItemDelete={this.props.onItemDelete}
+                    onItemDelete={this.onItemDelete}
                     onItemRename={this.props.onItemRename}
                     onItemMove={this.props.onItemMove}
                     onItemCopy={this.props.onItemCopy}

frontend/src/pages/lib-content-view/lib-content-view.js

@@ -70,6 +70,7 @@ class LibContentView extends React.Component {
       dirID: '',  // for update dir list
       errorMsg: '',
       isDirentDetailShow: false,
+      updateDetail: false,
     };
 
     window.onpopstate = this.onpopstate;
@@ -491,6 +492,7 @@ class LibContentView extends React.Component {
     let direntPaths = this.getSelectedDirentPaths();
     let dirNames = this.getSelectedDirentNames();
 
+    this.setState({updateDetail: !this.state.updateDetail});
     seafileAPI.deleteMutipleDirents(repoID, this.state.path, dirNames).then(res => {
       direntPaths.forEach(direntPath => {
         if (this.state.currentMode === 'column') {
@@ -1448,6 +1450,7 @@ class LibContentView extends React.Component {
             showDirentDetail={this.showDirentDetail}
             onDeleteRepoTag={this.onDeleteRepoTag}
             onToolbarFileTagChanged={this.onToolbarFileTagChanged}
+            updateDetail={this.state.updateDetail}
           />
           {this.state.pathExist && !this.state.isViewFile && (
             <FileUploader