Skip to content

adding type file to button component #785

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

Merged
aidamag merged 3 commits into from
Apr 7, 2022
Merged

adding type file to button component #785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15d5833
adding type file to button component
Jialecl Apr 6, 2022
64f03de
Merge branch 'master' of https://github.com/dxc-technology/halstack-a…
Jialecl Apr 7, 2022
c0add2e
Removing type size
Jialecl Apr 7, 2022
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
24 changes: 5 additions & 19 deletions projects/dxc-ngx-cdk/src/lib/dxc-button/dxc-button.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,7 @@ import {
} from "@angular/cdk/coercion";
import { DxcButtonIconComponent } from "./dxc-button-icon/dxc-button-icon.component";
import { BackgroundProviderService } from "../background-provider/service/background-provider.service";

type Size = "small" | "medium" | "large" | "fillParent" | "fitContent";
type Space =
| "xxsmall"
| "xsmall"
| "small"
| "medium"
| "large"
| "xlarge"
| "xxlarge";
type Margin = {
top?: Space;
bottom?: Space;
left?: Space;
right?: Space;
};
import { Space, Spacing, ButtonProperties } from "./dxc-button.types";

@Component({
selector: "dxc-button",
Expand Down Expand Up @@ -73,11 +58,11 @@ export class DxcButtonComponent {
* Size of the margin to be applied to the component ('xxsmall' | 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge' | 'xxlarge').
* You can pass an object with 'top', 'bottom', 'left' and 'right' properties in order to specify different margin sizes.
*/
@Input() margin: Space | Margin;
@Input() margin: Space | Spacing;
/**
* Size of the component.
*/
@Input() size: Size = "fitContent";
@Input() size: "small" | "medium" | "large" | "fillParent" | "fitContent" = "fitContent";
/**
* This prop corresponds to the 'type' prop of the button in html.
*/
Expand Down Expand Up @@ -107,7 +92,7 @@ export class DxcButtonComponent {
lightBackground: boolean = true;
darkBackground: boolean = false;

defaultInputs = new BehaviorSubject<any>({
defaultInputs = new BehaviorSubject<ButtonProperties>({
mode: "primary",
disabled: false,
label: null,
Expand All @@ -116,6 +101,7 @@ export class DxcButtonComponent {
margin: null,
size: "fitContent",
tabIndexValue: 0,
type: "button"
});

constructor(
Expand Down
27 changes: 27 additions & 0 deletions projects/dxc-ngx-cdk/src/lib/dxc-button/dxc-button.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
export type Space =
| "xxsmall"
| "xsmall"
| "small"
| "medium"
| "large"
| "xlarge"
| "xxlarge";

export type Spacing = {
top?: Space;
bottom?: Space;
left?: Space;
right?: Space;
};

export interface ButtonProperties {
mode: "primary" | "secondary" | "text";
label: string;
disabled: boolean;
iconSrc: string;
iconPosition: "before" | "after";
margin: Space | Spacing;
size: "small" | "medium" | "large" | "fillParent" | "fitContent";
type: "reset" | "submit" | "button";
tabIndexValue: number;
}