Skip to content

Commit

Permalink
feat(dropdown): rollout completely rewritten bs-dropdown version
Browse files Browse the repository at this point in the history
fixes #1674, fixes #1749, fixes #1623, fixes #1415, fixes #802, fixes #569, fixes #530, fixes #6,
fixes #1540, fixes #1217, fixes #591, fixes #478
  • Loading branch information
valorkin committed Mar 24, 2017
1 parent 2fdd2c7 commit b15a828
Show file tree
Hide file tree
Showing 41 changed files with 687 additions and 1,129 deletions.
4 changes: 2 additions & 2 deletions demo/src/app/components/+dropdown/demo-dropdown.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
import { DropdownModule } from 'ng2-bootstrap/dropdown';
import { BsDropdownModule } from 'ng2-bootstrap/dropdown';

import { SharedModule } from '../../shared';
import { DropdownSectionComponent } from './dropdown-section.component';
Expand All @@ -15,7 +15,7 @@ import { routes } from './demo-dropdown.routes';
...DEMO_COMPONENTS
],
imports: [
DropdownModule.forRoot(),
BsDropdownModule.forRoot(),
CommonModule,
FormsModule,
SharedModule,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class="btn-group" dropdown>
<button id="single-button" type="button" class="btn btn-primary" dropdownToggle>
<div class="btn-group" dropdown placement="bottom right">
<button dropdownToggle type="button" class="btn btn-primary dropdown-toggle">
This dropdown's menu is right-aligned <span class="caret"></span>
</button>
<ul dropdownMenu role="menu" aria-labelledby="single-button" class="dropdown-menu-right">
<ul *dropdownMenu class="dropdown-menu dropdown-menu-right" role="menu">
<li role="menuitem"><a class="dropdown-item" href="#">Action</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Another action</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Something else here</a></li>
Expand Down
16 changes: 7 additions & 9 deletions demo/src/app/components/+dropdown/demos/basic/basic-link.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<span dropdown (onToggle)="toggled($event)">
<a href id="simple-dropdown" dropdownToggle>
Click me for a dropdown, yo!
</a>
<ul class="dropdown-menu" dropdownMenu aria-labelledby="simple-dropdown">
<li *ngFor="let choice of items">
<a class="dropdown-item" href="#">{{choice}}</a>
</li>
</ul>
<span dropdown (isOpenChange)="toggled($event)">
<a href dropdownToggle (click)="false">Click me for a dropdown, yo!</a>
<ul *dropdownMenu class="dropdown-menu">
<li *ngFor="let choice of items">
<a class="dropdown-item" href="#">{{choice}}</a>
</li>
</ul>
</span>
7 changes: 4 additions & 3 deletions demo/src/app/components/+dropdown/demos/basic/basic.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<div class="btn-group" dropdown>
<button id="single-button" type="button" class="btn btn-primary" dropdownToggle>
<button dropdownToggle type="button" class="btn btn-primary dropdown-toggle">
Button dropdown <span class="caret"></span>
</button>
<ul dropdownMenu role="menu" aria-labelledby="single-button">
<ul *dropdownMenu class="dropdown-menu" role="menu">
<li role="menuitem"><a class="dropdown-item" href="#">Action</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Another action</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Something else here</a></li>
<li class="divider dropdown-divider"></li>
<li role="menuitem"><a class="dropdown-item" href="#">Separated link</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Separated link</a>
</li>
</ul>
</div>
10 changes: 6 additions & 4 deletions demo/src/app/components/+dropdown/demos/config/config.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<div dropdown>
<button type="button" class="btn btn-primary" dropdownToggle>
<button dropdownToggle type="button" class="btn btn-primary dropdown-toggle">
Button dropdown <span class="caret"></span>
</button>
<ul dropdownMenu role="menu" aria-labelledby="single-button">
<ul *dropdownMenu class="dropdown-menu" role="menu">
<li role="menuitem"><a class="dropdown-item" href="#">Action</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Another action</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Something else here</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Another action</a>
</li>
<li role="menuitem"><a class="dropdown-item" href="#">Something else
here</a></li>
</ul>
</div>
10 changes: 2 additions & 8 deletions demo/src/app/components/+dropdown/demos/config/config.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
import { Component } from '@angular/core';
import { DropdownConfig } from 'ng2-bootstrap/dropdown';

// such override allows to keep some initial values

export function getDropdownConfig(): DropdownConfig {
return Object.assign(new DropdownConfig(), {autoClose: 'disabled', keyboardNav: true});
}
import { BsDropdownConfig } from 'ng2-bootstrap/dropdown';

@Component({
selector: 'demo-dropdown-config',
templateUrl: './config.html',
providers: [{provide: DropdownConfig, useFactory: getDropdownConfig}]
providers: [{provide: BsDropdownConfig, useValue: {autoClose: false}}]
})
export class DemoDropdownConfigComponent {
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<div class="btn-group" dropdown dropdown-append-to-body>
<button id="btn-append-to-body" type="button" class="btn btn-primary" dropdownToggle>
<div class="btn-group" dropdown container="body">
<button dropdownToggle type="button" class="btn btn-primary dropdownToggle">
Dropdown on Body <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu" aria-labelledby="btn-append-to-body">
<ul *dropdownMenu class="dropdown-menu" role="menu">
<li role="menuitem"><a class="dropdown-item" href="#">Action</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Another action</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Something else here</a></li>
<li class="divider dropdown-divider"></li>
<li role="menuitem"><a class="dropdown-item" href="#">Separated link</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Separated link</a>
</li>
</ul>
</div>
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
<div class="btn-group" dropdown>
<button id="single-button" type="button" class="btn btn-primary" dropdownToggle [disabled]="disabled">
<div class="btn-group" dropdown [isDisabled]="disabled">
<button dropdownToggle type="button" class="btn btn-primary dropdownToggle">
Button dropdown <span class="caret"></span>
</button>
<ul dropdownMenu role="menu" aria-labelledby="single-button">
<ul *dropdownMenu class="dropdown-menu" role="menu">
<li role="menuitem"><a class="dropdown-item" href="#">Action</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Another action</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Something else here</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Another action</a>
</li>
<li role="menuitem"><a class="dropdown-item" href="#">Something else
here</a></li>
<li class="divider dropdown-divider"></li>
<li role="menuitem"><a class="dropdown-item" href="#">Separated link</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Separated link</a>
</li>
</ul>
</div>
<button type="button" class="btn btn-warning" (click)="disabled = !disabled">Enable/Disable</button>
<button type="button" class="btn btn-warning" (click)="disabled = !disabled">
Enable/Disable
</button>

This file was deleted.

22 changes: 0 additions & 22 deletions demo/src/app/components/+dropdown/demos/dropdown-demo.component.ts

This file was deleted.

21 changes: 12 additions & 9 deletions demo/src/app/components/+dropdown/demos/dropup/dropup.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<div class="btn-group dropup" dropdown>
<button id="single-button" type="button" class="btn btn-primary" dropdownToggle>
Dropup <span class="caret"></span>
</button>
<ul dropdownMenu role="menu" aria-labelledby="single-button">
<div class="btn-group dropup" dropdown dropup>
<button dropdownToggle type="button" class="btn btn-primary dropdown-toggle">
Dropup <span class="caret"></span>
</button>
<ul *dropdownMenu class="dropdown-menu" role="menu">
<li role="menuitem"><a class="dropdown-item" href="#">Action</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Another action</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Something else here</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Another action</a>
</li>
<li role="menuitem"><a class="dropdown-item" href="#">Something else
here</a></li>
<li class="divider dropdown-divider"></li>
<li role="menuitem"><a class="dropdown-item" href="#">Separated link</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Separated link</a>
</li>
</ul>
</div>
</div>
11 changes: 8 additions & 3 deletions demo/src/app/components/+dropdown/demos/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { DropdownDemoComponent } from './dropdown-demo.component';
import { DemoDropdownBasicComponent } from './basic/basic';
import { DemoDropdownSplitComponent } from './split/split';
import { DemoDropdownContainerComponent } from './container/container';
Expand All @@ -9,11 +8,13 @@ import { DemoDropupComponent } from './dropup/dropup';
import { DemoDropdownTriggersManualComponent } from './triggers-manual/triggers-manual';
import { DemoDropdownDisabledComponent } from './disabled-menu/disabled-menu';
import { DemoDropdownAlignmentComponent } from './alignment/menu-alignment';
import { DemoNestedDropdownsComponent } from './nested-dropdowns/nested-dropdowns';

export const DEMO_COMPONENTS = [
DropdownDemoComponent, DemoDropdownBasicComponent, DemoDropdownBasicLinkComponent, DemoDropdownSplitComponent,
DemoDropdownBasicComponent, DemoDropdownBasicLinkComponent, DemoDropdownSplitComponent,
DemoDropdownContainerComponent, DemoDropdownKeyboardComponent, DemoDropdownConfigComponent, DemoDropupComponent,
DemoDropdownTriggersManualComponent, DemoDropdownDisabledComponent, DemoDropdownAlignmentComponent
DemoDropdownTriggersManualComponent, DemoDropdownDisabledComponent, DemoDropdownAlignmentComponent,
DemoNestedDropdownsComponent
];

export const DEMOS = {
Expand Down Expand Up @@ -46,6 +47,10 @@ export const DEMOS = {
component: require('!!raw-loader?lang=typescript!./alignment/menu-alignment.ts'),
html: require('!!raw-loader?lang=markup!./alignment/menu-alignment.html')
},
nested: {
component: require('!!raw-loader?lang=typescript!./nested-dropdowns/nested-dropdowns.ts'),
html: require('!!raw-loader?lang=markup!./nested-dropdowns/nested-dropdowns.html')
},
keyboard: {
component: require('!!raw-loader?lang=typescript!./keyboard/keyboard.ts'),
html: require('!!raw-loader?lang=markup!./keyboard/keyboard.html')
Expand Down
15 changes: 9 additions & 6 deletions demo/src/app/components/+dropdown/demos/keyboard/keyboard.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<div class="btn-group" dropdown keyboardNav="true">
<button id="simple-btn-keyboard-nav" type="button" class="btn btn-primary" dropdownToggle>
<div dropdown class="btn-group" keyboardNav="true">
<button dropdownToggle type="button" class="btn btn-primary dropdown-toggle">
Dropdown with keyboard navigation <span class="caret"></span>
</button>
<ul class="dropdown-menu" dropdownMenu role="menu" aria-labelledby="simple-btn-keyboard-nav">
<ul *dropdownMenu class="dropdown-menu" role="menu">
<li role="menuitem"><a class="dropdown-item" href="#">Action</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Another action</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Something else here</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Another action</a>
</li>
<li role="menuitem"><a class="dropdown-item" href="#">Something else
here</a></li>
<li class="divider dropdown-divider"></li>
<li role="menuitem"><a class="dropdown-item" href="#">Separated link</a></li>
<li role="menuitem"><a class="dropdown-item" href="#">Separated link</a>
</li>
</ul>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<div class="btn-group" dropdown [autoClose]="false" container="body">
<button dropdownToggle type="button" class="btn btn-primary dropdown-toggle">
This dropdown has nested submenu <span class="caret"></span>
</button>
<ul *dropdownMenu class="dropdown-menu" role="menu">
<li role="menuitem"><a class="dropdown-item" href="#/dropdowns#nested">Action</a></li>

<li role="menuitem" dropdown triggers="mouseover" placement="right" container="body">
<a dropdownToggle class="dropdown-item dropdown-toggle"
(click)="false">Hover me for nested dropdown <span class="caret"></span></a>
<ul *dropdownMenu class="dropdown-menu" role="menu">
<li role="menuitem"><a class="dropdown-item" href="#/dropdowns#nested">Action</a></li>
<li role="menuitem"><a class="dropdown-item" href="#/dropdowns#nested">Action1</a></li>
<li role="menuitem"><a class="dropdown-item" href="#/dropdowns#nested">Action2</a></li>
</ul>
</li>

<li role="menuitem" dropdown triggers="mouseover" placement="right" container="body">
<a dropdownToggle class="dropdown-item dropdown-toggle"
(click)="false">Hover me for nested dropdown <span class="caret"></span></a>
<ul *dropdownMenu class="dropdown-menu" role="menu">
<li role="menuitem"><a class="dropdown-item" href="#/dropdowns#nested">Action</a></li>
<li role="menuitem"><a class="dropdown-item" href="#/dropdowns#nested">Action1</a></li>
<li role="menuitem"><a class="dropdown-item" href="#/dropdowns#nested">Action2</a></li>
</ul>
</li>

<li role="menuitem"><a class="dropdown-item" href="#/dropdowns#nested">Something else here</a></li>
<li class="divider dropdown-divider"></li>
<li role="menuitem"><a class="dropdown-item" href="#/dropdowns#nested">Separated link</a></li>
</ul>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { Component } from '@angular/core';

@Component({
selector: 'demo-nested-dropdowns',
templateUrl: './nested-dropdowns.html'
})
export class DemoNestedDropdownsComponent {
}
18 changes: 0 additions & 18 deletions demo/src/app/components/+dropdown/demos/not-yet-supported.html

This file was deleted.

Loading

0 comments on commit b15a828

Please sign in to comment.