@sb1/ffe-buttons-react 17.0.3 → 18.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sb1/ffe-buttons-react",
-    "version": "17.0.3",
+    "version": "18.0.1",
     "description": "React implementation of ffe-buttons",
     "keywords": [
         "ffe"
@@ -28,7 +28,7 @@
         "test:watch": "ffe-buildtool jest --watch"
     },
     "dependencies": {
-        "@sb1/ffe-buttons": "^17.0.2",
+        "@sb1/ffe-buttons": "^17.0.3",
         "@sb1/ffe-icons-react": "^7.3.5",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
@@ -46,5 +46,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "8cbf828bcc67fe4a402abfca9a133061e3d2c37e"
+    "gitHead": "8ea46bb4f8e7624e55dbe57e75308b51ffbf9528"
 }

package/types/index.d.ts

@@ -1,35 +1,27 @@
 import * as React from 'react';
 
-type To =
-    | string
-    | {
-          pathname: string;
-          search?: string;
-          hash?: string;
-          state?: { [key: string]: any };
-      };
+export type MinimalBaseButtonProps =
+    | ({
+          className?: string;
+          element?: HTMLElement | string | React.ElementType;
+          innerRef?: React.Ref<HTMLElement>;
+      } & React.ComponentProps<'button'>)
+    | React.ComponentProps<'a'>;
 
-export interface MinimalBaseButtonProps extends React.HTMLProps<HTMLElement> {
-    className?: string;
-    element?: HTMLElement | string | React.ElementType;
-    innerRef?: React.Ref<HTMLElement>;
-    to?: To; //used in order to make buttons work with react-router functionality in typescript-files.
-}
-
-export interface BaseButtonProps extends MinimalBaseButtonProps {
+export type BaseButtonProps = {
     children?: React.ReactNode;
     ariaLoadingMessage?: string;
     disabled?: boolean;
     isLoading?: boolean;
     leftIcon?: React.ReactNode;
     rightIcon?: React.ReactNode;
-}
+} & MinimalBaseButtonProps;
 
-export interface ActionButtonProps extends BaseButtonProps {}
+type ActionButtonProps = BaseButtonProps;
 
-export interface BackButtonProps extends MinimalBaseButtonProps {
+export type BackButtonProps = {
     children?: React.ReactNode;
-}
+} & MinimalBaseButtonProps;
 
 export interface ButtonGroupProps {
     className?: string;
@@ -38,63 +30,83 @@ export interface ButtonGroupProps {
     children: React.ReactNode;
 }
 
-export interface ExpandButtonProps extends MinimalBaseButtonProps {
+export type ExpandButtonProps = {
     children: React.ReactNode;
     closeLabel?: string;
     leftIcon?: React.ReactNode;
     rightIcon?: React.ReactNode;
     isExpanded: boolean;
     onClick: (e: React.MouseEvent | undefined) => void;
-}
+} & MinimalBaseButtonProps;
 
-export interface InlineExpandButtonProps extends MinimalBaseButtonProps {
+export type InlineExpandButtonProps = {
     children?: React.ReactNode;
     innerRef?: React.Ref<HTMLElement>;
     isExpanded: boolean;
     onClick: (e: React.MouseEvent | undefined) => void;
-}
+} & MinimalBaseButtonProps;
 
-export interface PrimaryButtonProps extends BaseButtonProps {}
+export type PrimaryButtonProps = BaseButtonProps;
 
-export interface SecondaryButtonProps extends BaseButtonProps {}
+export type SecondaryButtonProps = BaseButtonProps;
 
-export interface ShortcutButtonProps extends MinimalBaseButtonProps {
+export type ShortcutButtonProps = {
     children?: React.ReactNode;
     disabled?: boolean;
     leftIcon?: React.ReactNode;
-}
+} & MinimalBaseButtonProps;
 
-export interface TaskButtonProps extends MinimalBaseButtonProps {
+export type TaskButtonProps = {
     children?: React.ReactNode;
     disabled?: boolean;
     icon: React.ReactNode;
-}
+} & MinimalBaseButtonProps;
 
-export interface TertiaryButtonProps extends MinimalBaseButtonProps {
+export type TertiaryButtonProps = {
     children?: React.ReactNode;
     leftIcon?: React.ReactNode;
     rightIcon?: React.ReactNode;
-}
+} & MinimalBaseButtonProps;
+
+type NoInfer<T> = [T][T extends any ? 0 : never];
 
-declare class ActionButton extends React.Component<ActionButtonProps, any> {}
-declare class BackButton extends React.Component<BackButtonProps, any> {}
-declare class ButtonGroup extends React.Component<ButtonGroupProps, any> {}
-declare class ExpandButton extends React.Component<ExpandButtonProps, any> {}
-declare class InlineExpandButton extends React.Component<
-    InlineExpandButtonProps,
+declare class ActionButton<T = {}> extends React.Component<
+    NoInfer<T> & ActionButtonProps,
+    any
+> {}
+declare class BackButton<T = {}> extends React.Component<
+    NoInfer<T> & BackButtonProps,
+    any
+> {}
+declare class ButtonGroup<T = {}> extends React.Component<
+    NoInfer<T> & ButtonGroupProps,
+    any
+> {}
+declare class ExpandButton<T = {}> extends React.Component<
+    NoInfer<T> & ExpandButtonProps,
+    any
+> {}
+declare class InlineExpandButton<T = {}> extends React.Component<
+    NoInfer<T> & InlineExpandButtonProps,
+    any
+> {}
+declare class PrimaryButton<T = {}> extends React.Component<
+    NoInfer<T> & PrimaryButtonProps,
+    any
+> {}
+declare class SecondaryButton<T = {}> extends React.Component<
+    NoInfer<T> & SecondaryButtonProps,
     any
 > {}
-declare class PrimaryButton extends React.Component<PrimaryButtonProps, any> {}
-declare class SecondaryButton extends React.Component<
-    SecondaryButtonProps,
+declare class ShortcutButton<T = {}> extends React.Component<
+    NoInfer<T> & ShortcutButtonProps,
     any
 > {}
-declare class ShortcutButton extends React.Component<
-    ShortcutButtonProps,
+declare class TaskButton<T = {}> extends React.Component<
+    NoInfer<T> & TaskButtonProps,
     any
 > {}
-declare class TaskButton extends React.Component<TaskButtonProps, any> {}
-declare class TertiaryButton extends React.Component<
-    TertiaryButtonProps,
+declare class TertiaryButton<T = {}> extends React.Component<
+    NoInfer<T> & TertiaryButtonProps,
     any
 > {}