@sb1/ffe-buttons-react 21.0.19 → 22.0.0

package/lib/TertiaryButton.js

@@ -1,41 +1,24 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _react = _interopRequireDefault(require("react"));
-var _propTypes = require("prop-types");
-var _InlineBaseButton = _interopRequireDefault(require("./InlineBaseButton"));
-var _excluded = ["leftIcon", "rightIcon"];
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } } return target; }
-var TertiaryButton = function TertiaryButton(props) {
-  var leftIcon = props.leftIcon,
-    rightIcon = props.rightIcon,
-    rest = _objectWithoutProperties(props, _excluded);
-  return /*#__PURE__*/_react.default.createElement(_InlineBaseButton.default, _extends({
-    buttonType: "tertiary",
-    leftIcon: leftIcon,
-    rightIcon: rightIcon
-  }, rest));
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
 };
-TertiaryButton.propTypes = {
-  /** The button label */
-  children: _propTypes.node,
-  /** Extra class names */
-  className: _propTypes.string,
-  /** The rendered element, like an `<a />` or `<Link />` */
-  element: (0, _propTypes.oneOfType)([_propTypes.func, _propTypes.string, _propTypes.elementType]),
-  /** Ref-setting function, or ref created by useRef, passed to the button element */
-  innerRef: (0, _propTypes.oneOfType)([_propTypes.func, (0, _propTypes.shape)({
-    current: _propTypes.object
-  })]),
-  /** Icon shown to the left of the label */
-  leftIcon: _propTypes.node,
-  /** Icon shown to the right of the label */
-  rightIcon: _propTypes.node
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _default = exports.default = TertiaryButton;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TertiaryButton = void 0;
+var react_1 = __importDefault(require("react"));
+var InlineBaseButton_1 = require("./InlineBaseButton");
+var fixedForwardRef_1 = require("./fixedForwardRef");
+function TertiaryButtonPropsForwardRef(props, ref) {
+    return react_1.default.createElement(InlineBaseButton_1.InlineBaseButton, __assign({}, props, { ref: ref, buttonType: "tertiary" }));
+}
+exports.TertiaryButton = (0, fixedForwardRef_1.fixedForwardRef)(TertiaryButtonPropsForwardRef);

package/lib/fixedForwardRef.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fixedForwardRef = void 0;
+var react_1 = require("react");
+exports.fixedForwardRef = react_1.forwardRef;

package/lib/index.js

@@ -1,76 +1,23 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "ActionButton", {
-  enumerable: true,
-  get: function get() {
-    return _ActionButton.default;
-  }
-});
-Object.defineProperty(exports, "BackButton", {
-  enumerable: true,
-  get: function get() {
-    return _BackButton.default;
-  }
-});
-Object.defineProperty(exports, "ButtonGroup", {
-  enumerable: true,
-  get: function get() {
-    return _ButtonGroup.default;
-  }
-});
-Object.defineProperty(exports, "ExpandButton", {
-  enumerable: true,
-  get: function get() {
-    return _ExpandButton.default;
-  }
-});
-Object.defineProperty(exports, "InlineExpandButton", {
-  enumerable: true,
-  get: function get() {
-    return _InlineExpandButton.default;
-  }
-});
-Object.defineProperty(exports, "PrimaryButton", {
-  enumerable: true,
-  get: function get() {
-    return _PrimaryButton.default;
-  }
-});
-Object.defineProperty(exports, "SecondaryButton", {
-  enumerable: true,
-  get: function get() {
-    return _SecondaryButton.default;
-  }
-});
-Object.defineProperty(exports, "ShortcutButton", {
-  enumerable: true,
-  get: function get() {
-    return _ShortcutButton.default;
-  }
-});
-Object.defineProperty(exports, "TaskButton", {
-  enumerable: true,
-  get: function get() {
-    return _TaskButton.default;
-  }
-});
-Object.defineProperty(exports, "TertiaryButton", {
-  enumerable: true,
-  get: function get() {
-    return _TertiaryButton.default;
-  }
-});
-var _ActionButton = _interopRequireDefault(require("./ActionButton"));
-var _BackButton = _interopRequireDefault(require("./BackButton"));
-var _ButtonGroup = _interopRequireDefault(require("./ButtonGroup"));
-var _ExpandButton = _interopRequireDefault(require("./ExpandButton"));
-var _InlineExpandButton = _interopRequireDefault(require("./InlineExpandButton"));
-var _PrimaryButton = _interopRequireDefault(require("./PrimaryButton"));
-var _SecondaryButton = _interopRequireDefault(require("./SecondaryButton"));
-var _ShortcutButton = _interopRequireDefault(require("./ShortcutButton"));
-var _TaskButton = _interopRequireDefault(require("./TaskButton"));
-var _TertiaryButton = _interopRequireDefault(require("./TertiaryButton"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TertiaryButton = exports.TaskButton = exports.ShortcutButton = exports.SecondaryButton = exports.PrimaryButton = exports.InlineExpandButton = exports.ExpandButton = exports.ButtonGroup = exports.BackButton = exports.ActionButton = void 0;
+var ActionButton_1 = require("./ActionButton");
+Object.defineProperty(exports, "ActionButton", { enumerable: true, get: function () { return ActionButton_1.ActionButton; } });
+var BackButton_1 = require("./BackButton");
+Object.defineProperty(exports, "BackButton", { enumerable: true, get: function () { return BackButton_1.BackButton; } });
+var ButtonGroup_1 = require("./ButtonGroup");
+Object.defineProperty(exports, "ButtonGroup", { enumerable: true, get: function () { return ButtonGroup_1.ButtonGroup; } });
+var ExpandButton_1 = require("./ExpandButton");
+Object.defineProperty(exports, "ExpandButton", { enumerable: true, get: function () { return ExpandButton_1.ExpandButton; } });
+var InlineExpandButton_1 = require("./InlineExpandButton");
+Object.defineProperty(exports, "InlineExpandButton", { enumerable: true, get: function () { return InlineExpandButton_1.InlineExpandButton; } });
+var PrimaryButton_1 = require("./PrimaryButton");
+Object.defineProperty(exports, "PrimaryButton", { enumerable: true, get: function () { return PrimaryButton_1.PrimaryButton; } });
+var SecondaryButton_1 = require("./SecondaryButton");
+Object.defineProperty(exports, "SecondaryButton", { enumerable: true, get: function () { return SecondaryButton_1.SecondaryButton; } });
+var ShortcutButton_1 = require("./ShortcutButton");
+Object.defineProperty(exports, "ShortcutButton", { enumerable: true, get: function () { return ShortcutButton_1.ShortcutButton; } });
+var TaskButton_1 = require("./TaskButton");
+Object.defineProperty(exports, "TaskButton", { enumerable: true, get: function () { return TaskButton_1.TaskButton; } });
+var TertiaryButton_1 = require("./TertiaryButton");
+Object.defineProperty(exports, "TertiaryButton", { enumerable: true, get: function () { return TertiaryButton_1.TertiaryButton; } });

package/lib/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sb1/ffe-buttons-react",
-    "version": "21.0.19",
+    "version": "22.0.0",
     "description": "React implementation of ffe-buttons",
     "keywords": [
         "ffe"
@@ -21,24 +21,22 @@
         "url": "ssh://git@github.com:SpareBank1/designsystem.git"
     },
     "scripts": {
-        "build": "ffe-buildtool babel",
-        "watch": "ffe-buildtool babel-watch",
+        "build": "ffe-buildtool tsc",
+        "watch": "ffe-buildtool tsc-watch",
         "lint": "eslint src",
         "lint:fix": "eslint src --fix",
         "test": "ffe-buildtool jest",
         "test:watch": "ffe-buildtool jest --watch"
     },
     "dependencies": {
-        "@sb1/ffe-buttons": "^18.0.19",
-        "@sb1/ffe-icons-react": "^9.0.9",
-        "classnames": "^2.3.1",
-        "prop-types": "^15.7.2"
+        "@sb1/ffe-buttons": "^18.0.21",
+        "@sb1/ffe-icons-react": "^9.0.11",
+        "classnames": "^2.3.1"
     },
     "devDependencies": {
-        "@sb1/ffe-buildtool": "^0.5.2",
+        "@sb1/ffe-buildtool": "^0.6.0",
         "eslint": "^8.57.0",
         "react": "^16.9.0",
-        "react-collapse": "^4.0.3",
         "react-dom": "^16.9.0"
     },
     "peerDependencies": {
@@ -47,5 +45,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "c2e7c509b580bc205ca92d91b7e2e2c0503a0087"
+    "gitHead": "9ad9c4e14ec0db89189e0daaebace3028bf667d9"
 }

package/types/ActionButton.d.ts

@@ -0,0 +1,4 @@
+import React, { ElementType } from 'react';
+import { BaseButtonProps } from './BaseButton';
+export type ActionButtonProps<As extends ElementType = 'button'> = Omit<BaseButtonProps<As>, 'buttonType'>;
+export declare const ActionButton: <As extends React.ElementType>(props: ActionButtonProps<As> & React.RefAttributes<any>) => React.JSX.Element;

package/types/BackButton.d.ts

@@ -0,0 +1,4 @@
+import React, { ElementType } from 'react';
+import { InlineBaseButtonProps } from './InlineBaseButton';
+export type BackButtonProps<As extends ElementType = 'button'> = Omit<InlineBaseButtonProps<As>, 'buttonType' | 'leftIcon'>;
+export declare const BackButton: <As extends React.ElementType>(props: BackButtonProps<As> & React.RefAttributes<any>) => React.JSX.Element;

package/types/BaseButton.d.ts

@@ -0,0 +1,22 @@
+import React, { ElementType, ReactElement } from 'react';
+import { ComponentAsPropParams } from './types';
+export type BaseButtonProps<As extends ElementType = 'button'> = ComponentAsPropParams<As> & {
+    ariaLoadingMessage?: string;
+    buttonType: 'action' | 'primary' | 'secondary' | 'shortcut' | 'task';
+    isDisabled?: boolean;
+    isLoading?: boolean;
+    leftIcon?: ReactElement;
+    rightIcon?: ReactElement;
+};
+export declare const BaseButton: <As extends React.ElementType>(props: {
+    as?: As | undefined;
+} & import("./types").DistributiveOmit<React.ComponentPropsWithRef<React.ElementType extends As ? "button" : As>, "as" & {
+    ref: React.ForwardedRef<any>;
+}> & {
+    ariaLoadingMessage?: string | undefined;
+    buttonType: 'action' | 'primary' | 'secondary' | 'shortcut' | 'task';
+    isDisabled?: boolean | undefined;
+    isLoading?: boolean | undefined;
+    leftIcon?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | undefined;
+    rightIcon?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | undefined;
+} & React.RefAttributes<any>) => React.JSX.Element;

package/types/ButtonGroup.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+export interface ButtonGroupProps extends React.ComponentProps<'div'> {
+    /** Applies the thin modifier to remove margins */
+    thin?: boolean;
+    /** Applies the inline modifier to make all child buttons inline */
+    inline?: boolean;
+}
+export declare const ButtonGroup: React.FC<ButtonGroupProps>;

package/types/ExpandButton.d.ts

@@ -0,0 +1,18 @@
+import React, { ElementType } from 'react';
+import { ComponentAsPropParams } from './types';
+export type ExpandButtonProps<As extends ElementType = 'button'> = ComponentAsPropParams<As> & {
+    /** An accessible label for the close-button, only shown in the "isExpanded" state  */
+    closeLabel?: string;
+    /** When true the component will render a circle with an X indicating whatever is controlled is in an expanded state. */
+    isExpanded: boolean;
+};
+export declare const ExpandButton: <As extends React.ElementType>(props: {
+    as?: As | undefined;
+} & import("./types").DistributiveOmit<React.ComponentPropsWithRef<React.ElementType extends As ? "button" : As>, "as" & {
+    ref: React.ForwardedRef<any>;
+}> & {
+    /** An accessible label for the close-button, only shown in the "isExpanded" state  */
+    closeLabel?: string | undefined;
+    /** When true the component will render a circle with an X indicating whatever is controlled is in an expanded state. */
+    isExpanded: boolean;
+} & React.RefAttributes<any>) => React.JSX.Element;

package/types/InlineBaseButton.d.ts

@@ -0,0 +1,28 @@
+import React, { ElementType, ReactElement } from 'react';
+import { ComponentAsPropParams } from './types';
+export type InlineBaseButtonProps<As extends ElementType = 'button'> = ComponentAsPropParams<As> & {
+    /**
+     * Enum of supported prop types. Used internally only.
+     * @ignore
+     */
+    buttonType: 'tertiary' | 'back' | 'expand';
+    /** Icon shown to the left of the label */
+    leftIcon?: ReactElement;
+    /** Icon shown to the right of the label */
+    rightIcon?: ReactElement;
+};
+export declare const InlineBaseButton: <As extends React.ElementType>(props: {
+    as?: As | undefined;
+} & import("./types").DistributiveOmit<React.ComponentPropsWithRef<React.ElementType extends As ? "button" : As>, "as" & {
+    ref: React.ForwardedRef<any>;
+}> & {
+    /**
+     * Enum of supported prop types. Used internally only.
+     * @ignore
+     */
+    buttonType: 'tertiary' | 'back' | 'expand';
+    /** Icon shown to the left of the label */
+    leftIcon?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | undefined;
+    /** Icon shown to the right of the label */
+    rightIcon?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | undefined;
+} & React.RefAttributes<any>) => React.JSX.Element;

package/types/InlineExpandButton.d.ts

@@ -0,0 +1,10 @@
+import React, { ElementType } from 'react';
+import { InlineBaseButtonProps } from './InlineBaseButton';
+export type InlineExpandButtonProps<As extends ElementType = 'button'> = Omit<InlineBaseButtonProps<As>, 'buttonType' | 'rightIcon'> & {
+    /** When true it will indicate the button is in its open state */
+    isExpanded: boolean;
+};
+export declare const InlineExpandButton: <As extends React.ElementType>(props: Omit<InlineBaseButtonProps<As>, "buttonType" | "rightIcon"> & {
+    /** When true it will indicate the button is in its open state */
+    isExpanded: boolean;
+} & React.RefAttributes<any>) => React.JSX.Element;

package/types/PrimaryButton.d.ts

@@ -0,0 +1,4 @@
+import React, { ElementType } from 'react';
+import { BaseButtonProps } from './BaseButton';
+export type PrimaryButtonProps<As extends ElementType = 'button'> = Omit<BaseButtonProps<As>, 'buttonType'>;
+export declare const PrimaryButton: <As extends React.ElementType>(props: PrimaryButtonProps<As> & React.RefAttributes<any>) => React.JSX.Element;

package/types/SecondaryButton.d.ts

@@ -0,0 +1,4 @@
+import React, { ElementType } from 'react';
+import { BaseButtonProps } from './BaseButton';
+export type SecondaryButtonProps<As extends ElementType = 'button'> = Omit<BaseButtonProps<As>, 'buttonType'>;
+export declare const SecondaryButton: <As extends React.ElementType>(props: SecondaryButtonProps<As> & React.RefAttributes<any>) => React.JSX.Element;

package/types/ShortcutButton.d.ts

@@ -0,0 +1,4 @@
+import React, { ElementType } from 'react';
+import { BaseButtonProps } from './BaseButton';
+export type ShortcutButtonProps<As extends ElementType = 'button'> = Omit<BaseButtonProps<As>, 'buttonType' | 'rightIcon'>;
+export declare const ShortcutButton: <As extends React.ElementType>(props: ShortcutButtonProps<As> & React.RefAttributes<any>) => React.JSX.Element;

package/types/TaskButton.d.ts

@@ -0,0 +1,10 @@
+import React, { ElementType, ReactElement } from 'react';
+import { BaseButtonProps } from './BaseButton';
+export type TaskButtonProps<As extends ElementType = 'button'> = Omit<BaseButtonProps<As>, 'buttonType' | 'leftIcon' | 'rightIcon'> & {
+    /** icon element shown to the left of the label */
+    icon: ReactElement;
+};
+export declare const TaskButton: <As extends React.ElementType>(props: Omit<BaseButtonProps<As>, "buttonType" | "leftIcon" | "rightIcon"> & {
+    /** icon element shown to the left of the label */
+    icon: ReactElement;
+} & React.RefAttributes<any>) => React.JSX.Element;

package/types/TertiaryButton.d.ts

@@ -0,0 +1,4 @@
+import React, { ElementType } from 'react';
+import { InlineBaseButtonProps } from './InlineBaseButton';
+export type TertiaryButtonProps<As extends ElementType = 'button'> = Omit<InlineBaseButtonProps<As>, 'buttonType'>;
+export declare const TertiaryButton: <As extends React.ElementType>(props: TertiaryButtonProps<As> & React.RefAttributes<any>) => React.JSX.Element;

package/types/fixedForwardRef.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+type FixedForwardRef = <T, P = {}>(render: (props: P, ref: React.Ref<T>) => React.JSX.Element) => (props: P & React.RefAttributes<T>) => React.JSX.Element;
+export declare const fixedForwardRef: FixedForwardRef;
+export {};

package/types/index.d.ts

@@ -1,107 +1,10 @@
-import * as React from 'react';
-
-export type MinimalBaseButtonProps = {
-    className?: string;
-    element?: HTMLElement | string | React.ElementType;
-    innerRef?: React.Ref<HTMLElement>;
-} & (React.ComponentProps<'button'> | React.ComponentProps<'a'>);
-
-export type BaseButtonProps = {
-    children?: React.ReactNode;
-    ariaLoadingMessage?: string;
-    disabled?: boolean;
-    isLoading?: boolean;
-    leftIcon?: React.ReactNode;
-    rightIcon?: React.ReactNode;
-} & MinimalBaseButtonProps;
-
-type ActionButtonProps = BaseButtonProps;
-
-export type BackButtonProps = {
-    children?: React.ReactNode;
-} & MinimalBaseButtonProps;
-
-export interface ButtonGroupProps {
-    className?: string;
-    thin?: boolean;
-    inline?: boolean;
-    children: React.ReactNode;
-}
-
-export type ExpandButtonProps = {
-    children: React.ReactNode;
-    closeLabel?: string;
-    isExpanded: boolean;
-    onClick: (e: React.MouseEvent | undefined) => void;
-} & MinimalBaseButtonProps;
-
-export type InlineExpandButtonProps = {
-    children?: React.ReactNode;
-    innerRef?: React.Ref<HTMLElement>;
-    isExpanded: boolean;
-    onClick: (e: React.MouseEvent | undefined) => void;
-} & MinimalBaseButtonProps;
-
-export type PrimaryButtonProps = BaseButtonProps;
-
-export type SecondaryButtonProps = BaseButtonProps;
-
-export type ShortcutButtonProps = {
-    children?: React.ReactNode;
-    disabled?: boolean;
-} & MinimalBaseButtonProps;
-
-export type TaskButtonProps = {
-    children?: React.ReactNode;
-    disabled?: boolean;
-    icon: React.ReactNode;
-} & 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<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 ShortcutButton<T = {}> extends React.Component<
-    NoInfer<T> & ShortcutButtonProps,
-    any
-> {}
-declare class TaskButton<T = {}> extends React.Component<
-    NoInfer<T> & TaskButtonProps,
-    any
-> {}
-declare class TertiaryButton<T = {}> extends React.Component<
-    NoInfer<T> & TertiaryButtonProps,
-    any
-> {}
+export { ActionButton, ActionButtonProps } from './ActionButton';
+export { BackButton, BackButtonProps } from './BackButton';
+export { ButtonGroup, ButtonGroupProps } from './ButtonGroup';
+export { ExpandButton, ExpandButtonProps } from './ExpandButton';
+export { InlineExpandButton, InlineExpandButtonProps, } from './InlineExpandButton';
+export { PrimaryButton, PrimaryButtonProps } from './PrimaryButton';
+export { SecondaryButton, SecondaryButtonProps } from './SecondaryButton';
+export { ShortcutButton, ShortcutButtonProps } from './ShortcutButton';
+export { TaskButton, TaskButtonProps } from './TaskButton';
+export { TertiaryButton, TertiaryButtonProps } from './TertiaryButton';

package/types/types.d.ts

@@ -0,0 +1,8 @@
+import { ComponentPropsWithRef, ElementType, ForwardedRef } from 'react';
+export type DistributiveOmit<T, Omitted extends PropertyKey> = T extends any ? Omit<T, Omitted> : never;
+export type ComponentAsPropParams<As extends ElementType> = {
+    as?: As;
+} & DistributiveOmit<ComponentPropsWithRef<ElementType extends As ? 'button' : As>, 'as' & {
+    ref: ForwardedRef<any>;
+}>;
+export type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;