Skip to content

WIP: feat(fab): Create extendable fab, splitting fab from button #8441

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

WIP: feat(fab): Create extendable fab, splitting fab from button #8441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/src/lib/datepicker/** @mmalerba
/src/lib/dialog/** @jelbourn @crisbeto
/src/lib/expansion/** @josephperrott @jelbourn
/src/lib/fab/** @josephperrott
/src/lib/form-field/** @mmalerba
/src/lib/grid-list/** @kara @jelbourn
/src/lib/icon/** @jelbourn
Expand Down
166 changes: 75 additions & 91 deletions src/demo-app/button/button-demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,114 +1,98 @@
<div class="demo-button">
<section>
<button mat-button>flat</button>
<button mat-raised-button>raised</button>
<button mat-fab>
<mat-icon>check</mat-icon>
</button>
<button mat-fab>Btn</button>
<a mat-fab routerLink=".">Link</a>
<a mat-fab routerLink="."><mat-icon>check</mat-icon></a>
<button mat-mini-fab>
<mat-icon>check</mat-icon>
</button>
<button mat-mini-fab>Btn</button>
<a mat-mini-fab routerLink=".">Link</a>
</section>

<section>
<a href="http://www.google.com" mat-button color="primary">SEARCH</a>
<a href="http://www.google.com" mat-raised-button>SEARCH</a>
<a href="http://www.google.com" mat-fab>
<mat-icon>check</mat-icon>
</a>
<a href="http://www.google.com" mat-mini-fab>
<mat-icon>check</mat-icon>
</a>
</section>

<section>
<section class="outlined">
<label>Flat</label>
<button mat-button>default</button>
<button mat-button color="primary">primary</button>
<button mat-button color="accent">accent</button>
<button mat-button color="warn">warn</button>
</section>

<section>
<section class="outlined">
<label>Raised</label>
<button mat-raised-button>default</button>
<button mat-raised-button color="primary">primary</button>
<button mat-raised-button color="accent">accent</button>
<button mat-raised-button color="warn">warn</button>
</section>

<section>
<button mat-fab color="primary">
<mat-icon>home</mat-icon>
</button>
<button mat-fab color="accent">
<mat-icon>favorite</mat-icon>
</button>
<button mat-fab color="warn">
<mat-icon>feedback</mat-icon>
</button>
<section class="outlined">
<label>Icon</label>
<button mat-icon-button><mat-icon>home</mat-icon></button>
<button mat-icon-button color="primary"><mat-icon>home</mat-icon></button>
<button mat-icon-button color="accent"><mat-icon>favorite</mat-icon></button>
<button mat-icon-button color="warn"><mat-icon>feedback</mat-icon></button>
</section>

<section>
<button mat-icon-button color="primary">
<mat-icon>menu</mat-icon>
</button>
<section class="outlined">
<label>FABs</label>
<section>
<mat-slide-toggle [(ngModel)]="extendOnHover">Extend On Hover</mat-slide-toggle>
<mat-slide-toggle [(ngModel)]="extendOnFocus">Extend On Focus</mat-slide-toggle>
<mat-slide-toggle [(ngModel)]="hasLabel">Has Label</mat-slide-toggle>
<mat-form-field [style.display]="hasLabel ? 'inline-block' : 'none'" floatPlaceholder="never">
<input matInput type="text" [(ngModel)]="labelText">
</mat-form-field>
</section>
<section>
<button mat-fab color="primary"
[extendOnHover]="extendOnHover" [extendOnFocus]="extendOnFocus">
<mat-icon>check</mat-icon>
<ng-template #label *ngIf="hasLabel">{{labelText}}</ng-template>
</button>
<button mat-fab color="accent"
[extendOnHover]="extendOnHover" [extendOnFocus]="extendOnFocus">
<mat-icon>check</mat-icon>
<ng-template #label *ngIf="hasLabel">{{labelText}}</ng-template>
</button>
<button mat-fab color="warn"
[extendOnHover]="extendOnHover" [extendOnFocus]="extendOnFocus">
<mat-icon>check</mat-icon>
<ng-template #label *ngIf="hasLabel">{{labelText}}</ng-template>
</button>
<button mat-mini-fab color="primary"
[extendOnHover]="extendOnHover" [extendOnFocus]="extendOnFocus">
<mat-icon>check</mat-icon>
<ng-template #label *ngIf="hasLabel">{{labelText}}</ng-template>
</button>
<button mat-mini-fab color="accent"
[extendOnHover]="extendOnHover" [extendOnFocus]="extendOnFocus">
<mat-icon>check</mat-icon>
<ng-template #label *ngIf="hasLabel">{{labelText}}</ng-template>
</button>
<button mat-mini-fab color="warn"
[extendOnHover]="extendOnHover" [extendOnFocus]="extendOnFocus">
<mat-icon>check</mat-icon>
<ng-template #label *ngIf="hasLabel">{{labelText}}</ng-template>
</button>
</section>
</section>

<button mat-icon-button color="accent">
<mat-icon>favorite</mat-icon>
</button>

<button mat-icon-button>
<mat-icon>more_vert</mat-icon>
</button>
<section class="outlined">
<label>Anchors</label>
<a href="http://www.google.com" mat-button color="primary">SEARCH</a>
<a href="http://www.google.com" mat-raised-button>SEARCH</a>
<a href="http://www.google.com" mat-fab><mat-icon>check</mat-icon></a>
<a href="http://www.google.com" mat-mini-fab><mat-icon>check</mat-icon></a>
<a href="http://www.google.com" mat-icon-button><mat-icon>check</mat-icon></a>
</section>

<section>
<div>
<p>isDisabled: {{isDisabled}}, clickCounter: <span>{{clickCounter}}</span></p>
<button mat-raised-button (click)="isDisabled=!isDisabled">
Disable buttons
</button>
<section class="outlined">
<label>Disable and Focus</label>
<section>
<button mat-raised-button (click)="isDisabled=!isDisabled">Disable all</button>
<button mat-raised-button (click)="button1.focus()">Focus 1</button>
<button mat-raised-button (click)="button2.focus()">Focus 2</button>
<button mat-raised-button (click)="button3.focus()">Focus 3</button>
<button mat-raised-button (click)="button4.focus()">Focus 4</button>
</div>
<button mat-button #button1 [disabled]="isDisabled" (click)="clickCounter=clickCounter+1">off</button>
<button mat-button #button2 color="primary" [disabled]="isDisabled">off</button>
<a href="http://www.google.com" #button3 mat-button color="accent" [disabled]="isDisabled">off</a>
<button mat-raised-button #button4 color="primary" [disabled]="isDisabled">off</button>
<button mat-mini-fab [disabled]="isDisabled">
<mat-icon>check</mat-icon>
</button>

<button mat-icon-button color="accent" [disabled]="isDisabled">
<mat-icon>favorite</mat-icon>
</button>
</section>
<section>
<a href="http://www.google.com" mat-button color="primary">SEARCH</a>
<button mat-button>DANCE</button>
</section>
<section>
<a href="http://www.google.com" mat-raised-button color="primary">SEARCH</a>
<button mat-raised-button>DANCE</button>
</section>
<section>
<button mat-raised-button>More<mat-icon>more_vert</mat-icon></button>
<button mat-raised-button>Check<mat-icon>check</mat-icon></button>
<button mat-raised-button>Check<mat-icon>favorite</mat-icon></button>
<button mat-raised-button>Last<mat-icon>navigate_before</mat-icon></button>
</section>
<section>
<button mat-button>More<mat-icon>more_vert</mat-icon></button>
<button mat-button>Check<mat-icon>check</mat-icon></button>
<button mat-button>Check<mat-icon>favorite</mat-icon></button>
<button mat-button>Last<mat-icon>navigate_before</mat-icon></button>
</section>
<section>
<button mat-raised-button [disabled]="toggleDisable" (click)="toggleDisable = true">Disable</button>
<button mat-button [disabled]="!toggleDisable" (click)="toggleDisable = false">Disable</button>
<button mat-raised-button (click)="button5.focus()">Focus 5</button>
</section>
<section>
<button #button1 mat-button color="primary" [disabled]="isDisabled">1</button>
<button #button2 mat-raised-button color="accent" [disabled]="isDisabled">2</button>
<button #button3 mat-fab color="warn" [disabled]="isDisabled">3</button>
<button #button4 mat-mini-fab color="primary" [disabled]="isDisabled">4</button>
<button #button5 mat-icon-button color="accent" [disabled]="isDisabled">5</button>
</section>
</section>
</div>
20 changes: 18 additions & 2 deletions src/demo-app/button/button-demo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,25 @@
}

section {
display: flex;
align-items: center;
margin: 8px;
position: relative;

&.outlined {
border: 2px solid lightgray;
border-radius: 10px;
margin-top: 20px;
padding: 15px 5px 5px;
}

& > label {
position: absolute;
top: calc(-0.5em + -2px);
left: 1.5em;
border: 2px solid lightgray;
border-radius: 6px;
padding: 0 4px;
background: #fafafa;
}
}

p {
Expand Down
5 changes: 5 additions & 0 deletions src/demo-app/button/button-demo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,9 @@ export class ButtonDemo {
isDisabled: boolean = false;
clickCounter: number = 0;
toggleDisable: boolean = false;

extendOnHover = true;
extendOnFocus = false;
hasLabel = true;
labelText = 'Check this off!';
}
1 change: 1 addition & 0 deletions src/demo-app/system-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ System.config({
'@angular/material/datepicker': 'dist/packages/material/datepicker/index.js',
'@angular/material/dialog': 'dist/packages/material/dialog/index.js',
'@angular/material/expansion': 'dist/packages/material/expansion/index.js',
'@angular/material/fab': 'dist/packages/material/fab/index.js',
'@angular/material/form-field': 'dist/packages/material/form-field/index.js',
'@angular/material/grid-list': 'dist/packages/material/grid-list/index.js',
'@angular/material/icon': 'dist/packages/material/icon/index.js',
Expand Down
1 change: 1 addition & 0 deletions src/e2e-app/system-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ System.config({
'@angular/material/datepicker': 'dist/bundles/material-datepicker.umd.js',
'@angular/material/dialog': 'dist/bundles/material-dialog.umd.js',
'@angular/material/expansion': 'dist/bundles/material-expansion.umd.js',
'@angular/material/fab': 'dist/packages/material/fab/index.js',
'@angular/material/form-field': 'dist/bundles/material-form-field.umd.js',
'@angular/material/grid-list': 'dist/bundles/material-grid-list.umd.js',
'@angular/material/icon': 'dist/bundles/material-icon.umd.js',
Expand Down
37 changes: 1 addition & 36 deletions src/lib/button/_button-base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@ $mat-icon-button-size: 40px !default;
$mat-icon-button-border-radius: 50% !default;
$mat-icon-button-line-height: 24px !default;

// Fab standards
$mat-fab-border-radius: 50% !default;
$mat-fab-size: 56px !default;
$mat-fab-padding: 16px !default;

$mat-mini-fab-size: 40px !default;
$mat-mini-fab-padding: 8px !default;

// Applies base styles to all button types.
%mat-button-base {
box-sizing: border-box;
Expand Down Expand Up @@ -62,7 +54,7 @@ $mat-mini-fab-padding: 8px !default;
}
}

// Applies styles to buttons with backgrounds: raised, fab, and mini-fab
// Applies styles to buttons with raised backgrounds.
%mat-raised-button {
@extend %mat-button-base;

Expand All @@ -83,30 +75,3 @@ $mat-mini-fab-padding: 8px !default;
box-shadow: none;
}
}

// Applies styles to fab and mini-fab button types only
@mixin mat-fab($size, $padding) {
@extend %mat-raised-button;

@include mat-overridable-elevation(6);

// Reset the min-width from the button base.
min-width: 0;

border-radius: $mat-fab-border-radius;
width: $size;
height: $size;
padding: 0;

flex-shrink: 0;

&:not([disabled]):active {
@include mat-overridable-elevation(12);
}

.mat-button-wrapper {
padding: $padding 0;
display: inline-block;
line-height: $mat-icon-button-line-height;
}
}
4 changes: 2 additions & 2 deletions src/lib/button/_button-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
@include _mat-button-theme-color($theme, 'color');
}

.mat-raised-button, .mat-fab, .mat-mini-fab {
.mat-raised-button {
// Default properties when not using any [color] value.
color: mat-color($foreground, text);
background-color: mat-color($background, raised-button);
Expand All @@ -107,7 +107,7 @@
}

@mixin mat-button-typography($config) {
.mat-button, .mat-raised-button, .mat-icon-button, .mat-fab, .mat-mini-fab {
.mat-button, .mat-raised-button, .mat-icon-button {
font: {
family: mat-font-family($config, button);
size: mat-font-size($config, button);
Expand Down
9 changes: 3 additions & 6 deletions src/lib/button/button-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {MatCommonModule, MatRippleModule} from '@angular/material/core';
import {A11yModule} from '@angular/cdk/a11y';
import {MatFabModule} from '@angular/material/fab';
import {
MatAnchor,
MatButton,
MatMiniFab,
MatButtonCssMatStyler,
MatFab,
MatIconButtonCssMatStyler,
MatRaisedButtonCssMatStyler
} from './button';
Expand All @@ -26,23 +25,21 @@ import {
CommonModule,
MatRippleModule,
MatCommonModule,
MatFabModule,
A11yModule,
],
exports: [
MatButton,
MatAnchor,
MatMiniFab,
MatFab,
MatCommonModule,
MatFabModule,
MatButtonCssMatStyler,
MatRaisedButtonCssMatStyler,
MatIconButtonCssMatStyler,
],
declarations: [
MatButton,
MatAnchor,
MatMiniFab,
MatFab,
MatButtonCssMatStyler,
MatRaisedButtonCssMatStyler,
MatIconButtonCssMatStyler,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/button/button.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<span class="mat-button-wrapper"><ng-content></ng-content></span>
<div matRipple class="mat-button-ripple"
[class.mat-button-ripple-round]="_isRoundButton || _isIconButton"
[class.mat-button-ripple-round]="_isIconButton"
[matRippleDisabled]="_isRippleDisabled()"
[matRippleCentered]="_isIconButton"
[matRippleTrigger]="_getHostElement()"></div>
Expand Down
Loading