Merge branch 'develop' of https://github.com/nkg447/rc-file-manager

nkg447 · Nov 18, 2019 · 6e07977 · 6e07977
2 parents e213a9a + da8b490
commit 6e07977
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/app/components/addressBar/AddressBar.js b/app/components/addressBar/AddressBar.js
@@ -4,8 +4,10 @@ import styles from './AddressBar.css';
 export default props => {
   const { address, changeAddress } = props;
   const [path, setPath] = React.useState(address);
-  if (path !== address) {
+  const [oldPath, setOldPath] = React.useState(address);
+  if (oldPath !== address) {
     setPath(address);
+    setOldPath(address);
   }
   return (
     <div className={styles.container}>

diff --git a/app/components/fileItem/FileItem.js b/app/components/fileItem/FileItem.js
@@ -55,8 +55,10 @@ export default createSelectable(props => {
     isSelecting,
     selectableRef,
     selected,
+    isToCut,
     ...otherProps
   } = props;
+
   const isDirectory = file.isDirectory();
   const iconStyle = {
     fontSize: fileIconSize,
@@ -74,7 +76,11 @@ export default createSelectable(props => {
       icon={isDirectory ? faFolder : addressToIcon(file.name)}
       style={iconStyle}
       color={
-        selected || isSelecting ? Colors.selectedFileIcon : Colors.fileIcon
+        selected || isSelecting
+          ? Colors.selectedFileIcon
+          : isToCut
+          ? Colors.onCutFileIcon
+          : Colors.fileIcon
       }
     />
   );

diff --git a/app/containers/contentBody/ContentBody.js b/app/containers/contentBody/ContentBody.js
@@ -267,6 +267,9 @@ export default class ContentBody extends Component {
                 }}
                 fileIconSize={fileIconSize}
                 selected={this.state.selectedFiles.includes(file)}
+                isToCut={this.props.filesToCut.includes(
+                  path.join(address, file.name)
+                )}
               ></FileItem>
             ))}
           </div>

diff --git a/app/theme/Color.js b/app/theme/Color.js
@@ -2,5 +2,6 @@ export default {
   fileIcon: '#6cccfc',
   selectedFileIcon: '#74b1be',
   sidebarBackground: '#2c2e3b',
-  sidebar: '#74b1be'
+  sidebar: '#74b1be',
+  onCutFileIcon: '#b7e6fe'
 };