Merge remote-tracking branch 'origin/main' into main

team-aliens · Dec 27, 2022 · b0c720b · b0c720b
2 parents 872f187 + 3c7920d
commit b0c720b
Show file tree

Hide file tree

Showing 2 changed files with 132 additions and 18 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,3 +1,52 @@
+## [1.3.5](https://github.com/team-aliens/design-system/compare/v1.3.4...v1.3.5) (2022-12-27)
+
+
+### Bug Fixes
+
+* x,y 좌표 수정 ([84e0d59](https://github.com/team-aliens/design-system/commit/84e0d59bda9539531303dc29c9f40cf915534fda))
+
+## [1.3.4](https://github.com/team-aliens/design-system/compare/v1.3.3...v1.3.4) (2022-12-27)
+
+
+### Bug Fixes
+
+* studyRoom selected 로직 수정 ([f9e926d](https://github.com/team-aliens/design-system/commit/f9e926d6cf6e5513c66c2555227884ece773c753))
+
+## [1.3.3](https://github.com/team-aliens/design-system/compare/v1.3.2...v1.3.3) (2022-12-27)
+
+
+### Bug Fixes
+
+* width와 height에 -1를 하여 발생하는 에러 수정 ([cec1026](https://github.com/team-aliens/design-system/commit/cec1026e261d3562f7ae84fa5fb314fa59d983c1))
+
+## [1.3.2](https://github.com/team-aliens/design-system/compare/v1.3.1...v1.3.2) (2022-12-27)
+
+
+### Bug Fixes
+
+* default value 추가 ([9ef1910](https://github.com/team-aliens/design-system/commit/9ef1910fc6d24bf945560f013a924d3afe8f4734))
+
+## [1.3.1](https://github.com/team-aliens/design-system/compare/v1.3.0...v1.3.1) (2022-12-27)
+
+
+### Bug Fixes
+
+* selectedPosition optional 처리 ([d696052](https://github.com/team-aliens/design-system/commit/d6960527a34994c65e5bbe2a96413a51ca0dcf6a))
+
+# [1.3.0](https://github.com/team-aliens/design-system/compare/v1.2.12...v1.3.0) (2022-12-27)
+
+
+### Features
+
+* 자습실 에디터 기능 추가 ([079a490](https://github.com/team-aliens/design-system/commit/079a490f4d856b2615dbf2331b8be9150ccfd9b1))
+
+## [1.2.12](https://github.com/team-aliens/design-system/compare/v1.2.11...v1.2.12) (2022-12-27)
+
+
+### Bug Fixes
+
+* studyRoom  색 수정 ([b2cd88b](https://github.com/team-aliens/design-system/commit/b2cd88bee8b80f10ffc1c57910792e992b7c3225))
+
 ## [1.2.11](https://github.com/team-aliens/design-system/compare/v1.2.10...v1.2.11) (2022-12-27)
 
 

diff --git a/src/components/studyRoom/index.tsx b/src/components/studyRoom/index.tsx
@@ -34,8 +34,23 @@ interface PropsType {
   total_width_size: number;
   total_height_size: number;
   seats: seatType[];
+  isEdit?: boolean;
+  onClickSeat?: (xPosition: number, yPosition: number) => void;
+  selectedPosition?: {
+    x: number;
+    y: number;
+  };
 }
 
+const arr2Generator = (x: number, y: number) => {
+  let arr = [];
+  for (let i = 0; i < x; i++) {
+    arr[i] = [];
+    for (let j = 0; j < y; j++) arr[i][j] = 0;
+  }
+  return arr;
+};
+
 export const StudyRoom = ({
   east_description,
   west_description,
@@ -44,6 +59,12 @@ export const StudyRoom = ({
   total_height_size,
   total_width_size,
   seats,
+  isEdit = false,
+  onClickSeat = (x, y) => {},
+  selectedPosition = {
+    x: -1,
+    y: -1,
+  },
 }: PropsType) => {
   const arr2Generator = (x: number, y: number) => {
     let arr = [];
@@ -74,32 +95,64 @@ export const StudyRoom = ({
         {north_description}
       </_NorthDirection>
       <_Room>
-        {arr.map((seat, idx) => (
+        {arr.map((seatY, y) => (
           <_Seats>
-            {seat.map((seat, idx) => (
+            {seatY.map((seat, x) => (
               <>
                 {seat ? (
                   seat.number ? (
-                    <_Seat
-                      display="inline-block"
-                      background={seat.type.color || '#b1d0ff'}
-                      color="gray1"
-                      size="bodyS"
+                    <_SeatBlock
+                      isEdit={isEdit}
+                      isSelected={
+                        isEdit &&
+                        selectedPosition?.x === x &&
+                        selectedPosition?.y === y
+                      }
                     >
-                      {seat.type ? seat.type.name : seat.number}
-                    </_Seat>
+                      <_Seat
+                        onClick={() => isEdit && onClickSeat(x, y)}
+                        display="inline-block"
+                        background={seat.type.color || '#b1d0ff'}
+                        color="gray1"
+                        size="bodyS"
+                      >
+                        {seat.type ? seat.type.name : seat.number}
+                      </_Seat>
+                    </_SeatBlock>
                   ) : (
-                    <_Seat
-                      display="inline-block"
-                      background={'gray4'}
-                      color="gray1"
-                      size="bodyS"
+                    <_SeatBlock
+                      isEdit={isEdit}
+                      isSelected={
+                        isEdit &&
+                        selectedPosition?.x === x &&
+                        selectedPosition?.y === y
+                      }
                     >
-                      사용불가
-                    </_Seat>
+                      <_Seat
+                        onClick={() => isEdit && onClickSeat(x, y)}
+                        display="inline-block"
+                        background={'gray4'}
+                        color="gray1"
+                        size="bodyS"
+                      >
+                        사용불가
+                      </_Seat>
+                    </_SeatBlock>
                   )
                 ) : (
-                  <_Seat background={'gray1'} />
+                  <_SeatBlock
+                    isEdit={isEdit}
+                    isSelected={
+                      isEdit &&
+                      selectedPosition?.x === x &&
+                      selectedPosition?.y === y
+                    }
+                  >
+                    <_Seat
+                      onClick={() => isEdit && onClickSeat(x, y)}
+                      background={'gray1'}
+                    />
+                  </_SeatBlock>
                 )}
               </>
             ))}
@@ -112,6 +165,19 @@ export const StudyRoom = ({
 
 const _Seats = styled.div`
   display: flex;
+  overflow: hidden;
+`;
+
+const _SeatBlock = styled.div<{
+  isEdit: boolean;
+  isSelected: boolean;
+}>`
+  width: 100px;
+  height: 100px;
+  padding: 10px;
+  border: 1px solid
+    ${({ theme, isSelected, isEdit }) =>
+      isEdit ? (isSelected ? theme.color.primary : theme.color.gray4) : 'none'};
 `;
 
 const _Seat = styled(Text)<{ background: string }>`
@@ -120,7 +186,6 @@ const _Seat = styled(Text)<{ background: string }>`
   display: flex;
   justify-content: center;
   align-items: center;
-  margin: 10px;
   border-radius: 70%;
   background-color: ${({ background }) => background};
 `;