Skip to content

Commit

Permalink
ui(mobile): Change the add/edit note editor dialogs to be bottom sheets
Browse files Browse the repository at this point in the history
  • Loading branch information
MohamedBassem committed Aug 26, 2024
1 parent d8cf7c1 commit 8410a6d
Show file tree
Hide file tree
Showing 5 changed files with 154 additions and 125 deletions.
18 changes: 15 additions & 3 deletions apps/mobile/app/dashboard/(tabs)/index.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
import { useRef } from "react";
import { Platform, View } from "react-native";
import * as Haptics from "expo-haptics";
import * as ImagePicker from "expo-image-picker";
import { useRouter } from "expo-router";
import NoteEditorModal from "@/components/bookmarks/NewBookmarkModal";
import UpdatingBookmarkList from "@/components/bookmarks/UpdatingBookmarkList";
import CustomSafeAreaView from "@/components/ui/CustomSafeAreaView";
import PageTitle from "@/components/ui/PageTitle";
import { useToast } from "@/components/ui/Toast";
import useAppSettings from "@/lib/settings";
import { useUploadAsset } from "@/lib/upload";
import { BottomSheetModal } from "@gorhom/bottom-sheet";
import { MenuView } from "@react-native-menu/menu";
import { SquarePen } from "lucide-react-native";

