From 04e43a2748fd66b4164a94b05081dea6523300cb Mon Sep 17 00:00:00 2001 From: groovypark Date: Thu, 29 Oct 2020 15:09:33 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EB=A0=88=EC=8B=9C=ED=94=BC=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EC=BD=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Icon/assets/recipe.svg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 src/components/Icon/assets/recipe.svg diff --git a/src/components/Icon/assets/recipe.svg b/src/components/Icon/assets/recipe.svg new file mode 100644 index 0000000000..3190d20a83 --- /dev/null +++ b/src/components/Icon/assets/recipe.svg @@ -0,0 +1,3 @@ + + + From 06f3c2ad3b9dff4f1ed9bc5de6d230a99b3fbf68 Mon Sep 17 00:00:00 2001 From: danivelop <55433950+danivelop@users.noreply.github.com> Date: Thu, 29 Oct 2020 16:01:27 +0900 Subject: [PATCH 2/3] =?UTF-8?q?Editor=EC=9E=84=EC=8B=9C=EB=A1=9C=20export?= =?UTF-8?q?=EC=95=88=ED=95=A8=20(#178)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 빌드에러때문에 임시로 Editor는 export안하도록 변경 * v0.2.17 * TODO 주석 추가 --- package-lock.json | 2 +- package.json | 2 +- src/index.ts | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index dfee892deb..5dc75c36e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@channel.io/design-system", - "version": "0.2.16", + "version": "0.2.17", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index c5a6d78c4c..35063449a8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@channel.io/design-system", - "version": "0.2.16", + "version": "0.2.17", "description": "Design System by Channel", "repository": { "type": "git", diff --git a/src/index.ts b/src/index.ts index 92f3d53b20..0dfc557d92 100644 --- a/src/index.ts +++ b/src/index.ts @@ -16,7 +16,9 @@ export * from './components/List/ListMenuTitle' export * from './components/List/ListMenuGroup' export * from './components/List/ListItem' export * from './components/Overlay' -export * from './components/Editor' + +// TODO: Antlr 문제 수정 후 export (Cannot read property RuleContext of undefined) +// export * from './components/Editor' /* Layout */ export * from './layout/GNB' From 0253fe3f0c2a649559122ac7e92258d4209dd295 Mon Sep 17 00:00:00 2001 From: danivelop <55433950+danivelop@users.noreply.github.com> Date: Thu, 29 Oct 2020 16:13:53 +0900 Subject: [PATCH 3/3] =?UTF-8?q?overlayPosition=20export=EC=95=88=EB=90=98?= =?UTF-8?q?=EB=93=A0=EB=AC=B8=EC=A0=9C=20=EC=9E=AC=EC=88=98=EC=A0=95=20(#1?= =?UTF-8?q?79)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Overlay/Overlay.stories.tsx | 2 +- src/components/Overlay/Overlay.tsx | 2 +- src/components/Overlay/Overlay.types.ts | 16 +++++++++++++++- src/components/Overlay/OverlayPosition.ts | 16 ---------------- src/components/Overlay/index.ts | 4 ++-- 5 files changed, 19 insertions(+), 21 deletions(-) delete mode 100644 src/components/Overlay/OverlayPosition.ts diff --git a/src/components/Overlay/Overlay.stories.tsx b/src/components/Overlay/Overlay.stories.tsx index 9fabf0bda4..e0378b2f50 100644 --- a/src/components/Overlay/Overlay.stories.tsx +++ b/src/components/Overlay/Overlay.stories.tsx @@ -7,7 +7,7 @@ import { getTitle } from '../../utils/utils' import { styled } from '../../styling/Theme' import Palette from '../../styling/Palette' import Overlay from './Overlay' -import OverlayPosition from './OverlayPosition' +import { OverlayPosition } from './Overlay.types' export default { title: getTitle(base), diff --git a/src/components/Overlay/Overlay.tsx b/src/components/Overlay/Overlay.tsx index 6adc709a0d..91d7b7cf10 100644 --- a/src/components/Overlay/Overlay.tsx +++ b/src/components/Overlay/Overlay.tsx @@ -18,8 +18,8 @@ import OverlayProps, { GetOverlayStyleProps, GetOverlayPositionProps, GetOverlayTranslatationProps, + OverlayPosition, } from './Overlay.types' -import OverlayPosition from './OverlayPosition' import { Container, Wrapper, StyledOverlay } from './Overlay.styled' export const CONTAINER_TEST_ID = 'ch-design-system-container' diff --git a/src/components/Overlay/Overlay.types.ts b/src/components/Overlay/Overlay.types.ts index f605d4e73f..04366ccae0 100644 --- a/src/components/Overlay/Overlay.types.ts +++ b/src/components/Overlay/Overlay.types.ts @@ -3,7 +3,6 @@ import React from 'react' /* Internal dependencies */ import { UIComponentProps, ChildrenComponentProps } from '../../types/ComponentProps' -import OverlayPosition from './OverlayPosition' export default interface OverlayProps extends UIComponentProps, ChildrenComponentProps, React.HTMLAttributes { show?: boolean @@ -40,4 +39,19 @@ export interface StyledOverlayProps { isHidden: boolean } +export enum OverlayPosition { + TopCenter = 'topCenter', + TopLeft = 'topLeft', + TopRight = 'topRight', + RightCenter = 'rightCenter', + RightTop = 'rightTop', + RightBottom = 'rightBottom', + BottomCenter = 'bottomCenter', + BottomLeft = 'bottomLeft', + BottomRight = 'bottomRight', + LeftCenter = 'leftCenter', + LeftTop = 'leftTop', + LeftBottom = 'leftBottom', +} + export type EventHandler = (event: HTMLElementEventMap[K]) => any diff --git a/src/components/Overlay/OverlayPosition.ts b/src/components/Overlay/OverlayPosition.ts deleted file mode 100644 index 7b5d9e0e39..0000000000 --- a/src/components/Overlay/OverlayPosition.ts +++ /dev/null @@ -1,16 +0,0 @@ -enum OverlayPosition { - TopCenter = 'topCenter', - TopLeft = 'topLeft', - TopRight = 'topRight', - RightCenter = 'rightCenter', - RightTop = 'rightTop', - RightBottom = 'rightBottom', - BottomCenter = 'bottomCenter', - BottomLeft = 'bottomLeft', - BottomRight = 'bottomRight', - LeftCenter = 'leftCenter', - LeftTop = 'leftTop', - LeftBottom = 'leftBottom', -} - -export default OverlayPosition diff --git a/src/components/Overlay/index.ts b/src/components/Overlay/index.ts index 90e8b6d4ad..4bd820db68 100644 --- a/src/components/Overlay/index.ts +++ b/src/components/Overlay/index.ts @@ -1,13 +1,13 @@ /* Internal dependencies */ import Overlay from './Overlay' -import type OverlayPosition from './OverlayPosition' +import { OverlayPosition } from './Overlay.types' import type OverlayProps from './Overlay.types' export type { OverlayProps, - OverlayPosition, } export { Overlay, + OverlayPosition, }