diff --git a/app/components/addressBar/AddressBar.js b/app/components/addressBar/AddressBar.js index 239d15d..f156fe1 100644 --- 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 (
diff --git a/app/components/fileItem/FileItem.js b/app/components/fileItem/FileItem.js index e28c253..03fef33 100644 --- 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 index ca187d6..409238c 100644 --- 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) + )} > ))}
diff --git a/app/theme/Color.js b/app/theme/Color.js index 588051d..c5aa5a1 100644 --- 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' };