From a2510fcaa71361ea84ab5e2b320b9079f3fa4d79 Mon Sep 17 00:00:00 2001 From: agonzalez97 Date: Wed, 6 Apr 2022 16:08:58 +0200 Subject: [PATCH 1/2] Added types file in dialog --- .../lib/dxc-dialog/dxc-dialog.component.ts | 12 +++++----- .../src/lib/dxc-dialog/dxc-dialog.types.ts | 23 +++++++++++++++++++ 2 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 projects/dxc-ngx-cdk/src/lib/dxc-dialog/dxc-dialog.types.ts diff --git a/projects/dxc-ngx-cdk/src/lib/dxc-dialog/dxc-dialog.component.ts b/projects/dxc-ngx-cdk/src/lib/dxc-dialog/dxc-dialog.component.ts index 8ffe9e612..92791e3b4 100644 --- a/projects/dxc-ngx-cdk/src/lib/dxc-dialog/dxc-dialog.component.ts +++ b/projects/dxc-ngx-cdk/src/lib/dxc-dialog/dxc-dialog.component.ts @@ -14,8 +14,9 @@ import { coerceNumberProperty, } from "@angular/cdk/coercion"; import { BackgroundProviderService } from "../background-provider/service/background-provider.service"; +import { DialogProperties, Spacing } from "./dxc-dialog.types"; -type Space = +type Space = | "xxsmall" | "xsmall" | "small" @@ -23,8 +24,6 @@ type Space = | "large" | "xlarge" | "xxlarge"; -; - type Padding = { top?: Space; bottom?: Space; @@ -68,7 +67,7 @@ export class DxcDialogComponent { * object with 'top', 'bottom', 'left' and 'right' to * specify different padding sizes. */ - @Input() padding: Space | Padding = "small"; + @Input() padding: Space | Spacing = "small"; /** * Value of the tabindex given to the close button. @@ -90,7 +89,7 @@ export class DxcDialogComponent { /** * This event will emit when the user clicks the background. - * The responsibility of hiding the dialog lies with the user. + * The responsibility of hiding the dialog lies with the user. * */ @Output() onBackgroundClick: EventEmitter = new EventEmitter(); @@ -98,10 +97,11 @@ export class DxcDialogComponent { currentBackgroundColor: string; - defaultInputs = new BehaviorSubject({ + defaultInputs = new BehaviorSubject({ overlay: true, isCloseVisible: true, padding: "small", + margin: null, tabIndexValue: 0, }); diff --git a/projects/dxc-ngx-cdk/src/lib/dxc-dialog/dxc-dialog.types.ts b/projects/dxc-ngx-cdk/src/lib/dxc-dialog/dxc-dialog.types.ts new file mode 100644 index 000000000..7fcb8a29a --- /dev/null +++ b/projects/dxc-ngx-cdk/src/lib/dxc-dialog/dxc-dialog.types.ts @@ -0,0 +1,23 @@ +export interface DialogProperties { + margin?: Space | Spacing; + overlay?: boolean; + isCloseVisible?: boolean; + padding?: Space | Spacing; + tabIndexValue?: number; +} + +export type Space = + | "xxsmall" + | "xsmall" + | "small" + | "medium" + | "large" + | "xlarge" + | "xxlarge"; + +export type Spacing = { + top?: Space; + bottom?: Space; + left?: Space; + right?: Space; +}; From 4a00c78b4d0ea7d142067e08316d4bd270131da2 Mon Sep 17 00:00:00 2001 From: agonzalez97 Date: Mon, 11 Apr 2022 14:03:35 +0200 Subject: [PATCH 2/2] Removed Space from dialog component --- .../src/lib/dxc-dialog/dxc-dialog.component.ts | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/projects/dxc-ngx-cdk/src/lib/dxc-dialog/dxc-dialog.component.ts b/projects/dxc-ngx-cdk/src/lib/dxc-dialog/dxc-dialog.component.ts index 92791e3b4..4842a8872 100644 --- a/projects/dxc-ngx-cdk/src/lib/dxc-dialog/dxc-dialog.component.ts +++ b/projects/dxc-ngx-cdk/src/lib/dxc-dialog/dxc-dialog.component.ts @@ -14,22 +14,7 @@ import { coerceNumberProperty, } from "@angular/cdk/coercion"; import { BackgroundProviderService } from "../background-provider/service/background-provider.service"; -import { DialogProperties, Spacing } from "./dxc-dialog.types"; - -type Space = - | "xxsmall" - | "xsmall" - | "small" - | "medium" - | "large" - | "xlarge" - | "xxlarge"; -type Padding = { - top?: Space; - bottom?: Space; - left?: Space; - right?: Space; -}; +import { DialogProperties, Space, Spacing } from "./dxc-dialog.types"; @Component({ selector: "dxc-dialog",