Skip to content

Commit 2841241

Browse files
authored
Merge pull request depromeet#599 from depromeet/597-데스크탑-스페이스-템플릿-아이콘-클릭시-이후-화면-부재
fix: 스페이스 템플릿 아이콘 클릭시 이후 화면 부재 수정
2 parents a599726 + 30f0c06 commit 2841241

3 files changed

Lines changed: 12 additions & 2 deletions

File tree

apps/web/src/app/desktop/component/retrospect/template/list/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export function TemplateList() {
3131

3232
// * @see AddSpacePage.tsx - 첫 스페이스와 회고 생성시에 템플릿 선택 화면으로 이동할 때 URL 파라미터로 타입을 넘겨줘요
3333
const type = searchParams.get("template_type") || "";
34-
const DEFAULT_TAB = type === "retrospect_create" ? (["기본", "커스텀"] as const) : (["기본"] as const);
34+
const DEFAULT_TAB = ["기본", "커스텀"] as const;
3535

3636
const { tabs, curTab, selectTab } = useTabs(DEFAULT_TAB);
3737

apps/web/src/component/retrospect/space/RetrospectSpaceHeader.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { css } from "@emotion/react";
1616
import MemberManagement from "./members/MemberManagement";
1717
import { useQueries } from "@tanstack/react-query";
1818
import { useAtomValue, useSetAtom } from "jotai";
19+
import { TemplateList } from "@/app/desktop/component/retrospect/template/list";
1920

2021
export default function RetrospectSpaceHeader() {
2122
const { open } = useModal();
@@ -63,6 +64,14 @@ export default function RetrospectSpaceHeader() {
6364
}
6465
};
6566

67+
const handleMoveToListTemplate = () => {
68+
openFunnelModal({
69+
title: "템플릿 리스트",
70+
step: "listTemplate",
71+
contents: <TemplateList />,
72+
});
73+
};
74+
6675
return (
6776
<section
6877
css={css`
@@ -134,6 +143,7 @@ export default function RetrospectSpaceHeader() {
134143
background-color: ${DESIGN_TOKEN_COLOR.white};
135144
color: ${DESIGN_TOKEN_COLOR.gray600};
136145
`}
146+
onClick={handleMoveToListTemplate}
137147
>
138148
<Icon icon={"ic_document_color"} size={2.0} color={DESIGN_TOKEN_COLOR.gray00} />
139149

apps/web/src/hooks/useFunnelModal.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const useFunnelModal = () => {
77
const [state, setState] = useAtom(FunnelModalState);
88

99
const openFunnelModal = useCallback(
10-
({ title, step, contents, templateTag, onConfirm, onClose, overlayIndex }: Omit<FunnelModalType, "isOpen">) => {
10+
({ title, step, contents, templateTag, onConfirm, onClose, overlayIndex = 10000 }: Omit<FunnelModalType, "isOpen">) => {
1111
setState({
1212
isOpen: true,
1313
title,

0 commit comments

Comments
 (0)