Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MenuにWarnTextとGroupを追加 #287

Merged
merged 26 commits into from
Apr 12, 2021
Merged

MenuにWarnTextとGroupを追加 #287

merged 26 commits into from
Apr 12, 2021

Conversation

hirokikondo86
Copy link
Contributor

@hirokikondo86 hirokikondo86 commented Apr 8, 2021 •
edited

Ref

  • close voyagegroup/fluct_XDC#126
  • WarnText: PR#288
  • GroupText: PR#296

やったこと

  • WarnTextの追加
    • type: "default" | warning" | "disabled" を追加
    • disabled 時は onClick を反応させない
    • 後方互換性を保つため元々の disabled props が優先される
  • Groupの追加
    • title prop を渡すことでグルーピング
    • titleが空の場合は表示させない

スクショ

Before

image

After

WarnText

warning: true hover
image image

Group

Group追加時 Titleが空の場合 → 表示しない
image image

確認方法

Storybook

@hirokikondo86 hirokikondo86 marked this pull request as draft April 8, 2021 04:45
@hirokikondo86 hirokikondo86 mentioned this pull request Apr 8, 2021
Merged
3 tasks
@hirokikondo86 hirokikondo86 added ガーデニング ガーデニングデーに対応する優先度の低いやつ フロント and removed ガーデニング ガーデニングデーに対応する優先度の低いやつ labels Apr 8, 2021
@hirokikondo86 hirokikondo86 changed the title メニューにWarnTextとGroupを追加 MenuにWarnTextとGroupを追加 Apr 9, 2021
@netlify
Copy link

netlify bot commented Apr 12, 2021 •
edited

Deploy preview for ingred-ui ready!

Built with commit 15b868b

https://deploy-preview-287--ingred-ui.netlify.app

@hirokikondo86 hirokikondo86 mentioned this pull request Apr 12, 2021
Merged
@hirokikondo86 hirokikondo86 requested review from ryokosuge and removed request for ryokosuge April 12, 2021 06:56
@hirokikondo86 hirokikondo86 marked this pull request as ready for review April 12, 2021 07:02
@hirokikondo86 hirokikondo86 requested a review from a team as a code owner April 12, 2021 07:02
@hirokikondo86 hirokikondo86 requested review from ryokosuge and noronaoki and removed request for a team and ryokosuge April 12, 2021 07:02
noronaoki
noronaoki approved these changes Apr 12, 2021
View reviewed changes
Copy link
Contributor

@noronaoki noronaoki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@hirokikondo86 hirokikondo86 merged commit 296d50e into master Apr 12, 2021
@hirokikondo86 hirokikondo86 deleted the update-menu branch April 12, 2021 07:32
@hirokikondo86 hirokikondo86 added the enhancement New feature or request label Apr 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@noronaoki noronaoki noronaoki approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request ガーデニング ガーデニングデーに対応する優先度の低いやつ フロント
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@hirokikondo86 @noronaoki