funda-ui 4.5.22 → 4.5.35

package/MultipleCheckboxes/index.js

@@ -1468,10 +1468,28 @@ var MultipleCheckboxes = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forw
       });
     }
     return Array.isArray(dataInit) ? dataInit.map(function (item, index) {
+      var _optiondata = {};
+      Object.entries(item).forEach(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+          key = _ref2[0],
+          value = _ref2[1];
+        if (key !== 'extends') {
+          _optiondata[key] = value;
+        }
+      });
       var _groupEl = function _groupEl() {
         return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
           className: "rmultiple-checkboxes-group__label ".concat(groupLabelClassName || '')
         }, item.label), item.optgroup.map(function (opt, optIndex) {
+          var _optiondata2 = {};
+          Object.entries(item).forEach(function (_ref3) {
+            var _ref4 = _slicedToArray(_ref3, 2),
+              key = _ref4[0],
+              value = _ref4[1];
+            if (key !== 'extends') {
+              _optiondata2[key] = value;
+            }
+          });
           return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
             key: 'checkbox' + optIndex,
             className: (0,funda_utils_dist_cjs_cls__WEBPACK_IMPORTED_MODULE_6__.combinedCls)('multiple-checkboxes__control form-check pe-3', {
@@ -1495,7 +1513,7 @@ var MultipleCheckboxes = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forw
             "data-list-item-label": "".concat(typeof opt.listItemLabel === 'undefined' ? '' : opt.listItemLabel),
             "data-value": opt.value,
             "data-disabled": disabled || (typeof opt.disabled !== 'undefined' ? "".concat(opt.disabled) : 'false'),
-            "data-optiondata": JSON.stringify(opt),
+            "data-optiondata": JSON.stringify(_optiondata2),
             value: opt.value,
             disabled: disabled || (typeof opt.disabled !== 'undefined' ? opt.disabled : null),
             checked: selectedItems.has(opt.value),
@@ -1528,7 +1546,11 @@ var MultipleCheckboxes = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forw
               }
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(e.target, _res, VALUE_BY_BRACKETS ? (0,funda_utils_dist_cjs_convert__WEBPACK_IMPORTED_MODULE_4__.convertArrToValByBrackets)(_res) : _res.join(','), _resLabel, VALUE_BY_BRACKETS ? (0,funda_utils_dist_cjs_convert__WEBPACK_IMPORTED_MODULE_4__.convertArrToValByBrackets)(_resLabel) : _resLabel.join(','), curData, _resDataCollection);
             }
-          }, attributes)), labelRes(typeof opt.listItemLabel === 'undefined' ? opt.label : opt.listItemLabel, "multiple-checkboxes__control-label-".concat(index, "-").concat(optIndex, "-").concat(idRes)));
+          }, attributes)), labelRes(typeof opt.listItemLabel === 'undefined' ? opt.label : opt.listItemLabel, "multiple-checkboxes__control-label-".concat(index, "-").concat(optIndex, "-").concat(idRes)), typeof opt["extends"] !== 'undefined' ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+            className: "d-inline-block"
+          }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+            className: "form-control-extends__wrapper"
+          }, opt["extends"]))) : null);
         }));
       };
       var _normalEl = function _normalEl() {
@@ -1545,7 +1567,7 @@ var MultipleCheckboxes = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forw
           "data-list-item-label": "".concat(typeof item.listItemLabel === 'undefined' ? '' : item.listItemLabel),
           "data-value": item.value,
           "data-disabled": disabled || (typeof item.disabled !== 'undefined' ? "".concat(item.disabled) : 'false'),
-          "data-optiondata": JSON.stringify(item),
+          "data-optiondata": JSON.stringify(_optiondata),
           value: item.value,
           disabled: disabled || (typeof item.disabled !== 'undefined' ? item.disabled : null),
           checked: selectedItems.has(item.value),
@@ -1566,7 +1588,11 @@ var MultipleCheckboxes = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forw
             });
             _onChange === null || _onChange === void 0 ? void 0 : _onChange(e.target, _res, VALUE_BY_BRACKETS ? (0,funda_utils_dist_cjs_convert__WEBPACK_IMPORTED_MODULE_4__.convertArrToValByBrackets)(_res) : _res.join(','), _resLabel, VALUE_BY_BRACKETS ? (0,funda_utils_dist_cjs_convert__WEBPACK_IMPORTED_MODULE_4__.convertArrToValByBrackets)(_resLabel) : _resLabel.join(','), item, _resDataCollection);
           }
