octicon-mirror(24/)
javascript/ionic-framework
octicon-rss(16/)
1
0
octicon-repo-forked(16/)Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-10 22:44:13 +08:00
octicon-code(16/) Code octicon-issue-opened(16/) Issues octicon-package(16/) Packages octicon-project(16/) Projects octicon-tag(16/) Releases octicon-book(16/) Wiki octicon-pulse(16/) Activity

chore(): update dependencies

Browse Source
This commit is contained in:
octicon-git-branch(16/)
octicon-tag(16/)
Manu Mtz.-Almeida
2018-04-22 20:08:02 +02:00
gitea-unlock(16/)
parent 3f8fcda366
commit ae0541a465
octicon-diff(16/tw-mr-1) 48 changed files with 1299 additions and 1720 deletions
gitea-whitespace(16/)
gitea-split(16/)
octicon-kebab-horizontal(16/)
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/components/tabbar/tabbar.tsx
View File

@@ -2,6 +2,9 @@ import { Component, Element, Listen, Prop, State, Watch } from '@stencil/core';
import { createThemedClasses } from '../../utils/theme';
import { Mode, QueueController } from '../../index';
export type TabbarLayout = 'icon-top' | 'icon-start' | 'icon-end' | 'icon-bottom' | 'icon-hide' | 'title-hide';
export type TabbarPlacement = 'top' | 'bottom';
@Component({
tag: 'ion-tabbar',
styleUrls: {
@@ -28,7 +31,8 @@ export class Tabbar {
@State() canScrollRight = false;
@State() hidden = false;
@Prop() placement = 'bottom';
@Prop() layout: TabbarLayout = 'icon-top';
@Prop() placement: TabbarPlacement = 'bottom';
@Prop() selectedTab?: HTMLIonTabElement;
@Prop() scrollable = false;
@Prop() tabs: HTMLIonTabElement[] = [];
@@ -39,7 +43,6 @@ export class Tabbar {
this.highlight && this.updateHighlight();
}
@Prop() layout = 'icon-top';
@Prop() highlight = false;
/**
@@ -181,14 +184,14 @@ export class Tabbar {
render() {
const selectedTab = this.selectedTab;
const ionTabbarHighlight = this.highlight ? <div class='animated tabbar-highlight'/> as HTMLElement : null;
const ionTabbarHighlight = this.highlight ? <div class="animated tabbar-highlight"/> as HTMLElement : null;
const buttonClasses = createThemedClasses(this.mode, this.color, 'tab-button');
const tabButtons = this.tabs.map(tab => <ion-tab-button class={buttonClasses} tab={tab} selected={selectedTab === tab}/>);
if (this.scrollable) {
return [
<ion-button onClick={() => this.scrollByTab('left')} fill='clear' class={{inactive: !this.canScrollLeft}}>
<ion-icon name='arrow-dropleft'/>
<ion-button onClick={() => this.scrollByTab('left')} fill="clear" class={{inactive: !this.canScrollLeft}}>
<ion-icon name="arrow-dropleft"/>
</ion-button>,
<ion-scroll forceOverscroll={false} ref={(scrollEl) => this.scrollEl = scrollEl as HTMLIonScrollElement}>
@@ -196,8 +199,8 @@ export class Tabbar {
{ionTabbarHighlight}
</ion-scroll>,
<ion-button onClick={() => this.scrollByTab('right')} fill='clear' class={{inactive: !this.canScrollRight}}>
<ion-icon name='arrow-dropright'/>
<ion-button onClick={() => this.scrollByTab('right')} fill="clear" class={{inactive: !this.canScrollRight}}>
<ion-icon name="arrow-dropright"/>
</ion-button>
];
} else {