Skip to content

Commit

Permalink
Working version of command palette #244
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas101 committed Jan 14, 2019
1 parent 0da37d7 commit b31f37c
Show file tree
Hide file tree
Showing 24 changed files with 767 additions and 244 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -87,7 +87,7 @@
"terser-webpack-plugin": "1.2.1",
"url-loader": "1.1.2",
"uuid": "3.3.2",
"webpack": "4.28.1",
"webpack": "4.28.4",
"webpack-cli": "3.2.1",
"webpack-notifier": "1.7.0",
"webpack-target-electron-renderer": "0.4.0",
Expand Down
6 changes: 3 additions & 3 deletions src/scenes/content/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/scenes/content/package.json
Expand Up @@ -11,7 +11,7 @@
"@fortawesome/free-regular-svg-icons": "5.6.3",
"@fortawesome/free-solid-svg-icons": "5.6.3",
"@fortawesome/react-fontawesome": "0.1.3",
"@material-ui/core": "3.8.2",
"@material-ui/core": "3.8.3",
"@material-ui/icons": "3.0.2",
"alt": "0.18.6",
"classnames": "2.2.6",
Expand Down
6 changes: 3 additions & 3 deletions src/scenes/keychain/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/scenes/keychain/package.json
Expand Up @@ -5,7 +5,7 @@
"repository": "https://github.com/wavebox/waveboxapp",
"description": "Keychain UI for Wavebox",
"dependencies": {
"@material-ui/core": "3.8.2",
"@material-ui/core": "3.8.3",
"@material-ui/icons": "3.0.2",
"prop-types": "15.6.2",
"react": "16.7.0",
Expand Down
15 changes: 8 additions & 7 deletions src/scenes/mailboxes/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/scenes/mailboxes/package.json
Expand Up @@ -14,7 +14,7 @@
"@fortawesome/free-regular-svg-icons": "5.6.3",
"@fortawesome/free-solid-svg-icons": "5.6.3",
"@fortawesome/react-fontawesome": "0.1.3",
"@material-ui/core": "3.8.2",
"@material-ui/core": "3.8.3",
"@material-ui/icons": "3.0.2",
"addressparser": "1.0.1",
"alt": "0.18.6",
Expand Down Expand Up @@ -46,7 +46,7 @@
"react-router": "4.3.1",
"react-router-dom": "4.3.1",
"react-scrollspy": "3.3.5",
"react-sortable-hoc": "1.3.1",
"react-sortable-hoc": "1.4.0",
"react-tappable": "1.0.4",
"react-timeago": "4.1.9",
"semver": "5.6.0",
Expand Down
Expand Up @@ -218,7 +218,9 @@ class ServiceTooltip extends React.Component {
* @param bookmarkItem: the bookmark item to edit
*/
handleEditBookmark = (evt, serviceId, bookmarkItem) => {
window.location.hash = `/bookmark/edit/${serviceId}/${bookmarkItem.id}`
this.setState({ open: false }, () => {
window.location.hash = `/bookmark/edit/${serviceId}/${bookmarkItem.id}`
})
}

/**
Expand Down
Expand Up @@ -31,6 +31,7 @@ const styles = {
favicon: {
height: 36,
width: 36,
textIndent: -100000,
border: '1px solid #EEE',
backgroundImage: 'repeating-linear-gradient(45deg, #EEE, #EEE 2px, #FFF 2px, #FFF 5px)',
marginRight: 12
Expand Down
Expand Up @@ -4,9 +4,20 @@ import shallowCompare from 'react-addons-shallow-compare'
import Zoom from '@material-ui/core/Zoom'
import { RouterDialog } from 'Components/RouterDialog'
import CommandPaletteSceneContent from './CommandPaletteSceneContent'
import { withStyles } from '@material-ui/core/styles'

const TRANSITION_DURATION = 50

const styles = {
root: {
height: '100%',
minWidth: 600,
backgroundColor: 'rgba(245, 245, 245, 0.95)',
borderRadius: 10
}
}

@withStyles(styles)
class CommandPaletteScene extends React.Component {
/* **************************************************************************/
// PropTypes
Expand Down Expand Up @@ -40,15 +51,16 @@ class CommandPaletteScene extends React.Component {
}

render () {
const { routeName } = this.props
const { routeName, classes } = this.props

return (
<RouterDialog
routeName={routeName}
disableEnforceFocus
transitionDuration={TRANSITION_DURATION}
TransitionComponent={Zoom}
onClose={this.handleClose}>
onClose={this.handleClose}
classes={{ paper: classes.root }}>
<CommandPaletteSceneContent />
</RouterDialog>
)
Expand Down

0 comments on commit b31f37c

Please sign in to comment.