From 7dd4a0b907fe52093162a32b8c1ca6c43b73b627 Mon Sep 17 00:00:00 2001 From: Son Do Hong Date: Thu, 3 Sep 2020 18:59:36 +0700 Subject: [PATCH 01/40] chore(release): publish - @retail-ui/action-buttons@0.3.2 - @retail-ui/alert@0.3.2 - @retail-ui/avatar@0.2.1 - @retail-ui/badge@0.3.2 - @retail-ui/breadcrumb@0.3.1 - @retail-ui/button-icon@0.3.1 - @retail-ui/button@0.2.5 - @retail-ui/card@0.2.1 - @retail-ui/core@0.4.0 - @retail-ui/heroicons@0.2.4 - @retail-ui/icon@0.2.3 - @retail-ui/spinner@0.2.3 - @retail-ui/test-utils@0.2.2 - @retail-ui/theme@0.3.1 --- packages/action-buttons/CHANGELOG.md | 4 ++++ packages/action-buttons/package.json | 6 +++--- packages/alert/CHANGELOG.md | 4 ++++ packages/alert/package.json | 8 ++++---- packages/avatar/CHANGELOG.md | 4 ++++ packages/avatar/package.json | 6 +++--- packages/badge/CHANGELOG.md | 4 ++++ packages/badge/package.json | 8 ++++---- packages/breadcrumb/CHANGELOG.md | 4 ++++ packages/breadcrumb/package.json | 6 +++--- packages/button-icon/CHANGELOG.md | 4 ++++ packages/button-icon/package.json | 8 ++++---- packages/button/CHANGELOG.md | 4 ++++ packages/button/package.json | 10 +++++----- packages/card/CHANGELOG.md | 4 ++++ packages/card/package.json | 6 +++--- packages/core/CHANGELOG.md | 10 ++++++++++ packages/core/package.json | 26 +++++++++++++------------- packages/heroicons/CHANGELOG.md | 4 ++++ packages/heroicons/package.json | 4 ++-- packages/icon/CHANGELOG.md | 4 ++++ packages/icon/package.json | 4 ++-- packages/spinner/CHANGELOG.md | 4 ++++ packages/spinner/package.json | 4 ++-- packages/test-utils/CHANGELOG.md | 4 ++++ packages/test-utils/package.json | 4 ++-- packages/theme/CHANGELOG.md | 4 ++++ packages/theme/package.json | 2 +- 28 files changed, 113 insertions(+), 51 deletions(-) diff --git a/packages/action-buttons/CHANGELOG.md b/packages/action-buttons/CHANGELOG.md index 2ba290a..4b93835 100644 --- a/packages/action-buttons/CHANGELOG.md +++ b/packages/action-buttons/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.3.2](https://github.com/sondh0127/retail-ui/compare/@retail-ui/action-buttons@0.3.1...@retail-ui/action-buttons@0.3.2) (2020-09-03) + +**Note:** Version bump only for package @retail-ui/action-buttons + ## [0.3.1](https://github.com/sondh0127/retail-ui/compare/@retail-ui/action-buttons@0.3.0...@retail-ui/action-buttons@0.3.1) (2020-09-02) **Note:** Version bump only for package @retail-ui/action-buttons diff --git a/packages/action-buttons/package.json b/packages/action-buttons/package.json index 0e9316a..64dc568 100644 --- a/packages/action-buttons/package.json +++ b/packages/action-buttons/package.json @@ -1,6 +1,6 @@ { "name": "@retail-ui/action-buttons", - "version": "0.3.1", + "version": "0.3.2", "description": "The ActionButtons component of @retail-ui", "keywords": [ "react", @@ -43,7 +43,7 @@ "react": ">=16" }, "devDependencies": { - "@retail-ui/button": "^0.2.4", - "@retail-ui/theme": "^0.3.0" + "@retail-ui/button": "^0.2.5", + "@retail-ui/theme": "^0.3.1" } } diff --git a/packages/alert/CHANGELOG.md b/packages/alert/CHANGELOG.md index 70eb10d..0a7bb7e 100644 --- a/packages/alert/CHANGELOG.md +++ b/packages/alert/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.3.2](https://github.com/sondh0127/retail-ui/compare/@retail-ui/alert@0.3.1...@retail-ui/alert@0.3.2) (2020-09-03) + +**Note:** Version bump only for package @retail-ui/alert + ## [0.3.1](https://github.com/sondh0127/retail-ui/compare/@retail-ui/alert@0.3.0...@retail-ui/alert@0.3.1) (2020-09-02) **Note:** Version bump only for package @retail-ui/alert diff --git a/packages/alert/package.json b/packages/alert/package.json index a122612..604ca69 100644 --- a/packages/alert/package.json +++ b/packages/alert/package.json @@ -1,6 +1,6 @@ { "name": "@retail-ui/alert", - "version": "0.3.1", + "version": "0.3.2", "description": "The Alert component of @retail-ui", "keywords": [ "react", @@ -43,8 +43,8 @@ "react": ">=16" }, "devDependencies": { - "@retail-ui/button-icon": "^0.3.0", - "@retail-ui/heroicons": "^0.2.3", - "@retail-ui/theme": "^0.3.0" + "@retail-ui/button-icon": "^0.3.1", + "@retail-ui/heroicons": "^0.2.4", + "@retail-ui/theme": "^0.3.1" } } diff --git a/packages/avatar/CHANGELOG.md b/packages/avatar/CHANGELOG.md index d54c9ca..f1e1ff9 100644 --- a/packages/avatar/CHANGELOG.md +++ b/packages/avatar/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.2.1](https://github.com/sondh0127/retail-ui/compare/@retail-ui/avatar@0.2.0...@retail-ui/avatar@0.2.1) (2020-09-03) + +**Note:** Version bump only for package @retail-ui/avatar + # 0.2.0 (2020-09-02) ### Features diff --git a/packages/avatar/package.json b/packages/avatar/package.json index e7767d9..217dd5f 100644 --- a/packages/avatar/package.json +++ b/packages/avatar/package.json @@ -1,6 +1,6 @@ { "name": "@retail-ui/avatar", - "version": "0.2.0", + "version": "0.2.1", "description": "The Avatar component of @retail-ui", "keywords": [ "react", @@ -43,7 +43,7 @@ "react": ">=16" }, "devDependencies": { - "@retail-ui/icon": "^0.2.2", - "@retail-ui/theme": "^0.3.0" + "@retail-ui/icon": "^0.2.3", + "@retail-ui/theme": "^0.3.1" } } diff --git a/packages/badge/CHANGELOG.md b/packages/badge/CHANGELOG.md index d8e2047..21aeed7 100644 --- a/packages/badge/CHANGELOG.md +++ b/packages/badge/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.3.2](https://github.com/sondh0127/retail-ui/compare/@retail-ui/badge@0.3.1...@retail-ui/badge@0.3.2) (2020-09-03) + +**Note:** Version bump only for package @retail-ui/badge + ## [0.3.1](https://github.com/sondh0127/retail-ui/compare/@retail-ui/badge@0.3.0...@retail-ui/badge@0.3.1) (2020-09-02) **Note:** Version bump only for package @retail-ui/badge diff --git a/packages/badge/package.json b/packages/badge/package.json index 6f1194e..b6a34cd 100644 --- a/packages/badge/package.json +++ b/packages/badge/package.json @@ -1,6 +1,6 @@ { "name": "@retail-ui/badge", - "version": "0.3.1", + "version": "0.3.2", "description": "The Badge component of @retail-ui", "keywords": [ "react", @@ -43,8 +43,8 @@ "react": ">=16" }, "devDependencies": { - "@retail-ui/button-icon": "^0.3.0", - "@retail-ui/heroicons": "^0.2.3", - "@retail-ui/theme": "^0.3.0" + "@retail-ui/button-icon": "^0.3.1", + "@retail-ui/heroicons": "^0.2.4", + "@retail-ui/theme": "^0.3.1" } } diff --git a/packages/breadcrumb/CHANGELOG.md b/packages/breadcrumb/CHANGELOG.md index a9f3669..3893c7f 100644 --- a/packages/breadcrumb/CHANGELOG.md +++ b/packages/breadcrumb/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.3.1](https://github.com/sondh0127/retail-ui/compare/@retail-ui/breadcrumb@0.3.0...@retail-ui/breadcrumb@0.3.1) (2020-09-03) + +**Note:** Version bump only for package @retail-ui/breadcrumb + # 0.3.0 (2020-09-02) ### Features diff --git a/packages/breadcrumb/package.json b/packages/breadcrumb/package.json index 124d63b..366da42 100644 --- a/packages/breadcrumb/package.json +++ b/packages/breadcrumb/package.json @@ -1,6 +1,6 @@ { "name": "@retail-ui/breadcrumb", - "version": "0.3.0", + "version": "0.3.1", "description": "The Breadcrumb component of @retail-ui", "keywords": [ "react", @@ -43,7 +43,7 @@ "react": ">=16" }, "devDependencies": { - "@retail-ui/icon": "^0.2.2", - "@retail-ui/theme": "^0.3.0" + "@retail-ui/icon": "^0.2.3", + "@retail-ui/theme": "^0.3.1" } } diff --git a/packages/button-icon/CHANGELOG.md b/packages/button-icon/CHANGELOG.md index 004f1a1..f63dbb4 100644 --- a/packages/button-icon/CHANGELOG.md +++ b/packages/button-icon/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.3.1](https://github.com/sondh0127/retail-ui/compare/@retail-ui/button-icon@0.3.0...@retail-ui/button-icon@0.3.1) (2020-09-03) + +**Note:** Version bump only for package @retail-ui/button-icon + # 0.3.0 (2020-09-02) ### Bug Fixes diff --git a/packages/button-icon/package.json b/packages/button-icon/package.json index 2514248..b11107c 100644 --- a/packages/button-icon/package.json +++ b/packages/button-icon/package.json @@ -1,6 +1,6 @@ { "name": "@retail-ui/button-icon", - "version": "0.3.0", + "version": "0.3.1", "description": "The ButtonIcon component of @retail-ui", "keywords": [ "react", @@ -43,8 +43,8 @@ "react": ">=16" }, "devDependencies": { - "@retail-ui/icon": "^0.2.2", - "@retail-ui/spinner": "^0.2.2", - "@retail-ui/theme": "^0.3.0" + "@retail-ui/icon": "^0.2.3", + "@retail-ui/spinner": "^0.2.3", + "@retail-ui/theme": "^0.3.1" } } diff --git a/packages/button/CHANGELOG.md b/packages/button/CHANGELOG.md index f7edf42..65627a8 100644 --- a/packages/button/CHANGELOG.md +++ b/packages/button/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.2.5](https://github.com/sondh0127/retail-ui/compare/@retail-ui/button@0.2.4...@retail-ui/button@0.2.5) (2020-09-03) + +**Note:** Version bump only for package @retail-ui/button + ## [0.2.4](https://github.com/sondh0127/retail-ui/compare/@retail-ui/button@0.2.3...@retail-ui/button@0.2.4) (2020-09-02) **Note:** Version bump only for package @retail-ui/button diff --git a/packages/button/package.json b/packages/button/package.json index 3d36976..20dd07d 100644 --- a/packages/button/package.json +++ b/packages/button/package.json @@ -1,6 +1,6 @@ { "name": "@retail-ui/button", - "version": "0.2.4", + "version": "0.2.5", "description": "Button component", "keywords": [ "react", @@ -43,10 +43,10 @@ "react": ">=16" }, "devDependencies": { - "@retail-ui/heroicons": "^0.2.3", - "@retail-ui/icon": "^0.2.2", - "@retail-ui/spinner": "^0.2.2", - "@retail-ui/theme": "^0.3.0" + "@retail-ui/heroicons": "^0.2.4", + "@retail-ui/icon": "^0.2.3", + "@retail-ui/spinner": "^0.2.3", + "@retail-ui/theme": "^0.3.1" }, "gitHead": "929e4cfdd6ed4fd576af406c5281e9942717524f" } diff --git a/packages/card/CHANGELOG.md b/packages/card/CHANGELOG.md index 4ee9be1..186ceff 100644 --- a/packages/card/CHANGELOG.md +++ b/packages/card/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.2.1](https://github.com/sondh0127/retail-ui/compare/@retail-ui/card@0.2.0...@retail-ui/card@0.2.1) (2020-09-03) + +**Note:** Version bump only for package @retail-ui/card + # 0.2.0 (2020-09-02) ### Features diff --git a/packages/card/package.json b/packages/card/package.json index 7895de3..493a57b 100644 --- a/packages/card/package.json +++ b/packages/card/package.json @@ -1,6 +1,6 @@ { "name": "@retail-ui/card", - "version": "0.2.0", + "version": "0.2.1", "description": "The Card component of @retail-ui", "keywords": [ "react", @@ -44,7 +44,7 @@ }, "devDependencies": { "@retail-ui/hooks": "^0.2.1", - "@retail-ui/spinner": "^0.2.2", - "@retail-ui/theme": "^0.3.0" + "@retail-ui/spinner": "^0.2.3", + "@retail-ui/theme": "^0.3.1" } } diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 95ada17..399ae08 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [0.4.0](https://github.com/sondh0127/retail-ui/compare/@retail-ui/core@0.2.1...@retail-ui/core@0.4.0) (2020-09-03) + +### Features + +- **core:** provide resolveConfig, used to merge user config ([a698c89](https://github.com/sondh0127/retail-ui/commit/a698c899c846cb30c07ee017ad6d657e80f66283)) + +### BREAKING CHANGES + +- **core:** use resolveConfig in tailwind.config.js to merge @retail/ui default + # [0.3.0](https://github.com/sondh0127/retail-ui/compare/@retail-ui/core@0.2.1...@retail-ui/core@0.3.0) (2020-09-03) ### Features diff --git a/packages/core/package.json b/packages/core/package.json index 92c736c..94c5f58 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@retail-ui/core", - "version": "0.3.0", + "version": "0.4.0", "description": "The Core component of @retail-ui", "keywords": [ "react", @@ -44,19 +44,19 @@ "tailwindcss": ">=1" }, "dependencies": { - "@retail-ui/action-buttons": "^0.3.1", - "@retail-ui/alert": "^0.3.1", - "@retail-ui/avatar": "^0.2.0", - "@retail-ui/badge": "^0.3.1", - "@retail-ui/breadcrumb": "^0.3.0", - "@retail-ui/button": "^0.2.4", - "@retail-ui/button-icon": "^0.3.0", - "@retail-ui/card": "^0.2.0", - "@retail-ui/heroicons": "^0.2.3", + "@retail-ui/action-buttons": "^0.3.2", + "@retail-ui/alert": "^0.3.2", + "@retail-ui/avatar": "^0.2.1", + "@retail-ui/badge": "^0.3.2", + "@retail-ui/breadcrumb": "^0.3.1", + "@retail-ui/button": "^0.2.5", + "@retail-ui/button-icon": "^0.3.1", + "@retail-ui/card": "^0.2.1", + "@retail-ui/heroicons": "^0.2.4", "@retail-ui/hooks": "^0.2.1", - "@retail-ui/icon": "^0.2.2", - "@retail-ui/spinner": "^0.2.2", - "@retail-ui/theme": "^0.3.0", + "@retail-ui/icon": "^0.2.3", + "@retail-ui/spinner": "^0.2.3", + "@retail-ui/theme": "^0.3.1", "@tailwindcss/custom-forms": "0.2.1", "deepmerge": "^4.2.2", "tailwindcss-multi-theme": "1.0.3" diff --git a/packages/heroicons/CHANGELOG.md b/packages/heroicons/CHANGELOG.md index 7002a1f..418d593 100644 --- a/packages/heroicons/CHANGELOG.md +++ b/packages/heroicons/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.2.4](https://github.com/sondh0127/retail-ui/compare/@retail-ui/heroicons@0.2.3...@retail-ui/heroicons@0.2.4) (2020-09-03) + +**Note:** Version bump only for package @retail-ui/heroicons + ## [0.2.3](https://github.com/sondh0127/retail-ui/compare/@retail-ui/heroicons@0.2.2...@retail-ui/heroicons@0.2.3) (2020-09-02) ### Bug Fixes diff --git a/packages/heroicons/package.json b/packages/heroicons/package.json index 2100a18..0377e62 100644 --- a/packages/heroicons/package.json +++ b/packages/heroicons/package.json @@ -1,6 +1,6 @@ { "name": "@retail-ui/heroicons", - "version": "0.2.3", + "version": "0.2.4", "description": "The Heroicons component of @retail-ui", "keywords": [ "react", @@ -43,7 +43,7 @@ "react": ">=16" }, "devDependencies": { - "@retail-ui/icon": "^0.2.2" + "@retail-ui/icon": "^0.2.3" }, "gitHead": "929e4cfdd6ed4fd576af406c5281e9942717524f" } diff --git a/packages/icon/CHANGELOG.md b/packages/icon/CHANGELOG.md index 101f7b6..aa2d51f 100644 --- a/packages/icon/CHANGELOG.md +++ b/packages/icon/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.2.3](https://github.com/sondh0127/retail-ui/compare/@retail-ui/icon@0.2.2...@retail-ui/icon@0.2.3) (2020-09-03) + +**Note:** Version bump only for package @retail-ui/icon + ## [0.2.2](https://github.com/sondh0127/retail-ui/compare/@retail-ui/icon@0.2.1...@retail-ui/icon@0.2.2) (2020-09-02) **Note:** Version bump only for package @retail-ui/icon diff --git a/packages/icon/package.json b/packages/icon/package.json index 8b3531b..4429388 100644 --- a/packages/icon/package.json +++ b/packages/icon/package.json @@ -1,6 +1,6 @@ { "name": "@retail-ui/icon", - "version": "0.2.2", + "version": "0.2.3", "description": "The Icon component of @retail-ui", "keywords": [ "react", @@ -43,7 +43,7 @@ "react": ">=16" }, "devDependencies": { - "@retail-ui/theme": "^0.3.0" + "@retail-ui/theme": "^0.3.1" }, "gitHead": "929e4cfdd6ed4fd576af406c5281e9942717524f" } diff --git a/packages/spinner/CHANGELOG.md b/packages/spinner/CHANGELOG.md index c64876c..1e2ca34 100644 --- a/packages/spinner/CHANGELOG.md +++ b/packages/spinner/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.2.3](https://github.com/sondh0127/retail-ui/compare/@retail-ui/spinner@0.2.2...@retail-ui/spinner@0.2.3) (2020-09-03) + +**Note:** Version bump only for package @retail-ui/spinner + ## [0.2.2](https://github.com/sondh0127/retail-ui/compare/@retail-ui/spinner@0.2.1...@retail-ui/spinner@0.2.2) (2020-09-02) **Note:** Version bump only for package @retail-ui/spinner diff --git a/packages/spinner/package.json b/packages/spinner/package.json index 4bfd0c6..c9cb9af 100644 --- a/packages/spinner/package.json +++ b/packages/spinner/package.json @@ -1,6 +1,6 @@ { "name": "@retail-ui/spinner", - "version": "0.2.2", + "version": "0.2.3", "description": "The Spinner component of @retail-ui", "keywords": [ "react", @@ -43,7 +43,7 @@ "react": ">=16" }, "devDependencies": { - "@retail-ui/theme": "^0.3.0" + "@retail-ui/theme": "^0.3.1" }, "gitHead": "929e4cfdd6ed4fd576af406c5281e9942717524f" } diff --git a/packages/test-utils/CHANGELOG.md b/packages/test-utils/CHANGELOG.md index 921806f..6e07bfb 100644 --- a/packages/test-utils/CHANGELOG.md +++ b/packages/test-utils/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.2.2](https://github.com/sondh0127/retail-ui/compare/@retail-ui/test-utils@0.2.1...@retail-ui/test-utils@0.2.2) (2020-09-03) + +**Note:** Version bump only for package @retail-ui/test-utils + ## [0.2.1](https://github.com/sondh0127/retail-ui/compare/@retail-ui/test-utils@0.2.0...@retail-ui/test-utils@0.2.1) (2020-09-02) **Note:** Version bump only for package @retail-ui/test-utils diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index aab7d0b..a946cee 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@retail-ui/test-utils", - "version": "0.2.1", + "version": "0.2.2", "description": "Testing utilities for components of @retail-ui", "keywords": [ "react", @@ -43,7 +43,7 @@ "react": ">=16" }, "devDependencies": { - "@retail-ui/theme": "^0.3.0", + "@retail-ui/theme": "^0.3.1", "@testing-library/react": "10.4.9" } } diff --git a/packages/theme/CHANGELOG.md b/packages/theme/CHANGELOG.md index 2ac8149..8f57504 100644 --- a/packages/theme/CHANGELOG.md +++ b/packages/theme/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.3.1](https://github.com/sondh0127/retail-ui/compare/@retail-ui/theme@0.3.0...@retail-ui/theme@0.3.1) (2020-09-03) + +**Note:** Version bump only for package @retail-ui/theme + # [0.3.0](https://github.com/sondh0127/retail-ui/compare/@retail-ui/theme@0.2.1...@retail-ui/theme@0.3.0) (2020-09-02) ### Features diff --git a/packages/theme/package.json b/packages/theme/package.json index 98a784e..bc5e9b9 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -1,6 +1,6 @@ { "name": "@retail-ui/theme", - "version": "0.3.0", + "version": "0.3.1", "description": "The Theme component of @retail-ui", "keywords": [ "react", From bcf027158e124e67b377bae8f2242e6da3bed22c Mon Sep 17 00:00:00 2001 From: Son Do Hong Date: Fri, 4 Sep 2020 19:36:08 +0700 Subject: [PATCH 02/40] fix(card): fix card body style --- packages/theme/src/styles/CardStyles.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/theme/src/styles/CardStyles.ts b/packages/theme/src/styles/CardStyles.ts index 3e75571..c266ee4 100644 --- a/packages/theme/src/styles/CardStyles.ts +++ b/packages/theme/src/styles/CardStyles.ts @@ -1,6 +1,7 @@ // class=" export const CardStyles = { - base: `min-w-0 overflow-hidden rounded-lg transition-shadow duration-150 ease-in inline-flex flex-col relative border border-solid text-base`, + // + base: `min-w-0 overflow-hidden rounded-lg transition-shadow duration-150 ease-in relative border border-solid text-base`, hov: 'hover:shadow focus:shadow', header: { base: `px-3 py-2 border-b flex justify-between items-center`, @@ -21,7 +22,7 @@ export const CardStyles = { }, // class=" body: { - base: `px-3 py-2 flex-auto max-h-full relative`, + base: `px-3 py-2 flex-auto max-h-full relative break-words`, loading: { base: `opacity-25 pointer-events-none cursor-default`, spinner: `absolute inset-0 m-auto`, From 6cba9369c6a60071fa2457326690d497edad8111 Mon Sep 17 00:00:00 2001 From: Son Do Hong Date: Fri, 4 Sep 2020 23:38:57 +0700 Subject: [PATCH 03/40] chore(template): change component template --- _templates/component/with-prompt/name.ejs.t | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/_templates/component/with-prompt/name.ejs.t b/_templates/component/with-prompt/name.ejs.t index b71e6c7..076f2e0 100644 --- a/_templates/component/with-prompt/name.ejs.t +++ b/_templates/component/with-prompt/name.ejs.t @@ -1,16 +1,22 @@ --- to: packages/<%= name %>/src/<%= h.changeCase.pascal(name) %>.tsx --- +import clsx from 'clsx' import * as React from 'react' -export type <%= h.changeCase.pascal(name) %>Props = React.PropsWithChildren<{ - -}> +type ReactDivProps = React.HTMLAttributes type Ref = HTMLDivElement -export const <%= h.changeCase.pascal(name) %> = React.forwardRefProps>((props, ref) => { - const { children } = props - return
{children}
+export type <%= h.changeCase.pascal(name) %>Props = { + +} + +export const <%= h.changeCase.pascal(name) %> = React.forwardRefProps>((props, ref) => { + const { children, className, ...rest } = props + + const cls = clsx(className) + + return
{children}
}) <%= h.changeCase.pascal(name) %>.displayName = '<%= h.changeCase.pascal(name) %>' From b84c0296dbb362d1467cb49544bc30493ea6f2c0 Mon Sep 17 00:00:00 2001 From: Son Do Hong Date: Fri, 4 Sep 2020 23:39:55 +0700 Subject: [PATCH 04/40] fix(all): fix all component props provide all native prop for each component, add utils packages BREAKING CHANGE: use React.ReactNode for icon fix #10 --- packages/action-buttons/src/ActionButtons.tsx | 2 +- packages/alert/src/Alert.tsx | 156 ++++++++------- packages/alert/stories/Alert.stories.tsx | 10 +- packages/alert/test/Alert.test.tsx | 2 +- .../test/__snapshots__/Alert.test.tsx.snap | 1 + packages/avatar/package.json | 2 +- packages/avatar/src/Avatar.tsx | 93 ++++----- packages/avatar/src/AvatarGroup.tsx | 37 ++-- .../test/__snapshots__/Avatar.test.tsx.snap | 1 + packages/badge/src/Badge.tsx | 104 +++++----- .../test/__snapshots__/Badge.test.tsx.snap | 1 + packages/breadcrumb/package.json | 2 +- packages/breadcrumb/src/Breadcrumb.tsx | 35 ++-- packages/breadcrumb/src/BreadcrumbItem.tsx | 111 ++++++----- .../__snapshots__/Breadcrumb.test.tsx.snap | 1 + packages/button-icon/package.json | 4 +- packages/button-icon/src/ButtonIcon.tsx | 126 ++++++------ .../stories/ButtonIcon.stories.tsx | 6 +- packages/button-icon/test/ButtonIcon.test.tsx | 16 +- .../__snapshots__/ButtonIcon.test.tsx.snap | 21 ++ packages/button/package.json | 5 +- packages/button/src/Button.tsx | 186 +++++++++--------- packages/button/stories/Button.stories.tsx | 7 +- packages/button/test/Button.test.tsx | 14 +- .../test/__snapshots__/Button.test.tsx.snap | 14 ++ packages/card/src/Card.tsx | 82 ++++---- packages/card/src/CardBody.tsx | 63 +++--- packages/card/src/CardContext.tsx | 3 +- packages/card/src/CardFooter.tsx | 23 ++- packages/card/src/CardHeader.tsx | 19 +- .../test/__snapshots__/Card.test.tsx.snap | 19 +- packages/icon/src/Icon.tsx | 18 +- packages/spinner/package.json | 3 +- packages/spinner/src/Spinner.tsx | 80 ++++---- .../test/__snapshots__/Spinner.test.tsx.snap | 2 +- packages/utils/README.md | 3 + packages/utils/package.json | 49 +++++ packages/utils/src/index.tsx | 1 + packages/utils/src/reactNode.tsx | 19 ++ packages/utils/tsconfig.build.json | 7 + yarn.lock | 5 + 41 files changed, 766 insertions(+), 587 deletions(-) create mode 100644 packages/button-icon/test/__snapshots__/ButtonIcon.test.tsx.snap create mode 100644 packages/button/test/__snapshots__/Button.test.tsx.snap create mode 100644 packages/utils/README.md create mode 100644 packages/utils/package.json create mode 100644 packages/utils/src/index.tsx create mode 100644 packages/utils/src/reactNode.tsx create mode 100644 packages/utils/tsconfig.build.json diff --git a/packages/action-buttons/src/ActionButtons.tsx b/packages/action-buttons/src/ActionButtons.tsx index ad8a769..1c73020 100644 --- a/packages/action-buttons/src/ActionButtons.tsx +++ b/packages/action-buttons/src/ActionButtons.tsx @@ -3,7 +3,7 @@ import { useThemeCtx } from '@retail-ui/theme' import clsx from 'clsx' import * as React from 'react' -export interface ActionButtonsProps extends ButtonProps { +export type ActionButtonsProps = ButtonProps & { cancelText?: string submitText?: string onClickCancel?: () => void diff --git a/packages/alert/src/Alert.tsx b/packages/alert/src/Alert.tsx index 6776dc1..f9a6fd0 100644 --- a/packages/alert/src/Alert.tsx +++ b/packages/alert/src/Alert.tsx @@ -1,4 +1,4 @@ -import { ButtonIcon, ButtonIconVariant } from '@retail-ui/button-icon' +import { ButtonIcon, ButtonIconProps } from '@retail-ui/button-icon' import { BanOutline, CheckOutline, @@ -10,6 +10,9 @@ import { Theme, useThemeCtx } from '@retail-ui/theme' import clsx from 'clsx' import * as React from 'react' +type ReactDivProps = Omit, ''> +type Ref = HTMLDivElement + const ALERT_STATUS_ICON = { primary: ExclamationCircleOutline, success: CheckOutline, @@ -23,8 +26,8 @@ type AlertSize = keyof Theme['AlertStyles']['size'] type AlertBordered = keyof Theme['AlertStyles']['bordered'] type AlertStatusIcon = keyof typeof ALERT_STATUS_ICON -export type AlertProps = React.PropsWithChildren<{ - title: string | React.ReactNode +export type AlertProps = { + content: React.ReactNode variant?: AlertVariant color?: AlertColor statusIcon?: AlertStatusIcon @@ -32,86 +35,89 @@ export type AlertProps = React.PropsWithChildren<{ bordered?: AlertBordered hasClose?: boolean onClose?: () => void -}> - -type Ref = HTMLDivElement +} -export const Alert = React.forwardRef((props, ref) => { - const { - title, - children, - variant = 'default', - color = 'primary', - size = 'base', - bordered, - hasClose = false, - statusIcon, - onClose, - } = props +export const Alert = React.forwardRef( + (props, ref) => { + const { + content, + children, + variant = 'default', + color = 'primary', + size = 'base', + bordered, + hasClose = false, + statusIcon, + onClose, + className, + ...rest + } = props - const { - theme: { AlertStyles }, - } = useThemeCtx() - const variantCls = AlertStyles.variant + const { + theme: { AlertStyles }, + } = useThemeCtx() + const variantCls = AlertStyles.variant - const colorCls = variantCls[variant] - const sizeCls = AlertStyles.size - const borderedCls = AlertStyles.bordered + const colorCls = variantCls[variant] + const sizeCls = AlertStyles.size + const borderedCls = AlertStyles.bordered - const cls = clsx( - AlertStyles.base, - colorCls[color], - sizeCls[size], - bordered && borderedCls[bordered], - hasClose && AlertStyles.hasClose, - ) + const cls = clsx( + className, + AlertStyles.base, + colorCls[color], + sizeCls[size], + bordered && borderedCls[bordered], + hasClose && AlertStyles.hasClose, + ) - const btnCls = clsx(AlertStyles.btnClose) - const btnVariant: Record = { - default: 'light', - outline: 'outline', - solid: 'default', - } + const btnCls = clsx(AlertStyles.btnClose) + const btnVariant: Record = { + default: 'light', + outline: 'outline', + solid: 'default', + } - const StatusIcon = statusIcon ? ALERT_STATUS_ICON[statusIcon] : null - const statusIconCls = clsx(AlertStyles.statusIcon) + const StatusIcon = statusIcon ? ALERT_STATUS_ICON[statusIcon] : null + const statusIconCls = clsx(AlertStyles.statusIcon) - const descriptionCls = clsx(AlertStyles.description) + const descriptionCls = clsx(AlertStyles.description) - return ( -
- {StatusIcon && ( - - )} - {!children && title} - {children && ( -
- {title} -

{children}

-
- )} - {hasClose && ( -
- + {StatusIcon && ( + -
- )} -
- ) -}) + )} + {!children && content} + {children && ( +
+ {content} +

{children}

+
+ )} + {hasClose && ( +
+ +
+ )} + + ) + }, +) Alert.displayName = 'Alert' diff --git a/packages/alert/stories/Alert.stories.tsx b/packages/alert/stories/Alert.stories.tsx index 93dac3b..41c2db3 100644 --- a/packages/alert/stories/Alert.stories.tsx +++ b/packages/alert/stories/Alert.stories.tsx @@ -10,13 +10,11 @@ const meta = { export default meta const Template = (args: AlertProps) => ( - + ) export const Simple = Template.bind({}) // @ts-ignore -Simple.args = {} +Simple.args = { + content: `A alert that informs you of stuff`, +} diff --git a/packages/alert/test/Alert.test.tsx b/packages/alert/test/Alert.test.tsx index e1745cd..8a7e742 100644 --- a/packages/alert/test/Alert.test.tsx +++ b/packages/alert/test/Alert.test.tsx @@ -5,7 +5,7 @@ import * as Alert from '../stories/Alert.stories' describe('Alert', () => { it('renders correctly', () => { - const { asFragment } = render() + const { asFragment } = render() expect(asFragment()).toMatchSnapshot() }) }) diff --git a/packages/alert/test/__snapshots__/Alert.test.tsx.snap b/packages/alert/test/__snapshots__/Alert.test.tsx.snap index 90700a1..78af294 100644 --- a/packages/alert/test/__snapshots__/Alert.test.tsx.snap +++ b/packages/alert/test/__snapshots__/Alert.test.tsx.snap @@ -4,6 +4,7 @@ exports[`Alert renders correctly 1`] = `