Skip to content

Commit 5ddfbaa

Browse files
committed
feat(badge): update badge to ionic core
1 parent c833706 commit 5ddfbaa

File tree

12 files changed

+52
-55
lines changed

12 files changed

+52
-55
lines changed

src/components/app/app.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,3 +449,11 @@ ion-footer {
449449
}
450450
}
451451
}
452+
453+
454+
// Core Components
455+
// --------------------------------------------------
456+
457+
ion-badge {
458+
visibility: hidden;
459+
}

src/components/badge/badge.ios.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
@import "../../themes/ionic.globals.ios";
2+
@import "./badge";
3+
24

35
// iOS Badge
46
// --------------------------------------------------

src/components/badge/badge.md.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
@import "../../themes/ionic.globals.md";
2+
@import "./badge";
3+
24

35
// Material Design Badge
46
// --------------------------------------------------

src/components/badge/badge.module.ts

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/components/badge/badge.scss

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@import "../../themes/ionic.globals";
22

3+
34
// Badge
45
// --------------------------------------------------
56

@@ -10,9 +11,14 @@ $badge-font-size: 1.3rem !default;
1011
$badge-font-weight: bold !default;
1112

1213

13-
ion-badge {
14+
ion-badge,
15+
:host {
1416
display: inline-block;
17+
visibility: inherit !important;
18+
contain: layout content;
19+
}
1520

21+
.badge {
1622
padding: 3px 8px;
1723

1824
min-width: 10px;
@@ -26,6 +32,7 @@ ion-badge {
2632
vertical-align: baseline;
2733
}
2834

29-
ion-badge:empty {
35+
ion-badge:empty,
36+
:host(:empty) {
3037
display: none;
3138
}

src/components/badge/badge.ts

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,12 @@
1-
import { Directive, ElementRef, Renderer } from '@angular/core';
1+
import { Component } from '../../util/decorators';
22

3-
import { Config } from '../../config/config';
4-
import { Ion } from '../ion';
53

6-
7-
/**
8-
* @name Badge
9-
* @module ionic
10-
* @description
11-
* Badges are simple components in Ionic containing numbers or text. You can display a badge to indicate that there is new information associated with the item it is on.
12-
* @see {@link /docs/components/#badges Badges Component Docs}
13-
*/
14-
@Directive({
15-
selector: 'ion-badge'
16-
})
17-
export class Badge extends Ion {
18-
19-
constructor(config: Config, elementRef: ElementRef, renderer: Renderer) {
20-
super(config, elementRef, renderer, 'badge');
4+
@Component({
5+
tag: 'ion-badge',
6+
styleUrls: {
7+
ios: 'badge.ios.scss',
8+
md: 'badge.md.scss',
9+
wp: 'badge.wp.scss'
2110
}
22-
23-
}
11+
})
12+
export class Badge {}

src/components/badge/badge.wp.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
@import "../../themes/ionic.globals.wp";
2+
@import "./badge";
3+
24

35
// Windows Badge
46
// --------------------------------------------------

src/components/badge/test/basic/app/app.module.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { NgModule } from '@angular/core';
1+
import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
22
import { BrowserModule } from '@angular/platform-browser';
33
import { IonicApp, IonicModule } from '../../../../..';
44

@@ -14,6 +14,7 @@ import { PageOneModule } from '../pages/page-one/page-one.module';
1414
IonicModule.forRoot(AppComponent),
1515
PageOneModule
1616
],
17-
bootstrap: [IonicApp]
17+
bootstrap: [IonicApp],
18+
schemas: [CUSTOM_ELEMENTS_SCHEMA]
1819
})
1920
export class AppModule {}

src/components/badge/test/basic/pages/page-one/page-one.module.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { NgModule } from '@angular/core';
1+
import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
22
import { IonicPageModule } from '../../../../../..';
33

44
import { PageOne } from './page-one';
@@ -12,6 +12,9 @@ import { PageOne } from './page-one';
1212
],
1313
entryComponents: [
1414
PageOne,
15+
],
16+
schemas: [
17+
CUSTOM_ELEMENTS_SCHEMA
1518
]
1619
})
1720
export class PageOneModule {}

src/components/tabs/tabs.module.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { CommonModule } from '@angular/common';
2-
import { NgModule, ModuleWithProviders } from '@angular/core';
2+
import { NgModule, ModuleWithProviders, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
33

4-
import { BadgeModule } from '../badge/badge.module';
54
import { IconModule } from '../icon/icon.module';
65

76
import { Tab } from './tab';
@@ -12,7 +11,6 @@ import { Tabs } from './tabs';
1211
/** @hidden */
1312
@NgModule({
1413
imports: [
15-
BadgeModule,
1614
CommonModule,
1715
IconModule
1816
],
@@ -27,7 +25,8 @@ import { Tabs } from './tabs';
2725
TabButton,
2826
TabHighlight,
2927
Tabs
30-
]
28+
],
29+
schemas: [CUSTOM_ELEMENTS_SCHEMA]
3130
})
3231
export class TabsModule {
3332
public static forRoot(): ModuleWithProviders {

0 commit comments

Comments
 (0)