Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Javalab backpack dropdown #40785

Merged
merged 5 commits into from
May 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
181 changes: 181 additions & 0 deletions apps/src/javalab/Backpack.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import Radium from 'radium';
import color from '@cdo/apps/util/color';
import onClickOutside from 'react-onclickoutside';
import JavalabButton from './JavalabButton';
import javalabMsg from '@cdo/javalab/locale';

const placeholderFiles = [
'MyClass.java',
'MyPainter.java',
'NeighborhoodMain.java'
];

/**
* A button that drops down to a set of importable files, and closes itself if
* you click on the import button, or outside of the dropdown.
*/
export class Backpack extends Component {
static propTypes = {
isDarkMode: PropTypes.bool.isRequired
};

state = {
dropdownOpen: false
};

expandDropdown = () => {
this.setState({dropdownOpen: true});
};

collapseDropdown = () => {
this.setState({dropdownOpen: false});
};

handleClickOutside = () => {
if (this.state.dropdownOpen) {
this.collapseDropdown();
}
};

toggleDropdown = () => {
if (this.state.dropdownOpen) {
this.collapseDropdown();
} else {
this.expandDropdown();
}
};

render() {
const {isDarkMode} = this.props;
const {dropdownOpen} = this.state;

return (
<div>
<JavalabButton
icon={
<img
src="/blockly/media/javalab/backpack.png"
alt="backpack icon"
style={styles.backpackIcon}
/>
}
text={javalabMsg.backpackLabel()}
style={{
...styles.buttonStyles,
...(dropdownOpen && styles.dropdownOpenButton)
}}
isHorizontal
onClick={this.toggleDropdown}
/>
{dropdownOpen && (
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this work for both light and dark mode?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now it does!
Screen Shot 2021-05-27 at 1 30 24 PM

<div
style={{...styles.dropdown, ...(isDarkMode && styles.dropdownDark)}}
ref={ref => (this.dropdownList = ref)}
>
{placeholderFiles.map((filename, index) => (
<div
style={{
...styles.fileListItem,
...(isDarkMode && styles.fileListItemDark)
}}
key={`backpack-file-${index}`}
>
<input
type="checkbox"
id={`backpack-file-${index}`}
name={filename}
/>
<label
htmlFor={`backpack-file-${index}`}
style={styles.fileListLabel}
>
{filename}
</label>
</div>
))}
<JavalabButton
text="Import"
style={styles.importButton}
onClick={this.collapseDropdown}
/>
</div>
)}
</div>
);
}
}

export default onClickOutside(Radium(Backpack));

const styles = {
dropdown: {
position: 'absolute',
top: 30,
backgroundColor: color.lightest_gray,
color: color.darkest_gray,
zIndex: 20,
paddingTop: 5,
paddingBottom: 5,
borderRadius: 2,
display: 'flex',
flexDirection: 'column',
alignItems: 'center'
},
dropdownDark: {
backgroundColor: color.darkest_gray,
color: color.light_gray
},
buttonStyles: {
cursor: 'pointer',
float: 'right',
backgroundColor: color.light_purple,
margin: '3px 3px 3px 0px',
height: 24,
borderRadius: 4,
borderWidth: 0,
fontSize: 13,
color: color.white,
padding: '0px 12px',
fontFamily: '"Gotham 5r", sans-serif',
lineHeight: '18px',
display: 'flex',
flexDirection: 'row',
alignItems: 'center',
':hover': {
backgroundColor: color.cyan
}
},
dropdownOpenButton: {
backgroundColor: color.cyan
},
fileListItem: {
display: 'flex',
flexDirection: 'row',
padding: '5px 10px 5px 10px',
width: '90%',
':hover': {
backgroundColor: color.lighter_gray
}
},
fileListItemDark: {
':hover': {
backgroundColor: color.black
}
},
fileListLabel: {
marginLeft: 5
},
importButton: {
backgroundColor: color.orange,
color: color.white,
fontSize: 13,
padding: '5px 16px'
},
backpackIcon: {
height: 15,
paddingRight: 8,
opacity: 1
}
};
15 changes: 12 additions & 3 deletions apps/src/javalab/JavalabButton.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,32 @@ import color from '@cdo/apps/util/color';
// TODO: This component should be refactored to use <Button/> (apps/src/templates/Button.jsx).
// In order for that to work, we will need to refactor <Button/> to allow a button's icon and
// text to be vertically stacked.
export default function JavalabButton({icon, text, style, onClick}) {
export default function JavalabButton({
icon,
text,
style,
onClick,
isHorizontal
}) {
return (
<button
type="button"
style={{...styles.button, ...style}}
onClick={onClick}
>
{icon}
{text && <div style={icon && styles.padding}>{text}</div>}
{text && (
<div style={icon && !isHorizontal ? styles.padding : {}}>{text}</div>
)}
</button>
);
}
JavalabButton.propTypes = {
icon: PropTypes.node,
text: PropTypes.string,
style: PropTypes.object,
onClick: PropTypes.func.isRequired
onClick: PropTypes.func.isRequired,
isHorizontal: PropTypes.bool
};

const styles = {
Expand Down
19 changes: 11 additions & 8 deletions apps/src/javalab/JavalabEditor.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import NameFileDialog from './NameFileDialog';
import DeleteConfirmationDialog from './DeleteConfirmationDialog';
import JavalabEditorTabMenu from './JavalabEditorTabMenu';
import JavalabFileExplorer from './JavalabFileExplorer';
import Backpack from './Backpack';
import FontAwesome from '@cdo/apps/templates/FontAwesome';
import _ from 'lodash';
import msg from '@cdo/locale';
Expand Down Expand Up @@ -61,6 +62,13 @@ const style = {
marginBottom: 0,
display: 'flex',
alignItems: 'center'
},
backpackSection: {
textAlign: 'left',
display: 'inline-block',
float: 'left',
overflow: 'visible',
marginLeft: 3
}
};

Expand Down Expand Up @@ -471,14 +479,9 @@ class JavalabEditor extends React.Component {
label={javalabMsg.newFile()}
leftJustified
/>
<PaneButton
id="javalab-editor-backpack"
iconClass="fa fa-briefcase"
headerHasFocus
isRtl={false}
label={javalabMsg.backpackLabel()}
leftJustified
/>
<PaneSection style={style.backpackSection}>
<Backpack isDarkMode={isDarkMode} />
</PaneSection>
<PaneButton
id="data-mode-versions-header"
iconClass="fa fa-clock-o"
Expand Down
Binary file added apps/static/javalab/backpack.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.