Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(mobile): 修复原生建群表单触摸与内容高度

nanae4b1d612411f
diff --git a/apps/mobile/src/__tests__/composerSheetOrientation.test.tsx b/apps/mobile/src/__tests__/composerSheetOrientation.test.tsx
index f96359feb6..1d6c5f6049 100644
--- a/apps/mobile/src/__tests__/composerSheetOrientation.test.tsx
+++ b/apps/mobile/src/__tests__/composerSheetOrientation.test.tsx
@@ -7,24 +7,29 @@ import { CompanionSheet } from '../session/CompanionSheet.ios';
import { FormSheet } from '../session/FormSheet.ios';
import { ScrollView as RNScrollView } from 'react-native';
import { onGeometryChange, presentationDetents } from '@expo/ui/swift-ui/modifiers';
-const state = vi.hoisted(() => ({ width: 402, height: 874, sheet: null as any, formModal: null as any }));
+const state = vi.hoisted(() => ({ width: 402, height: 874, sheet: null as any, formScreen: null as any, formStack: null as any }));
vi.mock('../session/ComposerSheet', async () => import('../session/ComposerSheet.ios'));
vi.mock('react-native', () => ({
View: ({ children, style }: any) => <div style={style}>{children}</div>,
ScrollView: ({ children, maintainVisibleContentPosition }: any) => <section data-rn-scroll data-preserve-position={maintainVisibleContentPosition?.minIndexForVisible}>{children}</section>,
useWindowDimensions: () => ({ width: state.width, height: state.height }),
- Modal: (props: any) => { state.formModal = props; return props.children; },
+ Modal: () => { throw new Error('A native stack must own form presentation without a second Modal touch root'); },
ActivityIndicator: () => <span role="progressbar" />,
StyleSheet: { create: (styles: any) => styles },
}));
vi.mock('react-native-screens', () => ({
- ScreenStack: ({ children }: any) => children,
- ScreenStackItem: ({ headerConfig, children }: any) => <div>
- <nav>{[...headerConfig.headerLeftBarButtonItems, ...headerConfig.headerRightBarButtonItems].map((item: any) =>
- <button key={item.identifier} data-testid={item.identifier} aria-label={item.accessibilityLabel}
- data-system-image={item.icon?.name} disabled={item.disabled} onClick={item.onPress}>{item.title}</button>)}</nav>
- {children}
- </div>,
+ ScreenStack: (props: any) => { state.formStack = props; return props.children; },
+ ScreenStackItem: (props: any) => {
+ const { headerConfig, children } = props;
+ if (headerConfig.hidden) return null;
+ state.formScreen = props;
+ return <div>
+ <nav>{[...headerConfig.headerLeftBarButtonItems, ...headerConfig.headerRightBarButtonItems].map((item: any) =>
+ <button key={item.identifier} data-testid={item.identifier} aria-label={item.accessibilityLabel}
+ data-system-image={item.icon?.name} disabled={item.disabled} onClick={item.onPress}>{item.title}</button>)}</nav>
+ {children}
+ </div>;
+ },
}));
vi.mock('../session/CompanionNativeContent.ios', () => ({
CompanionNativeContent: ({ children }: any) => <div data-rn-size="content">{children}</div>,
@@ -119,15 +124,14 @@ it('selects a supported native detent when opening and rotating a menu', () => {
} finally { act(() => root.unmount()); }
});
-// #7658: cover the native form's callback boundary, not its pixel appearance.
-// Existing SwiftUI tests do not exercise UIBarButtonItems or Modal.onDismiss.
-// Unit input: a long form, then a pending submit. Native rendering needs iOS acceptance.
+// #7658: native appearance/dismissal events guard focus and opening the created group.
+// RN Modal + ScreenStack swallowed row touches on-device; this mock rejects that nesting.
it('keeps native form actions outside the roster and waits for completed dismissal', () => {
const container = document.createElement('div');
const root = createRoot(container);
const close = vi.fn(); const create = vi.fn();
const closed = vi.fn(); const shown = vi.fn();
- const render = (busy = false) => act(() => root.render(<FormSheet visible title="New group" onClose={close}
+ const render = (busy = false, visible = true) => act(() => root.render(<FormSheet visible={visible} title="New group" onClose={close}
onClosed={closed} onShow={shown} preventDismiss={busy}
leadingAction={{ label: 'Close', disabled: busy, onPress: close, testID: 'close' }}
trailingAction={{ label: 'Create', busy, onPress: create, testID: 'create' }}>
@@ -146,18 +150,36 @@ it('keeps native form actions outside the roster and waits for completed dismiss
expect(close).toHaveBeenCalledOnce();
expect(create).toHaveBeenCalledOnce();
expect(closed).not.toHaveBeenCalled();
- act(() => state.formModal.onShow());
+ act(() => state.formScreen.onAppear());
expect(shown).toHaveBeenCalledOnce();
render(true);
- expect(state.formModal.allowSwipeDismissal).toBe(false);
+ expect(state.formScreen.gestureEnabled).toBe(false);
+ expect(state.formScreen.preventNativeDismiss).toBe(true);
act(() => (container.querySelector('[data-testid=close]') as HTMLButtonElement).click());
act(() => (container.querySelector('[data-testid=create]') as HTMLButtonElement).click());
expect(close).toHaveBeenCalledOnce();
expect(create).toHaveBeenCalledOnce();
expect(container.querySelector('[role=progressbar]')).not.toBeNull();
expect(viewport.querySelector('[role=progressbar]')).toBeNull();
- act(() => state.formModal.onDismiss());
+ const dismissed = state.formScreen.onDismissed;
+ render(false, false);
+ expect(closed).not.toHaveBeenCalled();
+ act(() => state.formStack.onFinishTransitioning());
+ expect(closed).toHaveBeenCalledOnce();
+ act(() => state.formStack.onFinishTransitioning());
expect(closed).toHaveBeenCalledOnce();
+ act(() => dismissed());
+ expect(close).toHaveBeenCalledOnce();
+ expect(closed).toHaveBeenCalledOnce();
+ render();
+ act(() => state.formScreen.onAppear());
+ expect(shown).toHaveBeenCalledTimes(2);
+ act(() => state.formScreen.onDismissed());
+ expect(close).toHaveBeenCalledTimes(2);
+ expect(closed).toHaveBeenCalledTimes(2);
+ render(false, false);
+ act(() => state.formStack.onFinishTransitioning());
+ expect(closed).toHaveBeenCalledTimes(2);
} finally { act(() => root.unmount()); }
});
diff --git a/apps/mobile/src/session/FormSheet.ios.tsx b/apps/mobile/src/session/FormSheet.ios.tsx
index 9ab37a4f50..05b559409b 100644
--- a/apps/mobile/src/session/FormSheet.ios.tsx
+++ b/apps/mobile/src/session/FormSheet.ios.tsx
@@ -1,30 +1,38 @@
-import { ActivityIndicator, Modal, ScrollView, StyleSheet } from 'react-native';
+import { useRef } from 'react';
+import { ActivityIndicator, ScrollView, StyleSheet, useWindowDimensions } from 'react-native';
import { ScreenStack, ScreenStackItem } from 'react-native-screens';
import { spacing, useTheme } from '@/theme';
import type { FormSheetProps } from './FormSheet';
-/** UIKit navigation in a page sheet; onClosed waits for native dismissal. */
+/** A single native stack owns presentation and touch handling. */
export function FormSheet({
visible, title, onClose, onClosed, onShow, preventDismiss = false,
leadingAction, trailingAction, children, testID,
}: FormSheetProps) {
const { mode, colors } = useTheme();
+ const { width, height } = useWindowDimensions();
+ const presented = useRef(false);
+ const visibleRef = useRef(visible);
+ visibleRef.current = visible;
+ const finishClose = () => {
+ if (!presented.current) return;
+ presented.current = false;
+ onClosed?.();
+ };
return (
- <Modal
- visible={visible}
- presentationStyle="pageSheet"
- animationType="slide"
- supportedOrientations={['portrait', 'portrait-upside-down', 'landscape-left', 'landscape-right']}
- allowSwipeDismissal={!preventDismiss}
- onRequestClose={onClose}
- onDismiss={onClosed}
- onShow={onShow}
- >
- <ScreenStack style={styles.fill} nativeContainerStyle={{ backgroundColor: colors.surface }}>
- <ScreenStackItem
+ <ScreenStack style={[styles.anchor, visible && { width, height }]} pointerEvents="box-none"
+ onFinishTransitioning={() => { if (!visible) finishClose(); }}>
+ <ScreenStackItem screenId="form-sheet-anchor" activityState={2}
+ pointerEvents="none" style={StyleSheet.absoluteFill} headerConfig={{ hidden: true }} />
+ {visible ? <ScreenStackItem
+ stackPresentation="pageSheet"
+ gestureEnabled={!preventDismiss}
+ preventNativeDismiss={preventDismiss}
+ onAppear={() => { presented.current = true; onShow?.(); }}
+ onDismissed={() => { if (visibleRef.current) onClose(); finishClose(); }}
screenId={testID ?? 'form-sheet'}
activityState={2}
- style={styles.fill}
+ style={[StyleSheet.absoluteFill, { backgroundColor: colors.surface }]}
contentStyle={{ backgroundColor: colors.surface }}
headerConfig={{
title,
@@ -70,13 +78,13 @@ export function FormSheet({
</ScrollView>
{trailingAction.busy ? <ActivityIndicator style={styles.progress} color={colors.textSecondary}
accessibilityLabel={trailingAction.accessibilityLabel ?? trailingAction.label} /> : null}
- </ScreenStackItem>
- </ScreenStack>
- </Modal>
+ </ScreenStackItem> : null}
+ </ScreenStack>
);
}
const styles = StyleSheet.create({
+ anchor: { position: 'absolute', width: 0, height: 0 },
fill: { flex: 1 },
progress: { paddingVertical: spacing.sm },
content: { paddingHorizontal: spacing.lg, paddingTop: spacing.sm, paddingBottom: spacing.lg },