mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-24 10:27:10 +02:00
This commit is contained in:
parent
3367b52b53
commit
b695acf4ed
@ -1002,6 +1002,9 @@ packages/app-mobile/components/SelectDateTimeDialog.js.map
|
|||||||
packages/app-mobile/components/SideMenu.d.ts
|
packages/app-mobile/components/SideMenu.d.ts
|
||||||
packages/app-mobile/components/SideMenu.js
|
packages/app-mobile/components/SideMenu.js
|
||||||
packages/app-mobile/components/SideMenu.js.map
|
packages/app-mobile/components/SideMenu.js.map
|
||||||
|
packages/app-mobile/components/app-nav.d.ts
|
||||||
|
packages/app-mobile/components/app-nav.js
|
||||||
|
packages/app-mobile/components/app-nav.js.map
|
||||||
packages/app-mobile/components/TextInput.d.ts
|
packages/app-mobile/components/TextInput.d.ts
|
||||||
packages/app-mobile/components/TextInput.js
|
packages/app-mobile/components/TextInput.js
|
||||||
packages/app-mobile/components/TextInput.js.map
|
packages/app-mobile/components/TextInput.js.map
|
||||||
|
3
.gitignore
vendored
3
.gitignore
vendored
@ -990,6 +990,9 @@ packages/app-mobile/components/SelectDateTimeDialog.js.map
|
|||||||
packages/app-mobile/components/SideMenu.d.ts
|
packages/app-mobile/components/SideMenu.d.ts
|
||||||
packages/app-mobile/components/SideMenu.js
|
packages/app-mobile/components/SideMenu.js
|
||||||
packages/app-mobile/components/SideMenu.js.map
|
packages/app-mobile/components/SideMenu.js.map
|
||||||
|
packages/app-mobile/components/app-nav.d.ts
|
||||||
|
packages/app-mobile/components/app-nav.js
|
||||||
|
packages/app-mobile/components/app-nav.js.map
|
||||||
packages/app-mobile/components/TextInput.d.ts
|
packages/app-mobile/components/TextInput.d.ts
|
||||||
packages/app-mobile/components/TextInput.js
|
packages/app-mobile/components/TextInput.js
|
||||||
packages/app-mobile/components/TextInput.js.map
|
packages/app-mobile/components/TextInput.js.map
|
||||||
|
@ -1,17 +1,37 @@
|
|||||||
const React = require('react');
|
import * as React from 'react';
|
||||||
const Component = React.Component;
|
import { connect } from 'react-redux';
|
||||||
const { connect } = require('react-redux');
|
|
||||||
const { NotesScreen } = require('./screens/notes.js');
|
const { NotesScreen } = require('./screens/notes.js');
|
||||||
const { SearchScreen } = require('./screens/search.js');
|
const { SearchScreen } = require('./screens/search.js');
|
||||||
const { KeyboardAvoidingView, Keyboard, Platform, View } = require('react-native');
|
import { Component } from 'react';
|
||||||
|
import { KeyboardAvoidingView, Keyboard, Platform, View, KeyboardEvent, Dimensions, EmitterSubscription } from 'react-native';
|
||||||
|
import { AppState } from '../utils/types';
|
||||||
const { themeStyle } = require('./global-style.js');
|
const { themeStyle } = require('./global-style.js');
|
||||||
|
|
||||||
class AppNavComponent extends Component {
|
interface State {
|
||||||
constructor() {
|
autoCompletionBarExtraHeight: number;
|
||||||
super();
|
floatingKeyboardEnabled: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
route: any;
|
||||||
|
screens: any;
|
||||||
|
dispatch: (action: any)=> void;
|
||||||
|
themeId: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
class AppNavComponent extends Component<Props, State> {
|
||||||
|
private previousRouteName_: string|null = null;
|
||||||
|
private keyboardDidShowListener: EmitterSubscription|null = null;
|
||||||
|
private keyboardDidHideListener: EmitterSubscription|null = null;
|
||||||
|
private keyboardWillChangeFrameListener: EmitterSubscription|null = null;
|
||||||
|
|
||||||
|
constructor(props: Props) {
|
||||||
|
super(props);
|
||||||
|
|
||||||
this.previousRouteName_ = null;
|
this.previousRouteName_ = null;
|
||||||
this.state = {
|
this.state = {
|
||||||
autoCompletionBarExtraHeight: 0, // Extra padding for the auto completion bar at the top of the keyboard
|
autoCompletionBarExtraHeight: 0, // Extra padding for the auto completion bar at the top of the keyboard
|
||||||
|
floatingKeyboardEnabled: false,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -19,14 +39,18 @@ class AppNavComponent extends Component {
|
|||||||
if (Platform.OS === 'ios') {
|
if (Platform.OS === 'ios') {
|
||||||
this.keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', this.keyboardDidShow.bind(this));
|
this.keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', this.keyboardDidShow.bind(this));
|
||||||
this.keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', this.keyboardDidHide.bind(this));
|
this.keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', this.keyboardDidHide.bind(this));
|
||||||
|
this.keyboardWillChangeFrameListener = Keyboard.addListener('keyboardWillChangeFrame', this.keyboardWillChangeFrame);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
if (this.keyboardDidShowListener) this.keyboardDidShowListener.remove();
|
this.keyboardDidShowListener?.remove();
|
||||||
if (this.keyboardDidHideListener) this.keyboardDidHideListener.remove();
|
this.keyboardDidHideListener?.remove();
|
||||||
|
this.keyboardWillChangeFrameListener?.remove();
|
||||||
|
|
||||||
this.keyboardDidShowListener = null;
|
this.keyboardDidShowListener = null;
|
||||||
this.keyboardDidHideListener = null;
|
this.keyboardDidHideListener = null;
|
||||||
|
this.keyboardWillChangeFrameListener = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
keyboardDidShow() {
|
keyboardDidShow() {
|
||||||
@ -37,6 +61,16 @@ class AppNavComponent extends Component {
|
|||||||
this.setState({ autoCompletionBarExtraHeight: 0 });
|
this.setState({ autoCompletionBarExtraHeight: 0 });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
keyboardWillChangeFrame = (evt: KeyboardEvent) => {
|
||||||
|
const windowWidth = Dimensions.get('window').width;
|
||||||
|
|
||||||
|
// If the keyboard isn't as wide as the window, the floating keyboard is diabled.
|
||||||
|
// See https://github.com/facebook/react-native/issues/29473#issuecomment-696658937
|
||||||
|
this.setState({
|
||||||
|
floatingKeyboardEnabled: evt.endCoordinates.width < windowWidth,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
if (!this.props.route) throw new Error('Route must not be null');
|
if (!this.props.route) throw new Error('Route must not be null');
|
||||||
|
|
||||||
@ -67,8 +101,17 @@ class AppNavComponent extends Component {
|
|||||||
|
|
||||||
const style = { flex: 1, backgroundColor: theme.backgroundColor };
|
const style = { flex: 1, backgroundColor: theme.backgroundColor };
|
||||||
|
|
||||||
|
// When the floating keybaord is enabled, the KeyboardAvoidingView can have a very small
|
||||||
|
// height. Don't use the KeyboardAvoidingView when the floating keyboard is enabled.
|
||||||
|
// See https://github.com/facebook/react-native/issues/29473
|
||||||
|
const keyboardAvoidingViewEnabled = !this.state.floatingKeyboardEnabled;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'padding' : null} style={style}>
|
<KeyboardAvoidingView
|
||||||
|
enabled={keyboardAvoidingViewEnabled}
|
||||||
|
behavior={Platform.OS === 'ios' ? 'padding' : null}
|
||||||
|
style={style}
|
||||||
|
>
|
||||||
<NotesScreen visible={notesScreenVisible} navigation={{ state: route }} />
|
<NotesScreen visible={notesScreenVisible} navigation={{ state: route }} />
|
||||||
{searchScreenLoaded && <SearchScreen visible={searchScreenVisible} navigation={{ state: route }} />}
|
{searchScreenLoaded && <SearchScreen visible={searchScreenVisible} navigation={{ state: route }} />}
|
||||||
{!notesScreenVisible && !searchScreenVisible && <Screen navigation={{ state: route }} themeId={this.props.themeId} dispatch={this.props.dispatch} />}
|
{!notesScreenVisible && !searchScreenVisible && <Screen navigation={{ state: route }} themeId={this.props.themeId} dispatch={this.props.dispatch} />}
|
||||||
@ -78,7 +121,7 @@ class AppNavComponent extends Component {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const AppNav = connect(state => {
|
const AppNav = connect((state: AppState) => {
|
||||||
return {
|
return {
|
||||||
route: state.route,
|
route: state.route,
|
||||||
themeId: state.settings.theme,
|
themeId: state.settings.theme,
|
Loading…
Reference in New Issue
Block a user