-        }, attributes)), labelRes(typeof item.listItemLabel === 'undefined' ? item.label : item.listItemLabel, "multiple-checkboxes__control-label-".concat(index, "-").concat(idRes)));
+        }, attributes)), labelRes(typeof item.listItemLabel === 'undefined' ? item.label : item.listItemLabel, "multiple-checkboxes__control-label-".concat(index, "-").concat(idRes)), typeof item["extends"] !== 'undefined' ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+          className: "d-inline-block"
+        }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+          className: "form-control-extends__wrapper"
+        }, item["extends"]))) : null);
       };
       if (tableLayout) {
         /* TABLE LAYOUT */
@@ -1574,8 +1600,7 @@ var MultipleCheckboxes = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forw
           return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("td", {
             colSpan: 1,
             className: (0,funda_utils_dist_cjs_cls__WEBPACK_IMPORTED_MODULE_6__.combinedCls)('multiple-checkboxes-group__wrapper', groupWrapperClassName, tableLayoutCellClassName),
-            key: 'optgroup-' + index,
-            "data-optiondata": JSON.stringify(item)
+            key: 'optgroup-' + index
           }, _groupEl());
         } else {
           return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("td", {
@@ -1589,7 +1614,7 @@ var MultipleCheckboxes = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forw
             "data-value": item.value,
             "data-disabled": disabled || (typeof item.disabled !== 'undefined' ? "".concat(item.disabled) : 'false'),
             key: 'checkbox' + index,
-            "data-optiondata": JSON.stringify(item)
+            "data-optiondata": JSON.stringify(_optiondata)
           }, _normalEl());
         }
         /* /TABLE LAYOUT */
@@ -1597,8 +1622,7 @@ var MultipleCheckboxes = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forw
         if (typeof item.optgroup !== 'undefined') {
           return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
             className: (0,funda_utils_dist_cjs_cls__WEBPACK_IMPORTED_MODULE_6__.combinedCls)('multiple-checkboxes-group__wrapper', groupWrapperClassName),
-            key: 'optgroup-' + index,
-            "data-optiondata": JSON.stringify(item)
+            key: 'optgroup-' + index
           }, _groupEl());
         } else {
           return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
@@ -1611,7 +1635,7 @@ var MultipleCheckboxes = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forw
             "data-value": item.value,
             "data-disabled": disabled || (typeof item.disabled !== 'undefined' ? "".concat(item.disabled) : 'false'),
             key: 'checkbox' + index,
-            "data-optiondata": JSON.stringify(item)
+            "data-optiondata": JSON.stringify(_optiondata)
           }, _normalEl());
         }
       }

package/Radio/index.js

@@ -1254,11 +1254,11 @@ var Radio = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forwardRef)(funct
             checked: controlValue == opt.value // component status will not change if defaultChecked is used
             ,
             style: style
-          }, attributes)), labelRes(typeof opt.listItemLabel === 'undefined' ? opt.label : opt.listItemLabel, "field-".concat(uniqueID, "-").concat(index, "-").concat(optIndex))), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+          }, attributes)), labelRes(typeof opt.listItemLabel === 'undefined' ? opt.label : opt.listItemLabel, "field-".concat(uniqueID, "-").concat(index, "-").concat(optIndex))), typeof opt["extends"] !== 'undefined' ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
             className: "d-inline-block"
           }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
             className: "form-control-extends__wrapper"
-          }, typeof opt["extends"] !== 'undefined' ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, opt["extends"]) : null)));
+          }, opt["extends"]))) : null);
         }));
       };
       var _normalEl = function _normalEl() {
@@ -1297,11 +1297,11 @@ var Radio = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forwardRef)(funct
           dangerouslySetInnerHTML: {
             __html: "".concat(typeof item.listItemLabel === 'undefined' ? item.label : item.listItemLabel)
           }
-        })), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+        })), typeof item["extends"] !== 'undefined' ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
           className: "d-inline-block"
         }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
           className: "form-control-extends__wrapper"
