mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-18 09:35:20 +02:00
17fd8ee504
* Fix quick actions
* Receive quick actions when the app is cold-launched
* Force side menu close before creating quick note
* Fix react warning: Can't perform a react state update on an unmounted component
The warning was:
Warning: Can't perform a React state update on an unmounted component. This is a no-op, but it indicates a memory leak in your application. To fix, cancel all subscriptions and asynchronous tasks in the componentWillUnmount method.
in NoteScreenComponent (created by Connect(NoteScreenComponent))
in Connect(NoteScreenComponent) (at app-nav.js:74)
* Fix auto title generation for quick notes.
The previous version created a new provisional note but then while handling NAV_BACK at reduxSharedMiddleware:35 the list of provisional note ids was cleared so when NoteScreenComponent was being mounted later the note was no longer considered provisional and Joplin would not generate the note title from its contents.
* Check for quick action data to be present before processing.
For some reason sometimes it gets called with null.
109 lines
2.6 KiB
JavaScript
109 lines
2.6 KiB
JavaScript
import React from 'react';
|
|
import { View } from 'react-native';
|
|
import PopupDialog, { DialogTitle, DialogButton } from 'react-native-popup-dialog';
|
|
import DatePicker from 'react-native-datepicker';
|
|
import moment from 'moment';
|
|
import { _ } from 'lib/locale.js';
|
|
const { time } = require('lib/time-utils.js');
|
|
|
|
class SelectDateTimeDialog extends React.PureComponent {
|
|
|
|
constructor() {
|
|
super();
|
|
this.dialog_ = null;
|
|
this.shown_ = false;
|
|
this.state = { date: null };
|
|
|
|
this.onReject = this.onReject.bind(this);
|
|
}
|
|
|
|
UNSAFE_componentWillReceiveProps(newProps) {
|
|
if (newProps.date != this.state.date) {
|
|
this.setState({ date: newProps.date });
|
|
}
|
|
|
|
if ('shown' in newProps && newProps.shown != this.shown_) {
|
|
this.show(newProps.shown);
|
|
}
|
|
}
|
|
|
|
show(doShow = true) {
|
|
if (doShow) {
|
|
this.dialog_.show();
|
|
} else {
|
|
this.dialog_.dismiss();
|
|
}
|
|
|
|
this.shown_ = doShow;
|
|
}
|
|
|
|
dismiss() {
|
|
this.show(false);
|
|
}
|
|
|
|
dateTimeFormat() {
|
|
return time.dateTimeFormat();
|
|
}
|
|
|
|
stringToDate(s) {
|
|
return moment(s, this.dateTimeFormat()).toDate();
|
|
}
|
|
|
|
onAccept() {
|
|
if (this.props.onAccept) this.props.onAccept(this.state.date);
|
|
}
|
|
|
|
onReject() {
|
|
if (this.props.onReject) this.props.onReject();
|
|
}
|
|
|
|
onClear() {
|
|
if (this.props.onAccept) this.props.onAccept(null);
|
|
}
|
|
|
|
render() {
|
|
const clearAlarmText = _('Clear alarm'); // For unknown reasons, this particular string doesn't get translated if it's directly in the text property below
|
|
|
|
const popupActions = [
|
|
<DialogButton text={_('Save alarm')} align="center" onPress={() => this.onAccept()} key="saveButton" />,
|
|
<DialogButton text={clearAlarmText} align="center" onPress={() => this.onClear()} key="clearButton" />,
|
|
<DialogButton text={_('Cancel')} align="center" onPress={() => this.onReject()} key="cancelButton" />,
|
|
];
|
|
|
|
return (
|
|
<PopupDialog
|
|
ref={(dialog) => { this.dialog_ = dialog; }}
|
|
dialogTitle={<DialogTitle title={_('Set alarm')} />}
|
|
actions={popupActions}
|
|
dismissOnTouchOutside={false}
|
|
width={0.9}
|
|
height={350}
|
|
>
|
|
<View style={{ flex: 1, margin: 20, alignItems: 'center' }}>
|
|
<DatePicker
|
|
date={this.state.date}
|
|
mode="datetime"
|
|
placeholder={_('Select date')}
|
|
format={this.dateTimeFormat()}
|
|
confirmBtnText={_('Confirm')}
|
|
cancelBtnText={_('Cancel')}
|
|
onDateChange={(date) => { this.setState({ date: this.stringToDate(date) }); }}
|
|
style={{ width: 300 }}
|
|
customStyles={{
|
|
btnConfirm: {
|
|
paddingVertical: 0,
|
|
},
|
|
btnCancel: {
|
|
paddingVertical: 0,
|
|
},
|
|
}}
|
|
/>
|
|
</View>
|
|
</PopupDialog>
|
|
);
|
|
}
|
|
|
|
}
|
|
|
|
export { SelectDateTimeDialog };
|