@scheels-softdev/kendoreact-generics 2.8.12 → 2.8.13

package/GenericDropdown.d.ts

@@ -1,14 +1,4 @@
 import { CSSProperties } from "react";
-import { ComboBoxChangeEvent } from "@progress/kendo-react-dropdowns";
-/**
- * Handles the change event of a dropdown.
- *
- * @param {ComboBoxChangeEvent} e - The change event object.
- * @param {(value: T) => void} setFunction - The function to set the value.
- * @param {T} nullEventValue - The value to set when the event value is null.
- * @param {string} valueKey - The key to access the value in the event object.
- */
-export declare function handleDropdownChange<T>(e: ComboBoxChangeEvent, setFunction: (value: T) => void, nullEventValue: T, valueKey?: string): void;
 /**
  * JSX Component for displaying items in a virtualized combobox
  * @template T - The type of the data objects in the dropdown.
@@ -22,7 +12,7 @@ type GenericDDProps<T> = {
     /** The currently selected data object. (optional)*/
     selectedData?: T;
     /** Callback function triggered when the selected value changes*/
-    onChange: (e: ComboBoxChangeEvent) => void;
+    onChange: Function;
     /**  The field names used to extract text values for display */
     textField: keyof T;
     /**  The separator to use when concatenating multiple text values. (optional)*/

package/GenericDropdown.js

@@ -3,19 +3,6 @@ import { ComboBox } from "@progress/kendo-react-dropdowns";
 import { filterBy } from "@progress/kendo-data-query";
 import { useEffect, useRef, useState } from "react";
 import { Guard } from "@scheels-softdev/frontend-utility-functions";
-/**
- * Handles the change event of a dropdown.
- *
- * @param {ComboBoxChangeEvent} e - The change event object.
- * @param {(value: T) => void} setFunction - The function to set the value.
- * @param {T} nullEventValue - The value to set when the event value is null.
- * @param {string} valueKey - The key to access the value in the event object.
- */
-export function handleDropdownChange(e, setFunction, nullEventValue, valueKey) {
-    Guard.Catch.NullEmptyOrWhitespace(e.target.value)
-        ? setFunction(nullEventValue)
-        : setFunction(Guard.Catch.NullEmptyOrWhitespace(valueKey) ? e.target.value : e.target.value[valueKey !== null && valueKey !== void 0 ? valueKey : ""]);
-}
 export function GenericDropdown({ data, selectedId, selectedData, onChange, textField, disabled, idField, title, hideClearButton, style, isLoading, suggest, }) {
     //local state
     const pageSize = 8;
@@ -23,7 +10,7 @@ export function GenericDropdown({ data, selectedId, selectedData, onChange, text
         throw new Error("You cannot provide both selectedData and selectedId to GenericDropdown.");
     }
     //useState
-    const [selectedObject, setSelectedObject] = useState(null);
+    const [selectedObject, setSelectedObject] = useState(undefined);
     const [state, setState] = useState({
         skip: 0,
         total: data.length,
@@ -32,10 +19,13 @@ export function GenericDropdown({ data, selectedId, selectedData, onChange, text
     //trigger functions
     useEffect(() => {
         var _a, _b;
-        console.log(selectedData, selectedId);
-        setSelectedObject(selectedId
-            ? (_a = data.find((item) => selectedId === item[idField || "id"])) !== null && _a !== void 0 ? _a : null
-            : (_b = data.find((x) => Guard.Ensure.EqualObjects(Object.assign(Object.assign({}, x), selectedData), Object.assign({}, (x !== null && x !== void 0 ? x : {}))))) !== null && _b !== void 0 ? _b : null);
+        if (!selectedId && !selectedData)
+            setSelectedObject(undefined);
+        else {
+            setSelectedObject(selectedId
+                ? (_a = data.find((item) => selectedId === item[idField || "id"])) !== null && _a !== void 0 ? _a : undefined
+                : (_b = data.find((x) => Guard.Ensure.EqualObjects(Object.assign(Object.assign({}, x), selectedData), Object.assign({}, (x !== null && x !== void 0 ? x : {}))))) !== null && _b !== void 0 ? _b : undefined);
+        }
     }, [selectedId, selectedData, data]);
     useEffect(() => {
         setState({
@@ -75,5 +65,5 @@ export function GenericDropdown({ data, selectedId, selectedData, onChange, text
                 skip: state.skip,
             }, suggest: suggest, onPageChange: pageChange, filterable: true, onFilterChange: onFilterChange, popupSettings: {
                 height: "210px",
-            }, onChange: (e) => handleDropdownChange(e, () => onChange(e.value), {}, idField === null || idField === void 0 ? void 0 : idField.toString()), onBlur: (e) => e.nativeEvent.preventDefault(), clearButton: !hideClearButton, value: selectedObject }) })));
+            }, onChange: (e) => onChange(e), onBlur: (e) => e.nativeEvent.preventDefault(), clearButton: !hideClearButton, value: selectedObject !== null && selectedObject !== void 0 ? selectedObject : undefined }) })));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@scheels-softdev/kendoreact-generics",
-    "version": "2.8.12",
+    "version": "2.8.13",
     "main": "index.js",
     "scripts": {
         "test": "jest",