mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-08-21 04:53:58 +08:00
refactor(item): [tappable] -> [button]
This commit is contained in:
20
core/src/components.d.ts
vendored
20
core/src/components.d.ts
vendored
@ -2591,12 +2591,16 @@ declare global {
|
|||||||
|
|
||||||
declare global {
|
declare global {
|
||||||
interface HTMLIonItemElement extends HTMLStencilElement {
|
interface HTMLIonItemElement extends HTMLStencilElement {
|
||||||
|
/**
|
||||||
|
* Whether or not this item should be tappable. If true, a button tag will be rendered. Defaults to `false`.
|
||||||
|
*/
|
||||||
|
'button': boolean;
|
||||||
/**
|
/**
|
||||||
* The color to use from your Sass `$colors` map. Default options are: `"primary"`, `"secondary"`, `"tertiary"`, `"success"`, `"warning"`, `"danger"`, `"light"`, `"medium"`, and `"dark"`. For more information, see [Theming your App](/docs/theming/theming-your-app).
|
* The color to use from your Sass `$colors` map. Default options are: `"primary"`, `"secondary"`, `"tertiary"`, `"success"`, `"warning"`, `"danger"`, `"light"`, `"medium"`, and `"dark"`. For more information, see [Theming your App](/docs/theming/theming-your-app).
|
||||||
*/
|
*/
|
||||||
'color': string;
|
'color': string;
|
||||||
/**
|
/**
|
||||||
* If true, a detail arrow will appear on the item. Defaults to `false` unless the `mode` is `ios` and an `href`, `onclick` or `tappable` property is present.
|
* If true, a detail arrow will appear on the item. Defaults to `false` unless the `mode` is `ios` and an `href`, `onclick` or `button` property is present.
|
||||||
*/
|
*/
|
||||||
'detail': boolean;
|
'detail': boolean;
|
||||||
/**
|
/**
|
||||||
@ -2612,10 +2616,6 @@ declare global {
|
|||||||
* The mode determines which platform styles to use. Possible values are: `"ios"` or `"md"`. For more information, see [Platform Styles](/docs/theming/platform-specific-styles).
|
* The mode determines which platform styles to use. Possible values are: `"ios"` or `"md"`. For more information, see [Platform Styles](/docs/theming/platform-specific-styles).
|
||||||
*/
|
*/
|
||||||
'mode': 'ios' | 'md';
|
'mode': 'ios' | 'md';
|
||||||
/**
|
|
||||||
* Whether or not this item should be tappable. If true, a button tag will be rendered. Defaults to `false`.
|
|
||||||
*/
|
|
||||||
'tappable': boolean;
|
|
||||||
}
|
}
|
||||||
var HTMLIonItemElement: {
|
var HTMLIonItemElement: {
|
||||||
prototype: HTMLIonItemElement;
|
prototype: HTMLIonItemElement;
|
||||||
@ -2634,12 +2634,16 @@ declare global {
|
|||||||
}
|
}
|
||||||
namespace JSXElements {
|
namespace JSXElements {
|
||||||
export interface IonItemAttributes extends HTMLAttributes {
|
export interface IonItemAttributes extends HTMLAttributes {
|
||||||
|
/**
|
||||||
|
* Whether or not this item should be tappable. If true, a button tag will be rendered. Defaults to `false`.
|
||||||
|
*/
|
||||||
|
'button'?: boolean;
|
||||||
/**
|
/**
|
||||||
* The color to use from your Sass `$colors` map. Default options are: `"primary"`, `"secondary"`, `"tertiary"`, `"success"`, `"warning"`, `"danger"`, `"light"`, `"medium"`, and `"dark"`. For more information, see [Theming your App](/docs/theming/theming-your-app).
|
* The color to use from your Sass `$colors` map. Default options are: `"primary"`, `"secondary"`, `"tertiary"`, `"success"`, `"warning"`, `"danger"`, `"light"`, `"medium"`, and `"dark"`. For more information, see [Theming your App](/docs/theming/theming-your-app).
|
||||||
*/
|
*/
|
||||||
'color'?: string;
|
'color'?: string;
|
||||||
/**
|
/**
|
||||||
* If true, a detail arrow will appear on the item. Defaults to `false` unless the `mode` is `ios` and an `href`, `onclick` or `tappable` property is present.
|
* If true, a detail arrow will appear on the item. Defaults to `false` unless the `mode` is `ios` and an `href`, `onclick` or `button` property is present.
|
||||||
*/
|
*/
|
||||||
'detail'?: boolean;
|
'detail'?: boolean;
|
||||||
/**
|
/**
|
||||||
@ -2655,10 +2659,6 @@ declare global {
|
|||||||
* The mode determines which platform styles to use. Possible values are: `"ios"` or `"md"`. For more information, see [Platform Styles](/docs/theming/platform-specific-styles).
|
* The mode determines which platform styles to use. Possible values are: `"ios"` or `"md"`. For more information, see [Platform Styles](/docs/theming/platform-specific-styles).
|
||||||
*/
|
*/
|
||||||
'mode'?: 'ios' | 'md';
|
'mode'?: 'ios' | 'md';
|
||||||
/**
|
|
||||||
* Whether or not this item should be tappable. If true, a button tag will be rendered. Defaults to `false`.
|
|
||||||
*/
|
|
||||||
'tappable'?: boolean;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,7 @@ export class Item {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* If true, a detail arrow will appear on the item. Defaults to `false` unless the `mode`
|
* If true, a detail arrow will appear on the item. Defaults to `false` unless the `mode`
|
||||||
* is `ios` and an `href`, `onclick` or `tappable` property is present.
|
* is `ios` and an `href`, `onclick` or `button` property is present.
|
||||||
*/
|
*/
|
||||||
@Prop() detail: boolean;
|
@Prop() detail: boolean;
|
||||||
|
|
||||||
@ -52,7 +52,7 @@ export class Item {
|
|||||||
* Whether or not this item should be tappable.
|
* Whether or not this item should be tappable.
|
||||||
* If true, a button tag will be rendered. Defaults to `false`.
|
* If true, a button tag will be rendered. Defaults to `false`.
|
||||||
*/
|
*/
|
||||||
@Prop() tappable = false;
|
@Prop() button = false;
|
||||||
|
|
||||||
@Prop() goBack = false;
|
@Prop() goBack = false;
|
||||||
|
|
||||||
@ -99,7 +99,7 @@ export class Item {
|
|||||||
childStyles = Object.assign(childStyles, this.itemStyles[key]);
|
childStyles = Object.assign(childStyles, this.itemStyles[key]);
|
||||||
}
|
}
|
||||||
|
|
||||||
const clickable = !!(this.href || this.el.onclick || this.tappable);
|
const clickable = !!(this.href || this.el.onclick || this.button);
|
||||||
|
|
||||||
const TagType = clickable
|
const TagType = clickable
|
||||||
? this.href ? 'a' : 'button'
|
? this.href ? 'a' : 'button'
|
||||||
|
@ -7,6 +7,14 @@
|
|||||||
|
|
||||||
## Properties
|
## Properties
|
||||||
|
|
||||||
|
#### button
|
||||||
|
|
||||||
|
boolean
|
||||||
|
|
||||||
|
Whether or not this item should be tappable.
|
||||||
|
If true, a button tag will be rendered. Defaults to `false`.
|
||||||
|
|
||||||
|
|
||||||
#### color
|
#### color
|
||||||
|
|
||||||
string
|
string
|
||||||
@ -21,7 +29,7 @@ For more information, see [Theming your App](/docs/theming/theming-your-app).
|
|||||||
boolean
|
boolean
|
||||||
|
|
||||||
If true, a detail arrow will appear on the item. Defaults to `false` unless the `mode`
|
If true, a detail arrow will appear on the item. Defaults to `false` unless the `mode`
|
||||||
is `ios` and an `href`, `onclick` or `tappable` property is present.
|
is `ios` and an `href`, `onclick` or `button` property is present.
|
||||||
|
|
||||||
|
|
||||||
#### disabled
|
#### disabled
|
||||||
@ -53,7 +61,9 @@ Possible values are: `"ios"` or `"md"`.
|
|||||||
For more information, see [Platform Styles](/docs/theming/platform-specific-styles).
|
For more information, see [Platform Styles](/docs/theming/platform-specific-styles).
|
||||||
|
|
||||||
|
|
||||||
#### tappable
|
## Attributes
|
||||||
|
|
||||||
|
#### button
|
||||||
|
|
||||||
boolean
|
boolean
|
||||||
|
|
||||||
@ -61,8 +71,6 @@ Whether or not this item should be tappable.
|
|||||||
If true, a button tag will be rendered. Defaults to `false`.
|
If true, a button tag will be rendered. Defaults to `false`.
|
||||||
|
|
||||||
|
|
||||||
## Attributes
|
|
||||||
|
|
||||||
#### color
|
#### color
|
||||||
|
|
||||||
string
|
string
|
||||||
@ -77,7 +85,7 @@ For more information, see [Theming your App](/docs/theming/theming-your-app).
|
|||||||
boolean
|
boolean
|
||||||
|
|
||||||
If true, a detail arrow will appear on the item. Defaults to `false` unless the `mode`
|
If true, a detail arrow will appear on the item. Defaults to `false` unless the `mode`
|
||||||
is `ios` and an `href`, `onclick` or `tappable` property is present.
|
is `ios` and an `href`, `onclick` or `button` property is present.
|
||||||
|
|
||||||
|
|
||||||
#### disabled
|
#### disabled
|
||||||
@ -109,14 +117,6 @@ Possible values are: `"ios"` or `"md"`.
|
|||||||
For more information, see [Platform Styles](/docs/theming/platform-specific-styles).
|
For more information, see [Platform Styles](/docs/theming/platform-specific-styles).
|
||||||
|
|
||||||
|
|
||||||
#### tappable
|
|
||||||
|
|
||||||
boolean
|
|
||||||
|
|
||||||
Whether or not this item should be tappable.
|
|
||||||
If true, a button tag will be rendered. Defaults to `false`.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
----------------------------------------------
|
----------------------------------------------
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
<ion-label>a[ion-item] secondary</ion-label>
|
<ion-label>a[ion-item] secondary</ion-label>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
|
|
||||||
<ion-item tappable id="attachClick">
|
<ion-item button id="attachClick">
|
||||||
<ion-label>button[ion-item]</ion-label>
|
<ion-label>button[ion-item]</ion-label>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
|
|
||||||
|
@ -13,11 +13,11 @@
|
|||||||
<ion-label>Item Text</ion-label>
|
<ion-label>Item Text</ion-label>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
|
|
||||||
<ion-item tappable color="danger">
|
<ion-item button color="danger">
|
||||||
<ion-label>Item Tappable Danger</ion-label>
|
<ion-label>Item Tappable Danger</ion-label>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
|
|
||||||
<ion-item tappable color="danger" class="activated">
|
<ion-item button color="danger" class="activated">
|
||||||
<ion-label>Item Tappable Danger.activated</ion-label>
|
<ion-label>Item Tappable Danger.activated</ion-label>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user