-        }, typeof item["extends"] !== 'undefined' ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, item["extends"]) : null)));
+        }, item["extends"]))) : null);
       };
       if (tableLayout) {
         /* TABLE LAYOUT */

package/lib/cjs/MultipleCheckboxes/index.js

@@ -1468,10 +1468,28 @@ var MultipleCheckboxes = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forw
       });
     }
     return Array.isArray(dataInit) ? dataInit.map(function (item, index) {
+      var _optiondata = {};
+      Object.entries(item).forEach(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+          key = _ref2[0],
+          value = _ref2[1];
+        if (key !== 'extends') {
+          _optiondata[key] = value;
+        }
+      });
       var _groupEl = function _groupEl() {
         return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
           className: "rmultiple-checkboxes-group__label ".concat(groupLabelClassName || '')
         }, item.label), item.optgroup.map(function (opt, optIndex) {
+          var _optiondata2 = {};
+          Object.entries(item).forEach(function (_ref3) {
+            var _ref4 = _slicedToArray(_ref3, 2),
+              key = _ref4[0],
+              value = _ref4[1];
+            if (key !== 'extends') {
+              _optiondata2[key] = value;
+            }
+          });
           return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
             key: 'checkbox' + optIndex,
             className: (0,funda_utils_dist_cjs_cls__WEBPACK_IMPORTED_MODULE_6__.combinedCls)('multiple-checkboxes__control form-check pe-3', {
@@ -1495,7 +1513,7 @@ var MultipleCheckboxes = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forw
             "data-list-item-label": "".concat(typeof opt.listItemLabel === 'undefined' ? '' : opt.listItemLabel),
             "data-value": opt.value,
             "data-disabled": disabled || (typeof opt.disabled !== 'undefined' ? "".concat(opt.disabled) : 'false'),
-            "data-optiondata": JSON.stringify(opt),
+            "data-optiondata": JSON.stringify(_optiondata2),
             value: opt.value,
             disabled: disabled || (typeof opt.disabled !== 'undefined' ? opt.disabled : null),
             checked: selectedItems.has(opt.value),
@@ -1528,7 +1546,11 @@ var MultipleCheckboxes = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forw
               }
               _onChange === null || _onChange === void 0 ? void 0 : _onChange(e.target, _res, VALUE_BY_BRACKETS ? (0,funda_utils_dist_cjs_convert__WEBPACK_IMPORTED_MODULE_4__.convertArrToValByBrackets)(_res) : _res.join(','), _resLabel, VALUE_BY_BRACKETS ? (0,funda_utils_dist_cjs_convert__WEBPACK_IMPORTED_MODULE_4__.convertArrToValByBrackets)(_resLabel) : _resLabel.join(','), curData, _resDataCollection);
             }
-          }, attributes)), labelRes(typeof opt.listItemLabel === 'undefined' ? opt.label : opt.listItemLabel, "multiple-checkboxes__control-label-".concat(index, "-").concat(optIndex, "-").concat(idRes)));
+          }, attributes)), labelRes(typeof opt.listItemLabel === 'undefined' ? opt.label : opt.listItemLabel, "multiple-checkboxes__control-label-".concat(index, "-").concat(optIndex, "-").concat(idRes)), typeof opt["extends"] !== 'undefined' ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+            className: "d-inline-block"
+          }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+            className: "form-control-extends__wrapper"
+          }, opt["extends"]))) : null);
         }));
       };
       var _normalEl = function _normalEl() {
@@ -1545,7 +1567,7 @@ var MultipleCheckboxes = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forw
           "data-list-item-label": "".concat(typeof item.listItemLabel === 'undefined' ? '' : item.listItemLabel),
           "data-value": item.value,
           "data-disabled": disabled || (typeof item.disabled !== 'undefined' ? "".concat(item.disabled) : 'false'),
-          "data-optiondata": JSON.stringify(item),
+          "data-optiondata": JSON.stringify(_optiondata),
           value: item.value,
           disabled: disabled || (typeof item.disabled !== 'undefined' ? item.disabled : null),
           checked: selectedItems.has(item.value),
@@ -1566,7 +1588,11 @@ var MultipleCheckboxes = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forw
             });
             _onChange === null || _onChange === void 0 ? void 0 : _onChange(e.target, _res, VALUE_BY_BRACKETS ? (0,funda_utils_dist_cjs_convert__WEBPACK_IMPORTED_MODULE_4__.convertArrToValByBrackets)(_res) : _res.join(','), _resLabel, VALUE_BY_BRACKETS ? (0,funda_utils_dist_cjs_convert__WEBPACK_IMPORTED_MODULE_4__.convertArrToValByBrackets)(_resLabel) : _resLabel.join(','), item, _resDataCollection);
           }
