Skip to content

Commit 5821b77

Browse files
refactor(mobile): break module cycles with focused extractions (pingdotgg#13151)
1 parent 5d493d6 commit 5821b77

35 files changed

Lines changed: 431 additions & 97 deletions
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
export type ConfirmDialogRequest = {
2+
readonly title: string;
3+
readonly message?: string;
4+
readonly cancelText?: string;
5+
readonly confirmText: string;
6+
readonly destructive?: boolean;
7+
readonly onConfirm: () => void;
8+
readonly onCancel?: () => void;
9+
};
10+
11+
export type TextInputDialogRequest = {
12+
readonly title: string;
13+
readonly initialValue: string;
14+
readonly cancelText?: string;
15+
readonly confirmText: string;
16+
readonly onConfirm: (value: string) => void;
17+
readonly onCancel?: () => void;
18+
};

‎apps/mobile/src/components/ConfirmDialogHost.tsx‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,9 @@ import { Platform, Modal, Pressable, TextInput, View } from "react-native";
44
import { cn } from "../lib/cn";
55
import { AppText } from "./AppText";
66
import { MaterialConfirmDialog } from "./MaterialConfirmDialog";
7+
import type { ConfirmDialogRequest, TextInputDialogRequest } from "./ConfirmDialog.types";
78

8-
export type ConfirmDialogRequest = {
9-
readonly title: string;
10-
readonly message?: string;
11-
readonly cancelText?: string;
12-
readonly confirmText: string;
13-
readonly destructive?: boolean;
14-
readonly onConfirm: () => void;
15-
readonly onCancel?: () => void;
16-
};
17-
18-
export type TextInputDialogRequest = {
19-
readonly title: string;
20-
readonly initialValue: string;
21-
readonly cancelText?: string;
22-
readonly confirmText: string;
23-
readonly onConfirm: (value: string) => void;
24-
readonly onCancel?: () => void;
25-
};
9+
export type { ConfirmDialogRequest, TextInputDialogRequest } from "./ConfirmDialog.types";
2610

2711
type DialogRequest =
2812
| { readonly kind: "confirm"; readonly request: ConfirmDialogRequest }

‎apps/mobile/src/components/FilePreview.ios.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { requireNativeModule } from "expo";
22
import { useEffect, useEffectEvent, useId } from "react";
33
import { Alert } from "react-native";
44

5-
import type { ResolvedFilePreviewSource } from "./FilePreviewModal";
5+
import type { ResolvedFilePreviewSource } from "./FilePreviewModal.types";
66

77
const NativeControls = requireNativeModule<{
88
presentFile(

‎apps/mobile/src/components/FilePreview.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Alert, Modal, Pressable, View } from "react-native";
33
import ImageViewing from "react-native-image-viewing";
44

55
import { openAttachmentInViewer } from "../lib/attachmentDownload";
6-
import type { ResolvedFilePreviewSource } from "./FilePreviewModal";
6+
import type { ResolvedFilePreviewSource } from "./FilePreviewModal.types";
77
import { MediaImagePreview } from "./MediaImagePreview";
88
import { AppText as Text } from "./AppText";
99

‎apps/mobile/src/components/FilePreviewModal.tsx‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,13 @@
11
import { useIsFocused } from "@react-navigation/native";
2-
import type { AssetResource, EnvironmentId } from "@t3tools/contracts";
32
import { useEffect, useEffectEvent, useState } from "react";
43
import { Alert, Keyboard } from "react-native";
54

6-
import type { FileBackedComposerAttachment } from "../lib/composerImages";
75
import { loadLocalAttachmentPreview } from "../lib/localAttachmentPreview";
8-
import type { MediaActionsSource } from "../lib/mediaActions";
96
import { useRefreshAssetUrl } from "../state/assets";
107
import { FilePreview } from "./FilePreview";
8+
import type { FilePreviewSource } from "./FilePreviewModal.types";
119

12-
export interface ResolvedFilePreviewSource {
13-
readonly kind: "image" | "pdf" | "document";
14-
readonly mimeType?: string;
15-
readonly uri: string;
16-
readonly name?: string;
17-
readonly sourceIdentifier?: string;
18-
readonly srcFragment?: string;
19-
readonly actionsSource?: MediaActionsSource;
20-
}
21-
22-
export type FilePreviewSource = Omit<ResolvedFilePreviewSource, "uri"> &
23-
(
24-
| { readonly uri: string }
25-
| { readonly attachment: FileBackedComposerAttachment }
26-
| { readonly environmentId: EnvironmentId; readonly resource: AssetResource }
27-
);
10+
export type { FilePreviewSource, ResolvedFilePreviewSource } from "./FilePreviewModal.types";
2811

2912
function ResolvedFilePreview(props: {
3013
readonly source: FilePreviewSource;
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import type { AssetResource, EnvironmentId } from "@t3tools/contracts";
2+
3+
import type { FileBackedComposerAttachment } from "../lib/composerImages";
4+
import type { MediaActionsSource } from "../lib/mediaActions";
5+
6+
export interface ResolvedFilePreviewSource {
7+
readonly kind: "image" | "pdf" | "document";
8+
readonly mimeType?: string;
9+
readonly uri: string;
10+
readonly name?: string;
11+
readonly sourceIdentifier?: string;
12+
readonly srcFragment?: string;
13+
readonly actionsSource?: MediaActionsSource;
14+
}
15+
16+
export type FilePreviewSource = Omit<ResolvedFilePreviewSource, "uri"> &
17+
(
18+
| { readonly uri: string }
19+
| { readonly attachment: FileBackedComposerAttachment }
20+
| { readonly environmentId: EnvironmentId; readonly resource: AssetResource }
21+
);

‎apps/mobile/src/components/MaterialConfirmDialog.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { ConfirmDialogRequest } from "./ConfirmDialogHost";
1+
import type { ConfirmDialogRequest } from "./ConfirmDialog.types";
22

33
export interface MaterialConfirmDialogProps {
44
readonly request: Pick<

‎apps/mobile/src/components/MaterialSegmentedButtons.android.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { SegmentedButton, SingleChoiceSegmentedButtonRow, Text } from "@expo/ui/
22
import { defaultMinSize, fillMaxWidth } from "@expo/ui/jetpack-compose/modifiers";
33
import { useAppearancePreferences } from "../features/settings/appearance/AppearancePreferencesProvider";
44
import { useScaledTextRole } from "../features/settings/appearance/useScaledTextRole";
5-
import type { SegmentedControlProps } from "./SegmentedControl";
5+
import type { SegmentedControlProps } from "./SegmentedControl.types";
66

77
/** Compose content shared by screen controls and native dialogs, inside their existing Host. */
88
export function MaterialSegmentedButtons<Value extends number | string>(

‎apps/mobile/src/components/MaterialSegmentedControl.android.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { MaterialSegmentedButtons } from "./MaterialSegmentedButtons.android";
33
import { View } from "react-native";
44

55
import { useAppearancePreferences } from "../features/settings/appearance/AppearancePreferencesProvider";
6-
import type { SegmentedControlProps } from "./SegmentedControl";
6+
import type { SegmentedControlProps } from "./SegmentedControl.types";
77

88
export function MaterialSegmentedControl<Value extends number | string>(
99
props: SegmentedControlProps<Value>,

‎apps/mobile/src/components/MaterialSegmentedControl.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { SegmentedControlProps } from "./SegmentedControl";
1+
import type { SegmentedControlProps } from "./SegmentedControl.types";
22

33
export function MaterialSegmentedControl<Value extends number | string>(
44
_props: SegmentedControlProps<Value>,

0 commit comments

Comments
 (0)