add missing haptics for post menu(#511 (#603)

Co-authored-by: Gavin Kasdorf <[email protected]>

src/components/screens/Post/components/PostOptionsButton.tsx

@@ -1,12 +1,12 @@
 import React from "react";
 import { useTheme } from "native-base";
-import { useActionSheet } from "@expo/react-native-action-sheet";
 import { IconDots } from "tabler-icons-react-native";
 import { Alert } from "react-native";
 import { useAppDispatch } from "../../../../../store";
 import { lemmyAuthToken, lemmyInstance } from "../../../../LemmyInstance";
 import { showToast } from "../../../../slices/toast/toastSlice";
 import HeaderIconButton from "../../../common/Buttons/HeaderIconButton";
+import { useAppActionSheet } from "../../../../hooks/app/useAppActionSheet";
 import { handleLemmyError } from "../../../../helpers/LemmyErrorHelper";
 
 interface IProps {
@@ -15,22 +15,19 @@ interface IProps {
 
 function CommentSortButton({ postId }: IProps) {
   const theme = useTheme();
-  const { showActionSheetWithOptions } = useActionSheet();
+  const { showAppActionSheetWithOptions } = useAppActionSheet();
   const dispatch = useAppDispatch();
 
   const onPress = () => {
     const options = ["Report Post", "Cancel"];
     const cancelButtonIndex = options.indexOf("Cancel");
 
-    showActionSheetWithOptions(
+    showAppActionSheetWithOptions(
       {
         options,
         cancelButtonIndex,
-        userInterfaceStyle: theme.config.initialColorMode,
       },
       (index) => {
-        if (index === cancelButtonIndex) return;
-
         if (index === 0) onReportPress().then();
       }
     );

src/hooks/app/useAppActionSheet.ts

@@ -0,0 +1,27 @@
+import { useActionSheet } from "@expo/react-native-action-sheet";
+import { ActionSheetProps } from "@expo/react-native-action-sheet/lib/typescript/types";
+import { useTheme } from "native-base";
+import { onGenericHapticFeedback } from "../../helpers/HapticFeedbackHelpers";
+
+export const useAppActionSheet = () => {
+  const theme = useTheme();
+
+  const { showActionSheetWithOptions } = useActionSheet();
+
+  const showAppActionSheetWithOptions: ActionSheetProps["showActionSheetWithOptions"] =
+    (options, callback) => {
+      const defaultOptions = {
+        userInterfaceStyle: theme.config.initialColorMode,
+      };
+
+      showActionSheetWithOptions({ ...defaultOptions, ...options }, (index) => {
+        onGenericHapticFeedback();
+        if (index === options.cancelButtonIndex) return;
+        callback(index);
+      });
+    };
+
+  return {
+    showAppActionSheetWithOptions,
+  };
+};

src/hooks/post/useComment.ts

@@ -1,5 +1,3 @@
-import { useActionSheet } from "@expo/react-native-action-sheet";
-import { useTheme } from "native-base";
 import React, { SetStateAction } from "react";
 import Clipboard from "@react-native-community/clipboard";
 import { CommentReplyView } from "lemmy-js-client";
@@ -20,6 +18,7 @@ import { writeToLog } from "../../helpers/LogHelper";
 import { ILemmyVote } from "../../types/lemmy/ILemmyVote";
 import { showToast } from "../../slices/toast/toastSlice";
 import { setResponseTo } from "../../slices/comments/newCommentSlice";
+import { useAppActionSheet } from "../app/useAppActionSheet";
 import { handleLemmyError } from "../../helpers/LemmyErrorHelper";
 
 interface UseComment {
@@ -45,8 +44,7 @@ const useComment = ({
 
   const dispatch = useAppDispatch();
 
-  const { showActionSheetWithOptions } = useActionSheet();
-  const theme = useTheme();
+  const { showAppActionSheetWithOptions } = useAppActionSheet();
 
   const onCommentPress = () => {
     onGenericHapticFeedback();
@@ -108,19 +106,14 @@ const useComment = ({
     const optionsArr = Object.values(options);
     const cancelButtonIndex = optionsArr.indexOf(options.Cancel);
 
-    showActionSheetWithOptions(
+    showAppActionSheetWithOptions(
       {
         options: optionsArr,
         cancelButtonIndex,
-        userInterfaceStyle: theme.config.initialColorMode,
       },
       async (index: number) => {
-        onGenericHapticFeedback();
-
         const option = optionsArr[index];
 
-        if (index === cancelButtonIndex) return;
-
         if (option === options["Copy Text"]) {
           Clipboard.setString(comment.comment.comment.content);
         }