-        }, attributes)), labelRes(typeof item.listItemLabel === 'undefined' ? item.label : item.listItemLabel, "multiple-checkboxes__control-label-".concat(index, "-").concat(idRes)));
+        }, attributes)), labelRes(typeof item.listItemLabel === 'undefined' ? item.label : item.listItemLabel, "multiple-checkboxes__control-label-".concat(index, "-").concat(idRes)), typeof item["extends"] !== 'undefined' ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+          className: "d-inline-block"
+        }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+          className: "form-control-extends__wrapper"
+        }, item["extends"]))) : null);
       };
       if (tableLayout) {
         /* TABLE LAYOUT */
@@ -1574,8 +1600,7 @@ var MultipleCheckboxes = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forw
           return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("td", {
             colSpan: 1,
             className: (0,funda_utils_dist_cjs_cls__WEBPACK_IMPORTED_MODULE_6__.combinedCls)('multiple-checkboxes-group__wrapper', groupWrapperClassName, tableLayoutCellClassName),
-            key: 'optgroup-' + index,
-            "data-optiondata": JSON.stringify(item)
+            key: 'optgroup-' + index
           }, _groupEl());
         } else {
           return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("td", {
@@ -1589,7 +1614,7 @@ var MultipleCheckboxes = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forw
             "data-value": item.value,
             "data-disabled": disabled || (typeof item.disabled !== 'undefined' ? "".concat(item.disabled) : 'false'),
             key: 'checkbox' + index,
-            "data-optiondata": JSON.stringify(item)
+            "data-optiondata": JSON.stringify(_optiondata)
           }, _normalEl());
         }
         /* /TABLE LAYOUT */
@@ -1597,8 +1622,7 @@ var MultipleCheckboxes = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forw
         if (typeof item.optgroup !== 'undefined') {
           return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
             className: (0,funda_utils_dist_cjs_cls__WEBPACK_IMPORTED_MODULE_6__.combinedCls)('multiple-checkboxes-group__wrapper', groupWrapperClassName),
-            key: 'optgroup-' + index,
-            "data-optiondata": JSON.stringify(item)
+            key: 'optgroup-' + index
           }, _groupEl());
         } else {
           return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
@@ -1611,7 +1635,7 @@ var MultipleCheckboxes = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forw
             "data-value": item.value,
             "data-disabled": disabled || (typeof item.disabled !== 'undefined' ? "".concat(item.disabled) : 'false'),
             key: 'checkbox' + index,
-            "data-optiondata": JSON.stringify(item)
+            "data-optiondata": JSON.stringify(_optiondata)
           }, _normalEl());
         }
       }

package/lib/cjs/Radio/index.js

@@ -1254,11 +1254,11 @@ var Radio = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forwardRef)(funct
             checked: controlValue == opt.value // component status will not change if defaultChecked is used
             ,
             style: style
-          }, attributes)), labelRes(typeof opt.listItemLabel === 'undefined' ? opt.label : opt.listItemLabel, "field-".concat(uniqueID, "-").concat(index, "-").concat(optIndex))), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+          }, attributes)), labelRes(typeof opt.listItemLabel === 'undefined' ? opt.label : opt.listItemLabel, "field-".concat(uniqueID, "-").concat(index, "-").concat(optIndex))), typeof opt["extends"] !== 'undefined' ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
             className: "d-inline-block"
           }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
             className: "form-control-extends__wrapper"
