mirror of
https://github.com/mattermost/mattermost-mobile.git
synced 2026-11-06 10:50:13 +00:00
* app fixes surfaced by detox RF migration Carve the app-side bug fixes from the migrate_RF_to_detox branch into their own PR. Includes: - NavigationStore.waitUntilScreenIsTop helper + matching switchToChannel / notification.test wiring (Screens.CHANNEL_LIST -> Screens.HOME) - Detox source build + null-guard patch for Android FabricUIManagerIdlingResources (android/settings.gradle, android/app/build.gradle, gradle.properties) - iOS Podfile: Alamofire 5.10 duplicate-allHeaders patch + stdlib embed for extensions - iOS Server screen: defer push-proxy verification alert past Navigation.push to fix iOS 26 race - Android NetworkClient: null-guard host extraction to prevent NPE on bad cert reports - ephemeral_store: track recently-unsaved saved posts with 2-min TTL - post_draft: filter undefined channel observable to prevent archived-banner flicker - queries/servers/thread: is_following nullish-coalesce to false - datetime: NaN guard for invalid scheduled-message timestamp (MM-T5720) - navigation: dismissBottomSheet handles GENERIC_BOTTOM_SHEET fallback - bottom_sheet: accessibilityViewIsModal for VoiceOver - calls websocket_client: extend interface for optional sendBinary - edit_profile: wrap Save Pressable in View to constrain Detox tap bounds (MM-T4989_2/MM-T3250) - invite/summary: fix retry testID hardcoded to use the dynamic type - channel_bookmark/bookmark_link: URL resolution timeout + setBookmarkLinkUrl - categories_list/load_channel_error: missing return statement for error UI - iOS MattermostShare: TestID-friendly testIDs on Swift share-extension views - patches/react-native-network-client: Android host null-guard patch - scripts/build.sh: copy compass-icons.ttf manually when --ignore-scripts is used - types/modules: WebSocketClientInterface sendBinary extension Matched detox specs that exercise these bugs land in the rf-split/detox-tests PR. * address CodeRabbit review on PR #9789 - post_list/index.ts, thread_options/index.ts: track serverUrl in withObservables dependency keys - post/body/index.tsx: restore React.memo(Body) to avoid per-item re-render regression - thread.tsx, edit_profile.tsx: add pressed feedback via style callback; move inline typography to stylesheet - bookmark_link.tsx: include queueFetch in useDidUpdate deps - ephemeral_store.ts: complete and delete per-post recently-unsaved subjects on expiry/clear to bound growth Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * test: fix stale mocks and add coverage for recently-unsaved saved posts Update thread/preference tests for the new NavigationStore and prepareDestroyPermanently call paths, and add unit tests for the EphemeralStore recently-unsaved saved-post logic plus the websocket filterStaleSavedPostPreferences path. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * test: tighten recently-unsaved saved post assertions Address CodeRabbit nitpicks on #9789: - preference.test.ts: assert addRecentlyUnsavedSavedPost is called once with (serverUrl, postId) so the echoed websocket re-save is filtered. - ephemeral_store.test.ts: assert the observed Set size (2 after two adds, 1 after clearing one) so we catch stray/missing entries. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * docs: explain pinned posts descending sort order The asc->desc change to queryPinnedPostsInChannel surfaced during the detox RF migration was correct but undocumented. selectOrderedPosts (reached via observePinnedPostsInChannel) iterates the posts array from the end backwards expecting oldest->newest, so it requires descending (newest-first) input, matching queryPostsInChannel. Add a comment so the sort order isn't questioned in review. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * test: cover thread/config/bottom-sheet edge cases flagged in review Add unit tests for coverage gaps identified by CodeRabbit on #9789: - createThreadFromNewPost: reply where the thread is missing but the root post exists (back-fills + auto-follows), and where neither exists (only records the participant, no crash) - processReceivedThreads: thread entry with no post/participants is skipped without crashing - markThreadAsUnread: unread_replies/unread_mentions from the API response are persisted to the local thread - getConfigBooleanValue: 'true' -> true, non-'true' -> false, missing key honors the default - dismissBottomSheet: falls back to GENERIC_BOTTOM_SHEET when only the generic variant is in the stack Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * refactor(thread_options): use withServerUrl HOC Replace the hand-rolled `ThreadOptionsWithServerUrl` wrapper (which called `useServerUrl()` inside a function component and re-created the element via `React.createElement`) with the existing `withServerUrl` HOC from `@context/server`. Composition chain becomes: withDatabase(withServerUrl(enhanced(ThreadOptions))) Addresses larkox's review on app/screens/thread_options/index.ts:41: "This is not needed. You should be able to use `withServerUrl` function." Also tightens the Props type — `serverUrl` is now required (the HOC guarantees it), not optional. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * chore(deps): bump react-native-network-client to 1.10.2; drop workarounds 1.10.2 upstreams both fixes that were being carried locally: - iOS: apply_patches.rb is now idempotent (mattermost/react-native-network-client#167), so its bundled Alamofire diff can no longer double-apply. Removes the need for the Podfile post_install workaround that stripped the duplicate `let allHeaders` (Swift 6 / Xcode 26 "invalid redeclaration"). Workaround deleted. - Android: the cert-error host null-fallback in NetworkClient.kt is now upstream (and improved — prefers HttpUrl host, then URI, then baseUrlString; references #9789). The patch-package patch (@mattermost+react-native-network-client+1.10.0.patch) is therefore obsolete and deleted. It was also a silent no-op here anyway — named 1.10.0 while 1.10.1 was installed, so patch-package skipped it. Addresses @enahum's review on #9789: the fix belongs in network-client, not patched downstream — and it now is. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * chore(ios): update Podfile.lock for rnnc 1.10.2 Run `pod install` to sync Podfile.lock with the dependency bump in the previous commit: - react-native-network-client 1.10.1 → 1.10.2 - its pod checksum recomputed - PODFILE CHECKSUM recomputed (the Podfile changed — Alamofire duplicate-allHeaders workaround removed) The previous commit bumped package.json + ran npm install but did not regenerate Podfile.lock, so the iOS lockfile-consistency check would have failed (caught in review by @enahum). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * refactor(thread): use shared NavigationButton for header back Addresses @larkox's review on #9789: the thread route hand-rolled its header back button with a raw Pressable + CompassIcon + local StyleSheet, which is inconsistent with the rest of the app. Switch to the shared NavigationButton component — the same pattern used by app/screens/code/index.tsx, custom_status_clear_after, channel_bookmark, and the getModalHeaderOptions/getLoginModalHeaderOptions helpers (navigation.setOptions → NavigationButton with iconName/iconSize/color/ onPress/testID). Behavior is unchanged (still navigation.goBack() via handleBack) and the testID 'thread.navigation.back.button' is preserved for Detox. Net effect in the app: Android now gets the standard header ripple, a larger hitSlop touch target, and the arrow aligns like other NavigationButton headers. Removes the local styles, Pressable, StyleSheet, and CompassIcon imports. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
226 lines
6.7 KiB
TypeScript
226 lines
6.7 KiB
TypeScript
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
import BottomSheetM, {BottomSheetBackdrop, type BottomSheetBackdropProps} from '@gorhom/bottom-sheet';
|
|
import React, {forwardRef, type ReactNode, useCallback, useEffect, useImperativeHandle, useMemo, useRef} from 'react';
|
|
import {DeviceEventEmitter, type StyleProp, View, type ViewStyle} from 'react-native';
|
|
import {ReduceMotion, useReducedMotion, type WithSpringConfig} from 'react-native-reanimated';
|
|
import {useSafeAreaInsets} from 'react-native-safe-area-context';
|
|
|
|
import {Events} from '@constants';
|
|
import {useTheme} from '@context/theme';
|
|
import useAndroidHardwareBackHandler from '@hooks/android_back_handler';
|
|
import {useIsTablet} from '@hooks/device';
|
|
import useDidMount from '@hooks/did_mount';
|
|
import {navigateBack} from '@screens/navigation';
|
|
import BottomSheetStore from '@store/bottom_sheet_store';
|
|
import {hapticFeedback} from '@utils/general';
|
|
import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme';
|
|
|
|
import BottomSheetButton, {BUTTON_HEIGHT} from './button';
|
|
import EmptyBottomSheetFooter from './footer';
|
|
import {useBottomSheetStyle} from './hooks';
|
|
|
|
import type {AvailableScreens} from '@typings/screens/navigation';
|
|
|
|
export {default as BottomSheetContent, TITLE_HEIGHT} from './content';
|
|
|
|
export {BUTTON_HEIGHT, BottomSheetButton};
|
|
|
|
export type BottomSheetRef = {
|
|
close: () => void;
|
|
};
|
|
|
|
type Props = {
|
|
screen: AvailableScreens;
|
|
contentStyle?: StyleProp<ViewStyle>;
|
|
initialSnapIndex?: number;
|
|
footerComponent?: React.FC<unknown>;
|
|
renderContent: () => ReactNode;
|
|
snapPoints?: Array<string | number>;
|
|
enableDynamicSizing?: boolean;
|
|
testID?: string;
|
|
keyboardBehavior?: 'extend' | 'fillParent' | 'interactive';
|
|
keyboardBlurBehavior?: 'none' | 'restore';
|
|
}
|
|
|
|
const PADDING_TOP_MOBILE = 20;
|
|
|
|
export const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
|
|
return {
|
|
bottomSheet: {
|
|
borderTopStartRadius: 24,
|
|
borderTopEndRadius: 24,
|
|
shadowOffset: {
|
|
width: 0,
|
|
height: 8,
|
|
},
|
|
shadowOpacity: 0.12,
|
|
shadowRadius: 24,
|
|
shadowColor: '#000',
|
|
elevation: 24,
|
|
flexGrow: 1,
|
|
height: 1,
|
|
},
|
|
bottomSheetBackground: {
|
|
backgroundColor: 'transparent',
|
|
borderColor: changeOpacity(theme.centerChannelColor, 0.16),
|
|
},
|
|
content: {
|
|
flex: 1,
|
|
paddingHorizontal: 20,
|
|
paddingTop: PADDING_TOP_MOBILE,
|
|
},
|
|
view: {
|
|
flex: 1,
|
|
},
|
|
indicator: {
|
|
backgroundColor: 'white',
|
|
},
|
|
indicatorContainer: {
|
|
marginTop: 0,
|
|
},
|
|
};
|
|
});
|
|
|
|
export const animatedConfig: Omit<WithSpringConfig, 'velocity'> = {
|
|
damping: 50,
|
|
mass: 0.3,
|
|
stiffness: 121.6,
|
|
overshootClamping: true,
|
|
energyThreshold: 0.01,
|
|
};
|
|
|
|
const BottomSheet = forwardRef<BottomSheetRef, Props>(({
|
|
screen,
|
|
contentStyle,
|
|
initialSnapIndex = 1,
|
|
footerComponent,
|
|
renderContent,
|
|
snapPoints = [1, '50%', '80%'],
|
|
testID,
|
|
enableDynamicSizing = false,
|
|
keyboardBehavior = 'extend',
|
|
keyboardBlurBehavior = 'restore',
|
|
}: Props, ref) => {
|
|
const isClosing = useRef(false);
|
|
const reducedMotion = useReducedMotion();
|
|
const sheetRef = useRef<BottomSheetM>(null);
|
|
const insets = useSafeAreaInsets();
|
|
const theme = useTheme();
|
|
const styles = getStyleSheet(theme);
|
|
const screenStyle = useBottomSheetStyle();
|
|
const isTablet = useIsTablet();
|
|
|
|
const animationConfigs = useMemo(() => ({
|
|
...animatedConfig,
|
|
reduceMotion: reducedMotion ? ReduceMotion.Always : ReduceMotion.Never,
|
|
}), [reducedMotion]);
|
|
|
|
const close = useCallback(() => {
|
|
isClosing.current = true;
|
|
BottomSheetStore.reset();
|
|
navigateBack();
|
|
}, []);
|
|
|
|
useEffect(() => {
|
|
const listenerfn = () => {
|
|
if (sheetRef.current) {
|
|
sheetRef.current.close();
|
|
} else if (!isClosing.current) {
|
|
close();
|
|
}
|
|
};
|
|
const listener = DeviceEventEmitter.addListener(Events.CLOSE_BOTTOM_SHEET, listenerfn);
|
|
|
|
return () => listener.remove();
|
|
}, [close]);
|
|
|
|
const handleClose = useCallback(() => {
|
|
if (sheetRef.current) {
|
|
sheetRef.current.close();
|
|
} else if (!isClosing.current) {
|
|
close();
|
|
}
|
|
}, [close]);
|
|
|
|
const handleChange = useCallback((index: number) => {
|
|
if (index <= 0 && !isClosing.current) {
|
|
close();
|
|
}
|
|
}, [close]);
|
|
|
|
const onBottomSheetClose = useCallback(() => {
|
|
if (!isClosing.current) {
|
|
close();
|
|
}
|
|
}, [close]);
|
|
|
|
useAndroidHardwareBackHandler(screen, handleClose);
|
|
|
|
useDidMount(() => {
|
|
hapticFeedback();
|
|
});
|
|
|
|
useImperativeHandle(ref, () => ({
|
|
close: () => {
|
|
if (sheetRef.current) {
|
|
sheetRef.current.close();
|
|
} else if (!isClosing.current) {
|
|
close();
|
|
}
|
|
},
|
|
}), [close]);
|
|
|
|
const renderBackdrop = useCallback((props: BottomSheetBackdropProps) => {
|
|
return (
|
|
<BottomSheetBackdrop
|
|
{...props}
|
|
disappearsOnIndex={0}
|
|
appearsOnIndex={1}
|
|
opacity={0.6}
|
|
/>
|
|
);
|
|
}, []);
|
|
|
|
const renderContainerContent = () => (
|
|
<View
|
|
style={[styles.content, contentStyle]}
|
|
testID={`${testID}.screen`}
|
|
accessibilityViewIsModal={!isTablet}
|
|
>
|
|
{renderContent()}
|
|
</View>
|
|
);
|
|
|
|
return (
|
|
<BottomSheetM
|
|
ref={sheetRef}
|
|
index={initialSnapIndex}
|
|
snapPoints={snapPoints}
|
|
animateOnMount={true}
|
|
backdropComponent={renderBackdrop}
|
|
onChange={handleChange}
|
|
animationConfigs={animationConfigs}
|
|
handleIndicatorStyle={styles.indicator}
|
|
handleStyle={styles.indicatorContainer}
|
|
backgroundStyle={styles.bottomSheetBackground}
|
|
footerComponent={footerComponent || EmptyBottomSheetFooter}
|
|
keyboardBehavior={keyboardBehavior}
|
|
keyboardBlurBehavior={keyboardBlurBehavior}
|
|
onClose={onBottomSheetClose}
|
|
bottomInset={footerComponent ? 0 : insets.bottom}
|
|
enableDynamicSizing={enableDynamicSizing}
|
|
accessible={false}
|
|
>
|
|
<View style={[screenStyle, styles.bottomSheet]}>
|
|
{renderContainerContent()}
|
|
</View>
|
|
</BottomSheetM>
|
|
);
|
|
});
|
|
|
|
BottomSheet.displayName = 'BottomSheet';
|
|
|
|
export default BottomSheet;
|