Merge branch 'develop' into refactor/#952

sopt-makers · Nov 13, 2024 · 7182a21 · 7182a21
2 parents 21da436 + fabcf36
commit 7182a21
Show file tree

Hide file tree

Showing 28 changed files with 1,151 additions and 164 deletions.
diff --git a/packages/react-mentions/src/SuggestionsOverlay.js b/packages/react-mentions/src/SuggestionsOverlay.js
@@ -78,6 +78,7 @@ function SuggestionsOverlay({
     return suggestionsToRender
   }
 
+  //여기서 엔터를 눌렀을 때 해당 값 설정되도록 만들수는 없을까?
   const renderSuggestion = (result, queryInfo, index) => {
     const isFocused = index === focusIndex
     const { childIndex, query } = queryInfo

diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -20,6 +20,7 @@ import '@sopt-makers/ui/dist/index.css';
 import { DialogProvider, ToastProvider } from '@sopt-makers/ui';
 import { MentionProvider } from '@components/feed/Mention/MentionContext';
 import { globalStyles } from 'styles/globals';
+import { SearchMentionProvider } from '@components/form/SearchMention/SearchMentionContext';
 
 // 리액트 하이드레이션 에러를 피하기 위해 사용. 렌더링에 관여하지 않는 코드여서 if 문으로 분기처리
 if (typeof window !== 'undefined') {
@@ -97,40 +98,42 @@ function MyApp({ Component, pageProps }: AppProps) {
   }, []);
 
   return (
-    <MentionProvider>
-      <QueryClientProvider client={queryClient}>
-        <SEO />
-        <Script
-          id="gtag-base"
-          strategy="afterInteractive"
-          dangerouslySetInnerHTML={{
-            __html: `
+    <SearchMentionProvider>
+      <MentionProvider>
+        <QueryClientProvider client={queryClient}>
+          <SEO />
+          <Script
+            id="gtag-base"
+            strategy="afterInteractive"
+            dangerouslySetInnerHTML={{
+              __html: `
             (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
             new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
             j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
             'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
             })(window,document,'script','dataLayer', '${GTM_ID}');
           `,
-          }}
-        />
-        <Layout>
-          <DialogProvider>
-            <ToastProvider>
-              <OverlayProvider>
-                {isServiceReady ? (
-                  <>
-                    <Header />
-                    <Component {...pageProps} />
-                  </>
-                ) : (
-                  <Loader />
-                )}
-              </OverlayProvider>
-            </ToastProvider>
-          </DialogProvider>
-        </Layout>
-      </QueryClientProvider>
-    </MentionProvider>
+            }}
+          />
+          <Layout>
+            <DialogProvider>
+              <ToastProvider>
+                <OverlayProvider>
+                  {isServiceReady ? (
+                    <>
+                      <Header />
+                      <Component {...pageProps} />
+                    </>
+                  ) : (
+                    <Loader />
+                  )}
+                </OverlayProvider>
+              </ToastProvider>
+            </DialogProvider>
+          </Layout>
+        </QueryClientProvider>
+      </MentionProvider>
+    </SearchMentionProvider>
   );
 }
 

diff --git a/pages/edit/index.tsx b/pages/edit/index.tsx
@@ -38,6 +38,11 @@ const EditPage = () => {
   const formMethods = useForm<FormType>({
     mode: 'onChange',
     resolver: zodResolver(schema),
+    defaultValues: {
+      detail: {
+        coLeader: [],
+      },
+    },
   });
 
   const onSubmit: SubmitHandler<FormType> = async formData => {
@@ -95,6 +100,7 @@ const EditPage = () => {
           joinableParts,
           canJoinOnlyActiveGeneration: formData?.canJoinOnlyActiveGeneration,
           note: formData?.note ?? '',
+          coLeader: formData?.coMeetingLeaders,
         },
       });
     }

diff --git a/pages/make/index.tsx b/pages/make/index.tsx
@@ -22,6 +22,11 @@ const MakePage = () => {
   const formMethods = useForm<FormType>({
     mode: 'onChange',
     resolver: zodResolver(schema),
+    defaultValues: {
+      detail: {
+        coLeader: [],
+      },
+    },
   });
   const { isValid } = formMethods.formState;
   const { mutateAsync: mutateCreateMeeting, isLoading: isSubmitting } = useMutation({

diff --git a/pages/post/index.tsx b/pages/post/index.tsx
@@ -95,7 +95,7 @@ export default function PostPage() {
   const { mutate: togglePostLike } = useMutationPostLike(query.id as string);
 
   const { mutate: mutateDeletePost } = useMutation({
-    mutationFn: () => DELETE('/post/v1/{postId}', { params: { path: { postId: post!.id } } }),
+    mutationFn: () => DELETE('/post/v2/{postId}', { params: { path: { postId: post!.id } } }),
     onSuccess: () => router.replace(`/detail?id=${post?.meeting.id}`),
   });