Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Improve Space photo posting feedback

Anand Baburajanc111df5d78e6
diff --git a/web/apps/space/src/components/MessagesPage.tsx b/web/apps/space/src/components/MessagesPage.tsx
index e2920b28d0..0ff884fadb 100644
--- a/web/apps/space/src/components/MessagesPage.tsx
+++ b/web/apps/space/src/components/MessagesPage.tsx
@@ -690,12 +690,6 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
onOpenThread={openConversation}
onPostPhotoSelect={(file) => {
setPendingPostPhotoFile(file);
- void router
- .push(spaceRoutes.home)
- .catch((error: unknown) => {
- log.error("Failed to open post photo draft", error);
- setPendingPostPhotoFile(null);
- });
}}
onLoadActivityPost={(post) =>
loadCurrentMessageActivityPostPreview(post, actorSpaceId)
diff --git a/web/apps/space/src/components/PostComposer.tsx b/web/apps/space/src/components/PostComposer.tsx
new file mode 100644
index 0000000000..52b1852294
--- /dev/null
+++ b/web/apps/space/src/components/PostComposer.tsx
@@ -0,0 +1,173 @@
+import {
+ SpaceFileViewer,
+ SpaceViewerPostBackdrop,
+ type SpaceViewerPhoto,
+} from "components/FileViewer";
+import log from "ente-base/log";
+import { useBrowserBackClose } from "hooks/use-browser-back-close";
+import React from "react";
+import type { SetupProfile } from "screens/SetupProfileScreen";
+import type { SpacePost } from "services/space";
+import { useSpaceAppState } from "state/app-state";
+import { createLoadedLocalPostPhoto } from "utils/local-post-photo";
+import {
+ canPreviewSpaceImageFile,
+ spacePostImageErrorMessage,
+ spacePostPreviewImageForFile,
+ type SpaceDraftPostImage,
+} from "utils/post-image";
+
+interface PendingPostDraft {
+ error?: string;
+ isPreviewPending: boolean;
+ photo: SpaceViewerPhoto;
+}
+
+interface SpacePostComposerProps {
+ file: File;
+ onClose: () => void;
+ onPublish: (
+ image: SpaceDraftPostImage,
+ caption: string,
+ ) => Promise<SpacePost>;
+ profile: SetupProfile;
+}
+
+const SpacePostComposer: React.FC<SpacePostComposerProps> = ({
+ file,
+ onClose,
+ onPublish,
+ profile,
+}) => {
+ const displayName =
+ profile.fullName.trim() || profile.username.trim() || "You";
+ const [draft, setDraft] = React.useState<PendingPostDraft>(() => ({
+ isPreviewPending: true,
+ photo: {
+ alt: `${displayName} post`,
+ avatarUrl: profile.avatarUrl,
+ imageUrl: "",
+ name: displayName,
+ timestampMs: Date.now(),
+ },
+ }));
+ const [isDraftPostExitAnimating, setIsDraftPostExitAnimating] =
+ React.useState(false);
+ const [isDraftPostExiting, setIsDraftPostExiting] = React.useState(false);
+
+ const { clearBrowserBackState } = useBrowserBackClose({
+ open: true,
+ onClose: () => {
+ if (!isDraftPostExiting) onClose();
+ },
+ stateKey: "space-post-composer",
+ });
+
+ React.useEffect(() => {
+ let cancelled = false;
+ let previewURL: string | undefined;
+
+ const preparePreview = async () => {
+ if (canPreviewSpaceImageFile(file)) {
+ return await createLoadedLocalPostPhoto({
+ avatarUrl: profile.avatarUrl,
+ file,
+ name: displayName,
+ });
+ }
+
+ const preview = await spacePostPreviewImageForFile(file);
+ return {
+ objectUrl: preview.url,
+ photo: {
+ alt: `${displayName} post`,
+ avatarUrl: profile.avatarUrl,
+ height: preview.height,
+ imageUrl: preview.url,
+ name: displayName,
+ timestampMs: Date.now(),
+ width: preview.width,
+ },
+ };
+ };
+
+ void preparePreview()
+ .then((preview) => {
+ previewURL = preview.objectUrl;
+ if (cancelled) {
+ URL.revokeObjectURL(preview.objectUrl);
+ return;
+ }
+ setDraft({ isPreviewPending: false, photo: preview.photo });
+ })
+ .catch((error: unknown) => {
+ log.error("Failed to prepare post preview", error);
+ if (cancelled) return;
+ setDraft((current) => ({
+ ...current,
+ error: spacePostImageErrorMessage(error),
+ isPreviewPending: false,
+ }));
+ });
+
+ return () => {
+ cancelled = true;
+ if (previewURL) URL.revokeObjectURL(previewURL);
+ };
+ }, [displayName, file, profile.avatarUrl]);
+
+ return (
+ <>
+ <SpaceViewerPostBackdrop exiting={isDraftPostExitAnimating} />
+ <SpaceFileViewer
+ draftPostPreparationError={draft.error}
+ isDraftPostPreviewPending={draft.isPreviewPending}
+ onClose={onClose}
+ onDraftPostExitAnimationStart={() =>
+ setIsDraftPostExitAnimating(true)
+ }
+ onDraftPostExitStart={() => setIsDraftPostExiting(true)}
+ onDraftPostPublished={() => {
+ void clearBrowserBackState("back");
+ }}
+ onPublishDraftPost={
+ draft.isPreviewPending || draft.error
+ ? undefined
+ : (caption, edit) =>
+ onPublish(
+ {
+ cropArea: edit.cropArea,
+ file,
+ height: edit.height,
+ rotationDegrees: edit.rotationDegrees,
+ width: edit.width,
+ },
+ caption,
+ ).then(() => undefined)
+ }
+ photo={draft.photo}
+ postActionMode="draft-post"
+ />
+ </>
+ );
+};
+
+export const SpacePostComposerHost: React.FC = () => {
+ const {
+ pendingPostPhotoFile,
+ profile,
+ publishPost,
+ setPendingPostPhotoFile,
+ } = useSpaceAppState();
+
+ if (!pendingPostPhotoFile || !profile) return null;
+
+ return (
+ <SpacePostComposer
+ file={pendingPostPhotoFile}
+ onClose={() => setPendingPostPhotoFile(null)}
+ onPublish={publishPost}
+ profile={profile}
+ />
+ );
+};
diff --git a/web/apps/space/src/components/PostToast.tsx b/web/apps/space/src/components/PostToast.tsx
new file mode 100644
index 0000000000..8594f171d6
--- /dev/null
+++ b/web/apps/space/src/components/PostToast.tsx
@@ -0,0 +1,39 @@
+import { SpaceActionFeedbackIcon } from "components/ActionFeedback";
+import { SpaceActionToast } from "components/ActionToast";
+import React from "react";
+import { useSpaceAppState } from "state/app-state";
+
+const postedToastDurationMs = 2400;
+
+export const SpacePostToast: React.FC = () => {
+ const { dismissPostPublishToast, postPublishPhase } = useSpaceAppState();
+
+ React.useEffect(() => {
+ if (postPublishPhase != "posted") return;
+
+ const timeoutID = window.setTimeout(
+ dismissPostPublishToast,
+ postedToastDurationMs,
+ );
+ return () => window.clearTimeout(timeoutID);
+ }, [dismissPostPublishToast, postPublishPhase]);
+
+ if (!postPublishPhase) return null;
+
+ const isPosting = postPublishPhase == "posting";
+ return (
+ <SpaceActionToast
+ animateEntrance={isPosting}
+ closeLabel="Dismiss post status"
+ icon={
+ <SpaceActionFeedbackIcon
+ phase={isPosting ? "busy" : "done"}
+ size={20}
+ />
+ }
+ message={isPosting ? "Posting..." : "Posted"}
+ onClose={dismissPostPublishToast}
+ zIndex={1400}
+ />
+ );
+};
diff --git a/web/apps/space/src/components/PostUnreadBadge.tsx b/web/apps/space/src/components/PostUnreadBadge.tsx
index def000ea49..e57c6652b8 100644
--- a/web/apps/space/src/components/PostUnreadBadge.tsx
+++ b/web/apps/space/src/components/PostUnreadBadge.tsx
@@ -24,8 +24,8 @@ export const SpacePostUnreadBadge: React.FC<{ count: number }> = ({
pointerEvents: "none",
position: "absolute",
px: "7px",
- right: "8%",
- top: "8%",
+ right: "10%",
+ top: "10%",
whiteSpace: "nowrap",
zIndex: 1,
}}
diff --git a/web/apps/space/src/pages/_app.tsx b/web/apps/space/src/pages/_app.tsx
index ecec31f8c7..f9691296bf 100644
--- a/web/apps/space/src/pages/_app.tsx
+++ b/web/apps/space/src/pages/_app.tsx
@@ -2,6 +2,8 @@ import "@fontsource-variable/inter";
import "@fontsource/nunito/800.css";
import { CssBaseline } from "@mui/material";
import { createTheme, ThemeProvider } from "@mui/material/styles";
+import { SpacePostComposerHost } from "components/PostComposer";
+import { SpacePostToast } from "components/PostToast";
import { SpaceRouteTransitionBoundary } from "components/RouteTransitionBoundary";
import { SpaceShareLinkDialogHost } from "components/ShareLinkDialog";
import "configure-zod";
@@ -89,6 +91,8 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
<SpaceRouteTransitionBoundary>
<SpaceAppStateProvider>
<Component {...pageProps} />
+ <SpacePostComposerHost />
+ <SpacePostToast />
<SpaceShareLinkDialogHost />
</SpaceAppStateProvider>
</SpaceRouteTransitionBoundary>
diff --git a/web/apps/space/src/pages/app/index.tsx b/web/apps/space/src/pages/app/index.tsx
index d2b1fff0e9..36fc64fd0f 100644
--- a/web/apps/space/src/pages/app/index.tsx
+++ b/web/apps/space/src/pages/app/index.tsx
@@ -11,7 +11,6 @@ import {
import { consumeSentSpaceInviteFriend } from "services/invite";
import { loadExistingSpaceId } from "services/profile";
import {
- createCurrentPhotoPost,
loadCurrentFriendAvatarURL,
loadCurrentSpaceFriends,
loadCurrentSpacePostAssetURL,
@@ -22,7 +21,6 @@ import {
} from "services/space";
import { useSpaceAppState } from "state/app-state";
import { spaceAppBackgroundColor } from "styles/colors";
-import { prepareSpacePostImageFromEdit } from "utils/post-image";
import { useSpaceRouter } from "utils/route-transitions";
import { spaceRoutes } from "utils/routes";
@@ -30,12 +28,11 @@ const Page: React.FC = () => {
const router = useSpaceRouter();
const {
friends,
- pendingPostPhotoFile,
profile,
profileLoadError,
profileLoadStatus,
setFriends,
- setPendingPostPhotoFile,
+ publishPost,
} = useSpaceAppState();
const [friendRequestSentToastName, setFriendRequestSentToastName] =
useState<string>();
@@ -178,7 +175,6 @@ const Page: React.FC = () => {
friendRequestSentToastName={friendRequestSentToastName}
friends={friends}
hasUnreadMessages={hasUnreadMessages}
- initialPostPhotoFile={pendingPostPhotoFile}
isLatestPostsLoading={isLatestPostsLoading}
isFriendsLoading={isFriendsLoading}
profile={profile}
@@ -190,27 +186,10 @@ const Page: React.FC = () => {
!isFriendsLoading
}
onFriendRequestSentToastClose={closeFriendRequestSentToast}
- onInitialPostPhotoConsumed={() => setPendingPostPhotoFile(null)}
onCreatePost={
profile
? async (image, caption) => {
- const spaceId = profile.spaceId;
- if (!spaceId) throw new Error("Missing space.");
-
- const preparedImage =
- await prepareSpacePostImageFromEdit(
- image.file,
- image.cropArea,
- image.rotationDegrees,
- );
- await createCurrentPhotoPost({
- caption,
- file: preparedImage.file,
- height: preparedImage.height,
- spaceId,
- thumbHash: preparedImage.thumbHash,
- width: preparedImage.width,
- });
+ await publishPost(image, caption);
}
: undefined
}
diff --git a/web/apps/space/src/pages/app/post.tsx b/web/apps/space/src/pages/app/post.tsx
index e5640497e0..c242f9db07 100644
--- a/web/apps/space/src/pages/app/post.tsx
+++ b/web/apps/space/src/pages/app/post.tsx
@@ -4,7 +4,6 @@ import { Box } from "@mui/material";
import { SpaceBackIcon } from "components/BackIcon";
import { SpacePageMeta } from "components/PageMeta";
import { SpaceRouteFallback } from "components/RouteFallback";
-import log from "ente-base/log";
import React from "react";
import { useSpaceAppState } from "state/app-state";
import {
@@ -29,10 +28,11 @@ const Page: React.FC = () => {
profile,
profileLoadError,
profileLoadStatus,
+ pendingPostPhotoFile,
setPendingPostPhotoFile,
} = useSpaceAppState();
const inputRef = React.useRef<HTMLInputElement | null>(null);
- const [isOpeningPost, setIsOpeningPost] = React.useState(false);
+ const isOpeningPost = Boolean(pendingPostPhotoFile);
React.useEffect(() => {
if (profileLoadStatus == "ready" && !profile) {
@@ -56,13 +56,7 @@ const Page: React.FC = () => {
event.target.value = "";
if (!file) return;
- setIsOpeningPost(true);
setPendingPostPhotoFile(file);
- void router.push(spaceRoutes.home).catch((error: unknown) => {
- log.error("Failed to open post photo draft", error);
- setPendingPostPhotoFile(null);
- setIsOpeningPost(false);
- });
};
return (
diff --git a/web/apps/space/src/pages/app/profile.tsx b/web/apps/space/src/pages/app/profile.tsx
index 731bfab8e7..6632a19624 100644
--- a/web/apps/space/src/pages/app/profile.tsx
+++ b/web/apps/space/src/pages/app/profile.tsx
@@ -5,7 +5,6 @@ import React, { useEffect, useMemo, useState } from "react";
import { ProfileScreen } from "screens/ProfileScreen";
import { spaceInviteURL } from "services/invite";
import {
- createCurrentPhotoPost,
deleteCurrentPost,
loadCurrentSpaceFriendsCount,
loadCurrentSpacePostAssetURL,
@@ -17,7 +16,6 @@ import {
import { useSpaceAppState } from "state/app-state";
import { spaceAppBackgroundColor } from "styles/colors";
import { profilePostItemsFromPosts } from "utils/post-display";
-import { prepareSpacePostImageFromEdit } from "utils/post-image";
import { useSpaceRouter } from "utils/route-transitions";
import { spaceRoutes } from "utils/routes";
@@ -25,7 +23,8 @@ const initialPostLoadingIndicatorDelayMs = 350;
const Page: React.FC = () => {
const router = useSpaceRouter();
- const { profile, profileLoadError, profileLoadStatus } = useSpaceAppState();
+ const { profile, profileLoadError, profileLoadStatus, publishPost } =
+ useSpaceAppState();
const [friendsCount, setFriendsCount] = useState(0);
const [posts, setPosts] = useState<SpaceProfilePost[]>([]);
const [isPostsLoading, setIsPostsLoading] = useState(true);
@@ -122,24 +121,14 @@ const Page: React.FC = () => {
showPostLoadingIndicator={showInitialPostLoadingIndicator}
onBack={() => void router.push(spaceRoutes.home)}
onCreatePost={async (image, caption) => {
- const spaceId = profile.spaceId;
- if (!spaceId) throw new Error("Missing space.");
-
- const preparedImage = await prepareSpacePostImageFromEdit(
- image.file,
- image.cropArea,
- image.rotationDegrees,
- );
- await createCurrentPhotoPost({
- caption,
- file: preparedImage.file,
- height: preparedImage.height,
- spaceId,
- thumbHash: preparedImage.thumbHash,
- width: preparedImage.width,
- });
+ const post = await publishPost(image, caption);
+ setPosts((currentPosts) => [
+ post,
+ ...currentPosts.filter(
+ (currentPost) => currentPost.postId != post.postId,
+ ),
+ ]);
}}
- onDraftPostPublished={() => void router.push(spaceRoutes.home)}
onDeletePost={async (postId) => {
const spaceId = profile.spaceId;
if (!spaceId) throw new Error("Missing space.");
diff --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsx
index 190a2e948b..3d2e5b3ff2 100644
--- a/web/apps/space/src/screens/HomeScreen.tsx
+++ b/web/apps/space/src/screens/HomeScreen.tsx
@@ -9,7 +9,6 @@ import { SpaceAvatarImage } from "components/AvatarImage";
import {
SpaceFileViewer,
SpaceViewerPostBackdrop,
- type SpaceViewerDraftPostEdit,
type SpaceViewerPhoto,
type SpaceViewerPostActionMode,
} from "components/FileViewer";
@@ -49,6 +48,7 @@ import {
spacePostImageErrorMessage,
spacePostImageInputAccept,
spacePostPreviewImageForFile,
+ type SpaceDraftPostImage,
} from "utils/post-image";
import { thumbHashDataURLFromBase64 } from "utils/thumbhash";
@@ -78,18 +78,16 @@ interface HomeScreenProps {
friendRequestSentToastName?: string;
friends: FriendProfile[];
hasUnreadMessages?: boolean;
- initialPostPhotoFile?: File | null;
isLatestPostsLoading?: boolean;
isFriendsLoading?: boolean;
showInstallPrompt?: boolean;
onCreatePost?: (
- image: DraftSpacePostImage,
+ image: SpaceDraftPostImage,
caption: string,
) => Promise<void>;
onLoadFriendAvatar?: (friend: FriendProfile) => Promise<string | null>;
onLoadPostImage?: SpacePostAssetURLLoader;
onFriendRequestSentToastClose?: () => void;
- onInitialPostPhotoConsumed?: () => void;
onOpenFriend?: (friendID: string, username?: string) => void;
onOpenMessages?: () => void;
onOpenProfile?: () => void;
@@ -130,14 +128,6 @@ interface SelectedHomeViewer {
posts?: SpacePost[];
}
-interface DraftSpacePostImage {
- cropArea?: SpaceViewerDraftPostEdit["cropArea"];
- file: File;
- height?: number;
- rotationDegrees?: number;
- width?: number;
-}
-
interface AddedFriendToastProps {
message: string;
onClose?: () => void;
@@ -671,7 +661,6 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
friendRequestSentToastName,
friends,
hasUnreadMessages,
- initialPostPhotoFile,
isLatestPostsLoading = false,
isFriendsLoading = false,
showInstallPrompt = false,
@@ -679,7 +668,6 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
onLoadFriendAvatar,
onLoadPostImage,
onFriendRequestSentToastClose,
- onInitialPostPhotoConsumed,
onOpenFriend,
onOpenMessages,
onOpenProfile,
@@ -707,7 +695,6 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
>({});
const postCircleCanvasRef = React.useRef<HTMLDivElement | null>(null);
const postInputRef = React.useRef<HTMLInputElement | null>(null);
- const initialPostPhotoFileRef = React.useRef<File | null>(null);
const localPostObjectUrlsRef = React.useRef<Set<string>>(new Set());
const activeLocalPostObjectUrlRef = React.useRef<string | null>(null);
const avatarLoadsInFlightRef = React.useRef<
@@ -1182,32 +1169,6 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
[profile, profileDisplayName],
);
- React.useEffect(() => {
- if (
- !initialPostPhotoFile ||
- initialPostPhotoFileRef.current == initialPostPhotoFile ||
- isPostPhotoButtonDisabled
- ) {
- return;
- }
-
- initialPostPhotoFileRef.current = initialPostPhotoFile;
- setIsPostPhotoOpening(true);
- void prepareSelectedPostPhoto(initialPostPhotoFile)
- .catch((error: unknown) => {
- log.error("Failed to open post photo draft", error);
- })
- .finally(() => {
- onInitialPostPhotoConsumed?.();
- setIsPostPhotoOpening(false);
- });
- }, [
- initialPostPhotoFile,
- isPostPhotoButtonDisabled,
- onInitialPostPhotoConsumed,
- prepareSelectedPostPhoto,
- ]);
-
const handlePostPhotoSelect: React.ChangeEventHandler<HTMLInputElement> = (
event,
) => {
@@ -1495,8 +1456,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
width: "100%",
}}
>
- {initialPostPhotoFile ? null : isFriendsLoading &&
- orderedFriends.length == 0 ? (
+ {isFriendsLoading && orderedFriends.length == 0 ? (
<Box
sx={{
alignItems: "center",
diff --git a/web/apps/space/src/state/AppStateProvider.tsx b/web/apps/space/src/state/AppStateProvider.tsx
index 7d41f3544c..78f61d9033 100644
--- a/web/apps/space/src/state/AppStateProvider.tsx
+++ b/web/apps/space/src/state/AppStateProvider.tsx
@@ -22,6 +22,7 @@ import {
import {
clearSpaceFriendsCache,
clearSpaceMediaURLCache,
+ createCurrentPhotoPost,
} from "services/space";
import {
type OnboardingEntrySource,
@@ -29,9 +30,11 @@ import {
type RefreshSpaceProfileOptions,
type SpaceAppState,
SpaceAppStateContext,
+ type SpacePostPublishPhase,
type SpaceProfileLoadStatus,
initialFriends,
} from "state/app-state";
+import { prepareSpacePostImageFromEdit } from "utils/post-image";
export const SpaceAppStateProvider: React.FC<React.PropsWithChildren> = ({
children,
@@ -57,11 +60,57 @@ export const SpaceAppStateProvider: React.FC<React.PropsWithChildren> = ({
const [profileLoadError, setProfileLoadError] = useState<string>();
const [profileLoadStatus, setProfileLoadStatus] =
useState<SpaceProfileLoadStatus>("loading");
+ const [postPublishPhase, setPostPublishPhase] =
+ useState<SpacePostPublishPhase | null>(null);
const [signupEmail, setSignupEmail] = useState("");
const avatarURLRef = useRef<string | null>(null);
const coverURLRef = useRef<string | null>(null);
const profileRef = useRef<SetupProfile | null>(null);
const profileLoadGenerationRef = useRef(0);
+ const postPublishGenerationRef = useRef(0);
+
+ const dismissPostPublishToast = useCallback(() => {
+ postPublishGenerationRef.current += 1;
+ setPostPublishPhase(null);
+ }, []);
+
+ const publishPost = useCallback(
+ async (
+ image: Parameters<SpaceAppState["publishPost"]>[0],
+ caption: string,
+ ) => {
+ const spaceId = profileRef.current?.spaceId;
+ if (!spaceId) throw new Error("Missing space.");
+
+ const generation = ++postPublishGenerationRef.current;
+ setPostPublishPhase("posting");
+ try {
+ const preparedImage = await prepareSpacePostImageFromEdit(
+ image.file,
+ image.cropArea,
+ image.rotationDegrees,
+ );
+ const post = await createCurrentPhotoPost({
+ caption,
+ file: preparedImage.file,
+ height: preparedImage.height,
+ spaceId,
+ thumbHash: preparedImage.thumbHash,
+ width: preparedImage.width,
+ });
+ if (postPublishGenerationRef.current == generation) {
+ setPostPublishPhase("posted");
+ }
+ return post;
+ } catch (error) {
+ if (postPublishGenerationRef.current == generation) {
+ setPostPublishPhase(null);
+ }
+ throw error;
+ }
+ },
+ [],
+ );
const applyProfile = useCallback((nextProfile: SetupProfile | null) => {
const previousAvatarURL = avatarURLRef.current;
@@ -221,6 +270,7 @@ export const SpaceAppStateProvider: React.FC<React.PropsWithChildren> = ({
applyProfile(null);
setProfileLoadError(undefined);
setProfileLoadStatus("ready");
+ dismissPostPublishToast();
setPendingLoginCredentials(null);
setPendingPasskeyVerification(null);
setPendingPostPhotoFile(null);
@@ -229,7 +279,7 @@ export const SpaceAppStateProvider: React.FC<React.PropsWithChildren> = ({
setPendingCreateProfile(null);
setOnboardingEntrySource("direct");
setFriends(initialFriends());
- }, [applyProfile]);
+ }, [applyProfile, dismissPostPublishToast]);
useEffect(() => {
void refreshProfile();
@@ -246,11 +296,14 @@ export const SpaceAppStateProvider: React.FC<React.PropsWithChildren> = ({
pendingProfileAvatarFile,
pendingProfileCoverFile,
pendingCreateProfile,
+ postPublishPhase,
profile,
profileLoadError,
profileLoadStatus,
refreshProfile,
resetAfterLogout,
+ dismissPostPublishToast,
+ publishPost,
setFriends,
setIsLiveSignupVerification,
setOnboardingEntrySource,
@@ -274,11 +327,14 @@ export const SpaceAppStateProvider: React.FC<React.PropsWithChildren> = ({
pendingProfileAvatarFile,
pendingProfileCoverFile,
pendingCreateProfile,
+ postPublishPhase,
profile,
profileLoadError,
profileLoadStatus,
refreshProfile,
resetAfterLogout,
+ dismissPostPublishToast,
+ publishPost,
signupEmail,
applyProfile,
],
diff --git a/web/apps/space/src/state/app-state.tsx b/web/apps/space/src/state/app-state.tsx
index b4f3a4c24e..527e3dccd9 100644
--- a/web/apps/space/src/state/app-state.tsx
+++ b/web/apps/space/src/state/app-state.tsx
@@ -6,10 +6,13 @@ import type {
SetupProfileDetails,
} from "screens/SetupProfileScreen";
import type { PendingSpacePasskeyVerification } from "services/passkey-verification";
+import type { SpacePost } from "services/space";
+import type { SpaceDraftPostImage } from "utils/post-image";
import type { CreateProfileSource } from "utils/routes";
export type OnboardingEntrySource = "direct" | "add-friend-link";
export type SpaceProfileLoadStatus = "error" | "loading" | "ready";
+export type SpacePostPublishPhase = "posted" | "posting";
export type PendingCreateProfile = SetupProfileDetails & {
source: CreateProfileSource;
};
@@ -31,7 +34,13 @@ export interface SpaceAppState {
profile: SetupProfile | null;
profileLoadError?: string;
profileLoadStatus: SpaceProfileLoadStatus;
+ postPublishPhase: SpacePostPublishPhase | null;
signupEmail: string;
+ dismissPostPublishToast: () => void;
+ publishPost: (
+ image: SpaceDraftPostImage,
+ caption: string,
+ ) => Promise<SpacePost>;
refreshProfile: (
options?: RefreshSpaceProfileOptions,
) => Promise<SetupProfile | null>;
diff --git a/web/apps/space/src/utils/post-image.ts b/web/apps/space/src/utils/post-image.ts
index e4a04157e9..5a3fefbd48 100644
--- a/web/apps/space/src/utils/post-image.ts
+++ b/web/apps/space/src/utils/post-image.ts
@@ -32,6 +32,15 @@ export interface SpaceImageCropArea {
y: number;
}
+export interface SpaceDraftPostImage {
+ cropArea?: SpaceImageCropArea;
+ file: File;
+ height?: number;
+ previewUrl?: string;
+ rotationDegrees?: number;
+ width?: number;
+}
+
export const spaceAvatarImageInputAccept =
"image/jpeg,image/png,image/webp,image/heic,image/heif,.jpg,.jpeg,.png,.webp,.heic,.heif";
export const spaceCoverImageInputAccept = spaceAvatarImageInputAccept;