From 2d7d1c2b6d31e1c8086f228fb616707991969173 Mon Sep 17 00:00:00 2001 From: "casio@sparcs.org" Date: Mon, 14 Oct 2024 23:49:05 +0900 Subject: [PATCH 1/8] feat: impl multi prop into select --- .../src/common/components/Forms/Select.tsx | 82 +++++++++++++++---- 1 file changed, 65 insertions(+), 17 deletions(-) diff --git a/packages/web/src/common/components/Forms/Select.tsx b/packages/web/src/common/components/Forms/Select.tsx index 0f8e0e7..4482030 100644 --- a/packages/web/src/common/components/Forms/Select.tsx +++ b/packages/web/src/common/components/Forms/Select.tsx @@ -15,8 +15,9 @@ interface SelectProps { label?: string; errorMessage?: string; disabled?: boolean; - selectedValue?: string; - onSelect?: (value: string) => void; + selectedValue?: string | string[]; + multi?: boolean; // 다중 선택 여부 추가 + onSelect?: (value: string | string[]) => void; setErrorStatus?: (hasError: boolean) => void; } @@ -72,10 +73,10 @@ const Dropdown = styled.div` border-radius: 4px; background-color: ${({ theme }) => theme.colors.WHITE}; gap: 4px; - z-index: 1000; // Ensure the dropdown appears above other content + z-index: 1000; `; -const Option = styled.div<{ selectable?: boolean }>` +const Option = styled.div<{ selectable?: boolean; isSelected?: boolean }>` gap: 10px; border-radius: 4px; padding: 4px 12px; @@ -85,6 +86,8 @@ const Option = styled.div<{ selectable?: boolean }>` font-weight: ${({ theme }) => theme.fonts.WEIGHT.REGULAR}; color: ${({ theme, selectable }) => selectable ? theme.colors.BLACK : theme.colors.GRAY[100]}; + background-color: ${({ theme, isSelected }) => + isSelected ? theme.colors.GREEN[100] : theme.colors.WHITE}; ${({ selectable }) => selectable && css` @@ -136,6 +139,7 @@ const Select: React.FC = ({ label = "", disabled = false, selectedValue = "", + multi = false, // 기본값을 false로 설정 onSelect = () => {}, setErrorStatus = () => {}, }) => { @@ -144,8 +148,11 @@ const Select: React.FC = ({ const containerRef = useRef(null); useEffect(() => { - setErrorStatus(!!errorMessage || (!selectedValue && items.length > 0)); - }, [errorMessage, selectedValue, items.length, setErrorStatus]); + const hasError = + (multi && Array.isArray(selectedValue) && selectedValue.length === 0) || + (!multi && !selectedValue && items.length > 0); + setErrorStatus(!!errorMessage || hasError); + }, [errorMessage, selectedValue, items.length, multi, setErrorStatus]); useEffect(() => { function handleClickOutside(event: MouseEvent) { @@ -175,14 +182,40 @@ const Select: React.FC = ({ const handleOptionClick = (item: SelectItem) => { if (item.selectable) { - onSelect(item.value); + if (multi) { + let newSelectedValue = Array.isArray(selectedValue) + ? [...selectedValue] + : []; + if (newSelectedValue.includes(item.value)) { + newSelectedValue = newSelectedValue.filter(val => val !== item.value); + } else { + newSelectedValue.push(item.value); + } + onSelect(newSelectedValue); + } else { + onSelect(item.value); + } + } + if (!multi) { setIsOpen(false); } }; - const selectedLabel = - items.find(item => item.value === selectedValue)?.label || - "항목을 선택해주세요"; + let selectedLabel: string; // 'let'을 사용하여 변수를 선언합니다. + + if (multi) { + if (Array.isArray(selectedValue) && selectedValue.length > 0) { + selectedLabel = items + .filter(item => selectedValue.includes(item.value)) + .map(item => item.label) + .join(", "); + } else { + selectedLabel = "항목을 선택해주세요"; + } + } else { + const foundItem = items.find(item => item.value === selectedValue); + selectedLabel = foundItem ? foundItem.label : "항목을 선택해주세요"; + } return ( @@ -191,13 +224,19 @@ const Select: React.FC = ({ 0 && !isOpen + hasOpenedOnce && + multi && + Array.isArray(selectedValue) && + selectedValue.length === 0 && + !isOpen } disabled={disabled} onClick={handleSelectClick} isOpen={isOpen} > - + 0 : !!selectedValue} + > {selectedLabel} @@ -215,6 +254,12 @@ const Select: React.FC = ({ - {hasOpenedOnce && !selectedValue && items.length > 0 && ( - - {errorMessage || "필수로 선택해야 하는 항목입니다"} - - )} + {hasOpenedOnce && + multi && + Array.isArray(selectedValue) && + selectedValue.length === 0 && ( + + {errorMessage || "필수로 선택해야 하는 항목입니다"} + + )} ); From 41f3cc5edae8a0e01be115ddcc544ed7b1f22b4b Mon Sep 17 00:00:00 2001 From: "casio@sparcs.org" Date: Mon, 14 Oct 2024 23:52:03 +0900 Subject: [PATCH 2/8] chore: delete comment --- packages/web/src/common/components/Forms/Select.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web/src/common/components/Forms/Select.tsx b/packages/web/src/common/components/Forms/Select.tsx index 4482030..ee624cf 100644 --- a/packages/web/src/common/components/Forms/Select.tsx +++ b/packages/web/src/common/components/Forms/Select.tsx @@ -201,7 +201,7 @@ const Select: React.FC = ({ } }; - let selectedLabel: string; // 'let'을 사용하여 변수를 선언합니다. + let selectedLabel: string; if (multi) { if (Array.isArray(selectedValue) && selectedValue.length > 0) { From 1f46603cce2a15c22ab163d7032679ee465caf51 Mon Sep 17 00:00:00 2001 From: "casio@sparcs.org" Date: Mon, 11 Nov 2024 15:53:12 +0900 Subject: [PATCH 3/8] chore: fix file directory --- packages/web/src/app/favicon.ico | Bin 25931 -> 93062 bytes .../{Forms/Select.tsx => Select/index.tsx} | 19 +++--------------- 2 files changed, 3 insertions(+), 16 deletions(-) rename packages/web/src/common/components/{Forms/Select.tsx => Select/index.tsx} (94%) diff --git a/packages/web/src/app/favicon.ico b/packages/web/src/app/favicon.ico index 718d6fea4835ec2d246af9800eddb7ffb276240c..d4e29cd3f85af9cd3f0d28b42ea7b2becb305458 100644 GIT binary patch literal 93062 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 LrJugUA?W`A8`#=m diff --git a/packages/web/src/common/components/Forms/Select.tsx b/packages/web/src/common/components/Select/index.tsx similarity index 94% rename from packages/web/src/common/components/Forms/Select.tsx rename to packages/web/src/common/components/Select/index.tsx index ee624cf..9c14102 100644 --- a/packages/web/src/common/components/Forms/Select.tsx +++ b/packages/web/src/common/components/Select/index.tsx @@ -1,8 +1,9 @@ import React, { useState, useRef, useEffect } from "react"; import styled, { css } from "styled-components"; import { KeyboardArrowDown, KeyboardArrowUp } from "@mui/icons-material"; -import Label from "./_atomic/Label"; -import ErrorMessage from "./_atomic/ErrorMessage"; +import Label from "../Forms/_atomic/Label"; +import ErrorMessage from "../Forms/_atomic/ErrorMessage"; +import Dropdown from "./Dropdown"; export interface SelectItem { label: string; @@ -62,20 +63,6 @@ const StyledSelect = styled.div<{ ${({ disabled }) => disabled && disabledStyle} `; -const Dropdown = styled.div` - position: absolute; - display: flex; - flex-direction: column; - width: 100%; - margin-top: 4px; - padding: 8px; - border: 1px solid ${({ theme }) => theme.colors.GRAY[100]}; - border-radius: 4px; - background-color: ${({ theme }) => theme.colors.WHITE}; - gap: 4px; - z-index: 1000; -`; - const Option = styled.div<{ selectable?: boolean; isSelected?: boolean }>` gap: 10px; border-radius: 4px; From 53a16553feee40418296b4ec2f1dec7ba2aa2f8e Mon Sep 17 00:00:00 2001 From: "casio@sparcs.org" Date: Mon, 11 Nov 2024 15:54:38 +0900 Subject: [PATCH 4/8] chore: fix file directory --- packages/web/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web/tsconfig.json b/packages/web/tsconfig.json index 06e8a23..9d5a843 100644 --- a/packages/web/tsconfig.json +++ b/packages/web/tsconfig.json @@ -23,4 +23,4 @@ }, "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"], "exclude": ["node_modules"] -} +} \ No newline at end of file From f864e0c1d60bc266b5873788962f5ebc41b245f4 Mon Sep 17 00:00:00 2001 From: sparcscasio <162997498+sparcscasio@users.noreply.github.com> Date: Sat, 23 Nov 2024 15:41:43 +0900 Subject: [PATCH 5/8] feat: add example page --- packages/web/src/app/example/casio/page.tsx | 86 +++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 packages/web/src/app/example/casio/page.tsx diff --git a/packages/web/src/app/example/casio/page.tsx b/packages/web/src/app/example/casio/page.tsx new file mode 100644 index 0000000..f76b8fd --- /dev/null +++ b/packages/web/src/app/example/casio/page.tsx @@ -0,0 +1,86 @@ +"use client"; + +import Select, { + SelectItem, +} from "@sparcs-students/web/common/components/Select"; +import React, { useState } from "react"; +import styled from "styled-components"; + +const Container = styled.div` + max-width: 600px; + margin: 0 auto; + padding: 20px; + font-family: Arial, sans-serif; +`; + +const Section = styled.div` + margin-bottom: 40px; +`; + +const Header = styled.h1` + font-size: 24px; + margin-bottom: 20px; +`; + +const ExamplePage: React.FC = () => { + const [singleSelected, setSingleSelected] = useState(""); + const [multiSelected, setMultiSelected] = useState([]); + const [errorStatus, setErrorStatus] = useState(false); + + const singleSelectItems: SelectItem[] = [ + { label: "Option 1", value: "option1", selectable: true }, + { label: "Option 2", value: "option2", selectable: true }, + { label: "Option 3", value: "option3", selectable: true }, + ]; + + const multiSelectItems: SelectItem[] = [ + { label: "Apple", value: "apple", selectable: true }, + { label: "Banana", value: "banana", selectable: true }, + { label: "Cherry", value: "cherry", selectable: true }, + { label: "Grapes", value: "grapes", selectable: true }, + ]; + + console.log(errorStatus); + + return ( + +
Select Component Example
+ + {/* 단일 선택 */} +
+

Single Select

+ setMultiSelected(value as string[])} + errorMessage="At least one fruit must be selected" + setErrorStatus={setErrorStatus} + /> +

