This repository has been archived by the owner on Aug 2, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 7
Add support for disabled and loading states to polaris-setting-toggle #199
Merged
andrewpye
merged 3 commits into
master
from
enhancement/setting-toggle-disabled-and-loading-states
Oct 10, 2018
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -145,7 +145,7 @@ test('it handles the enabled attribute correctly', function(assert) { | |
); | ||
}); | ||
|
||
test('it handles the suppied action correctly', function(assert) { | ||
test('it handles the supplied action correctly', function(assert) { | ||
this.set('actionFired', false); | ||
this.render(hbs` | ||
{{polaris-setting-toggle | ||
|
@@ -160,3 +160,41 @@ test('it handles the suppied action correctly', function(assert) { | |
click(settingActionButtonSelector); | ||
assert.ok(this.get('actionFired'), 'fires the action when button clicked'); | ||
}); | ||
|
||
test("it obeys the passed-in action hash's loading and disabled flags", function(assert) { | ||
this.setProperties({ | ||
isLoading: true, | ||
isDisabled: false, | ||
}); | ||
|
||
this.render(hbs` | ||
{{polaris-setting-toggle | ||
action=(hash | ||
text="Toggle" | ||
loading=isLoading | ||
disabled=isDisabled | ||
onAction=(action (mut dummy)) | ||
) | ||
}} | ||
`); | ||
|
||
let button = find(settingActionButtonSelector); | ||
assert.ok( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this could also be written as assert.dom(settingActionButtonSelector).hasClass('Polaris-Button--loading', 'button is in loading state when loading is true'); There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It could... but I want to get this out quickly so wasn't going to update the test file to use the newer things 🤷♂️ |
||
button.classList.contains('Polaris-Button--loading'), | ||
'button is in loading state when loading is true' | ||
); | ||
|
||
this.setProperties({ | ||
isLoading: false, | ||
isDisabled: true, | ||
}); | ||
|
||
assert.ok( | ||
button.classList.contains('Polaris-Button--disabled'), | ||
'button is in disabled state when disabled is true' | ||
); | ||
assert.notOk( | ||
button.classList.contains('Polaris-Button--loading'), | ||
'button is not in loading state when loading is false' | ||
); | ||
}); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should we document
disabled
too?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thought about it but I'm not sure there's any real value