-          }, typeof opt["extends"] !== 'undefined' ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, opt["extends"]) : null)));
+          }, opt["extends"]))) : null);
         }));
       };
       var _normalEl = function _normalEl() {
@@ -1297,11 +1297,11 @@ var Radio = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forwardRef)(funct
           dangerouslySetInnerHTML: {
             __html: "".concat(typeof item.listItemLabel === 'undefined' ? item.label : item.listItemLabel)
           }
-        })), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+        })), typeof item["extends"] !== 'undefined' ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
           className: "d-inline-block"
         }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
           className: "form-control-extends__wrapper"
-        }, typeof item["extends"] !== 'undefined' ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, item["extends"]) : null)));
+        }, item["extends"]))) : null);
       };
       if (tableLayout) {
         /* TABLE LAYOUT */

package/lib/esm/MultipleCheckboxes/index.tsx

@@ -331,6 +331,13 @@ const MultipleCheckboxes = forwardRef((props: MultipleCheckboxesProps, externalR
         
         return Array.isArray(dataInit) ? dataInit.map((item: any, index: number) => {
 
+            const _optiondata: any = {};
+            Object.entries(item).forEach(([key, value]) => {
+                if (key !== 'extends') {
+                    _optiondata[key] = value;
+                }
+            });
+
             const _groupEl = () => {
                 return <>
     
@@ -339,7 +346,14 @@ const MultipleCheckboxes = forwardRef((props: MultipleCheckboxesProps, externalR
                     {/* /GROUP LABEL */}
     
                     {item.optgroup.map((opt: any, optIndex: number) => {
-    
+
+                        const _optiondata2: any = {};
+                        Object.entries(item).forEach(([key, value]) => {
+                            if (key !== 'extends') {
+                                _optiondata2[key] = value;
+                            }
+                        });
+
                         return <div
                             key={'checkbox' + optIndex}
                             className={combinedCls(
@@ -367,7 +381,7 @@ const MultipleCheckboxes = forwardRef((props: MultipleCheckboxesProps, externalR
                                 data-list-item-label={`${typeof opt.listItemLabel === 'undefined' ? '' : opt.listItemLabel}`}
                                 data-value={opt.value}
                                 data-disabled={disabled || (typeof opt.disabled !== 'undefined' ? `${opt.disabled}` : 'false')}
-                                data-optiondata={JSON.stringify(opt)}
+                                data-optiondata={JSON.stringify(_optiondata2)}
                                 value={opt.value}
                                 disabled={disabled || (typeof opt.disabled !== 'undefined' ? opt.disabled : null)}
                                 checked={selectedItems.has(opt.value)}
@@ -404,6 +418,14 @@ const MultipleCheckboxes = forwardRef((props: MultipleCheckboxesProps, externalR
                             />
     
                             {labelRes(typeof opt.listItemLabel === 'undefined' ? opt.label : opt.listItemLabel, `multiple-checkboxes__control-label-${index}-${optIndex}-${idRes}`)}
+
+                            {/* EXTENDS */}
+                            {typeof opt.extends !== 'undefined' ? <>
+                                <div className="d-inline-block">
+                                    <div className="form-control-extends__wrapper">{opt.extends}</div>
+                                </div>
+                            </> : null}
+
     
                         </div>;
     
@@ -428,7 +450,7 @@ const MultipleCheckboxes = forwardRef((props: MultipleCheckboxesProps, externalR
                         data-list-item-label={`${typeof item.listItemLabel === 'undefined' ? '' : item.listItemLabel}`}
                         data-value={item.value}
                         data-disabled={disabled || (typeof item.disabled !== 'undefined' ? `${item.disabled}` : 'false')}
-                        data-optiondata={JSON.stringify(item)}
+                        data-optiondata={JSON.stringify(_optiondata)}
                         value={item.value}
                         disabled={disabled || (typeof item.disabled !== 'undefined' ? item.disabled : null)}
                         checked={selectedItems.has(item.value)}
@@ -451,6 +473,14 @@ const MultipleCheckboxes = forwardRef((props: MultipleCheckboxesProps, externalR
                     />
     
                     {labelRes(typeof item.listItemLabel === 'undefined' ? item.label : item.listItemLabel, `multiple-checkboxes__control-label-${index}-${idRes}`)}
+
+                    {/* EXTENDS */}
+                    {typeof item.extends !== 'undefined' ? <>
+                        <div className="d-inline-block">
+                            <div className="form-control-extends__wrapper">{item.extends}</div>
+                        </div>
+                    </> : null}
+
                 </>;
             };
     
@@ -467,7 +497,6 @@ const MultipleCheckboxes = forwardRef((props: MultipleCheckboxesProps, externalR
                             tableLayoutCellClassName
                         )} 
                         key={'optgroup-' + index}
-                        data-optiondata={JSON.stringify(item)}
                     >
                         {_groupEl()}
                     </td>;
@@ -488,7 +517,7 @@ const MultipleCheckboxes = forwardRef((props: MultipleCheckboxesProps, externalR
                         data-value={item.value}
                         data-disabled={disabled || (typeof item.disabled !== 'undefined' ? `${item.disabled}` : 'false')}
                         key={'checkbox' + index}
-                        data-optiondata={JSON.stringify(item)}
+                        data-optiondata={JSON.stringify(_optiondata)}
                     >
                         {_normalEl()}
                     </td>;
@@ -504,7 +533,6 @@ const MultipleCheckboxes = forwardRef((props: MultipleCheckboxesProps, externalR
                             groupWrapperClassName
                         )} 
                         key={'optgroup-' + index}
-                        data-optiondata={JSON.stringify(item)}
                     >
                         {_groupEl()}
                     </div>;
@@ -523,7 +551,7 @@ const MultipleCheckboxes = forwardRef((props: MultipleCheckboxesProps, externalR
                         data-value={item.value}
                         data-disabled={disabled || (typeof item.disabled !== 'undefined' ? `${item.disabled}` : 'false')}
                         key={'checkbox' + index}
-                        data-optiondata={JSON.stringify(item)}
+                        data-optiondata={JSON.stringify(_optiondata)}
                     >
                         {_normalEl()}
                     </div>;

package/lib/esm/Radio/index.tsx

@@ -11,7 +11,6 @@ import {
 import { clsWrite, combinedCls } from 'funda-utils/dist/cjs/cls';
 
 
-
 export interface OptionConfig {
     [propName: string]: string | number | React.ReactNode | boolean;
 }
@@ -468,9 +467,14 @@ const Radio = forwardRef((props: RadioProps, externalRef: any) => {
                                 {labelRes(typeof opt.listItemLabel === 'undefined' ? opt.label : opt.listItemLabel, `field-${uniqueID}-${index}-${optIndex}`)}
 
                             </div>
-                            <div className="d-inline-block">
-                                <div className="form-control-extends__wrapper">{typeof opt.extends !== 'undefined' ? <>{opt.extends}</> : null}</div>
-                            </div>
+                            
+                            {/* EXTENDS */}
+                            {typeof opt.extends !== 'undefined' ? <>
+                                <div className="d-inline-block">
+                                    <div className="form-control-extends__wrapper">{opt.extends}</div>
+                                </div>
+                            </> : null}
+
                         </div>;
 
                     })}
@@ -511,9 +515,13 @@ const Radio = forwardRef((props: RadioProps, externalRef: any) => {
                             __html: `${typeof item.listItemLabel === 'undefined' ? item.label : item.listItemLabel}`
                         }}></label>
                     </div>
-                    <div className="d-inline-block">
-                        <div className="form-control-extends__wrapper">{typeof item.extends !== 'undefined' ? <>{item.extends}</> : null}</div>
-                    </div>
+
+                    {/* EXTENDS */}
+                    {typeof item.extends !== 'undefined' ? <>
+                        <div className="d-inline-block">
+                            <div className="form-control-extends__wrapper">{item.extends}</div>
+                        </div>
+                    </> : null}
 
                 </>;
             };

package/package.json

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