@uxf/ui 10.8.0 → 10.8.1

package/_file-input-base/file-input-base.d.ts

@@ -8,6 +8,6 @@ export interface FileInputBaseProps extends FormControlProps<FileResponse | null
     id?: string;
     maxFileSize?: number;
     onUploadError?: (err: unknown) => void;
-    onUploadFile: (file: File) => Promise<FileResponse>;
+    onUploadFile: (file: File | undefined) => Promise<FileResponse | null>;
 }
 export declare const _FileInputBase: React.ForwardRefExoticComponent<FileInputBaseProps & React.RefAttributes<HTMLInputElement>>;

package/_file-input-base/file-input-base.js

@@ -28,8 +28,8 @@ const react_1 = __importStar(require("react"));
 const validator_exceptions_1 = require("../utils/validator/validator-exceptions");
 exports._FileInputBase = (0, react_1.forwardRef)((props, ref) => {
     const onChange = async (e) => {
-        var _a;
-        if (e.target.files) {
+        var _a, _b;
+        if ((_a = e.target.files) === null || _a === void 0 ? void 0 : _a.length) {
             try {
                 const file = e.target.files[0];
                 if (props.maxFileSize && file.size > props.maxFileSize) {
@@ -39,7 +39,7 @@ exports._FileInputBase = (0, react_1.forwardRef)((props, ref) => {
                 await props.onChange(response, e);
             }
             catch (err) {
-                (_a = props.onUploadError) === null || _a === void 0 ? void 0 : _a.call(props, err);
+                (_b = props.onUploadError) === null || _b === void 0 ? void 0 : _b.call(props, err);
             }
         }
         else {

package/_select-base/_select-base.js

@@ -36,10 +36,8 @@ const input_1 = require("@uxf/ui/input");
 const label_1 = require("@uxf/ui/label");
 const react_2 = __importStar(require("react"));
 const Option = (props) => {
-    var _a, _b, _c, _d;
-    const optionKey = (_a = props.keyExtractor) === null || _a === void 0 ? void 0 : _a.call(props, props.option);
     const HUIComponent = props.HUIComponent;
-    return (react_2.default.createElement(HUIComponent.Option, { className: (optionState) => (0, cx_1.cx)("uxf-dropdown__item", optionState.active && classes_1.CLASSES.IS_ACTIVE, optionState.disabled && classes_1.CLASSES.IS_DISABLED, optionState.selected && classes_1.CLASSES.IS_SELECTED), key: optionKey !== null && optionKey !== void 0 ? optionKey : props.option.id, value: props.option }, (_d = (_c = (_b = props.renderOption) === null || _b === void 0 ? void 0 : _b.call(props, props.option)) !== null && _c !== void 0 ? _c : optionKey) !== null && _d !== void 0 ? _d : props.option.label));
+    return (react_2.default.createElement(HUIComponent.Option, { className: (optionState) => (0, cx_1.cx)("uxf-dropdown__item", optionState.active && classes_1.CLASSES.IS_ACTIVE, optionState.disabled && classes_1.CLASSES.IS_DISABLED, optionState.selected && classes_1.CLASSES.IS_SELECTED), value: props.option }, (optionState) => { var _a, _b; return (_b = (_a = props.renderOption) === null || _a === void 0 ? void 0 : _a.call(props, props.option, optionState.selected)) !== null && _b !== void 0 ? _b : props.option.label; }));
 };
 Option.displayName = "UxfUiSelectBaseOption";
 function isHUICombobox(HUIComponent) {
@@ -68,9 +66,9 @@ const Options = (props) => {
     return (react_2.default.createElement(HUIComponent.Options, { className: (0, cx_1.cx)("uxf-dropdown uxf-select-base__options", `uxf-dropdown--size-${(_a = props.size) !== null && _a !== void 0 ? _a : "default"}`, `uxf-dropdown--variant-${(_b = props.variant) !== null && _b !== void 0 ? _b : "default"}`, props.matchWidth
             ? "uxf-select-base__options--match-width"
             : "uxf-select-base__options--not-match-width", props.placement === "bottom" && "uxf-dropdown--bottom", props.placement === "top" && "uxf-dropdown--top", props.className), ref: props.forwardRef, static: true, style: props.style }, props.options && props.options.length > 0 ? (props.options.map((option) => {
-        var _a;
-        const optionKey = (_a = props.keyExtractor) === null || _a === void 0 ? void 0 : _a.call(props, option);
-        return (react_2.default.createElement(Option, { key: optionKey, keyExtractor: props.keyExtractor, option: option, HUIComponent: HUIComponent }));
+        var _a, _b;
+        const optionKey = (_b = (_a = props.keyExtractor) === null || _a === void 0 ? void 0 : _a.call(props, option)) !== null && _b !== void 0 ? _b : option.id;
+        return (react_2.default.createElement(Option, { HUIComponent: HUIComponent, key: optionKey, option: option, renderOption: props.renderOption }));
     })) : (react_2.default.createElement("div", { className: "uxf-dropdown__empty-wrapper" }, props.emptyMessage))));
 };
 Options.displayName = "UxfUiSelectBaseOptions";

package/avatar-file-input/avatar-file-input.js

@@ -45,7 +45,14 @@ exports.AvatarFileInput = (0, react_1.forwardRef)((props, ref) => {
     const stateClassName = (0, cx_1.cx)(((_a = props.isFocused) !== null && _a !== void 0 ? _a : input.focused) && classes_1.CLASSES.IS_FOCUSED, props.isDisabled && classes_1.CLASSES.IS_DISABLED, props.isInvalid && classes_1.CLASSES.IS_INVALID, props.isReadOnly && classes_1.CLASSES.IS_READONLY, props.isRequired && classes_1.CLASSES.IS_REQUIRED);
     const rootClassName = (0, cx_1.cx)(`uxf-avatar-file-input uxf-avatar-file-input--variant-${(_b = props.variant) !== null && _b !== void 0 ? _b : "default"}`, stateClassName, props.className);
     const onSelectFile = () => { var _a; return (_a = innerRef.current) === null || _a === void 0 ? void 0 : _a.click(); };
-    const onRemoveFile = () => props.onChange(null);
+    const onRemoveFile = () => {
+        props.onChange(null);
+        // this ensures that the file input is cleared on remove, so that the same file can be selected again
+        const inputNode = innerRef.current;
+        if (inputNode) {
+            inputNode.value = "";
+        }
+    };
     return (react_1.default.createElement(form_component_1.FormComponent, { className: rootClassName, errorId: props.id, helperText: props.helperText, hiddenLabel: props.hiddenLabel, inputId: id, label: props.label },
         react_1.default.createElement("div", { className: "uxf-avatar-file-input__inner-wrapper" },
             react_1.default.createElement("div", { className: (0, cx_1.cx)("uxf-avatar-file-input__input", stateClassName), onClick: onSelectFile },

package/dropzone/dropzone-input.d.ts

@@ -15,6 +15,6 @@ export interface DropzoneInputProps extends FormControlProps<DropzoneFile[] | un
     noClick?: boolean;
     noDrag?: boolean;
     onUploadError?: (err: unknown) => void;
-    onUploadFile: (file: File, options?: UploadOptions) => Promise<FileResponse>;
+    onUploadFile: (file: File | undefined, options?: UploadOptions) => Promise<FileResponse | null>;
 }
 export declare const DropzoneInput: React.ForwardRefExoticComponent<DropzoneInputProps & React.RefAttributes<HTMLDivElement>>;

package/dropzone/dropzone-input.js

@@ -51,7 +51,7 @@ function progressHandler(progressEvent, file, onValuesChange, values) {
     }
 }
 function fileUploadedHandler(uploadedFile, dropzoneFile, onValuesChange, values) {
-    if (values) {
+    if (values && uploadedFile) {
         onValuesChange(values.map((f) => f.id === dropzoneFile.id ? { ...uploadedFile, progress: 100, originalFile: f.originalFile } : f));
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/ui",
-  "version": "10.8.0",
+  "version": "10.8.1",
   "description": "",
   "publishConfig": {
     "access": "public"

package/utils/mocks/upload-file.mock.d.ts

@@ -1,2 +1,2 @@
 import { FileResponse, UploadOptions } from "@uxf/ui/types";
-export declare function uploadFile(file: File, uploadOptions?: UploadOptions): Promise<FileResponse>;
+export declare function uploadFile(file: File | undefined, uploadOptions?: UploadOptions): Promise<FileResponse | null>;

package/utils/mocks/upload-file.mock.js

@@ -10,37 +10,40 @@ function getRandomUuid() {
         .join(""))
         .join("-");
 }
-function uploadFile(file, uploadOptions) {
-    // axios.put("/api/upload", file, { signal: uploadOptions?.abortController?.signal, onUploadProgress: uploadOptions?.onUploadProgress });
-    return new Promise((resolve) => {
-        const time = file.size / 100;
-        const interval = time / 10;
-        let loaded = 0;
-        const intervalTimer = window.setInterval(() => {
-            var _a, _b;
-            if ((_a = uploadOptions === null || uploadOptions === void 0 ? void 0 : uploadOptions.abortController) === null || _a === void 0 ? void 0 : _a.signal.aborted) {
+async function uploadFile(file, uploadOptions) {
+    if (file) {
+        // axios.put("/api/upload", file, { signal: uploadOptions?.abortController?.signal, onUploadProgress: uploadOptions?.onUploadProgress });
+        return new Promise((resolve) => {
+            const time = file.size / 100;
+            const interval = time / 10;
+            let loaded = 0;
+            const intervalTimer = window.setInterval(() => {
+                var _a, _b;
+                if ((_a = uploadOptions === null || uploadOptions === void 0 ? void 0 : uploadOptions.abortController) === null || _a === void 0 ? void 0 : _a.signal.aborted) {
+                    clearInterval(intervalTimer);
+                    // eslint-disable-next-line @typescript-eslint/no-use-before-define
+                    clearTimeout(timeoutTimer);
+                    return;
+                }
+                loaded += (file.size / time) * interval;
+                (_b = uploadOptions === null || uploadOptions === void 0 ? void 0 : uploadOptions.onUploadProgress) === null || _b === void 0 ? void 0 : _b.call(uploadOptions, {
+                    lengthComputable: true,
+                    loaded,
+                    total: file.size,
+                });
+            }, interval);
+            const timeoutTimer = window.setTimeout(() => {
                 clearInterval(intervalTimer);
-                // eslint-disable-next-line @typescript-eslint/no-use-before-define
                 clearTimeout(timeoutTimer);
-                return;
-            }
-            loaded += (file.size / time) * interval;
-            (_b = uploadOptions === null || uploadOptions === void 0 ? void 0 : uploadOptions.onUploadProgress) === null || _b === void 0 ? void 0 : _b.call(uploadOptions, {
-                lengthComputable: true,
-                loaded,
-                total: file.size,
-            });
-        }, interval);
-        const timeoutTimer = window.setTimeout(() => {
-            clearInterval(intervalTimer);
-            clearTimeout(timeoutTimer);
-            resolve({
-                id: Math.round(Math.random() * 100000000),
-                uuid: getRandomUuid(),
-                name: file.name,
-                extension: file.name.split(".").slice(-1).join(""),
-            });
-        }, time);
-    });
+                resolve({
+                    id: Math.round(Math.random() * 100000000),
+                    uuid: getRandomUuid(),
+                    name: file.name,
+                    extension: file.name.split(".").slice(-1).join(""),
+                });
+            }, time);
+        });
+    }
+    return null;
 }
 exports.uploadFile = uploadFile;