javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-10 00:27:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(tap-click): works inside shadow-dom

Browse Source 
adds private ion-activable attribute

fixes #15128
This commit is contained in:
Manu Mtz.-Almeida
2018-08-12 22:48:58 +02:00
parent 270ece0b5e
commit 0dc70f7f6d
10 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/components/action-sheet/action-sheet.tsx
View File

@ -1,8 +1,8 @@
import { Component, Element, Event, EventEmitter, Listen, Method, Prop } from '@stencil/core';
import { ActionSheetButton, Animation, AnimationBuilder, Color, Config, CssClassMap, Mode, OverlayEventDetail, OverlayInterface } from '../../interface';
import { ActionSheetButton, Animation, AnimationBuilder, Config, CssClassMap, Mode, OverlayEventDetail, OverlayInterface } from '../../interface';
import { BACKDROP, dismiss, eventMethod, isCancel, present } from '../../utils/overlays';
import { createColorClasses, getClassMap } from '../../utils/theme';
import { getClassMap } from '../../utils/theme';
import { iosEnterAnimation } from './animations/ios.enter';
import { iosLeaveAnimation } from './animations/ios.leave';
@ -20,7 +20,6 @@ import { mdLeaveAnimation } from './animations/md.leave';
export class ActionSheet implements OverlayInterface {
mode!: Mode;
color?: Color;
presented = false;
animation?: Animation;
@ -208,7 +207,6 @@ export class ActionSheet implements OverlayInterface {
zIndex: 20000 + this.overlayId,
},
class: {
...createColorClasses(this.color),
...getClassMap(this.cssClass),
'action-sheet-translucent': this.translucent
}
@ -237,7 +235,7 @@ export class ActionSheet implements OverlayInterface {
</div>
}
{buttons.map(b =>
<button type="button" class={buttonClass(b)} onClick={() => this.buttonClick(b)}>
<button type="button" ion-activable class={buttonClass(b)} onClick={() => this.buttonClick(b)}>
<span class="action-sheet-button-inner">
{b.icon && <ion-icon icon={b.icon} lazy={false} class="action-sheet-icon" />}
{b.text}
@ -249,6 +247,7 @@ export class ActionSheet implements OverlayInterface {
{cancelButton &&
<div class="action-sheet-group action-sheet-group-cancel">
<button
ion-activable
type="button"
class={buttonClass(cancelButton)}
onClick={() => this.buttonClick(cancelButton)}