mirror of
https://github.com/mattermost/mattermost-mobile.git
synced 2026-11-06 10:50:13 +00:00
* Expo-Router partial migration * Full migration to ExpoRouter * i18n * add tests * Merge branch 'main' into expo-router * align package-lock.json * i18n * feedback review * feedback review * android 16kb patch * Refactored emoji picker keyboard using a state machine * set android launch_screen in drawables instead of layout * no conditional hooks * remove duplicate call in test * address feedback * fix tests and address more feedback * small corrections * small corrections * small corrections * fix draft test * fix draft test 2 * remove navigateToScreen in draff test * fix nit in draft test * remove doc file * Feedback review * fix snapshots * improve test coverage * fix i18n * Upgrade t o RN 0.83, other dependencies and new architecture (#9737) * library hardware-keyboard android new arch support fix * library rnshare android new arch support fix * library rnutils android new arch support fix * library secure-pdf-viewer add new arch support * Enable new arch on iOS and Android * update emm and network client with new-arch * update intune to use new-arch * performance improvements * fix tests * fixes post input on new-arch * fix android emoji picker * remove doc * run tests in parallel * upgrade to React Native 0.83.9, Expo 55, React 19, and New Architecture Bumps core dependencies to their latest versions: - React Native 0.77.3 → 0.83.9 (New Architecture enabled) - React 18.3.1 → 19.2.5 - Expo SDK 52 → 55 - TypeScript 5.8.3 → 6.0.3 - Node.js 22.16.0 → 24.15.0 - react-native-reanimated 3.17.3 → 4.3.0 - Various other dependency upgrades Migrates iOS AppDelegate from Objective-C to Swift, updates Android build tooling and Gradle wrapper, refreshes all patches and font assets, and adapts app code, tests, and CI workflows throughout for API changes introduced by these upgrades. * remove unecessary dismissKeyboard in notifications * feedback review * update intune to use new-arch * update @mattermost deps * missing i18n string * additional fixes * update fastlane
131 lines
4.6 KiB
TypeScript
131 lines
4.6 KiB
TypeScript
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
import {useCallback, useEffect, useRef, useState} from 'react';
|
|
import {Platform} from 'react-native';
|
|
import {scheduleOnUI} from 'react-native-worklets';
|
|
|
|
import {isAndroidEdgeToEdge} from '@constants/device';
|
|
import {useKeyboardState} from '@context/keyboard_state';
|
|
|
|
import type {PasteTextInputInstance} from '@mattermost/react-native-paste-input';
|
|
|
|
/**
|
|
* Hook to handle focusing input after emoji picker is dismissed on Android.
|
|
* On Android, when the emoji picker is open and user tries to focus the input,
|
|
* the emoji picker closes but the keyboard doesn't open. This hook handles
|
|
* the delayed focus logic to ensure the keyboard opens properly.
|
|
*
|
|
*/
|
|
export const useFocusAfterEmojiDismiss = (
|
|
inputRef: React.MutableRefObject<PasteTextInputInstance | null>,
|
|
focusInput: () => void,
|
|
) => {
|
|
const {
|
|
showInputAccessoryView,
|
|
setShowInputAccessoryView,
|
|
setIsEmojiSearchFocused,
|
|
stateContext,
|
|
stateMachine,
|
|
} = useKeyboardState();
|
|
|
|
const [isManuallyFocusingAfterEmojiDismiss, setIsManuallyFocusingAfterEmojiDismiss] = useState(false);
|
|
const isDismissingEmojiPicker = useRef(false);
|
|
const focusTimeoutRef = useRef<NodeJS.Timeout | null>(null);
|
|
|
|
// Handle focus after emoji picker is dismissed
|
|
useEffect(() => {
|
|
if (Platform.OS === 'android' && isManuallyFocusingAfterEmojiDismiss && !showInputAccessoryView) {
|
|
isDismissingEmojiPicker.current = false;
|
|
|
|
if (focusTimeoutRef.current) {
|
|
clearTimeout(focusTimeoutRef.current);
|
|
}
|
|
|
|
inputRef.current?.blur();
|
|
|
|
// Use requestAnimationFrame to ensure state updates have been applied
|
|
const raf = requestAnimationFrame(() => {
|
|
const handleDelayedFocus = () => {
|
|
focusInput();
|
|
setIsManuallyFocusingAfterEmojiDismiss(false);
|
|
focusTimeoutRef.current = null;
|
|
};
|
|
|
|
focusTimeoutRef.current = setTimeout(handleDelayedFocus, 200);
|
|
});
|
|
|
|
return () => {
|
|
if (raf) {
|
|
cancelAnimationFrame(raf);
|
|
}
|
|
|
|
if (focusTimeoutRef.current) {
|
|
clearTimeout(focusTimeoutRef.current);
|
|
focusTimeoutRef.current = null;
|
|
}
|
|
};
|
|
}
|
|
|
|
return undefined;
|
|
}, [isManuallyFocusingAfterEmojiDismiss, showInputAccessoryView, inputRef, focusInput]);
|
|
|
|
// Wrapped focus function that handles emoji picker dismissal
|
|
const focusWithEmojiDismiss = useCallback(() => {
|
|
// Android < 35: Use complex dismissal logic with delays
|
|
// Android >= 35 (EdgeToEdge): Use simple focus like iOS - state machine handles transition
|
|
if (Platform.OS === 'android' && !isAndroidEdgeToEdge && showInputAccessoryView) {
|
|
isDismissingEmojiPicker.current = true;
|
|
setIsManuallyFocusingAfterEmojiDismiss(true);
|
|
|
|
// Set guard flag to block keyboard events during transition
|
|
stateContext.isEmojiPickerTransition.value = true;
|
|
|
|
// Animate emoji picker to 0 and dispatch close event
|
|
scheduleOnUI(() => {
|
|
'worklet';
|
|
stateContext.inputAccessoryHeight.value = 0;
|
|
stateContext.postInputTranslateY.value = 0;
|
|
});
|
|
|
|
setIsEmojiSearchFocused(false);
|
|
setShowInputAccessoryView(false);
|
|
stateMachine.onUserCloseEmoji();
|
|
|
|
if (focusTimeoutRef.current) {
|
|
clearTimeout(focusTimeoutRef.current);
|
|
}
|
|
|
|
inputRef.current?.blur();
|
|
|
|
// Schedule focus after emoji picker closes
|
|
focusTimeoutRef.current = setTimeout(() => {
|
|
focusInput();
|
|
setIsManuallyFocusingAfterEmojiDismiss(false);
|
|
isDismissingEmojiPicker.current = false;
|
|
focusTimeoutRef.current = null;
|
|
|
|
// Clear guard flag after transition completes
|
|
stateContext.isEmojiPickerTransition.value = false;
|
|
}, 200);
|
|
} else {
|
|
focusInput();
|
|
}
|
|
}, [
|
|
showInputAccessoryView,
|
|
setShowInputAccessoryView,
|
|
setIsEmojiSearchFocused,
|
|
inputRef,
|
|
focusInput,
|
|
stateContext,
|
|
stateMachine,
|
|
]);
|
|
|
|
return {
|
|
focus: focusWithEmojiDismiss,
|
|
isDismissingEmojiPicker,
|
|
focusTimeoutRef,
|
|
isManuallyFocusingAfterEmojiDismiss,
|
|
};
|
|
};
|