Skip to content

Commit

Permalink
Merge branch 'main' into wait-a11y
Browse files Browse the repository at this point in the history
  • Loading branch information
Blackbaud-SteveBrush authored Oct 17, 2022
2 parents f8f6ba1 + e38a2da commit 528d3de
Show file tree
Hide file tree
Showing 168 changed files with 2,757 additions and 1,786 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
package-name: 'skyux'
pull-request-title-pattern: 'chore: release ${version}'
labels: 'autorelease ${{ github.ref_name }}: pending'
release-as: 7.0.0-beta.2
release-as: 7.0.0-beta.4
release-labels: 'autorelease ${{ github.ref_name }}: tagged'
prerelease: true
draft-pull-request: true
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"editor.formatOnSave": true,
"prettier.requireConfig": true,
"coverage-gutters.showLineCoverage": true,
"cSpell.words": ["skyux", "blackbaud", "tabset", "tablist"]
"cSpell.words": ["blackbaud", "skyux", "tabindex", "tablist", "tabset"]
}
53 changes: 53 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,58 @@
# Changelog

## [7.0.0-beta.3](https://github.com/blackbaud/skyux/compare/7.0.0-beta.2...7.0.0-beta.3) (2022-10-14)


### ⚠ BREAKING CHANGES

* **components/indicators:** This change removes support for `alertType` on the alert component being an unaccepted string. To address this change, change the `alertType` to an accepted `SkyIndicatorTypeIcon` or remove it to use the default `alertType` of `'warning'`.
* **components/forms:** The `SkyFileDrop` and `SkyFileAttachment` components' `validateFn` input type was updated to receive a `SkyFileType` parameter and return a string or undefined. To address this, ensure all `validateFn` inputs have the correct parameter and return types.
* **components/config:** The config params `get` function was updated to accurately reflect that it may return undefined. To address this change, account for a possible undefined value wherever you are using the `get` function.
* **components/modals:** `SkyModalConfigurationInterface.providers` accepts an array of `StaticProvider`s instead of any value.
* **components/modals:** `SkyConfirmButton`'s `styleType` will only accept predefined strings of type `SkyConfirmButtonStyleType`. To address this, ensure `styleType` is only being set to a supported value.
* **components/modals:** The `SkyConfirmButton` component is intended for internal use only and is removed from the exported API. To address this, remove any usages of the `SkyConfirmButton` component.

### Features

