@scheels-softdev/kendoreact-generics 2.6.2 → 2.6.3

package/GenericDropdown.js

@@ -3,17 +3,30 @@ import { ComboBox } from "@progress/kendo-react-dropdowns";
 import { filterBy, process } from "@progress/kendo-data-query";
 import { useEffect, useRef, useState } from "react";
 import { Skeleton } from "@progress/kendo-react-indicators";
+import { Guard } from "@scheels-softdev/frontend-utility-functions";
 export function GenericDropdown({ data, selectedId, selectedData, onChange, textField, disabled, idField, title, hideClearButton, style, isLoading, }) {
+    //local state
+    const pageSize = 8;
     if (selectedId !== undefined && selectedData !== undefined) {
         throw new Error("You cannot provide both selectedData and selectedId to GenericDropdown.");
     }
-    //local state
-    const pageSize = 8;
+    //useState
+    const [selectedObject, setSelectedObject] = useState(null);
     const [state, setState] = useState({
         skip: 0,
         total: data.length,
         subsetData: data.slice(0, pageSize),
     });
+    //trigger functions
+    useEffect(() => {
+        var _a, _b;
+        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 && _b !== void 0 ? _b : null);
+    }, [selectedId, selectedData, data]);
+    useEffect(() => {
+        setState((current) => (Object.assign(Object.assign({}, current), { subsetData: process(data, current).data })));
+    }, [data]);
     //external function variables
     let filteredData = useRef(data.slice());
     //function creation
@@ -39,17 +52,6 @@ export function GenericDropdown({ data, selectedId, selectedData, onChange, text
         const newSubsetData = filteredData.current.length ? filteredData.current.slice(skip, skip + take) : data.slice(skip, skip + take);
         setState(Object.assign(Object.assign({}, state), { subsetData: newSubsetData, skip: skip }));
     };
-    const findByIndex = (id, idKey) => {
-        const item = data.find((item) => id === item[idKey || "id"]);
-        return item;
-    };
-    const findByValue = (item) => {
-        const returnVal = data.find((x) => JSON.stringify(Object.assign(Object.assign({}, x), selectedData)) === JSON.stringify(Object.assign({}, x)));
-        return returnVal;
-    };
-    useEffect(() => {
-        setState((current) => (Object.assign(Object.assign({}, current), { subsetData: process(data, current).data })));
-    }, [data]);
     return (_jsx("div", Object.assign({ "data-testid": "dropdown" }, { children: data.length && !isLoading ? (_jsx(ComboBox, { style: style, label: title, disabled: disabled, data: state.subsetData, textField: textField.toString(), virtual: {
                 // enable virtualization for large datasets
                 total: state.total,
@@ -57,5 +59,5 @@ export function GenericDropdown({ data, selectedId, selectedData, onChange, text
                 skip: state.skip,
             }, suggest: true, onPageChange: pageChange, filterable: true, onFilterChange: onFilterChange, popupSettings: {
                 height: "210px",
-            }, onChange: (e) => onChange(e), onBlur: (e) => e.nativeEvent.preventDefault(), clearButton: !hideClearButton, value: !selectedId && !selectedData ? null : findByIndex(selectedId, idField) || findByValue(selectedData) || null })) : (_jsx(Skeleton, { shape: "rectangle", style: style ? style : { height: "40px", width: "100%" } })) })));
+            }, onChange: (e) => onChange(e), onBlur: (e) => e.nativeEvent.preventDefault(), clearButton: !hideClearButton, value: selectedObject })) : (_jsx(Skeleton, { shape: "rectangle", style: style ? style : { height: "40px", width: "100%" } })) })));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@scheels-softdev/kendoreact-generics",
-    "version": "2.6.2",
+    "version": "2.6.3",
     "main": "index.js",
     "scripts": {
         "test": "jest",
@@ -19,6 +19,7 @@
         "@progress/kendo-react-grid": "latest",
         "@progress/kendo-react-indicators": "^5.14.1",
         "@progress/kendo-react-inputs": "latest",
+        "@scheels-softdev/frontend-utility-functions": "^1.3.7",
         "@testing-library/react": "^14.0.0",
         "@types/jest": "^29.5.3",
         "@types/moment": "latest",