Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add appearance stylesheet behavior #17516

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
8912d32
Merge pull request #1 from microsoft/master
eljefe223 Sep 17, 2020
7f2afc9
Merge branch 'master' of https://github.com/microsoft/fluentui
eljefe223 Sep 18, 2020
b97a477
Merge branch 'master' of https://github.com/microsoft/fluentui
eljefe223 Sep 23, 2020
1d450b7
Merge branch 'master' of https://github.com/microsoft/fluentui
eljefe223 Sep 23, 2020
abc1aac
Merge branch 'master' of https://github.com/microsoft/fluentui
eljefe223 Sep 23, 2020
f40c04e
Merge branch 'master' of https://github.com/microsoft/fluentui
eljefe223 Nov 9, 2020
57d97a5
Merge branch 'master' of https://github.com/microsoft/fluentui
eljefe223 Nov 16, 2020
82b70f4
Merge branch 'master' of https://github.com/microsoft/fluentui
eljefe223 Nov 16, 2020
c67924a
Merge branch 'master' of https://github.com/microsoft/fluentui
eljefe223 Nov 17, 2020
937ab9e
Merge branch 'master' of https://github.com/microsoft/fluentui
eljefe223 Nov 20, 2020
204c744
Merge branch 'master' of https://github.com/microsoft/fluentui
eljefe223 Nov 20, 2020
cfdf698
Merge branch 'master' of https://github.com/microsoft/fluentui
eljefe223 Nov 24, 2020
4d62088
Merge branch 'master' of https://github.com/microsoft/fluentui
eljefe223 Dec 1, 2020
ac92354
Merge branch 'master' of https://github.com/microsoft/fluentui
eljefe223 Dec 16, 2020
8b1e138
Merge branch 'master' of https://github.com/microsoft/fluentui
eljefe223 Dec 17, 2020
1cd5f4c
Merge branch 'master' of https://github.com/microsoft/fluentui
eljefe223 Dec 17, 2020
600c579
Merge branch 'master' of https://github.com/microsoft/fluentui
eljefe223 Jan 5, 2021
068690c
Merge branch 'master' of https://github.com/microsoft/fluentui
eljefe223 Jan 21, 2021
e8f4ac4
Merge branch 'master' of https://github.com/microsoft/fluentui
eljefe223 Feb 4, 2021
a8bdc9f
Merge branch 'master' of https://github.com/microsoft/fluentui
eljefe223 Mar 8, 2021
e547034
Merge branch 'master' of https://github.com/microsoft/fluentui
eljefe223 Mar 22, 2021
fee1431
feat: add appearance style sheet behavior
eljefe223 Mar 22, 2021
16f7bb5
Change files
eljefe223 Mar 22, 2021
af7dde6
Update change/@fluentui-web-components-c5450e83-2cfb-4d5f-ada1-28d5a0…
eljefe223 Mar 22, 2021
bfa3f9a
Apply suggestions from code review (chrisdholt)
chrisdholt Mar 22, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "add appearance style sheet behavior",
"packageName": "@fluentui/web-components",
"email": "[email protected]",
"dependentChangeType": "patch"
}
53 changes: 7 additions & 46 deletions packages/web-components/src/anchor/anchor.styles.ts
Original file line number Diff line number Diff line change
@@ -1,59 +1,20 @@
import { css } from '@microsoft/fast-element';
import {
AccentButtonStyles,
accentFillActiveBehavior,
accentFillHoverBehavior,
accentFillRestBehavior,
accentForegroundActiveBehavior,
accentForegroundCutRestBehavior,
accentForegroundHoverBehavior,
accentForegroundRestBehavior,
BaseButtonStyles,
HypertextStyles,
LightweightButtonStyles,
neutralFillActiveBehavior,
neutralFillFocusBehavior,
neutralFillHoverBehavior,
neutralFillRestBehavior,
neutralFillStealthActiveBehavior,
neutralFillStealthHoverBehavior,
neutralFillStealthRestBehavior,
neutralFocusBehavior,
neutralFocusInnerAccentBehavior,
neutralForegroundRestBehavior,
neutralOutlineActiveBehavior,
neutralOutlineHoverBehavior,
neutralOutlineRestBehavior,
OutlineButtonStyles,
StealthButtonStyles,
} from '../styles/';
import { appearanceBehavior } from '../utilities/behaviors';