* **components/angular-tree-component:** add inline help support for angular tree component ([#659](https://github.com/blackbaud/skyux/issues/659)) ([3fbabf2](https://github.com/blackbaud/skyux/commit/3fbabf28cb406a220aa4d7dbfe282b8a81e6365a))
* **components/config:** add more specific typing to config params function return types ([#668](https://github.com/blackbaud/skyux/issues/668)) ([102cd0a](https://github.com/blackbaud/skyux/commit/102cd0a97a5b64c78e469b462fe1f59601e44557))
* **components/forms:** update file attachment validateFn inputs to more specific type ([#669](https://github.com/blackbaud/skyux/issues/669)) ([95b7ab5](https://github.com/blackbaud/skyux/commit/95b7ab59f6352a591dcff17da5d76c3e9c4d3325))
* **components/indicators:** change `alertType` to `SkyIndicatorIconType` ([#683](https://github.com/blackbaud/skyux/issues/683)) ([9081186](https://github.com/blackbaud/skyux/commit/90811866e56e772f95422db308ed7caf801cfac0))
* **components/indicators:** remove bottom margin from alert component ([#648](https://github.com/blackbaud/skyux/issues/648)) ([5bd8762](https://github.com/blackbaud/skyux/commit/5bd87621ba412cebb38285b6e9ece256e07bbe6b))
* **components/lookup:** deprecate search inputs ([#647](https://github.com/blackbaud/skyux/issues/647)) ([74396bb](https://github.com/blackbaud/skyux/commit/74396bb18906e82e86fa920276c8f709bd5b0143))
* **components/modals:** improve `SkyModalConfigurationInterface.providers` type ([#665](https://github.com/blackbaud/skyux/issues/665)) ([a65dae0](https://github.com/blackbaud/skyux/commit/a65dae0642b45764fed92d9671e2830e0f1cc24e))
* **components/modals:** remove 'string' from `SkyConfirmButton`'s `styleType` type ([#664](https://github.com/blackbaud/skyux/issues/664)) ([8fda84e](https://github.com/blackbaud/skyux/commit/8fda84ebf9afa68e0c436578dbb6177f6cc7bfdd))
* **components/modals:** remove public export of confirm button ([#656](https://github.com/blackbaud/skyux/issues/656)) ([f465207](https://github.com/blackbaud/skyux/commit/f46520739ebf874d759efa372a809d19cee3afb6))
* **components/tabs:** add descriptive aria label to tab buttons ([#586](https://github.com/blackbaud/skyux/issues/586)) ([#660](https://github.com/blackbaud/skyux/issues/660)) ([9a01d54](https://github.com/blackbaud/skyux/commit/9a01d549d498a9616d16aae4e3334b878372da3e))
* **components/toast:** improve toast service `openComponent` `component` param type ([#667](https://github.com/blackbaud/skyux/issues/667)) ([8ffa182](https://github.com/blackbaud/skyux/commit/8ffa182538269488b561fda377dc677927f0e227))


### Bug Fixes

* **components/lookup:** modern search clickbox takes up entire input box ([#677](https://github.com/blackbaud/skyux/issues/677)) ([#679](https://github.com/blackbaud/skyux/issues/679)) ([2b70b38](https://github.com/blackbaud/skyux/commit/2b70b383a69bbe0c7028e0fdfaeb129d0c6fb1fa))
* **components/text-editor:** toolbars are hidden when no items exist within the toolbars ([#676](https://github.com/blackbaud/skyux/issues/676)) ([#678](https://github.com/blackbaud/skyux/issues/678)) ([9711a84](https://github.com/blackbaud/skyux/commit/9711a842e8c3a5c6887adfdfceab6719001a4a1e))

## [6.25.0](https://github.com/blackbaud/skyux/compare/6.24.0...6.25.0) (2022-10-13)


### Features

* **components/forms:** support status indicator errors for input box ([#633](https://github.com/blackbaud/skyux/issues/633)) ([7648638](https://github.com/blackbaud/skyux/commit/764863802c3e4d18212dbd86fe390e14c3df0fb2))


### Bug Fixes

* **components/lookup:** modern search clickbox takes up entire input box ([#677](https://github.com/blackbaud/skyux/issues/677)) ([85330ed](https://github.com/blackbaud/skyux/commit/85330ed879054cd8967d9a075589ea601775509f))
* **components/text-editor:** toolbars are hidden when no items exist within the toolbars ([#676](https://github.com/blackbaud/skyux/issues/676)) ([b2ba8de](https://github.com/blackbaud/skyux/commit/b2ba8de9952306c576bd04b066b70626cb756eee))

## [6.24.0](https://github.com/blackbaud/skyux/compare/6.23.3...6.24.0) (2022-10-10)


### Features

* **components/angular-tree-component:** add inline help support for angular tree component ([#631](https://github.com/blackbaud/skyux/issues/631)) ([8674852](https://github.com/blackbaud/skyux/commit/86748522fc65f59830850303ed1839368e0e3317))
* **components/tabs:** add descriptive aria label to tab buttons ([#586](https://github.com/blackbaud/skyux/issues/586)) ([f827ca0](https://github.com/blackbaud/skyux/commit/f827ca0cde063303fa525b4c01510ba8abe663d8))

## [7.0.0-beta.2](https://github.com/blackbaud/skyux/compare/7.0.0-beta.1...7.0.0-beta.2) (2022-10-07)


Expand Down
7 changes: 7 additions & 0 deletions apps/code-examples/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ const routes: Routes = [
loadChildren: () =>
import('./features/action-bars.module').then((m) => m.ActionBarsModule),
},
{
path: 'angular-tree',
loadChildren: () =>
import('./features/angular-tree.modules').then(
(m) => m.AngularTreeFeatureModule
),
},
{
path: 'colorpicker',
loadChildren: () =>
Expand Down
15 changes: 15 additions & 0 deletions apps/code-examples/src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@
</li>
</ul>
</li>
<li>
Angular Tree
<ul>
<li><a routerLink="angular-tree/advanced">Advanced</a></li>
<li><a routerLink="angular-tree/inline-help">Inline help</a></li>
</ul>
</li>
<li>
Autonumeric
<ul>
Expand Down Expand Up @@ -136,6 +143,14 @@
<li>
<a routerLink="forms/input-box/basic">Input box</a>
</li>
<li>
<a routerLink="forms/selection-box/checkbox"
>Selection box (checkbox)</a
>
</li>
<li>
<a routerLink="forms/selection-box/radio">Selection box (radio)</a>
</li>
</ul>
</li>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<form novalidate [formGroup]="demoOptions">
<sky-fluid-grid>
<sky-row>
<sky-column screenSmall="6">
<sky-column [screenSmall]="6">
<h4 id="sky-demo-modes">Modes</h4>
<sky-radio-group ariaLabel="Tree modes" formControlName="treeMode">
<ul class="sky-list-unstyled">
Expand Down Expand Up @@ -83,7 +83,7 @@ <h4 id="sky-demo-modes">Modes</h4>
</li>
</ul>
</sky-column>
<sky-column screenSmall="6">
<sky-column [screenSmall]="6">
<ul class="sky-list-unstyled">
<li>
<sky-checkbox formControlName="showToolbar">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.app-demo-container {
border: 1px solid #cdcfd2;
padding: 20px;

.angular-tree-component {
background: #fff;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,7 @@ import {

@Component({
selector: 'app-angular-tree-component-demo',
styles: [
`
.app-demo-container {
border: 1px solid #cdcfd2;
padding: 20px;
.angular-tree-component {
background: #fff;
}
}
`,
],
styleUrls: ['./angular-tree-demo.component.scss'],
templateUrl: './angular-tree-demo.component.html',
changeDetection: ChangeDetectionStrategy.OnPush,
})
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<sky-angular-tree-wrapper>
<tree-root [nodes]="nodes" #tree>
<ng-template
let-index="index"
let-node
let-templates="templates"
#treeNodeFullTemplate
>
<sky-angular-tree-node
[index]="index"
[node]="node"
[templates]="templates"
>
<sky-help-inline
*ngIf="node.data.showHelp"
class="sky-control-help"
></sky-help-inline>
</sky-angular-tree-node>
</ng-template>
</tree-root>
</sky-angular-tree-wrapper>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.app-demo-container {
border: 1px solid #cdcfd2;
padding: 20px;

.angular-tree-component {
background: #fff;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';

@Component({
selector: 'app-angular-tree-component-demo',
styleUrls: ['./angular-tree-demo.component.scss'],
templateUrl: './angular-tree-demo.component.html',
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class AngularTreeDemoComponent {
public nodes = [
{
name: 'Animals',
isExpanded: true,
showHelp: true,
children: [
{
name: 'Cats',
isExpanded: true,
showHelp: true,
children: [
{ name: 'Burmese' },
{ name: 'Persian' },
{ name: 'Tabby' },
],
},
{
name: 'Dogs',
isExpanded: true,
children: [
{
name: 'Beagle',
showHelp: true,
},
{ name: 'German shepherd' },
{ name: 'Labrador retriever' },
],
},
],
},
];
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { TreeModule } from '@circlon/angular-tree-component';
import { SkyAngularTreeModule } from '@skyux/angular-tree-component';
import { SkyCheckboxModule, SkyRadioModule } from '@skyux/forms';
import { SkyHelpInlineModule } from '@skyux/indicators';
import { SkyFluidGridModule } from '@skyux/layout';
import { SkyDropdownModule } from '@skyux/popovers';

import { AngularTreeDemoComponent } from './angular-tree-demo.component';

@NgModule({
imports: [
CommonModule,
ReactiveFormsModule,
SkyAngularTreeModule,
SkyCheckboxModule,
SkyDropdownModule,
SkyFluidGridModule,
SkyRadioModule,
TreeModule,
SkyHelpInlineModule,
],
declarations: [AngularTreeDemoComponent],
exports: [AngularTreeDemoComponent],
})
export class AngularTreeDemoModule {}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<form [formGroup]="myForm">
<sky-selection-box-grid>
<sky-selection-box
*ngFor="let control of checkboxArray?.controls; let i = index"
*ngFor="let control of checkboxControls; let i = index"
[control]="checkbox"
>
<sky-icon iconType="skyux" [icon]="selectionBoxes[i].icon"></sky-icon>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
import { Component, OnInit } from '@angular/core';
import { FormArray, FormBuilder, FormGroup } from '@angular/forms';
import { FormArray, FormBuilder, FormControl, FormGroup } from '@angular/forms';

@Component({
selector: 'app-selection-box-demo',
templateUrl: './selection-box-demo.component.html',
})
export class SelectionBoxDemoComponent implements OnInit {
public checkboxArray: FormArray | undefined;

public selectionBoxes: any[] = [
public checkboxControls: FormControl[] | undefined;

public selectionBoxes: {
name: string;
icon: string;
description: string;
selected?: boolean;
}[] = [
{
name: 'Save time and effort',
icon: 'clock',
Expand Down Expand Up @@ -37,9 +42,12 @@ export class SelectionBoxDemoComponent implements OnInit {
}

public ngOnInit(): void {
this.checkboxArray = this.#buildCheckboxes();
const checkboxArray = this.#buildCheckboxes();

this.checkboxControls = checkboxArray.controls as FormControl[];

this.myForm = this.#formBuilder.group({
checkboxes: this.checkboxArray,
checkboxes: checkboxArray,
});

this.myForm.valueChanges.subscribe((value) => console.log(value));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<sky-key-info [layout]="layout" data-sky-id="key-info-demo">
<sky-key-info-value>{{ value }}</sky-key-info-value>
<sky-key-info-value class="sky-font-display-3">
{{ value }}
</sky-key-info-value>
<sky-key-info-label> New members </sky-key-info-label>
</sky-key-info>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { SkyKeyInfoLayoutType } from '@skyux/indicators';
})
export class KeyInfoDemoComponent {
@Input()
public set value(value: number) {
public set value(value: number | undefined) {
this.#_value = value;
this.layout = this.#_value >= 100 ? 'vertical' : 'horizontal';
}
Expand All @@ -18,5 +18,5 @@ export class KeyInfoDemoComponent {

public layout: SkyKeyInfoLayoutType = 'vertical';

#_value: number | undefined;
#_value: number | undefined = 575;
}
33 changes: 33 additions & 0 deletions apps/code-examples/src/app/features/angular-tree.modules.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';

import { AngularTreeDemoComponent } from '../code-examples/angular-tree-component/angular-tree/advanced/angular-tree-demo.component';
import { AngularTreeDemoModule } from '../code-examples/angular-tree-component/angular-tree/advanced/angular-tree-demo.module';
import { AngularTreeDemoComponent as AngularTreeInlineHelpDemoComponent } from '../code-examples/angular-tree-component/angular-tree/inline-help/angular-tree-demo.component';
import { AngularTreeDemoModule as AngularTreeInlineHelpDemoModule } from '../code-examples/angular-tree-component/angular-tree/inline-help/angular-tree-demo.module';

const routes: Routes = [
{
path: 'advanced',
component: AngularTreeDemoComponent,
},
{
path: 'inline-help',
component: AngularTreeInlineHelpDemoComponent,
},
];

@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class AngularTreeRoutingModule {}

@NgModule({
imports: [
AngularTreeDemoModule,
AngularTreeRoutingModule,
AngularTreeInlineHelpDemoModule,
],
})
export class AngularTreeFeatureModule {}
Loading

0 comments on commit 528d3de

Please sign in to comment.