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

Allow non-enum Input in components #2093

Closed
wants to merge 4 commits into from
Closed

Allow non-enum Input in components #2093

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10a459e
Enable non-enum input
Mar 7, 2022
251598d
Update button.component.ts
Mar 7, 2022
ae4c739
Revert
Mar 7, 2022
d129fac
Use values when enum is mapping
Mar 9, 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 | keyof AvatarSize = AvatarSize.SM;
Copy link
Contributor

@MadsBuchmann MadsBuchmann Mar 8, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately keyof AvatarSize returns all of the keys for a string object (i think it is a string object - not 100% sure).

I've created an example here: link to typescript playground.

Notice the type of TestType
Screenshot 2022-03-08 at 14 52 58

I think we need something like valueof AvatarSize (unfortunately i do not think valueof exists...).

This comment goes for all of the places where keyof has been used.

Copy link
Contributor Author

@MortenGregersen MortenGregersen Mar 9, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is only the case where the case in the enum maps to a string. I already fixed it for ButtonSize, but didn't see it for AvatarSize. I found 2 others.

@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;

@ContentChild(IconComponent) icon: IconComponent;
@ContentChild(IconComponent, { read: ElementRef })
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 | keyof InputSize = InputSize.large;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolves to:

(property) InputComponent.size: number | InputSize | "toString" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | ... 29 more ... | "padEnd"


/**
* 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 | keyof 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 | keyof 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 @@ -42,7 +42,7 @@ export class PopoverComponent implements AfterViewInit, OnDestroy {
wrapperElement: ElementRef<HTMLDivElement>;

@Input()
popout: HorizontalDirection = HorizontalDirection.right;
popout: HorizontalDirection | keyof HorizontalDirection = HorizontalDirection.right;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolves to:

(property) PopoverComponent.popout: number | "toString" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | "toLowerCase" | ... 28 more ... | HorizontalDirection


@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 | keyof SegmentedControlMode = SegmentedControlMode.default;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolves to:

(property) SegmentedControlComponent.mode: number | "toString" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | "toLowerCase" | ... 28 more ... | SegmentedControlMode


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