funda-ui 1.0.520 → 1.0.525

package/MultiFuncSelect/index.js

@@ -770,10 +770,16 @@ var MultiFuncSelect = /*#__PURE__*/(0,external_root_React_commonjs2_react_common
       handleFetch(val).then(function (response) {
         _orginalData = response;
         update(_orginalData);
+
+        // Adjust the overall height to fit the wrapper
+        fixContentHeight();
       });
     } else {
       _orginalData = orginalData;
       update(_orginalData);
+
+      // Adjust the overall height to fit the wrapper
+      fixContentHeight();
     }
   }, 350, [optionsData]);
 
@@ -860,6 +866,14 @@ var MultiFuncSelect = /*#__PURE__*/(0,external_root_React_commonjs2_react_common
   }
 
   //
+  function fixContentHeight() {
+    if (listContentRef.current === null) return;
+    setTimeout(function () {
+      var _displayedItems = listContentRef.current.querySelectorAll('.list-group-item');
+      var _displayedHeight = _displayedItems[0].clientHeight * _displayedItems.length;
+      listContentRef.current.style.height = _displayedHeight + 'px';
+    }, 0);
+  }
   function getPlacement(el) {
     var restorePos = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     if (el === null) return;

package/Radio/index.d.ts

@@ -7,7 +7,7 @@ declare module 'react' {
 interface OptionConfig {
     [propName: string]: string | number;
 }
-declare type RadioOptionChangeFnType = (arg1: any, arg2: any) => void;
+declare type RadioOptionChangeFnType = (arg1: any, arg2: any, arg3?: any) => void;
 declare type RadioProps = {
     wrapperClassName?: string;
     value?: string;

package/Radio/index.js

@@ -257,6 +257,7 @@ var Radio = function Radio(props) {
   }
   function handleChange(event) {
     var val = event.target.value;
+    var currentIndex = event.target.dataset.index;
 
     //----
     // update value
@@ -268,8 +269,10 @@ var Radio = function Radio(props) {
 
     //
     if (typeof onChange === 'function') {
-      onChange(event, dataInit[event.target.selectedIndex]);
-      event.target.blur();
+      onChange(event, val, dataInit[currentIndex]);
+    }
+    if (typeof onClick === 'function') {
+      onClick(event, val, dataInit[currentIndex]);
     }
   }
   function handleBlur(event) {
@@ -293,6 +296,7 @@ var Radio = function Radio(props) {
       className: "form-check-input",
       id: "field-".concat(uniqueID, "-").concat(index),
       name: name,
+      "data-index": index,
       value: "".concat(item.value),
       required: requiredVal,
       disabled: disabled || null,

package/lib/cjs/MultiFuncSelect/index.js

@@ -770,10 +770,16 @@ var MultiFuncSelect = /*#__PURE__*/(0,external_root_React_commonjs2_react_common
       handleFetch(val).then(function (response) {
         _orginalData = response;
         update(_orginalData);
+
+        // Adjust the overall height to fit the wrapper
+        fixContentHeight();
       });
     } else {
       _orginalData = orginalData;
       update(_orginalData);
+
+      // Adjust the overall height to fit the wrapper
+      fixContentHeight();
     }
   }, 350, [optionsData]);
 
@@ -860,6 +866,14 @@ var MultiFuncSelect = /*#__PURE__*/(0,external_root_React_commonjs2_react_common
   }
 
   //
+  function fixContentHeight() {
+    if (listContentRef.current === null) return;
+    setTimeout(function () {
+      var _displayedItems = listContentRef.current.querySelectorAll('.list-group-item');
+      var _displayedHeight = _displayedItems[0].clientHeight * _displayedItems.length;
+      listContentRef.current.style.height = _displayedHeight + 'px';
+    }, 0);
+  }
   function getPlacement(el) {
     var restorePos = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     if (el === null) return;

package/lib/cjs/Radio/index.d.ts

@@ -7,7 +7,7 @@ declare module 'react' {
 interface OptionConfig {
     [propName: string]: string | number;
 }
-declare type RadioOptionChangeFnType = (arg1: any, arg2: any) => void;
+declare type RadioOptionChangeFnType = (arg1: any, arg2: any, arg3?: any) => void;
 declare type RadioProps = {
     wrapperClassName?: string;
     value?: string;

package/lib/cjs/Radio/index.js

@@ -257,6 +257,7 @@ var Radio = function Radio(props) {
   }
   function handleChange(event) {
     var val = event.target.value;
+    var currentIndex = event.target.dataset.index;
 
     //----
     // update value
@@ -268,8 +269,10 @@ var Radio = function Radio(props) {
 
     //
     if (typeof onChange === 'function') {
-      onChange(event, dataInit[event.target.selectedIndex]);
-      event.target.blur();
+      onChange(event, val, dataInit[currentIndex]);
+    }
+    if (typeof onClick === 'function') {
+      onClick(event, val, dataInit[currentIndex]);
     }
   }
   function handleBlur(event) {
@@ -293,6 +296,7 @@ var Radio = function Radio(props) {
       className: "form-check-input",
       id: "field-".concat(uniqueID, "-").concat(index),
       name: name,
+      "data-index": index,
       value: "".concat(item.value),
       required: requiredVal,
       disabled: disabled || null,

package/lib/esm/MultiFuncSelect/index.tsx

@@ -11,7 +11,6 @@ import {
     addTreeDepth,
     addTreeIndent
 } from './utils/tree';
-import { type } from 'os';
 
 
 declare module 'react' {
@@ -171,6 +170,7 @@ const MultiFuncSelect = forwardRef((props: MultiFuncSelectProps, ref: any) => {
     const multiSelControlOptionExist = (arr: any[], val: any) => arr.map((v: any) => v.toString()).includes(val.toString());
 
 
+
     //performance
     const handleChangeFetchSafe = useDebounce((val: any) => {
         
@@ -199,20 +199,29 @@ const MultiFuncSelect = forwardRef((props: MultiFuncSelectProps, ref: any) => {
                     }
                 });
 
+
             }
 
             setOptionsData(filterRes);
         };
    
-        if ( fetchUpdate ) {
+        if (fetchUpdate) {
 
             handleFetch(val).then((response: any) => {
                 _orginalData = response;
                 update(_orginalData);
+
+
+                // Adjust the overall height to fit the wrapper
+                fixContentHeight();
             });
         } else {
             _orginalData = orginalData;
             update(_orginalData);
+
+
+            // Adjust the overall height to fit the wrapper
+            fixContentHeight();
         }
   
 
@@ -308,6 +317,20 @@ const MultiFuncSelect = forwardRef((props: MultiFuncSelectProps, ref: any) => {
 
 
     //
+    function fixContentHeight() {
+        if (listContentRef.current === null) return;
+
+        setTimeout(() => {
+
+            const _displayedItems = listContentRef.current.querySelectorAll('.list-group-item');
+            const _displayedHeight = _displayedItems[0].clientHeight * _displayedItems.length;
+
+            listContentRef.current.style.height = _displayedHeight + 'px';
+            
+        }, 0);
+
+    }
+
     function getPlacement(el: HTMLElement, restorePos: boolean = false) {
 
         if ( el === null ) return;
@@ -370,7 +393,6 @@ const MultiFuncSelect = forwardRef((props: MultiFuncSelectProps, ref: any) => {
                 listContentRef.current.style.height = _displayedHeight + 'px';
             }
 
-         
             //
             listContentRef.current.style.overflowY = 'auto';
 

package/lib/esm/Radio/index.tsx

@@ -11,7 +11,7 @@ interface OptionConfig {
 }
 
 
-type RadioOptionChangeFnType = (arg1: any, arg2: any) => void;
+type RadioOptionChangeFnType = (arg1: any, arg2: any, arg3?: any) => void;
 
 
 type RadioProps = {
@@ -192,6 +192,7 @@ const Radio = (props: RadioProps) => {
 
     function handleChange(event: any) {
         const val = event.target.value;
+        const currentIndex = event.target.dataset.index;
 
 
         //----
@@ -205,11 +206,11 @@ const Radio = (props: RadioProps) => {
 
         //
         if (typeof (onChange) === 'function') {
-            onChange(event, dataInit[event.target.selectedIndex]);
-
-            event.target.blur();
+            onChange(event, val, dataInit[currentIndex]);
+        }
+        if (typeof (onClick) === 'function') {
+            onClick(event, val, dataInit[currentIndex]);
         }
-
     }
 
     function handleBlur(event: any) {
@@ -234,6 +235,7 @@ const Radio = (props: RadioProps) => {
                 className="form-check-input"
                 id={`field-${uniqueID}-${index}`}
                 name={name}
+                data-index={index}
                 value={`${item.value}`}
                 required={requiredVal}
                 disabled={disabled || null}

package/package.json

@@ -2,7 +2,7 @@
   "author": "UIUX Lab",
   "email": "uiuxlab@gmail.com",
   "name": "funda-ui",
-  "version": "1.0.520",
+  "version": "1.0.525",
   "description": "React components using pure Bootstrap 5+ which does not contain any external style and script libraries.",
   "repository": {
     "type": "git",