function HeaderRight() {
function HeaderRight({
openNewBookmarkModal,
}: {
openNewBookmarkModal: () => void;
}) {
const { toast } = useToast();
const router = useRouter();
const { settings } = useAppSettings();
Expand All @@ -25,7 +32,7 @@ function HeaderRight() {
onPressAction={async ({ nativeEvent }) => {
Haptics.selectionAsync();
if (nativeEvent.event === "note") {
router.navigate("dashboard/add-note");
openNewBookmarkModal();
} else if (nativeEvent.event === "link") {
router.navigate("dashboard/add-link");
} else if (nativeEvent.event === "library") {
Expand Down Expand Up @@ -79,14 +86,19 @@ function HeaderRight() {
}

export default function Home() {
const newBookmarkModal = useRef<BottomSheetModal>(null);

return (
<CustomSafeAreaView>
<NoteEditorModal ref={newBookmarkModal} snapPoints={["90%", "60%"]} />
<UpdatingBookmarkList
query={{ archived: false }}
header={
<View className="flex flex-row justify-between">
<PageTitle title="Home" />
<HeaderRight />
<HeaderRight
openNewBookmarkModal={() => newBookmarkModal.current?.present()}
/>
</View>
}
/>
Expand Down
7 changes: 0 additions & 7 deletions apps/mobile/app/dashboard/_layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,6 @@ export default function Dashboard() {
presentation: "modal",
}}
/>
<Stack.Screen
name="add-note"
options={{
title: "New Note",
presentation: "modal",
}}
/>
</StyledStack>
);
}
114 changes: 0 additions & 114 deletions apps/mobile/app/dashboard/add-note.tsx

This file was deleted.

11 changes: 10 additions & 1 deletion apps/mobile/components/bookmarks/BookmarkCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import { useToast } from "../ui/Toast";
import BookmarkAssetImage from "./BookmarkAssetImage";
import BookmarkTextMarkdown from "./BookmarkTextMarkdown";
import ListPickerModal from "./ListPickerModal";
import NoteEditorModal from "./NewBookmarkModal";

function ActionBar({ bookmark }: { bookmark: ZBookmark }) {
const { toast } = useToast();
Expand Down Expand Up @@ -74,6 +75,7 @@ function ActionBar({ bookmark }: { bookmark: ZBookmark }) {
});

const manageListsSheetRef = useRef<BottomSheetModal>(null);
const editBookmarkModal = useRef<BottomSheetModal>(null);

return (
<View className="flex flex-row gap-4">
Expand All @@ -99,6 +101,13 @@ function ActionBar({ bookmark }: { bookmark: ZBookmark }) {
snapPoints={["50%", "90%"]}
bookmarkId={bookmark.id}
/>
{bookmark.content.type === BookmarkTypes.TEXT && (
<NoteEditorModal
ref={editBookmarkModal}
bookmark={bookmark}
snapPoints={["90%", "60%"]}
/>
)}

<MenuView
onPressAction={({ nativeEvent }) => {
Expand All @@ -115,7 +124,7 @@ function ActionBar({ bookmark }: { bookmark: ZBookmark }) {
} else if (nativeEvent.event === "manage_list") {
manageListsSheetRef?.current?.present();
} else if (nativeEvent.event === "edit") {
router.push(`/dashboard/add-note?bookmarkId=${bookmark.id}`);
editBookmarkModal.current?.present();
}
}}
actions={[
Expand Down
129 changes: 129 additions & 0 deletions apps/mobile/components/bookmarks/NewBookmarkModal.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
import React, { useEffect, useState } from "react";
import { Text, View } from "react-native";
import {
BottomSheetBackdrop,
BottomSheetModal,
BottomSheetModalProps,
BottomSheetTextInput,
BottomSheetView,
useBottomSheetModal,
} from "@gorhom/bottom-sheet";

import {
useCreateBookmark,
useUpdateBookmarkText,
} from "@hoarder/shared-react/hooks/bookmarks";
import { BookmarkTypes, ZBookmark } from "@hoarder/shared/types/bookmarks";

import { Button } from "../ui/Button";
import PageTitle from "../ui/PageTitle";

const NoteEditorModal = React.forwardRef<
BottomSheetModal,
Omit<
BottomSheetModalProps,
"children" | "backdropComponent" | "onDismiss"
> & {
bookmark?: ZBookmark;
}
>(({ bookmark, ...props }, ref) => {
const { dismiss } = useBottomSheetModal();
const isEditing = !!bookmark;

const [text, setText] = useState("");
const [error, setError] = useState<string | undefined>();

const resetText = () => {
if (bookmark) {
if (bookmark.content.type !== BookmarkTypes.TEXT) {
throw new Error("Wrong content type rendered");
}
setText(bookmark.content.text);
}
};

useEffect(resetText, []);

const onSuccess = () => {
resetText();
dismiss();
};

const { mutate: createBookmark } = useCreateBookmark({
onSuccess,
onError: (e) => {
let message;
if (e.data?.zodError) {
const zodError = e.data.zodError;
message = JSON.stringify(zodError);
} else {
message = `Something went wrong: ${e.message}`;
}
setError(message);
},
});

const { mutate: updateBookmark } = useUpdateBookmarkText({
onSuccess,
onError: (e) => {
let message;
if (e.data?.zodError) {
const zodError = e.data.zodError;
message = JSON.stringify(zodError);
} else {
message = `Something went wrong: ${e.message}`;
}
setError(message);
},
});

const mutate = (text: string) => {
if (isEditing) {
updateBookmark({
bookmarkId: bookmark.id,
text,
});
} else {
createBookmark({ type: BookmarkTypes.TEXT, text });
}
};

return (
<View>
<BottomSheetModal
ref={ref}
backdropComponent={(props) => (
<BottomSheetBackdrop
appearsOnIndex={0}
disappearsOnIndex={-1}
{...props}
/>
)}
{...props}
>
<PageTitle title={isEditing ? "Edit Note" : "New Note"} />
<BottomSheetView className="p-4">
{error && (
<Text className="w-full text-center text-red-500">{error}</Text>
)}
<BottomSheetTextInput
value={text}
onChangeText={setText}
multiline
numberOfLines={8}
placeholder="What's on your mind?"
autoFocus
textAlignVertical="top"
/>
<Button
onPress={() => mutate(text)}
label={isEditing ? "Save" : "Add Note"}
/>
</BottomSheetView>
</BottomSheetModal>
</View>
);
});
NoteEditorModal.displayName = "NewBookmarkModal";

export default NoteEditorModal;

0 comments on commit 8410a6d

Please sign in to comment.