@aloudata/aloudata-design 2.13.4 → 2.13.5-beta.1

package/dist/Form/index.d.ts

@@ -26,7 +26,7 @@ declare const AldFormItem: {
 type InternalFormType = typeof AldForm;
 type OriginUseFormType<T> = typeof useForm<T>;
 type CompoundedComponent = InternalFormType & {
-    useForm: <T>(...args: [...Parameters<OriginUseFormType<T>>, string?]) => ReturnType<OriginUseFormType<T>>;
+    useForm: <T = any>(...args: [...Parameters<OriginUseFormType<T>>, string?]) => ReturnType<OriginUseFormType<T>>;
     useFormInstance: typeof useFormInstance;
     useWatch: typeof useWatch;
     Item: typeof AldFormItem;

package/dist/Select/index.js

@@ -36,20 +36,33 @@ var defaultDropdownStyle = {
   minWidth: 192
 };
 var DEFAULT_LIST_ITEM_HEIGHT = 36;
-var getSelectedOptionsFromValue = function getSelectedOptionsFromValue(isMultiple, options, value, defaultValue) {
+var getSelectedOptionsFromValue = function getSelectedOptionsFromValue(isMultiple, options, value, defaultValue, prevSelectOptions) {
   if (typeof value !== 'undefined') {
     if (isMultiple) {
       if (Array.isArray(value)) {
-        var newOptions = options === null || options === void 0 ? void 0 : options.filter(function (option) {
-          return value.includes(option.value);
+        var _newOptions = [];
+        value.forEach(function (currentValue) {
+          var newOption = options === null || options === void 0 ? void 0 : options.find(function (option) {
+            return option.value === currentValue;
+          });
+          if (newOption) {
+            _newOptions.push(newOption);
+          } else {
+            var prevOption = prevSelectOptions === null || prevSelectOptions === void 0 ? void 0 : prevSelectOptions.find(function (option) {
+              return option.value === currentValue;
+            });
+            if (prevOption) {
+              _newOptions.push(prevOption);
+            }
+          }
         });
-        return newOptions || [];
+        return _newOptions;
       }
     } else {
-      var _newOptions = options === null || options === void 0 ? void 0 : options.filter(function (option) {
+      var newOptions = options === null || options === void 0 ? void 0 : options.filter(function (option) {
         return option.value === value;
       });
-      return _newOptions || [];
+      return newOptions || [];
     }
     return [];
   }
@@ -365,7 +378,9 @@ var Select = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   useEffect(function () {
     if (updatedRef.current) {
-      setSelectedOptions(getSelectedOptionsFromValue(isMultiple, innerOptions, value, defaultValue));
+      setSelectedOptions(function (prev) {
+        return getSelectedOptionsFromValue(isMultiple, innerOptions, value, defaultValue, prev);
+      });
     } else {
       updatedRef.current = true;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aloudata/aloudata-design",
-  "version": "2.13.4",
+  "version": "2.13.5-beta.1",
   "description": "",
   "license": "MIT",
   "module": "dist/index.js",