@amboss/design-system 1.7.0 → 1.7.2

package/build/src/components/Button/Button.d.ts

@@ -1,12 +1,12 @@
 import React, { AriaAttributes } from "react";
 import { IconName } from "../Icon/Icon";
-import { BaseVariations, ButtonSize, HorizontalAlignment, TextVariations } from "../../types";
+import { BaseVariations, ButtonSize, HorizontalAlignment, TextVariations, PolymorphicComponentProp, AsProp } from "../../types";
 declare type ButtonPrivateProps = {
     squareCorners?: boolean | ("TopLeft" | "TopRight" | "BottomLeft" | "BottomRight")[];
     alignItems?: HorizontalAlignment;
     rightIconVariant?: TextVariations;
 };
-export declare type ButtonProps = Record<string, unknown> & {
+export declare type ButtonProps = {
     children?: React.ReactNode;
     variant?: BaseVariations;
     size?: ButtonSize;
@@ -18,7 +18,6 @@ export declare type ButtonProps = Record<string, unknown> & {
     onClick?: (e: React.MouseEvent) => void;
     onFocus?: (e: React.FocusEvent) => void;
     onBlur?: (e: React.FocusEvent) => void;
-    as?: "a" | "button" | React.ComponentType;
     leftIcon?: IconName;
     rightIcon?: IconName;
     fullWidth?: boolean;
@@ -28,8 +27,8 @@ export declare type ButtonProps = Record<string, unknown> & {
      */
     ariaAttributes?: AriaAttributes;
 };
-export declare function Button({ "data-e2e-test-id": dataE2eTestId, ariaAttributes, as, children, disabled, fullWidth, leftIcon, loading, onBlur, onClick, onFocus, privateProps: { squareCorners, alignItems, rightIconVariant }, rightIcon, size, type, variant, ...rest }: ButtonProps): React.ReactElement;
+export declare function Button<C extends React.ElementType = "button">({ "data-e2e-test-id": dataE2eTestId, ariaAttributes, as, children, disabled, fullWidth, leftIcon, loading, onBlur, onClick, onFocus, privateProps: { squareCorners, alignItems, rightIconVariant }, rightIcon, size, type, variant, ...rest }: PolymorphicComponentProp<C, ButtonProps>): React.ReactElement;
 export declare namespace Button {
-    var defaultProps: Partial<ButtonProps>;
+    var defaultProps: Partial<ButtonProps> & AsProp<"button">;
 }
 export {};

package/build/src/components/Link/Link.d.ts

@@ -1,65 +1,14 @@
 import React from "react";
-import { LinkVariations, LinkTextSize } from "../../types";
-declare type FontWeight = "normal" | "bold" | "inherit";
-declare type NoTargetNoRel = {
-    target?: never;
-    rel?: never;
-};
-declare type LinkPropsExtended = {
-    as?: "a";
-    href: string;
-    onClick?: never;
-    to?: never;
-} & ({
-    target: "_blank";
-    rel: "noopener noreferrer";
-} | NoTargetNoRel);
-declare type LinkAsButtonProps = {
-    as: "button";
-    onClick: (e: React.MouseEvent) => void;
-    href?: never;
-    to?: never;
-} & NoTargetNoRel;
-declare type RouterLinkProps = {
-    as: React.ComponentType;
-    to: string;
-    onClick?: never;
-    href?: never;
-} & NoTargetNoRel;
-declare type LinkProps = Record<string, unknown> & {
-    children: string;
+import { LinkVariations, LinkTextSize, PolymorphicComponentProp, AsProp } from "../../types";
+declare type LinkProps = {
     size?: LinkTextSize;
-    weight?: FontWeight;
+    weight?: "normal" | "bold" | "inherit";
     variant?: LinkVariations;
+    onClick?: () => void;
     "data-e2e-test-id"?: string;
-} & (LinkPropsExtended | LinkAsButtonProps | RouterLinkProps);
-export declare function Link({ children, size, weight, variant, "data-e2e-test-id": dataE2eTestId, ...rest }: LinkProps): React.ReactElement;
+};
+export declare function Link<C extends React.ElementType = "a">({ children, size, weight, variant, "data-e2e-test-id": dataE2eTestId, ...rest }: PolymorphicComponentProp<C, LinkProps>): React.ReactElement;
 export declare namespace Link {
-    var defaultProps: Partial<Record<string, unknown> & {
-        children: string;
-        size?: "xs" | "s" | "m" | "l";
-        weight?: FontWeight;
-        variant?: "primary" | "secondary" | "tertiary";
-        "data-e2e-test-id"?: string;
-    } & {
-        as?: "a";
-        href: string;
-        onClick?: never;
-        to?: never;
-    } & NoTargetNoRel> | Partial<Record<string, unknown> & {
-        children: string;
-        size?: "xs" | "s" | "m" | "l";
-        weight?: FontWeight;
-        variant?: "primary" | "secondary" | "tertiary";
-        "data-e2e-test-id"?: string;
-    } & {
-        as?: "a";
-        href: string;
-        onClick?: never;
-        to?: never;
-    } & {
-        target: "_blank";
-        rel: "noopener noreferrer";
-    }>;
+    var defaultProps: Partial<LinkProps> & AsProp<"a">;
 }
 export {};

package/build/src/components/PictogramButton/PictogramButton.d.ts

@@ -1,13 +1,14 @@
 import React from "react";
 import { IconName } from "../Icon/Icon";
 import { ButtonProps } from "../Button/Button";
-export declare type PictogramButtonProps = Pick<ButtonProps, "variant" | "type" | "disabled" | "onClick" | "onFocus" | "onBlur" | "as" | "data-e2e-test-id"> & {
+import { AsProp } from "../../types";
+export declare type PictogramButtonProps = Pick<ButtonProps, "variant" | "type" | "disabled" | "onClick" | "onFocus" | "onBlur" | "data-e2e-test-id"> & {
     /** The centered icon to be displayed. */
     icon: IconName;
     /** If true, the button has square corners. */
     squareCorners?: boolean;
 };
-export declare function PictogramButton({ onClick, onFocus, onBlur, type, disabled, as, icon, "data-e2e-test-id": dataE2eTestId, ...rest }: PictogramButtonProps): React.ReactElement;
+export declare function PictogramButton<C extends React.ElementType = "button">({ onClick, onFocus, onBlur, type, disabled, as, icon, "data-e2e-test-id": dataE2eTestId, ...rest }: PictogramButtonProps & AsProp<C>): React.ReactElement;
 export declare namespace PictogramButton {
-    var defaultProps: Partial<PictogramButtonProps>;
+    var defaultProps: Partial<PictogramButtonProps> & AsProp<"button">;
 }

package/build/src/components/RoundButton/RoundButton.d.ts

@@ -1,11 +1,12 @@
 import React from "react";
 import { IconName } from "../Icon/Icon";
 import { ButtonProps } from "../Button/Button";
-export declare type RoundButtonProps = Pick<ButtonProps, "variant" | "type" | "disabled" | "onClick" | "onFocus" | "onBlur" | "as" | "data-e2e-test-id"> & {
+import { AsProp } from "../../types";
+export declare type RoundButtonProps = Pick<ButtonProps, "variant" | "type" | "disabled" | "onClick" | "onFocus" | "onBlur" | "data-e2e-test-id"> & {
     /** The centered icon to be displayed. */
     icon: IconName;
 };
-export declare function RoundButton({ onClick, onFocus, onBlur, type, disabled, as, icon, "data-e2e-test-id": dataE2eTestId, ...rest }: RoundButtonProps): React.ReactElement;
+export declare function RoundButton<C extends React.ElementType = "button">({ onClick, onFocus, onBlur, type, disabled, as, icon, "data-e2e-test-id": dataE2eTestId, ...rest }: RoundButtonProps & AsProp<C>): React.ReactElement;
 export declare namespace RoundButton {
-    var defaultProps: Partial<RoundButtonProps>;
+    var defaultProps: Partial<RoundButtonProps> & AsProp<"button">;
 }

package/build/src/types/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Literal, Union, Static } from "runtypes";
 export declare const LinkTextSizeRuntype: Union<[Literal<"xs">, Literal<"s">, Literal<"m">, Literal<"l">]>;
 export declare type LinkTextSize = Static<typeof LinkTextSizeRuntype>;
@@ -34,4 +35,11 @@ export declare const HyphensRuntype: Union<[Literal<"auto">, Literal<"none">, Li
 export declare type Hyphens = Static<typeof HyphensRuntype>;
 export declare const ToggleSizeRuntype: Union<[Literal<"s">, Literal<"m">]>;
 export declare type ToggleSize = Static<typeof ToggleSizeRuntype>;
+export declare type AsProp<C extends React.ElementType> = {
+    as?: C;
+};
+declare type PropsToOmit<C extends React.ElementType, P> = keyof (AsProp<C> & P);
+export declare type PolymorphicComponentProp<C extends React.ElementType, Props = {
+    as: "a";
+}> = React.PropsWithChildren<Props & AsProp<C>> & Omit<React.ComponentPropsWithoutRef<C>, PropsToOmit<C, Props>>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amboss/design-system",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "description": "the design system for AMBOSS products",
   "author": "Bagrat Gobedashvili",
   "license": "ISC",