Skip to content
This repository was archived by the owner on Feb 21, 2020. It is now read-only.

Commit 300518f

Browse files
authored
Merge pull request #162 from BoostIO/fix-button-bug
Fix button bug on note modal
2 parents 9ea867f + 84c039f commit 300518f

File tree

2 files changed

+47
-41
lines changed

2 files changed

+47
-41
lines changed

app/views/note/DropboxNoteModal.js

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ import {
1313
import {
1414
Container,
1515
Content,
16-
ActionSheet
16+
ActionSheet,
17+
Root
1718
} from 'native-base'
1819

1920
import Modal from 'react-native-modalbox'
@@ -260,27 +261,29 @@ export default class DropboxNoteModal extends React.Component {
260261

261262
render () {
262263
return (
263-
<Modal
264-
coverScreen
265-
isOpen={this.state.isNoteOpen}
266-
position={'top'}
267-
swipeToClose={false}
268-
onClosed={() => this.onCloseModal()}>
269-
<Container>
270-
<HeaderComponent
271-
setIsOpen={this.props.setIsOpen}
272-
folderName='Dropbox'
273-
handleSwitchEditButtonClick={this.handleSwitchEditButtonClick.bind(this)}
274-
isEditting={this.state.isEditting}
275-
handlePressDetailButton={this.handlePressDetailButton.bind(this)} />
276-
<Content keyboardShouldPersistTaps='always'>
277-
<ActivityIndicator animating={this.state.isLoading} />
278-
{this.state.isLoading
279-
? null
280-
: this.getNoteComponent()}
281-
</Content>
282-
</Container>
283-
</Modal>
264+
<Root>
265+
<Modal
266+
coverScreen
267+
isOpen={this.state.isNoteOpen}
268+
position={'top'}
269+
swipeToClose={false}
270+
onClosed={() => this.onCloseModal()}>
271+
<Container>
272+
<HeaderComponent
273+
setIsOpen={this.props.setIsOpen}
274+
folderName='Dropbox'
275+
handleSwitchEditButtonClick={this.handleSwitchEditButtonClick.bind(this)}
276+
isEditting={this.state.isEditting}
277+
handlePressDetailButton={this.handlePressDetailButton.bind(this)} />
278+
<Content keyboardShouldPersistTaps='always'>
279+
<ActivityIndicator animating={this.state.isLoading} />
280+
{this.state.isLoading
281+
? null
282+
: this.getNoteComponent()}
283+
</Content>
284+
</Container>
285+
</Modal>
286+
</Root>
284287
)
285288
}
286289
}

app/views/note/NoteModal.js

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import {
1111
import {
1212
Container,
1313
Content,
14-
ActionSheet
14+
ActionSheet,
15+
Root
1516
} from 'native-base'
1617

1718
import Modal from 'react-native-modalbox'
@@ -186,24 +187,26 @@ export default class NoteModal extends React.Component {
186187

187188
render () {
188189
return (
189-
<Modal
190-
coverScreen
191-
isOpen={this.props.isNoteOpen}
192-
position={'top'}
193-
swipeToClose={false}
194-
onClosed={() => this.props.setIsOpen('', false)}>
195-
<Container>
196-
<HeaderComponent
197-
setIsOpen={this.props.setIsOpen}
198-
folderName='All Note'
199-
handleSwitchEditButtonClick={this.handleSwitchEditButtonClick.bind(this)}
200-
isEditting={this.state.isEditting}
201-
handlePressDetailButton={this.handlePressDetailButton.bind(this)} />
202-
<Content keyboardShouldPersistTaps='always'>
203-
{this.getNoteComponent()}
204-
</Content>
205-
</Container>
206-
</Modal>
190+
<Root>
191+
<Modal
192+
coverScreen
193+
isOpen={this.props.isNoteOpen}
194+
position={'top'}
195+
swipeToClose={false}
196+
onClosed={() => this.props.setIsOpen('', false)}>
197+
<Container>
198+
<HeaderComponent
199+
setIsOpen={this.props.setIsOpen}
200+
folderName='All Note'
201+
handleSwitchEditButtonClick={this.handleSwitchEditButtonClick.bind(this)}
202+
isEditting={this.state.isEditting}
203+
handlePressDetailButton={this.handlePressDetailButton.bind(this)} />
204+
<Content keyboardShouldPersistTaps='always'>
205+
{this.getNoteComponent()}
206+
</Content>
207+
</Container>
208+
</Modal>
209+
</Root>
207210
)
208211
}
209212
}

0 commit comments

Comments
 (0)