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.

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

fix(item-option): styling and behaviour for disabled item-option #17909

Merged
merged 4 commits into from Mar 28, 2019
Merged

fix(item-option): styling and behaviour for disabled item-option #17909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9717517
feat(item-option): set a class when disabled
kelvindart-surely Mar 28, 2019
5ea949d
feat(item-option): disabled styling
kelvindart-surely Mar 28, 2019
a2695a8
feat(item-option): update demo to include disabled item-option
kelvindart-surely Mar 28, 2019
8e412d9
Add test to item-sliding tests
liamdebeasi Mar 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions core/src/components/item-option/item-option.scss
View file
Open in desktop
Expand Up @@ -112,3 +112,17 @@
transition-property: none;
transition-timing-function: cubic-bezier(.65, .05, .36, 1);
}


// Item Disabled Styling
// --------------------------------------------------

:host(.item-option-disabled) {
pointer-events: none;
}

:host(.item-option-disabled) .button-native {
cursor: default;
opacity: .5;
pointer-events: none;
}
4 changes: 3 additions & 1 deletion core/src/components/item-option/item-option.tsx
View file
Open in desktop
Expand Up @@ -60,10 +60,12 @@ export class ItemOption implements ComponentInterface {
}

hostData() {
const { disabled, expandable } = this;
return {
class: {
...createColorClasses(this.color),
'item-option-expandable': this.expandable,
'item-option-disabled': disabled,
'item-option-expandable': expandable,
'ion-activatable': true,
}
};
Expand Down
24 changes: 24 additions & 0 deletions core/src/components/item-sliding/test/basic/index.html
View file
Open in desktop
Expand Up @@ -120,6 +120,30 @@ <h2>HubStruck Notifications</h2>

</ion-item-sliding>

<ion-item-sliding id="item100">
<ion-item href="#">
<ion-label>
<h2>Disabled Buttons</h2>
<p>Buttons should not be clickable</p>
</ion-label>
</ion-item>

<ion-item-options side="start">
<ion-item-option disabled>
Disabled
</ion-item-option>
</ion-item-options>
<ion-item-options side="end">
<ion-item-option color="danger" disabled>
<ion-icon slot="icon-only" name="trash"></ion-icon>
</ion-item-option>
<ion-item-option disabled>
<ion-icon slot="icon-only" name="star"></ion-icon>
</ion-item-option>
</ion-item-options>

</ion-item-sliding>

<ion-item-sliding id="item0">
<ion-item onclick="clickedItem('item0')">
<ion-label text-wrap>
Expand Down
2 changes: 1 addition & 1 deletion core/src/themes/test/css-variables/index.html
View file
Open in desktop
Expand Up @@ -189,7 +189,7 @@
<ion-item-sliding>
<ion-item><ion-label>Goldeneye 007</ion-label></ion-item>
<ion-item-options>
<ion-item-option>More</ion-item-option>
<ion-item-option disabled="true">More</ion-item-option>
</ion-item-options>
</ion-item-sliding>
</ion-list>
Expand Down