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.

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

Jump to bottom

Allow input properties with enum type to be provided as string #2099

Merged
merged 7 commits into from
Apr 4, 2022
Merged

Allow input properties with enum type to be provided as string #2099

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bba7ef7
Enable non-enum input
Mar 7, 2022
a7f2fe3
Update button.component.ts
Mar 7, 2022
737a218
Use values when enum is mapping
Mar 9, 2022
f88420a
allow use of string values for enum input props
MadsBuchmann Mar 10, 2022
0c787e7
:label: Allow non-enum input types
MadsBuchmann Apr 4, 2022
b503ffa
:label: Update mocks to use template literal types
MadsBuchmann Apr 4, 2022
37c3eb6
:fire: Exclude flakey test from suite
MadsBuchmann Apr 4, 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
2 changes: 1 addition & 1 deletion libs/designsystem/src/lib/components/avatar/avatar.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export class AvatarComponent {
@Input() shadow: boolean;
@Input() text: string;
@Input() overlay: boolean;
@Input() size: AvatarSize = AvatarSize.SM;
@Input() size: AvatarSize | `${AvatarSize}` = AvatarSize.SM;
@Input()
themeColor: NotificationColor | BrandColor | 'medium' | 'white' | 'dark' | 'light' | 'semi-light';

Expand Down
2 changes: 1 addition & 1 deletion libs/designsystem/src/lib/components/button/button.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export class ButtonComponent implements AfterContentInit {
@Input() expand: 'full' | 'block';
@Input() isFloating: boolean = false;
@Input()
size: ButtonSize = ButtonSize.MD;
size: ButtonSize | 'sm' | 'md' | 'lg' = ButtonSize.MD;
MadsBuchmann marked this conversation as resolved.
Show resolved Hide resolved

@ContentChild(IconComponent) icon: IconComponent;
@ContentChild(IconComponent, { read: ElementRef })
Expand Down
7 changes: 4 additions & 3 deletions libs/designsystem/src/lib/components/dropdown/dropdown.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@ export class DropdownComponent
static readonly OPEN_DELAY_IN_MS = 100;
private state = OpenState.closed;
private hasConfiguredSlottedItems = false;
private horizontalDirection = HorizontalDirection.right;
private verticalDirection = VerticalDirection.down;
private horizontalDirection: HorizontalDirection | `${HorizontalDirection}` =
HorizontalDirection.right;
private verticalDirection: VerticalDirection | `${VerticalDirection}` = VerticalDirection.down;

private _items: string[] | any[] = [];
get items(): string[] | any[] {
Expand Down Expand Up @@ -80,7 +81,7 @@ export class DropdownComponent
@Input()
placeholder = 'Please select:';

@Input() set popout(direction: HorizontalDirection) {
@Input() set popout(direction: HorizontalDirection | `${HorizontalDirection}`) {
this.horizontalDirection = direction || HorizontalDirection.right;
}

Expand Down
2 changes: 1 addition & 1 deletion libs/designsystem/src/lib/components/form-field/input/input.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export class InputComponent implements OnChanges {

@HostBinding('class')
@Input()
size: InputSize = InputSize.large;
size: InputSize | `${InputSize}` = InputSize.large;

/**
* Removes padding, width, rounded borders and drop-shadow when set to `true`.
Expand Down
2 changes: 1 addition & 1 deletion libs/designsystem/src/lib/components/icon/icon.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class IconComponent implements OnChanges {
private _icon = (this.icon = this.defaultIcon);
@HostBinding('class')
@Input()
size: IconSize;
size: IconSize | `${IconSize}`;

@Input() name: string;
@Input() customName: string;
Expand Down
2 changes: 1 addition & 1 deletion libs/designsystem/src/lib/components/item/item.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export class ItemComponent {
reorderable: boolean;
@HostBinding('class')
@Input()
size: ItemSize = ItemSize.MD;
size: ItemSize | `${ItemSize}` = ItemSize.MD;

// Prevent default when inside kirby-dropdown to avoid blurring dropdown:
onMouseDown(event: MouseEvent) {
Expand Down
2 changes: 1 addition & 1 deletion libs/designsystem/src/lib/components/popover/popover.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export class PopoverComponent implements AfterViewInit, OnDestroy {
wrapperElement: ElementRef<HTMLDivElement>;

@Input()
popout: HorizontalDirection = HorizontalDirection.right;
popout: HorizontalDirection | `${HorizontalDirection}` = HorizontalDirection.right;

@Input()
target: HTMLElement | ElementRef<HTMLElement>;
Expand Down
2 changes: 1 addition & 1 deletion libs/designsystem/src/lib/components/segmented-control/segmented-control.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class SegmentedControlComponent {
}
}

@Input() mode: SegmentedControlMode = SegmentedControlMode.default;
@Input() mode: SegmentedControlMode | `${SegmentedControlMode}` = SegmentedControlMode.default;

@HostBinding('class')
get _modeCssClass() {
Expand Down