export const AnchorStyles = css`
${BaseButtonStyles}
${AccentButtonStyles}
${HypertextStyles}
${LightweightButtonStyles}
${OutlineButtonStyles}
${StealthButtonStyles}
${BaseButtonStyles}
`.withBehaviors(
accentFillActiveBehavior,
accentFillHoverBehavior,
accentFillRestBehavior,
accentForegroundActiveBehavior,
accentForegroundCutRestBehavior,
accentForegroundHoverBehavior,
accentForegroundRestBehavior,
neutralFillActiveBehavior,
neutralFillFocusBehavior,
neutralFillHoverBehavior,
neutralFillRestBehavior,
neutralFillStealthActiveBehavior,
neutralFillStealthHoverBehavior,
neutralFillStealthRestBehavior,
neutralFocusBehavior,
neutralFocusInnerAccentBehavior,
neutralForegroundRestBehavior,
neutralOutlineActiveBehavior,
neutralOutlineHoverBehavior,
neutralOutlineRestBehavior,
appearanceBehavior('accent', AccentButtonStyles),
appearanceBehavior('hypertext', HypertextStyles),
appearanceBehavior('lightweight', LightweightButtonStyles),
appearanceBehavior('outline', OutlineButtonStyles),
appearanceBehavior('stealth', StealthButtonStyles),
);
51 changes: 6 additions & 45 deletions packages/web-components/src/button/button.styles.ts
Original file line number Diff line number Diff line change
@@ -1,57 +1,18 @@
import { css } from '@microsoft/fast-element';
import {
AccentButtonStyles,
accentFillActiveBehavior,
accentFillHoverBehavior,
accentFillRestBehavior,
accentForegroundActiveBehavior,
accentForegroundCutRestBehavior,
accentForegroundHoverBehavior,
accentForegroundRestBehavior,
BaseButtonStyles,
LightweightButtonStyles,
neutralFillActiveBehavior,
neutralFillFocusBehavior,
neutralFillHoverBehavior,
neutralFillRestBehavior,
neutralFillStealthActiveBehavior,
neutralFillStealthHoverBehavior,
neutralFillStealthRestBehavior,
neutralFocusBehavior,
neutralFocusInnerAccentBehavior,
neutralForegroundRestBehavior,
neutralOutlineActiveBehavior,
neutralOutlineHoverBehavior,
neutralOutlineRestBehavior,
OutlineButtonStyles,
StealthButtonStyles,
} from '../styles/';
import { appearanceBehavior } from '../utilities/behaviors';

export const ButtonStyles = css`
${BaseButtonStyles}
${AccentButtonStyles}
${LightweightButtonStyles}
${OutlineButtonStyles}
${StealthButtonStyles}
${BaseButtonStyles}
`.withBehaviors(
accentFillActiveBehavior,
accentFillHoverBehavior,
accentFillRestBehavior,
accentForegroundActiveBehavior,
accentForegroundCutRestBehavior,
accentForegroundHoverBehavior,
accentForegroundRestBehavior,
neutralFillActiveBehavior,
neutralFillFocusBehavior,
neutralFillHoverBehavior,
neutralFillRestBehavior,
neutralFillStealthActiveBehavior,
neutralFillStealthHoverBehavior,
neutralFillStealthRestBehavior,
neutralFocusBehavior,
neutralFocusInnerAccentBehavior,
neutralForegroundRestBehavior,
neutralOutlineActiveBehavior,
neutralOutlineHoverBehavior,
neutralOutlineRestBehavior,
appearanceBehavior('accent', AccentButtonStyles),
appearanceBehavior('lightweight', LightweightButtonStyles),
appearanceBehavior('outline', OutlineButtonStyles),
appearanceBehavior('stealth', StealthButtonStyles),
);
15 changes: 15 additions & 0 deletions packages/web-components/src/utilities/behaviors.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { ElementStyles } from '@microsoft/fast-element';
import { PropertyStyleSheetBehavior } from '@microsoft/fast-foundation';

/**
* Behavior that will conditionally apply a stylesheet based on the elements
* appearance property
*
* @param value - The value of the appearance property
* @param styles - The styles to be applied when condition matches
*
* @public
*/
export function appearanceBehavior(value: string, styles: ElementStyles) {
return new PropertyStyleSheetBehavior('appearance', value, styles);
}