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

fix(Inline-banner): refactored yield #151

Merged
merged 11 commits into from
Mar 19, 2020
Merged

fix(Inline-banner): refactored yield #151

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d485ec4
remove htmlSafe
Shalini-Sivakumar Feb 7, 2020
3429839
removed computed property
Shalini-Sivakumar Feb 7, 2020
38a2d8a
changed class name
Shalini-Sivakumar Feb 10, 2020
9e01a73
changed name in test
Shalini-Sivakumar Feb 11, 2020
adf619a
Merge remote-tracking branch 'origin/master' into inline-banner-class
Shalini-Sivakumar Feb 19, 2020
e670906
changed indentations
Shalini-Sivakumar Mar 12, 2020
31c835e
Merge branch 'master' into inline-banner-content
Shalini-Sivakumar Mar 12, 2020
c0825e8
changed backstop setup
Shalini-Sivakumar Mar 13, 2020
26e266c
changed yield content
Shalini-Sivakumar Mar 17, 2020
8b1db9d
refactored code
Shalini-Sivakumar Mar 17, 2020
658edf0
changed if/else block
Shalini-Sivakumar Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions packages/@nucleus/tests/dummy/app/templates/components/nucleus-inline-banner/demo-2.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,8 @@
{{#docs-demo as |demo|}}
{{#demo.example name="nucleus-inline-banner-2.hbs"}}
{{#nucleus-inline-banner type="warning" as |banner|}}
<div class="nucleus-inline-banner__icon">
{{nucleus-icon name="nucleus-circle-help" size="medium" variant="warning"}}
</div>
<div class="nucleus-inline-banner__content">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim blandit volutpat maecenas volutpat.</p>
<a class="docs-link" href="#">Click here</a>
</div>
<div class="nucleus-inline-banner__close">
{{nucleus-button
variant="text"
size="mini"
icon="nucleus-cross"
iconOnly=true
onClick=(action banner.close)}}
</div>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim blandit volutpat maecenas volutpat.</p>
<a class="docs-link" href="#">Click here</a>
{{/nucleus-inline-banner}}
{{/demo.example}}
{{demo.snippet "nucleus-inline-banner-2.hbs"}}
Expand Down
39 changes: 18 additions & 21 deletions packages/inline-banner/addon/templates/components/nucleus-inline-banner.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
{{#if hasBlock}}
{{yield
(hash
close=(action "onCloseTip")
)
}}
{{else}}
<div class="nucleus-inline-banner__icon">
{{nucleus-icon name=_icon size="medium" variant=type}}
<div class="nucleus-inline-banner__icon">
{{nucleus-icon name=_icon size="medium" variant=type}}
</div>
<div class="nucleus-inline-banner__content">
{{#if hasBlock}}
{{yield}}
{{/if}}
<div data-test-id="nucleus-inline-banner-title">
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't this be else part? Otherwise, it'd get rendered for hasBlock scenario too, which is not what we want right?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I'll do this change..

{{title}}
</div>
<div class="nucleus-inline-banner__content">
<div data-test-id="nucleus-inline-banner-title">{{title}}</div>
</div>
{{#if isDismissible}}
<div class="nucleus-inline-banner__close">
{{nucleus-button
variant="text"
size="mini"
icon="nucleus-cross"
iconOnly=true
onClick=(action "onCloseTip")}}
</div>
{{#if isDismissible}}
<div class="nucleus-inline-banner__close">
{{nucleus-button
variant="text"
size="mini"
icon="nucleus-cross"
iconOnly=true
onClick=(action "onCloseTip")}}
</div>
{{/if}}
{{/if}}
Binary file modified ...ine-banner__it_passes_visual_regression_tests__assert0_0_document_0_webview.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.