+ Selected Values:{" "} + {multiSelected.length > 0 ? multiSelected.join(", ") : "None"} +

+
+ + ); +}; + +export default ExamplePage; From ab934c9e960dc962d413a8130cd9092aac36aa82 Mon Sep 17 00:00:00 2001 From: sparcscasio <162997498+sparcscasio@users.noreply.github.com> Date: Sun, 24 Nov 2024 04:50:56 +0900 Subject: [PATCH 6/8] chore: delete example file --- packages/web/src/app/example/casio/page.tsx | 86 --------------------- 1 file changed, 86 deletions(-) delete mode 100644 packages/web/src/app/example/casio/page.tsx diff --git a/packages/web/src/app/example/casio/page.tsx b/packages/web/src/app/example/casio/page.tsx deleted file mode 100644 index f76b8fd..0000000 --- a/packages/web/src/app/example/casio/page.tsx +++ /dev/null @@ -1,86 +0,0 @@ -"use client"; - -import Select, { - SelectItem, -} from "@sparcs-students/web/common/components/Select"; -import React, { useState } from "react"; -import styled from "styled-components"; - -const Container = styled.div` - max-width: 600px; - margin: 0 auto; - padding: 20px; - font-family: Arial, sans-serif; -`; - -const Section = styled.div` - margin-bottom: 40px; -`; - -const Header = styled.h1` - font-size: 24px; - margin-bottom: 20px; -`; - -const ExamplePage: React.FC = () => { - const [singleSelected, setSingleSelected] = useState(""); - const [multiSelected, setMultiSelected] = useState([]); - const [errorStatus, setErrorStatus] = useState(false); - - const singleSelectItems: SelectItem[] = [ - { label: "Option 1", value: "option1", selectable: true }, - { label: "Option 2", value: "option2", selectable: true }, - { label: "Option 3", value: "option3", selectable: true }, - ]; - - const multiSelectItems: SelectItem[] = [ - { label: "Apple", value: "apple", selectable: true }, - { label: "Banana", value: "banana", selectable: true }, - { label: "Cherry", value: "cherry", selectable: true }, - { label: "Grapes", value: "grapes", selectable: true }, - ]; - - console.log(errorStatus); - - return ( - -
Select Component Example
- - {/* 단일 선택 */} -
-

Single Select

- setMultiSelected(value as string[])} - errorMessage="At least one fruit must be selected" - setErrorStatus={setErrorStatus} - /> -

- Selected Values:{" "} - {multiSelected.length > 0 ? multiSelected.join(", ") : "None"} -

-
- - ); -}; - -export default ExamplePage; From f8e4caca7f3814cdf97379839d4727ad89486d4f Mon Sep 17 00:00:00 2001 From: sparcscasio <162997498+sparcscasio@users.noreply.github.com> Date: Sun, 24 Nov 2024 05:04:06 +0900 Subject: [PATCH 7/8] chore: resolve errors --- packages/web/src/common/components/Select/index.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/web/src/common/components/Select/index.tsx b/packages/web/src/common/components/Select/index.tsx index 339df81..9c14102 100644 --- a/packages/web/src/common/components/Select/index.tsx +++ b/packages/web/src/common/components/Select/index.tsx @@ -25,7 +25,6 @@ interface SelectProps { const DropdownContainer = styled.div` gap: 4px; position: relative; - display: flex; `; const disabledStyle = css` @@ -40,7 +39,7 @@ const StyledSelect = styled.div<{ isOpen?: boolean; }>` width: 100%; - padding: 8px 32px 8px 12px; + padding: 8px 12px; outline: none; cursor: pointer; background-color: ${({ theme }) => theme.colors.WHITE}; @@ -64,13 +63,12 @@ const StyledSelect = styled.div<{ ${({ disabled }) => disabled && disabledStyle} `; -const Option = styled.div<{ selectable?: boolean }>` +const Option = styled.div<{ selectable?: boolean; isSelected?: boolean }>` gap: 10px; border-radius: 4px; padding: 4px 12px; font-family: ${({ theme }) => theme.fonts.FAMILY.PRETENDARD}; font-size: 16px; - packages/web/src/common/components/Select/index.tsx line-height: 20px; font-weight: ${({ theme }) => theme.fonts.WEIGHT.REGULAR}; color: ${({ theme, selectable }) => From 20af66fcd9ff912d5e19f71f712460c0825b92e8 Mon Sep 17 00:00:00 2001 From: sparcscasio <162997498+sparcscasio@users.noreply.github.com> Date: Sun, 24 Nov 2024 05:07:52 +0900 Subject: [PATCH 8/8] chore: resolve errors --- packages/web/stories/Forms/Select.stories.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/web/stories/Forms/Select.stories.tsx b/packages/web/stories/Forms/Select.stories.tsx index c649d36..6a9353b 100644 --- a/packages/web/stories/Forms/Select.stories.tsx +++ b/packages/web/stories/Forms/Select.stories.tsx @@ -1,8 +1,9 @@ import type { Meta, StoryObj } from "@storybook/react"; import React from "react"; -import Select from "@sparcs-students/web/common/components/Forms/Select"; + import { useArgs } from "@storybook/client-api"; import { fn } from "@storybook/test"; +import Select from "@sparcs-students/web/common/components/Select"; const meta: Meta = { title: "components/Forms/Select",