javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-17 02:31:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(button): use correct size on a dynamic button in an item (#18395)

Browse Source 
fixes ##18085
This commit is contained in:
Vlad Topala
2019-06-10 23:47:32 +03:00
committed by Brandy Carney
parent 58672fb221
commit a3e23fc9fa
5 changed files with 103 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/components/button/button.tsx
View File

@ -21,6 +21,7 @@ import { createColorClasses, openURL } from '../../utils/theme';
export class Button implements ComponentInterface {
private inToolbar = false;
private inItem = false;
@Element() el!: HTMLElement;
@ -105,6 +106,7 @@ export class Button implements ComponentInterface {
componentWillLoad() {
this.inToolbar = !!this.el.closest('ion-buttons');
this.inItem = !!this.el.closest('ion-item') || !!this.el.closest('ion-item-divider');
}
@Listen('click')
@ -155,11 +157,12 @@ export class Button implements ComponentInterface {
}
hostData() {
const { buttonType, disabled, color, expand, hasIconOnly, shape, size, strong } = this;
const { buttonType, disabled, color, expand, hasIconOnly, shape, strong } = this;
let fill = this.fill;
if (fill === undefined) {
fill = this.inToolbar ? 'clear' : 'solid';
}
const size = this.size === undefined && this.inItem ? 'small' : this.size;
return {
'aria-disabled': disabled ? 'true' : null,
class: {