toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not use extra keyboard on Android (#8651)

Browse source
This commit is contained in:
Elias Nahum 2025-03-11 22:04:15 +08:00 committed by GitHub
parent 1c8770c74d
commit 915692d828
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/components/post_draft/post_draft.tsx
View file

@ -2,6 +2,7 @@
// See LICENSE.txt for license information.
import React, {useEffect, useState} from 'react';
import {Platform} from 'react-native';
import Autocomplete from '@components/autocomplete';
import {ExtraKeyboard} from '@context/extra_keyboard';
@ -122,7 +123,7 @@ function PostDraft({
<>
{draftHandler}
{autoComplete}
<ExtraKeyboard/>
{Platform.OS !== 'android' && <ExtraKeyboard/>}
</>
);
}

37
app/screens/navigation.ts
View file

@ -3,15 +3,14 @@
/* eslint-disable max-lines */
import RNUtils from '@mattermost/rnutils';
import merge from 'deepmerge';
import {Appearance, DeviceEventEmitter, StatusBar, Platform, Alert, type EmitterSubscription} from 'react-native';
import {type ComponentWillAppearEvent, type ImageResource, type LayoutOrientation, Navigation, type Options, OptionsModalPresentationStyle, type OptionsTopBarButton, type ScreenPoppedEvent, type EventSubscription, type ComponentDidAppearEvent} from 'react-native-navigation';
import {type ComponentWillAppearEvent, type ImageResource, type LayoutOrientation, Navigation, type Options, OptionsModalPresentationStyle, type OptionsTopBarButton, type ScreenPoppedEvent, type EventSubscription} from 'react-native-navigation';
import tinyColor from 'tinycolor2';
import CompassIcon from '@components/compass_icon';
import {Events, Screens, Launch} from '@constants';
import {NOT_READY, SCREENS_WITH_EXTRA_KEYBOARD} from '@constants/screens';
import {NOT_READY} from '@constants/screens';
import {getDefaultThemeByAppearance} from '@context/theme';
import EphemeralStore from '@store/ephemeral_store';
import NavigationStore from '@store/navigation_store';
@ -40,8 +39,15 @@ export function registerNavigationListeners() {
Navigation.events().registerScreenPoppedListener(onPoppedListener),
Navigation.events().registerCommandListener(onCommandListener),
Navigation.events().registerComponentWillAppearListener(onScreenWillAppear),
Navigation.events().registerComponentDidAppearListener(onScreenDidAppear),
Navigation.events().registerComponentDidDisappearListener(onScreenDidDisappear),
/**
* For the time being and until we add the emoji picker in the keyboard area
* will keep Android as adjustResize cause useAnimatedKeyboard from reanimated
* is reporting the wrong values when the keyboard was opened but we switch
* to a different channel or thread.
*/
// Navigation.events().registerComponentDidAppearListener(onScreenDidAppear),
// Navigation.events().registerComponentDidDisappearListener(onScreenDidDisappear),
];
}
@ -79,33 +85,12 @@ function onPoppedListener({componentId}: ScreenPoppedEvent) {
NavigationStore.removeScreenFromStack(componentId as AvailableScreens);
}
function setAndroidSoftKeyboard(screen: AvailableScreens) {
if (Platform.OS !== 'android') {
return;
}
if (SCREENS_WITH_EXTRA_KEYBOARD.has(screen) || (isTablet() && screen === Screens.HOME)) {
RNUtils.setSoftKeyboardToAdjustNothing();
} else {
RNUtils.setSoftKeyboardToAdjustResize();
}
}
function onScreenWillAppear(event: ComponentWillAppearEvent) {
if (event.componentId === Screens.HOME) {
DeviceEventEmitter.emit(Events.TAB_BAR_VISIBLE, true);
}
}
function onScreenDidAppear(event: ComponentDidAppearEvent) {
setAndroidSoftKeyboard(event.componentId as AvailableScreens);
}
function onScreenDidDisappear() {
const screen = NavigationStore.getVisibleScreen();
setAndroidSoftKeyboard(screen);
}
export const loginAnimationOptions = () => {
const theme = getThemeFromState();
return {