Skip to content

Commit e002e04

Browse files
committed
Rewritten select component
1 parent 82e540e commit e002e04

File tree

131 files changed

+1621
-3590
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+1621
-3590
lines changed

components/dimmer/dimmer.module.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import {NgModule} from '@angular/core';
2+
import {SUI_DIMMER_DIRECTIVES} from "./dimmer";
3+
4+
@NgModule({
5+
declarations: SUI_DIMMER_DIRECTIVES,
6+
exports: SUI_DIMMER_DIRECTIVES
7+
})
8+
export class SuiDimmerModule {}

old-components/dimmer/dimmer.component.ts renamed to components/dimmer/dimmer.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {Component, Input, Output, HostBinding, HostListener, EventEmitter} from
22

33
@Component({
44
selector: 'sui-dimmer',
5+
exportAs: 'suiDimmer',
56
template: `
67
<div class="content">
78
<div class="center">
@@ -21,7 +22,7 @@ import {Component, Input, Output, HostBinding, HostListener, EventEmitter} from
2122
}
2223
`]
2324
})
24-
export class Dimmer {
25+
export class SuiDimmer {
2526
@HostBinding('class.ui')
2627
@HostBinding('class.dimmer') classes = true;
2728

@@ -30,7 +31,7 @@ export class Dimmer {
3031
@HostBinding('class.active')
3132
@Input() public isDimmed:boolean = false;
3233

33-
@Output() public isDimmedChange:EventEmitter<boolean> = new EventEmitter(false);
34+
@Output() public isDimmedChange:EventEmitter<boolean> = new EventEmitter<boolean>(false);
3435

3536
@HostListener('click')
3637
private click() {
@@ -40,3 +41,5 @@ export class Dimmer {
4041
}
4142
}
4243
}
44+
45+
export const SUI_DIMMER_DIRECTIVES = [SuiDimmer];

old-components/dropdown/dropdown-menu.directive.ts renamed to components/dropdown/dropdown-menu.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import {Directive, ElementRef, HostBinding} from '@angular/core';
2-
import {DropdownService} from './dropdown.service';
2+
import {SuiDropdownService} from './dropdown.service';
33

4-
@Directive({ selector: '[suiDropdownMenu]' })
5-
export class DropdownMenu {
6-
private _service:DropdownService;
7-
public set service(service:DropdownService) {
4+
@Directive({
5+
selector: '[suiDropdownMenu]'
6+
})
7+
export class SuiDropdownMenu {
8+
private _service:SuiDropdownService;
9+
public set service(service:SuiDropdownService) {
810
this._service = service;
911
this._service.menuElement = this.el;
1012
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import {NgModule} from '@angular/core';
2+
import {SUI_DROPDOWN_DIRECTIVES, SUI_DROPDOWN_PROVIDERS} from "./dropdown";
3+
4+
@NgModule({
5+
declarations: SUI_DROPDOWN_DIRECTIVES,
6+
exports: SUI_DROPDOWN_DIRECTIVES,
7+
providers: SUI_DROPDOWN_PROVIDERS
8+
})
9+
export class SuiDropdownModule {}

old-components/dropdown/dropdown.service.ts renamed to components/dropdown/dropdown.service.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ export const KEYCODE = {
1515
BACKSPACE: 8
1616
};
1717

18-
export class DropdownService {
18+
export class SuiDropdownService {
1919
// State
2020
private _isOpen:boolean;
2121
public isDisabled:boolean;
2222
public autoClose:string;
2323

2424
// State Events
25-
public onToggle:EventEmitter<boolean> = new EventEmitter(false);
26-
public isOpenChange:EventEmitter<boolean> = new EventEmitter(false);
25+
public onToggle:EventEmitter<boolean> = new EventEmitter<boolean>(false);
26+
public isOpenChange:EventEmitter<boolean> = new EventEmitter<boolean>(false);
2727

2828
// Important Elements
2929
public dropdownElement:ElementRef;
@@ -124,6 +124,7 @@ export class DropdownService {
124124
return;
125125
}
126126

127+
//noinspection TypeScriptUnresolvedFunction
127128
if (this.isOpen &&
128129
([KEYCODE.ENTER, KEYCODE.UP, KEYCODE.RIGHT, KEYCODE.DOWN, KEYCODE.LEFT]
129130
.find(keyCode => event.which == keyCode))) {
@@ -200,4 +201,4 @@ export class DropdownService {
200201
}
201202
}
202203
}
203-
}
204+
}

old-components/dropdown/dropdown.directive.ts renamed to components/dropdown/dropdown.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import {Directive, Input, Output, HostBinding, EventEmitter, ElementRef, HostListener, AfterContentInit, ContentChild} from '@angular/core';
2-
import {DropdownService} from './dropdown.service';
3-
import {DropdownMenu} from './dropdown-menu.directive';
2+
import {SuiDropdownService} from './dropdown.service';
3+
import {SuiDropdownMenu} from './dropdown-menu';
44

55
@Directive({
66
selector: '[suiDropdown]'
77
})
8-
export class Dropdown implements AfterContentInit {
9-
protected _service:DropdownService;
10-
@ContentChild(DropdownMenu) protected _menu:DropdownMenu;
8+
export class SuiDropdown implements AfterContentInit {
9+
protected _service:SuiDropdownService;
10+
@ContentChild(SuiDropdownMenu) protected _menu:SuiDropdownMenu;
1111

1212
@HostBinding('class.visible')
1313
@Input()
@@ -49,7 +49,7 @@ export class Dropdown implements AfterContentInit {
4949
}
5050

5151
public constructor(el: ElementRef) {
52-
this._service = new DropdownService();
52+
this._service = new SuiDropdownService();
5353
this._service.dropdownElement = el;
5454
}
5555

@@ -67,3 +67,6 @@ export class Dropdown implements AfterContentInit {
6767
return false;
6868
}
6969
}
70+
71+
export const SUI_DROPDOWN_DIRECTIVES = [SuiDropdown, SuiDropdownMenu];
72+
export const SUI_DROPDOWN_PROVIDERS = [SuiDropdownService];

components/index.ts

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,28 @@ import {NgModule} from "@angular/core";
33
import {SuiCollapseModule} from "./collapse/collapse.module";
44
import {SuiAccordionModule} from "./accordion/accordion.module";
55
import {SuiCheckboxModule} from "./checkbox/checkbox.module";
6+
import {SuiDimmerModule} from "./dimmer/dimmer.module";
7+
import {SuiDropdownModule} from "./dropdown/dropdown.module";
8+
import {SuiMessageModule} from "./message/message.module";
9+
import {SuiProgressModule} from "./progress/progress.module";
10+
import {SuiRatingModule} from "./rating/rating.module";
11+
import {SuiSearchModule} from "./search/search.module";
12+
import {SuiTabsModule} from "./tabs/tab.module";
13+
import {SuiSelectModule} from "./select/select.module";
614

715
@NgModule({
816
exports: [
917
SuiAccordionModule,
1018
SuiCheckboxModule,
11-
SuiCollapseModule
19+
SuiCollapseModule,
20+
SuiDimmerModule,
21+
SuiDropdownModule,
22+
SuiMessageModule,
23+
SuiProgressModule,
24+
SuiRatingModule,
25+
SuiSearchModule,
26+
SuiSelectModule,
27+
SuiTabsModule
1228
]
1329
})
14-
export class SuiModule {
15-
}
30+
export class SuiModule {}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import {NgModule} from '@angular/core';
2+
import {SUI_MESSAGE_DIRECTIVES} from "./message";
3+
import {CommonModule} from "@angular/common";
4+
5+
@NgModule({
6+
imports: [CommonModule],
7+
declarations: SUI_MESSAGE_DIRECTIVES,
8+
exports: SUI_MESSAGE_DIRECTIVES
9+
})
10+
export class SuiMessageModule {}

old-components/message/message.component.ts renamed to components/message/message.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ import {Component, Input, Output, EventEmitter} from '@angular/core';
22

33
@Component({
44
selector: 'sui-message',
5-
directives: [],
5+
exportAs: 'suiMessage',
66
template: `
77
<div class="ui message {{ classes }}" *ngIf="!dismissed">
88
<i class="close icon" *ngIf="dismissible" (click)="dismiss()"></i>
99
<ng-content></ng-content>
1010
</div>
1111
`
1212
})
13-
export class Message {
13+
export class SuiMessage {
1414
@Input() public dismissible:boolean = true;
1515

16-
@Output() public onDismiss:EventEmitter<Message> = new EventEmitter(false);
16+
@Output() public onDismiss:EventEmitter<SuiMessage> = new EventEmitter<SuiMessage>(false);
1717

1818
private dismissed:boolean = false;
1919

@@ -24,4 +24,6 @@ export class Message {
2424

2525
@Input("class")
2626
private classes:string = "";
27-
}
27+
}
28+
29+
export const SUI_MESSAGE_DIRECTIVES = [SuiMessage];
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import {NgModule} from '@angular/core';
2+
import {SUI_PROGRESS_DIRECTIVES} from "./progress";
3+
import {CommonModule} from "@angular/common";
4+
5+
@NgModule({
6+
imports: [CommonModule],
7+
declarations: SUI_PROGRESS_DIRECTIVES,
8+
exports: SUI_PROGRESS_DIRECTIVES
9+
})
10+
export class SuiProgressModule {}

0 commit comments

Comments
 (0)