This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 78
Expandables Added aria-controls and aria-expanded #820
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
33 changes: 33 additions & 0 deletions
33
libs/barista-components/core/src/common-behaviours/id.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
/** | ||
* @license | ||
* Copyright 2020 Dynatrace LLC | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
import { mixinId } from './id'; | ||
|
||
describe('MixinId', () => { | ||
it('should augment an existing class with an property', () => { | ||
class EmptyClass {} | ||
|
||
const classWithDisabled = mixinId(EmptyClass, 'dt-mixin-test'); | ||
const instance = new classWithDisabled(); | ||
|
||
// Expected the mixed-into class to have an id property | ||
expect(instance.id).toMatch(/dt-mixin-test-\d/); | ||
|
||
instance.id = 'my-id'; | ||
// Expected the mixed-into class to have an updated id property | ||
expect(instance.id).toBe('my-id'); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
/** | ||
* @license | ||
* Copyright 2020 Dynatrace LLC | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
import { Constructor } from './constructor'; | ||
import { isDefined } from '../util'; | ||
|
||
/** | ||
* UniqueId counter, will be incremented with every | ||
* instatiation of the ExpandablePanel class | ||
*/ | ||
let uniqueId = 0; | ||
|
||
export interface HasId { | ||
/** Represents the unique id of the component. */ | ||
id: string; | ||
} | ||
|
||
/** Mixin to augment a directive with a `id` property. */ | ||
export function mixinId<T extends Constructor<{}>>( | ||
base: T, | ||
idPreset: string, | ||
): Constructor<HasId> & T { | ||
return class extends base { | ||
/** Sets a unique id for the expandable section. */ | ||
get id(): string { | ||
return this._id; | ||
} | ||
set id(value: string) { | ||
if (isDefined(value)) { | ||
this._id = value; | ||
} else { | ||
this._id = `${idPreset}-${uniqueId++}`; | ||
} | ||
} | ||
private _id = `${idPreset}-${uniqueId++}`; | ||
|
||
// tslint:disable-next-line | ||
constructor(...args: any[]) { | ||
super(...args); // tslint:disable-line:no-inferred-empty-object-type | ||
} | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@bardosmisi FYI