Skip to content

Commit

Permalink
[FE] BottomFixedButton 버그 수정 (#385)
Browse files Browse the repository at this point in the history
* rename: meetingFrame 렌더 함수 네이밍 수정

* refactor: gap 속성 추가 및 시간 선택 테이블 max-height 제거, MSW 주석 추가
  • Loading branch information
Largopie authored Oct 7, 2024
1 parent 17d61f4 commit 71c6779
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
1 change: 0 additions & 1 deletion frontend/src/components/Schedules/Schedules.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ export const s_container = css`
export const s_relativeContainer = css`
position: relative;
flex: 1;
max-height: fit-content;
`;

export const s_selectModeButtonsContainer = css`
Expand Down
1 change: 1 addition & 0 deletions frontend/src/mocks/meeting/meetingHandlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import mySchedule from './data/mySchedule.json';

const meetingHandlers = [
http.get(`${BASE_URL}/:uuid`, () => {
// meetingTableFrame에서 type을 "DATETIME"으로 설정하면 시간 선택 표가 나오고, "DAYSONLY"로 설정하면 달력이 나옵니다.
return HttpResponse.json(meetingTableFrame, { status: 200 });
}),

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { css } from '@emotion/react';
export const s_container = css`
display: flex;
flex-direction: column;
gap: 0.8rem;
width: 100%;
height: 100%;
`;
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/MeetingTimePickPage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export default function MeetingTimePickPage() {
}
};

const renderPicker = (meetingType: MeetingType) => {
const renderMeetingFrame = (meetingType: MeetingType) => {
if (!meetingFrame) return;

switch (meetingType) {
Expand Down Expand Up @@ -117,7 +117,7 @@ export default function MeetingTimePickPage() {
</div>
)}
</section>
{meetingFrame && renderPicker(meetingFrame.type)}
{meetingFrame && renderMeetingFrame(meetingFrame.type)}
</div>
);
}

0 comments on commit 71c6779

Please sign in to comment.