Skip to content

Commit 7e04fd3

Browse files
committed
EnterでSubmitができる - Hotkey, folder edit, folder create(preference/create new folder modal両方)
1 parent 1fe15bc commit 7e04fd3

4 files changed

Lines changed: 31 additions & 5 deletions

File tree

lib/components/modal/CreateNewFolder.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ export default class CreateNewFolder extends React.Component {
5050
}
5151
}
5252

53+
handleKeyDown (e) {
54+
if (e.keyCode === 13) {
55+
this.handleConfirmButton()
56+
}
57+
}
58+
5359
render () {
5460
let alert = this.state.alert
5561
let alertElement = alert != null ? (
@@ -78,7 +84,7 @@ export default class CreateNewFolder extends React.Component {
7884

7985
<div className='title'>Create new folder</div>
8086

81-
<input className='ipt' type='text' valueLink={this.linkState('name')} placeholder='Enter folder name'/>
87+
<input onKeyDown={e => this.handleKeyDown(e)} className='ipt' type='text' valueLink={this.linkState('name')} placeholder='Enter folder name'/>
8288
<div className='colorSelect'>
8389
{colorElements}
8490
</div>

lib/components/modal/Preference/AppSettingTab.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,20 @@ export default class AppSettingTab extends React.Component {
3636
ipc.removeListener('APP_SETTING_ERROR', this.handleSettingError)
3737
}
3838

39-
handleSaveButtonClick (e) {
39+
submitHotKey () {
4040
ipc.send('hotkeyUpdated', {
4141
toggleFinder: this.state.toggleFinder
4242
})
4343
}
4444

45+
handleSaveButtonClick (e) {
46+
this.submitHotKey()
47+
}
48+
49+
handleKeyDown (e) {
50+
this.submitHotKey()
51+
}
52+
4553
render () {
4654
let alert = this.state.alert
4755
let alertElement = alert != null ? (
@@ -56,7 +64,7 @@ export default class AppSettingTab extends React.Component {
5664
<div className='sectionTitle'>Hotkey</div>
5765
<div className='sectionInput'>
5866
<label>Toggle Finder(popup)</label>
59-
<input valueLink={this.linkState('toggleFinder')} type='text'/>
67+
<input onKeyDown={e => this.handleKeyDown(e)} valueLink={this.linkState('toggleFinder')} type='text'/>
6068
</div>
6169
<div className='sectionConfirm'>
6270
<button onClick={e => this.handleSaveButtonClick(e)}>Save</button>

lib/components/modal/Preference/FolderRow.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ export default class FolderRow extends React.Component {
5050
this.setState({mode: DELETE})
5151
}
5252

53+
handleNameInputKeyDown (e) {
54+
if (e.keyCode === 13) {
55+
this.handleSaveButtonClick()
56+
}
57+
}
58+
5359
handleColorSelectClick (e) {
5460
this.setState({
5561
isColorEditing: true
@@ -133,7 +139,7 @@ export default class FolderRow extends React.Component {
133139
}
134140
</div>
135141
<div className='folderName'>
136-
<input valueLink={this.linkState('name')} type='text'/>
142+
<input onKeyDown={e => this.handleNameInputKeyDown(e)} valueLink={this.linkState('name')} type='text'/>
137143
</div>
138144
<div className='folderControl'>
139145
<button onClick={e => this.handleSaveButtonClick(e)} className='primary'>Save</button>

lib/components/modal/Preference/FolderSettingTab.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ export default class FolderSettingTab extends React.Component {
1212
}
1313
}
1414

15+
handleNewFolderNameKeyDown (e) {
16+
if (e.keyCode === 13) {
17+
this.handleSaveButtonClick()
18+
}
19+
}
20+
1521
handleSaveButtonClick (e) {
1622
this.setState({alert: null}, () => {
1723
if (this.state.name.trim().length === 0) return false
@@ -71,7 +77,7 @@ export default class FolderSettingTab extends React.Component {
7177
{folderElements}
7278
<div className='newFolder'>
7379
<div className='folderName'>
74-
<input valueLink={this.linkState('name')} type='text' placeholder='New Folder'/>
80+
<input onKeyDown={e => this.handleNewFolderNameKeyDown(e)} valueLink={this.linkState('name')} type='text' placeholder='New Folder'/>
7581
</div>
7682
<div className='folderControl'>
7783
<button onClick={e => this.handleSaveButtonClick(e)} className='primary'>Add</button>

0 commit comments

Comments
 (0)