self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-12-20 23:30:05 +02:00
Code Issues Releases Activity

Mobile: Resolves #2595: Add undo/redo support

Browse Source
This commit is contained in:
Laurent Cozic
2020-06-13 16:20:18 +01:00
parent 341c9ba64b
commit 9a9cfbd130
8 changed files with 353 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ReactNativeClient/lib/components/screen-header.js
View File

@@ -61,8 +61,8 @@ class ScreenHeaderComponent extends React.PureComponent {
iconButton: {
flex: 1,
backgroundColor: theme.backgroundColor2,
paddingLeft: 15,
paddingRight: 15,
paddingLeft: 10,
paddingRight: 10,
paddingTop: PADDING_V,
paddingBottom: PADDING_V,
},
@@ -248,6 +248,36 @@ class ScreenHeaderComponent extends React.PureComponent {
);
}
const renderTopButton = (options) => {
if (!options.visible) return null;
const icon = <Icon name={options.iconName} style={this.styles().topIcon} />;
const viewStyle = options.disabled ? this.styles().iconButtonDisabled : this.styles().iconButton;
return (
<TouchableOpacity onPress={options.onPress} style={{ padding: 0 }} disabled={!!options.disabled}>
<View style={viewStyle}>{icon}</View>
</TouchableOpacity>
);
};
const renderUndoButton = () => {
return renderTopButton({
iconName: 'md-undo',
onPress: this.props.onUndoButtonPress,
visible: this.props.showUndoButton,
disabled: this.props.undoButtonDisabled,
});
};
const renderRedoButton = () => {
return renderTopButton({
iconName: 'md-redo',
onPress: this.props.onRedoButtonPress,
visible: this.props.showRedoButton,
});
};
function selectAllButton(styles, onPress) {
return (
<TouchableOpacity onPress={onPress}>
@@ -462,6 +492,8 @@ class ScreenHeaderComponent extends React.PureComponent {
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
{sideMenuComp}
{backButtonComp}
{renderUndoButton(this.styles())}
{renderRedoButton(this.styles())}
{saveButton(
this.styles(),
() => {