Skip to content

Commit df5ac3f

Browse files
committed
✨ make sidebar close on file click
1 parent faaa6d2 commit df5ac3f

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

client/components/mobile/Explorer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import ConnectedFileNode from '../../modules/IDE/components/FileNode';
77

88
const Explorer = ({ id, canEdit, onPressClose }) => (
99
<Sidebar title="Files" onPressClose={onPressClose}>
10-
<ConnectedFileNode id={id} canEdit={canEdit} onClickFile={onPressClose} />
10+
<ConnectedFileNode id={id} canEdit={canEdit} onClickFile={() => onPressClose()} />
1111
</Sidebar>
1212
);
1313

client/components/mobile/Sidebar.jsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ const SidebarWrapper = styled.div`
2020
box-shadow: 0 6px 6px 0 rgba(0,0,0,0.10);
2121
`;
2222

23-
// onClick={() => alert('haha')}
24-
2523
const Sidebar = ({ title, onPressClose, children }) => (
2624
<SidebarWrapper>
2725
{title &&

client/components/useAsModal.jsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ const BackgroundOverlay = styled.div`
1515
export default (Element, hasOverlay = false) => {
1616
const [visible, toggle, setRef] = useModalBehavior();
1717

18-
// const Comp = styled(() => Element).attrs({ onPressClose: toggle });
19-
2018
const wrapper = () => (visible &&
2119
<div>
2220
{hasOverlay && <BackgroundOverlay />}

client/modules/IDE/components/FileNode.jsx

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,15 @@ export class FileNode extends React.Component {
108108
handleFileClick = (event) => {
109109
event.stopPropagation();
110110
const { isDeleting } = this.state;
111-
const { id, setSelectedFile, name } = this.props;
111+
const {
112+
id, setSelectedFile, name, onClickFile
113+
} = this.props;
112114
if (name !== 'root' && !isDeleting) {
113115
setSelectedFile(id);
114116
}
117+
118+
// debugger; // eslint-disable-line
119+
if (onClickFile) { onClickFile(); }
115120
}
116121

117122
handleFileNameChange = (event) => {
@@ -214,7 +219,7 @@ export class FileNode extends React.Component {
214219

215220
renderChild = childId => (
216221
<li key={childId}>
217-
<ConnectedFileNode id={childId} parentId={this.props.id} canEdit={this.props.canEdit} />
222+
<ConnectedFileNode id={childId} parentId={this.props.id} canEdit={this.props.canEdit} onClickFile={this.props.onClickFile} />
218223
</li>
219224
)
220225

@@ -233,7 +238,7 @@ export class FileNode extends React.Component {
233238
const isRoot = this.props.name === 'root';
234239

235240
return (
236-
<div className={itemClass}>
241+
<div className={itemClass} >
237242
{ !isRoot &&
238243
<div className="file-item__content" onContextMenu={this.toggleFileOptions}>
239244
<span className="file-item__spacer"></span>
@@ -382,10 +387,12 @@ FileNode.propTypes = {
382387
hideFolderChildren: PropTypes.func.isRequired,
383388
canEdit: PropTypes.bool.isRequired,
384389
openUploadFileModal: PropTypes.func.isRequired,
385-
authenticated: PropTypes.bool.isRequired
390+
authenticated: PropTypes.bool.isRequired,
391+
onClickFile: PropTypes.func
386392
};
387393

388394
FileNode.defaultProps = {
395+
onClickFile: null,
389396
parentId: '0',
390397
isSelectedFile: false,
391398
isFolderClosed: false,

0 commit comments

Comments
 (0)