Skip to content
This repository has been archived by the owner on Dec 8, 2022. It is now read-only.

Commit

Permalink
Merge branch 'master' into feature-numeric-truncate
Browse files Browse the repository at this point in the history
  • Loading branch information
Blackbaud-SteveBrush authored Jul 25, 2018
2 parents ce8bf1f + 4786309 commit 899ef89
Show file tree
Hide file tree
Showing 180 changed files with 2,215 additions and 623 deletions.
52 changes: 47 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,53 @@
# 2.18.0 (2018-07-20)

- Added ability to include `body` content within confirm component. [#1776](https://github.com/blackbaud/skyux2/pull/1776) (Thanks @Blackbaud-JackMcElhinney)
- Added default ARIA label to colorpicker input. [#1788](https://github.com/blackbaud/skyux2/pull/1788)
- Added default ARIA label to timepicker button and input. [#1802](https://github.com/blackbaud/skyux2/pull/1802), [#1795](https://github.com/blackbaud/skyux2/pull/1795)
- Added ARIA sort attribute to grid component columns. [#1796](https://github.com/blackbaud/skyux2/pull/1796) (Thanks @Blackbaud-JackMcElhinney)
- Added support for `rgb` format for colorpicker component. [#1775](https://github.com/blackbaud/skyux2/pull/1775) (Thanks @Blackbaud-JackMcElhinney)
- Added ARIA label input for token component. [#1824](https://github.com/blackbaud/skyux2/pull/1824) [#1807](https://github.com/blackbaud/skyux2/pull/1807)
- Added ARIA required and accessibility attributes to sectioned form component vertical tabs. [#1797](https://github.com/blackbaud/skyux2/pull/1797)
- Changed element in page summary subtitle component. [#1800](https://github.com/blackbaud/skyux2/pull/1800) (Thanks @Blackbaud-JackMcElhinney)
- Fixed toast component to appear above modals. [#1756](https://github.com/blackbaud/skyux2/pull/1756) (Thanks @Blackbaud-JackMcElhinney)
- Fixed asynchronous tabs to initialize appropriately. [#1827](https://github.com/blackbaud/skyux2/pull/1827)
- Fixed tile component to only display title element when heading text is supplied. [#1801](https://github.com/blackbaud/skyux2/pull/1801)
- Fixed timepicker component to clear input value when `ngModel` is set to `undefined`. [#1772](https://github.com/blackbaud/skyux2/pull/1772) (Thanks @Blackbaud-JackMcElhinney)
- Fixed Plunker for colorpicker component demo. [#1752](https://github.com/blackbaud/skyux2/pull/1752)
- Fixed regular expression for email validation to be more specific. [#1813](https://github.com/blackbaud/skyux2/pull/1813) (Thanks @Blackbaud-DylanHouston)
- Fixed accessibility issue in confirm demo. [#1783](https://github.com/blackbaud/skyux2/pull/1783)
- Fixed accessibility issue in email validation demo. [#1806](https://github.com/blackbaud/skyux2/pull/1806)
- Moved Angular animations module to `devDependencies`. [#1746](https://github.com/blackbaud/skyux2/pull/1746)
- Fixed visual tests to fail during Protractor's error code 199. [#1830](https://github.com/blackbaud/skyux2/pull/1830)
- Removed SKY Host status bar during visual tests. [#1825](https://github.com/blackbaud/skyux2/pull/1825)

# 2.17.0 (2018-07-05)

- Added primary action button to flyout component toolbar. [#1766](https://github.com/blackbaud/skyux2/pull/1766) (Thanks @Blackbaud-StewartStephens)
- Updated accessibility for colorpicker component. [#1789](https://github.com/blackbaud/skyux2/pull/1789)
- Updated accessibility for dropdown button component. [#1781](https://github.com/blackbaud/skyux2/pull/1781)
- Updated accessibility for tabset component. [#1786](https://github.com/blackbaud/skyux2/pull/1786)
- Updated accessibility for action button component. [#1778](https://github.com/blackbaud/skyux2/pull/1778)
- Updated accessibility for link records component. [#1782](https://github.com/blackbaud/skyux2/pull/1782)

# 2.16.0 (2018-07-02)

- Restructured list toolbar component to meet design guidelines. [#1645](https://github.com/blackbaud/skyux2/pull/1645) (Thanks @Blackbaud-TrevorBurch)
- Added ARIA labels to datepicker component. [#1753](https://github.com/blackbaud/skyux2/pull/1753)
- Added ARIA roles to dropdown component. [#1749](https://github.com/blackbaud/skyux2/pull/1749)
- Added default value for timepicker component's `timeFormat` input. [#1736](https://github.com/blackbaud/skyux2/pull/1736)
- Fixed paging component's `maxPages` input to correctly display the maximum number of pages. [#1735](https://github.com/blackbaud/skyux2/pull/1735)
- Added hyperlink anchor tags to demos for alert and toast components. [#1723](https://github.com/blackbaud/skyux2/pull/1723)
- Fixed race condition in wait service during teardown of wait component. [#1739](https://github.com/blackbaud/skyux2/pull/1739)
- Fixed incorrect tab indexes for conditionally rendered tabs. [#1738](https://github.com/blackbaud/skyux2/pull/1738)

# 2.15.0 (2018-06-18)

- Added debounce time to search component. [#1726](https://github.com/blackbaud/skyux2/pull/1726) (Thanks @Blackbaud-LoganJahnke)
- Added `startingDay` input to datepicker directive. [#1732](https://github.com/blackbaud/skyux2/pull/1732)
- Fixed datepicker not clearing value from underlying input element. [#1730](https://github.com/blackbaud/skyux2/pull/1730)
- Fixed repeater not initializing correctly when consumed by a component with a change detection strategy of `OnPush`. [#1724](https://github.com/blackbaud/skyux2/pull/1724)
- Fixed numeric service not using accurate localization symbols. [#1716](https://github.com/blackbaud/skyux2/pull/1716)
- Fixed issue with modal trying to close itself on route change if it is already closed. [#1741](https://github.com/blackbaud/skyux2/pull/1741)
- Added `startingDay` to datepicker input directive. [#1732](https://github.com/blackbaud/skyux2/pull/1732)
- Fixed datepicker input directive to clear value from underlying input element. [#1730](https://github.com/blackbaud/skyux2/pull/1730)
- Fixed repeater component to correctly initialize when consumed by component with change detection strategy of `OnPush`. [#1724](https://github.com/blackbaud/skyux2/pull/1724)
- Fixed numeric service to use accurate localization symbols. [#1716](https://github.com/blackbaud/skyux2/pull/1716)
- Fixed issue with modal component trying to close itself on route change if it is already closed. [#1741](https://github.com/blackbaud/skyux2/pull/1741)

# 2.14.0 (2018-06-05)

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@blackbaud/skyux",
"version": "2.15.0",
"version": "2.18.0",
"description": "SKY UX built on Angular 2",
"author": "Blackbaud, Inc.",
"homepage": "https://github.com/blackbaud/skyux2",
Expand Down Expand Up @@ -40,7 +40,6 @@
"wdio": "wdio"
},
"dependencies": {
"@angular/animations": "4.3.6",
"dragula": "3.7.2",
"intl": "1.2.5",
"microedge-rxstate": "2.0.2",
Expand All @@ -49,6 +48,7 @@
"web-animations-js": "2.3.1"
},
"devDependencies": {
"@angular/animations": "4.3.6",
"@angular/core": "4.3.6",
"@angular/forms": "4.3.6",
"@angular/platform-browser": "4.3.6",
Expand Down
7 changes: 0 additions & 7 deletions skyux-spa-visual-tests/config/utils/start-visual.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,6 @@ function killServers(exitCode) {
httpServer = null;
}

// Catch protractor's "Kitchen Sink" error.
if (exitCode === 199) {
logger.warn('Supressing protractor\'s "kitchen sink" error 199');
exitCode = 0;
}

logger.info(`Execution Time: ${(new Date().getTime() - start) / 1000} seconds`);
logger.info(`Exiting process with ${exitCode}`);
process.exit(exitCode || 0);
Expand Down Expand Up @@ -201,4 +195,3 @@ function spawnBuild(skyPagesConfig, webpack) {
});
});
}

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions skyux-spa-visual-tests/src/app/app-extras.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import { ModalTiledDemoComponent } from './modal/modal-tiled-demo.component';
import { Tile1Component } from './tiles/tile1.component';
import { Tile2Component } from './tiles/tile2.component';

require('style-loader!./visual.scss');

// Specify entry components, module-level providers, etc. here.
@NgModule({
providers: [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@
Yes/cancel confirm
</button>

<button
type="button"
class="sky-btn sky-btn-primary sky-confirm-btn-body"
(click)="openConfirmWithBody()">
Confirm with body
</button>

<button
type="button"
class="sky-btn sky-btn-primary sky-confirm-btn-yesnocancel"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ export class ConfirmVisualComponent {
});
}

public openConfirmWithBody() {
this.confirmService.open({
message: 'Do you wish to continue?',
body: 'This could be dangerous!',
type: SkyConfirmType.YesCancel
});
}

public openYesNoCancelConfirm() {
this.confirmService.open({
message: 'Do you wish to continue?',
Expand Down
36 changes: 36 additions & 0 deletions skyux-spa-visual-tests/src/app/confirm/confirm.visual-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,24 @@ describe('Confirm', () => {
});
});

it('should match previous body screenshot', () => {
return SkyVisualTest
.setupTest('confirm')
.then(() => {
element(by.css('.sky-confirm-btn-body')).click();

SkyVisualTest.moveCursorOffScreen();

return SkyVisualTest.compareScreenshot({
screenshotName: 'confirm-body',
selector: '.sky-modal'
});
})
.then(() => {
element(by.css('.sky-confirm-buttons .sky-btn-primary')).click();
});
});

it('should match previous YesNoCancel screenshot', () => {
return SkyVisualTest
.setupTest('confirm')
Expand Down Expand Up @@ -111,6 +129,24 @@ describe('Confirm', () => {
});
});

it('should match previous body screenshot on small screens', () => {
return SkyVisualTest
.setupTest('confirm', 480)
.then(() => {
element(by.css('.sky-confirm-btn-body')).click();

SkyVisualTest.moveCursorOffScreen();

return SkyVisualTest.compareScreenshot({
screenshotName: 'confirm-body',
selector: '.sky-modal'
});
})
.then(() => {
element(by.css('.sky-confirm-buttons .sky-btn-primary')).click();
});
});

it('should match previous YesNoCancel screenshot on small screens', () => {
return SkyVisualTest
.setupTest('confirm', 480)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
<div id="screenshot-filter-button">
<sky-filter-button
[active]="filtersActive"
(filterButtonClick)="filtersActive = !filtersActive">
(filterButtonClick)="filtersActive = !filtersActive"
[showButtonText]="false">
</sky-filter-button>
</div>

<div id="screenshot-filter-button-text">
<sky-filter-button
[active]="filtersActive"
(filterButtonClick)="filtersActive = !filtersActive"
[showButtonText]="true">
</sky-filter-button>
</div>

Expand Down
22 changes: 22 additions & 0 deletions skyux-spa-visual-tests/src/app/filter/filter.visual-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,28 @@ describe('Filter', () => {

});

it('should match the previous screenshot for filter button when text is shown', () => {
return SkyVisualTest.setupTest('filter')
.then(() => {
return SkyVisualTest.compareScreenshot({
screenshotName: 'filter-button-text',
selector: '#screenshot-filter-button-text'
});
});

});

it('should match the previous screenshot for filter button when text is on but the screen is small', () => {
return SkyVisualTest.setupTest('filter', 400)
.then(() => {
return SkyVisualTest.compareScreenshot({
screenshotName: 'filter-button-text-small',
selector: '#screenshot-filter-button-text'
});
});

});

it('should match previous screenshot for active filter button', () => {
return SkyVisualTest.setupTest('filter')
.then(() => {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<list-column-selector-action-visual></list-column-selector-action-visual>
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<div id="screenshot-list-column-selector-action">
<sky-list [data]="data">
<sky-list-toolbar>
<sky-list-column-selector-action [gridView]="grid"></sky-list-column-selector-action>
</sky-list-toolbar>
<sky-list-view-grid fit="scroll">
<sky-grid-column field="column1" heading="Column1"></sky-grid-column>
<sky-grid-column field="column2" heading="Column2"></sky-grid-column>
</sky-list-view-grid>
</sky-list>
</div>

<div id="screenshot-list-column-selector-action-deprecated">
<sky-list [data]="data">
<sky-list-toolbar>
<sky-list-secondary-actions>
<sky-list-column-selector-action [gridView]="grid"></sky-list-column-selector-action>
</sky-list-secondary-actions>
</sky-list-toolbar>
<sky-list-view-grid fit="scroll" #grid>
<sky-grid-column field="column1" heading="Column1"></sky-grid-column>
<sky-grid-column field="column2" heading="Column2"></sky-grid-column>
</sky-list-view-grid>
</sky-list>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { Component } from '@angular/core';

import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/of';

@Component({
selector: 'list-column-selector-action-visual',
templateUrl: './list-column-selector-action-visual.component.html'
})
export class ListColumnSelectorActionVisualComponent {

public data: Observable<Array<any>> = Observable.of([
{ id: '1', column1: 101, column2: 'Apple', column3: 'Anne eats apples'},
{ id: '2', column1: 202, column2: 'Banana', column3: 'Ben eats bananas' },
{ id: '3', column1: 303, column2: 'Pear', column3: 'Patty eats pears' },
{ id: '4', column1: 404, column2: 'Grape', column3: 'George eats grapes' },
{ id: '5', column1: 505, column2: 'Banana', column3: 'Becky eats bananas' },
{ id: '6', column1: 606, column2: 'Lemon', column3: 'Larry eats lemons' },
{ id: '7', column1: 707, column2: 'Strawberry', column3: 'Sally eats strawberries' }
]);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import { SkyVisualTest } from '../../../config/utils/visual-test-commands';
import { element, by } from 'protractor';

describe('list-column-selector-action component', () => {

it('should display toolbar with the column chooser', () => {
return SkyVisualTest
.setupTest('list-column-selector-action')
.then(() => {
return SkyVisualTest.compareScreenshot({
screenshotName: 'list-column-selector-action',
selector: '#screenshot-list-column-selector-action'
});
});
});

it('should display toolbar with the column chooser without text when a small screen', () => {
return SkyVisualTest
.setupTest('list-column-selector-action', 400)
.then(() => {
return SkyVisualTest.compareScreenshot({
screenshotName: 'list-column-selector-action-small',
selector: '#screenshot-list-column-selector-action'
});
});
});

it('should display toolbar with the column chooser in the deprecated manner', () => {
return SkyVisualTest
.setupTest('list-column-selector-action')
.then(() => {
return element(by.css('#screenshot-list-column-selector-action-deprecated .sky-list-secondary-actions .sky-dropdown-button'))
.click() as any;
})
.then(() => {
return SkyVisualTest.compareScreenshot({
screenshotName: 'list-column-selector-action-deprecated',
selector: '#screenshot-list-column-selector-action-deprecated'
});
});
});
});
1 change: 1 addition & 0 deletions skyux-spa-visual-tests/src/app/list-toolbar/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<list-toolbar-visual></list-toolbar-visual>
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<div id="screenshot-list-toolbar">
<sky-list [data]="data">
<sky-list-toolbar>
<sky-list-secondary-actions>
<sky-list-secondary-action>
<button type="button">
Option
</button>
</sky-list-secondary-action>
</sky-list-secondary-actions>
<sky-list-column-selector-action [gridView]="grid"></sky-list-column-selector-action>
<sky-list-toolbar-sort
label="Custom"
field="column1"
type="string"
[descending]="false">
</sky-list-toolbar-sort>
<sky-list-filter-button>
<sky-filter-button [showButtonText]="true">
</sky-filter-button>
</sky-list-filter-button>
<sky-list-toolbar-view-actions>
<button
class="sky-btn sky-btn-default"
title="Sort descending"
type="button"
>
<i class="fa fa-angle-double-down" aria-hidden="true"></i>
</button>
<button
class="sky-btn sky-btn-default"
title="Sort ascending"
type="button"
>
<i class="fa fa-angle-double-up" aria-hidden="true"></i>
</button>
</sky-list-toolbar-view-actions>
</sky-list-toolbar>
<sky-list-view-grid fit="scroll" #grid>
<sky-grid-column field="column1" heading="Column1"></sky-grid-column>
<sky-grid-column field="column2" heading="Column2"></sky-grid-column>
</sky-list-view-grid>
</sky-list>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { Component } from '@angular/core';

import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/of';

@Component({
selector: 'list-toolbar-visual',
templateUrl: './list-toolbar-visual.component.html'
})
export class ListToolbarVisualComponent {

public data: Observable<Array<any>> = Observable.of([
{ id: '1', column1: 101, column2: 'Apple', column3: 'Anne eats apples'},
{ id: '2', column1: 202, column2: 'Banana', column3: 'Ben eats bananas' },
{ id: '3', column1: 303, column2: 'Pear', column3: 'Patty eats pears' },
{ id: '4', column1: 404, column2: 'Grape', column3: 'George eats grapes' },
{ id: '5', column1: 505, column2: 'Banana', column3: 'Becky eats bananas' },
{ id: '6', column1: 606, column2: 'Lemon', column3: 'Larry eats lemons' },
{ id: '7', column1: 707, column2: 'Strawberry', column3: 'Sally eats strawberries' }
]);
}
Loading

0 comments on commit 899ef89

Please sign in to comment.