@jobber/components 4.4.2 → 4.4.4

package/dist/Button/Button.d.ts

@@ -11,6 +11,7 @@ interface ButtonFoundationProps {
     readonly ariaHaspopup?: boolean;
     readonly ariaExpanded?: boolean;
     readonly disabled?: boolean;
+    readonly external?: boolean;
     readonly fullWidth?: boolean;
     readonly icon?: IconNames;
     readonly iconOnRight?: boolean;
@@ -18,48 +19,46 @@ interface ButtonFoundationProps {
     readonly label?: string;
     readonly loading?: boolean;
     readonly size?: "small" | "base" | "large";
+    onClick?(event: React.MouseEvent<HTMLAnchorElement | HTMLButtonElement>): void;
     onMouseDown?(event: React.MouseEvent<HTMLAnchorElement | HTMLButtonElement>): void;
 }
-interface ButtonIconProps {
+interface ButtonIconProps extends ButtonFoundationProps {
     readonly icon: IconNames;
     readonly ariaLabel: string;
 }
 interface ButtonLabelProps extends ButtonFoundationProps {
     readonly label: string;
 }
-interface BaseActionProps {
-    readonly variation?: "work" | "learning" | "subtle" | "destructive";
-    readonly type?: "primary" | "secondary" | "tertiary";
-    onClick?(event: React.MouseEvent<HTMLAnchorElement | HTMLButtonElement>): void;
-}
-interface ButtonAnchorProps extends BaseActionProps {
+interface ButtonAnchorProps extends ButtonFoundationProps {
     /**
      * Used to create an 'href' on an anchor tag.
      */
     readonly url?: string;
-    /**
-     * Used to open a new tab instead of change the location of the current tab
-     */
-    readonly external?: boolean;
 }
-interface ButtonLinkProps extends BaseActionProps {
+interface ButtonLinkProps extends ButtonFoundationProps {
     /**
      * Used for client side routing. Only use when inside a routed component.
      */
     readonly to?: string;
 }
-interface SubmitButtonProps {
+interface BaseActionProps extends ButtonFoundationProps {
+    readonly variation?: "work" | "learning" | "subtle" | "destructive";
+    readonly type?: "primary" | "secondary" | "tertiary";
+}
+interface DestructiveActionProps extends ButtonFoundationProps {
+    readonly variation: "destructive";
+    readonly type?: "primary" | "secondary" | "tertiary";
+}
+interface SubmitActionProps extends Omit<ButtonFoundationProps, "external" | "onClick"> {
+    readonly type?: "primary";
+    readonly submit: boolean;
+}
+interface SubmitButtonProps extends Omit<ButtonFoundationProps, "external" | "onClick"> {
     /**
      * Allows the button to submit a form
      */
-    submit: true;
-    readonly type?: "primary";
-    readonly variation?: Extract<BaseActionProps["variation"], "work" | "destructive">;
+    submit: boolean;
 }
-/** This type ensures the button defines only one purpose */
-type ButtonFunctionality = XOR<SubmitButtonProps, XOR<ButtonLinkProps, ButtonAnchorProps>>;
-/**This type ensures the button is identifiable to users*/
-type ButtonIdentification = XOR<ButtonIconProps, ButtonLabelProps>;
-export type ButtonProps = ButtonFoundationProps & ButtonFunctionality & ButtonIdentification;
+export type ButtonProps = XOR<BaseActionProps, XOR<DestructiveActionProps, SubmitActionProps>> & XOR<SubmitButtonProps, XOR<ButtonLinkProps, ButtonAnchorProps>> & XOR<ButtonIconProps, ButtonLabelProps>;
 export declare function Button(props: ButtonProps): JSX.Element;
 export {};

package/dist/InputAvatar/index.js

@@ -6,7 +6,7 @@ var tslib_es6 = require('../tslib.es6-5b8768b7.js');
 var React = require('react');
 var styleInject_es = require('../style-inject.es-9d2f5f4e.js');
 var Avatar = require('../Avatar-98b59e17.js');
-var InputFile = require('../InputFile-9e6f4dec.js');
+var InputFile = require('../InputFile-33d7d2fb.js');
 var ProgressBar = require('../ProgressBar-8438dd4c.js');
 var Button = require('../Button-e2452625.js');
 require('classnames');

package/dist/InputFile/InputFile.d.ts

@@ -25,7 +25,7 @@ export interface FileUpload {
     /**
      * Base URL where file was sent as a POST. This is the same URL as what's returned in getUploadParams.
      */
-    readonly uploadUrl: string;
+    readonly uploadUrl?: string;
     /**
      * The data url of the file.
      */

package/dist/InputFile/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var InputFile = require('../InputFile-9e6f4dec.js');
+var InputFile = require('../InputFile-33d7d2fb.js');
 require('../tslib.es6-5b8768b7.js');
 require('react');
 require('classnames');

package/dist/{InputFile-9e6f4dec.js → InputFile-33d7d2fb.js}

@@ -52,7 +52,7 @@ function InputFile({ variation = "dropzone", size = "base", buttonLabel: provide
     function uploadFile(file) {
         return tslib_es6.__awaiter(this, void 0, void 0, function* () {
             const { url, key = uuid.v1(), fields = {}, httpMethod = "POST", } = yield getUploadParams(file);
-            const fileUpload = Object.assign(Object.assign({}, getFileUpload(file, key)), { uploadUrl: url });
+            const fileUpload = getFileUpload(file, key, url);
             onUploadStart && onUploadStart(Object.assign({}, fileUpload));
             const handleUploadProgress = (progressEvent) => {
                 onUploadProgress &&
@@ -109,7 +109,7 @@ function getLabels(providedButtonLabel, multiple, allowedTypes) {
         buttonLabel = providedButtonLabel;
     return { buttonLabel, hintText };
 }
-function getFileUpload(file, key) {
+function getFileUpload(file, key, uploadUrl) {
     return {
         key: key,
         name: file.name,
@@ -117,6 +117,7 @@ function getFileUpload(file, key) {
         size: file.size,
         progress: 0,
         src: getSrc,
+        uploadUrl,
     };
     function getSrc() {
         const promise = new Promise((resolve, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jobber/components",
-  "version": "4.4.2",
+  "version": "4.4.4",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -81,5 +81,5 @@
     "> 1%",
     "IE 10"
   ],
-  "gitHead": "f164bf5420fb0073954c04f759e32e23c409108a"
+  "gitHead": "20acbaa4df15d6dcf541c9dab3211b4f91072d08"
 }