primereact 9.3.1 → 9.5.0

package/fieldset/fieldset.esm.js

@@ -2,7 +2,8 @@ import * as React from 'react';
 import { CSSTransition } from 'primereact/csstransition';
 import { useMountEffect } from 'primereact/hooks';
 import { Ripple } from 'primereact/ripple';
-import { ObjectUtils, UniqueComponentId, classNames, IconUtils } from 'primereact/utils';
+import { UniqueComponentId, mergeProps, classNames, IconUtils } from 'primereact/utils';
+import { ComponentBase } from 'primereact/componentbase';
 import { PlusIcon } from 'primereact/icons/plus';
 import { MinusIcon } from 'primereact/icons/minus';
 
@@ -76,7 +77,7 @@ function _slicedToArray(arr, i) {
   return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
 }
 
-var FieldsetBase = {
+var FieldsetBase = ComponentBase.extend({
   defaultProps: {
     __TYPE: 'Fieldset',
     id: null,
@@ -93,14 +94,8 @@ var FieldsetBase = {
     onToggle: null,
     onClick: null,
     children: undefined
-  },
-  getProps: function getProps(props) {
-    return ObjectUtils.getMergedProps(props, FieldsetBase.defaultProps);
-  },
-  getOtherProps: function getOtherProps(props) {
-    return ObjectUtils.getDiffProps(props, FieldsetBase.defaultProps);
   }
-};
+});
 
 var Fieldset = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
   var props = FieldsetBase.getProps(inProps);
@@ -117,6 +112,14 @@ var Fieldset = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
   var contentRef = React.useRef(null);
   var headerId = idState + '_header';
   var contentId = idState + '_content';
+  var _FieldsetBase$setMeta = FieldsetBase.setMetaData({
+      props: props,
+      state: {
+        id: idState,
+        collapsed: collapsed
+      }
+    }),
+    ptm = _FieldsetBase$setMeta.ptm;
   var toggle = function toggle(event) {
     if (props.toggleable) {
       collapsed ? expand(event) : collapse(event);
@@ -147,6 +150,17 @@ var Fieldset = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
     }
   });
   var createContent = function createContent() {
+    var contentProps = mergeProps({
+      className: 'p-fieldset-content'
+    }, ptm('content'));
+    var toggleableProps = mergeProps({
+      ref: contentRef,
+      id: contentId,
+      'aria-hidden': collapsed,
+      role: 'region',
+      'aria-labelledby': headerId,
+      className: 'p-toggleable-content'
+    }, ptm('toggleableContent'));
     return /*#__PURE__*/React.createElement(CSSTransition, {
       nodeRef: contentRef,
       classNames: "p-toggleable-content",
@@ -157,28 +171,15 @@ var Fieldset = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
       "in": !collapsed,
       unmountOnExit: true,
       options: props.transitionOptions
-    }, /*#__PURE__*/React.createElement("div", {
-      ref: contentRef,
-      id: contentId,
-      className: "p-toggleable-content",
-      "aria-hidden": collapsed,
-      role: "region",
-      "aria-labelledby": headerId
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "p-fieldset-content"
-    }, props.children)));
+    }, /*#__PURE__*/React.createElement("div", toggleableProps, /*#__PURE__*/React.createElement("div", contentProps, props.children)));
   };
   var createToggleIcon = function createToggleIcon() {
     if (props.toggleable) {
-      var iconClassName = 'p-fieldset-toggler';
-      var icon = collapsed ? props.expandIcon || /*#__PURE__*/React.createElement(PlusIcon, {
-        className: iconClassName
-      }) : props.collapseIcon || /*#__PURE__*/React.createElement(MinusIcon, {
-        className: iconClassName
-      });
-      var toggleIcon = IconUtils.getJSXIcon(icon, {
-        className: iconClassName
-      }, {
+      var togglerIconProps = mergeProps({
+        className: 'p-fieldset-toggler'
+      }, ptm('togglericon'));
+      var icon = collapsed ? props.expandIcon || /*#__PURE__*/React.createElement(PlusIcon, togglerIconProps) : props.collapseIcon || /*#__PURE__*/React.createElement(MinusIcon, togglerIconProps);
+      var toggleIcon = IconUtils.getJSXIcon(icon, togglerIconProps, {
         props: props
       });
       return toggleIcon;
@@ -186,30 +187,32 @@ var Fieldset = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
     return null;
   };
   var createLegendContent = function createLegendContent() {
+    var legendTextProps = mergeProps({
+      className: 'p-fieldset-legend-text'
+    }, ptm('legendTitle'));
+    var togglerProps = mergeProps({
+      id: headerId,
+      'aria-expanded': !collapsed,
+      'aria-controls': contentId,
+      href: '#' + contentId,
+      tabIndex: props.toggleable ? null : -1
+    }, ptm('toggler'));
     if (props.toggleable) {
       var toggleIcon = createToggleIcon();
-      return /*#__PURE__*/React.createElement("a", {
-        href: '#' + contentId,
-        "aria-controls": contentId,
-        id: headerId,
-        "aria-expanded": !collapsed,
-        tabIndex: props.toggleable ? null : -1
-      }, toggleIcon, /*#__PURE__*/React.createElement("span", {
-        className: "p-fieldset-legend-text"
-      }, props.legend), /*#__PURE__*/React.createElement(Ripple, null));
+      return /*#__PURE__*/React.createElement("a", togglerProps, toggleIcon, /*#__PURE__*/React.createElement("span", legendTextProps, props.legend), /*#__PURE__*/React.createElement(Ripple, null));
     }
-    return /*#__PURE__*/React.createElement("span", {
-      className: "p-fieldset-legend-text",
+    return /*#__PURE__*/React.createElement("span", _extends({}, legendTextProps, {
       id: headerId
-    }, props.legend);
+    }), props.legend);
   };
   var createLegend = function createLegend() {
+    var legendProps = mergeProps({
+      className: 'p-fieldset-legend p-unselectable-text',
+      onClick: toggle
+    }, ptm('legend'));
     if (props.legend != null || props.toggleable) {
       var legendContent = createLegendContent();
-      return /*#__PURE__*/React.createElement("legend", {
-        className: "p-fieldset-legend p-unselectable-text",
-        onClick: toggle
-      }, legendContent);
+      return /*#__PURE__*/React.createElement("legend", legendProps, legendContent);
     }
   };
   React.useImperativeHandle(ref, function () {
@@ -223,20 +226,18 @@ var Fieldset = /*#__PURE__*/React.forwardRef(function (inProps, ref) {
       }
     };
   });
-  var otherProps = FieldsetBase.getOtherProps(props);
-  var className = classNames('p-fieldset p-component', {
-    'p-fieldset-toggleable': props.toggleable
-  }, props.className);
-  var legend = createLegend();
-  var content = createContent();
-  return /*#__PURE__*/React.createElement("fieldset", _extends({
+  var rootProps = mergeProps({
     id: idState,
     ref: elementRef,
-    className: className,
-    style: props.style
-  }, otherProps, {
+    style: props.style,
+    className: classNames('p-fieldset p-component', {
+      'p-fieldset-toggleable': props.toggleable
+    }, props.className),
     onClick: props.onClick
-  }), legend, content);
+  }, FieldsetBase.getOtherProps(props), ptm('root'));
+  var legend = createLegend();
+  var content = createContent();
+  return /*#__PURE__*/React.createElement("fieldset", rootProps, legend, content);
 });
 Fieldset.displayName = 'Fieldset';
 

package/fieldset/fieldset.esm.min.js

@@ -1 +1 @@
-import*as e from"react";import{CSSTransition as t}from"primereact/csstransition";import{useMountEffect as n}from"primereact/hooks";import{Ripple as l}from"primereact/ripple";import{ObjectUtils as r,UniqueComponentId as o,classNames as a,IconUtils as i}from"primereact/utils";import{PlusIcon as s}from"primereact/icons/plus";import{MinusIcon as c}from"primereact/icons/minus";function u(){return u=Object.assign?Object.assign.bind():function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var l in n)Object.prototype.hasOwnProperty.call(n,l)&&(e[l]=n[l])}return e},u.apply(this,arguments)}function p(e){if(Array.isArray(e))return e}function f(e,t){var n=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=n){var l,r,o,a,i=[],s=!0,c=!1;try{if(o=(n=n.call(e)).next,0===t){if(Object(n)!==n)return;s=!1}else for(;!(s=(l=o.call(n)).done)&&(i.push(l.value),i.length!==t);s=!0);}catch(e){c=!0,r=e}finally{try{if(!s&&null!=n.return&&(a=n.return(),Object(a)!==a))return}finally{if(c)throw r}}return i}}function g(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,l=new Array(t);n<t;n++)l[n]=e[n];return l}function d(e,t){if(e){if("string"==typeof e)return g(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);return"Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n?Array.from(e):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?g(e,t):void 0}}function m(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function b(e,t){return p(e)||f(e,t)||d(e,t)||m()}var v={defaultProps:{__TYPE:"Fieldset",id:null,legend:null,className:null,style:null,toggleable:null,collapsed:null,collapseIcon:null,transitionOptions:null,expandIcon:null,onExpand:null,onCollapse:null,onToggle:null,onClick:null,children:void 0},getProps:function(e){return r.getMergedProps(e,v.defaultProps)},getOtherProps:function(e){return r.getDiffProps(e,v.defaultProps)}},y=e.forwardRef((function(r,p){var f=v.getProps(r),g=b(e.useState(f.id),2),d=g[0],m=g[1],y=b(e.useState(f.collapsed),2),h=y[1],E=!!f.toggleable&&(f.onToggle?f.collapsed:y[0]),x=e.useRef(null),N=e.useRef(null),O=d+"_header",P=d+"_content",I=function(e){f.toggleable&&(E?C(e):j(e),f.onToggle&&f.onToggle({originalEvent:e,value:!E})),e.preventDefault()},C=function(e){f.onToggle||h(!1),f.onExpand&&f.onExpand(e)},j=function(e){f.onToggle||h(!0),f.onCollapse&&f.onCollapse(e)};n((function(){f.id||m(o())}));var S=function(){if(f.toggleable){var t="p-fieldset-toggler";return i.getJSXIcon(E?f.expandIcon||e.createElement(s,{className:t}):f.collapseIcon||e.createElement(c,{className:t}),{className:t},{props:f})}return null},T=function(){if(f.toggleable){var t=S();return e.createElement("a",{href:"#"+P,"aria-controls":P,id:O,"aria-expanded":!E,tabIndex:f.toggleable?null:-1},t,e.createElement("span",{className:"p-fieldset-legend-text"},f.legend),e.createElement(l,null))}return e.createElement("span",{className:"p-fieldset-legend-text",id:O},f.legend)};e.useImperativeHandle(p,(function(){return{props:f,getElement:function(){return x.current},getContent:function(){return N.current}}}));var w=v.getOtherProps(f),A=a("p-fieldset p-component",{"p-fieldset-toggleable":f.toggleable},f.className),k=function(){if(null!=f.legend||f.toggleable){var t=T();return e.createElement("legend",{className:"p-fieldset-legend p-unselectable-text",onClick:I},t)}}(),R=e.createElement(t,{nodeRef:N,classNames:"p-toggleable-content",timeout:{enter:1e3,exit:450},in:!E,unmountOnExit:!0,options:f.transitionOptions},e.createElement("div",{ref:N,id:P,className:"p-toggleable-content","aria-hidden":E,role:"region","aria-labelledby":O},e.createElement("div",{className:"p-fieldset-content"},f.children)));return e.createElement("fieldset",u({id:d,ref:x,className:A,style:f.style},w,{onClick:f.onClick}),k,R)}));y.displayName="Fieldset";export{y as Fieldset};
+import*as e from"react";import{CSSTransition as t}from"primereact/csstransition";import{useMountEffect as n}from"primereact/hooks";import{Ripple as l}from"primereact/ripple";import{UniqueComponentId as r,mergeProps as o,classNames as a,IconUtils as i}from"primereact/utils";import{ComponentBase as c}from"primereact/componentbase";import{PlusIcon as s}from"primereact/icons/plus";import{MinusIcon as u}from"primereact/icons/minus";function p(){return p=Object.assign?Object.assign.bind():function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var l in n)Object.prototype.hasOwnProperty.call(n,l)&&(e[l]=n[l])}return e},p.apply(this,arguments)}function g(e){if(Array.isArray(e))return e}function f(e,t){var n=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=n){var l,r,o,a,i=[],c=!0,s=!1;try{if(o=(n=n.call(e)).next,0===t){if(Object(n)!==n)return;c=!1}else for(;!(c=(l=o.call(n)).done)&&(i.push(l.value),i.length!==t);c=!0);}catch(e){s=!0,r=e}finally{try{if(!c&&null!=n.return&&(a=n.return(),Object(a)!==a))return}finally{if(s)throw r}}return i}}function d(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,l=new Array(t);n<t;n++)l[n]=e[n];return l}function m(e,t){if(e){if("string"==typeof e)return d(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);return"Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n?Array.from(e):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?d(e,t):void 0}}function b(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function v(e,t){return g(e)||f(e,t)||m(e,t)||b()}var y=c.extend({defaultProps:{__TYPE:"Fieldset",id:null,legend:null,className:null,style:null,toggleable:null,collapsed:null,collapseIcon:null,transitionOptions:null,expandIcon:null,onExpand:null,onCollapse:null,onToggle:null,onClick:null,children:void 0}}),h=e.forwardRef((function(c,g){var f=y.getProps(c),d=v(e.useState(f.id),2),m=d[0],b=d[1],h=v(e.useState(f.collapsed),2),E=h[1],x=!!f.toggleable&&(f.onToggle?f.collapsed:h[0]),O=e.useRef(null),C=e.useRef(null),I=m+"_header",N=m+"_content",T=y.setMetaData({props:f,state:{id:m,collapsed:x}}).ptm,j=function(e){f.toggleable&&(x?S(e):w(e),f.onToggle&&f.onToggle({originalEvent:e,value:!x})),e.preventDefault()},S=function(e){f.onToggle||E(!1),f.onExpand&&f.onExpand(e)},w=function(e){f.onToggle||E(!0),f.onCollapse&&f.onCollapse(e)};n((function(){f.id||b(r())}));var A=function(){if(f.toggleable){var t=o({className:"p-fieldset-toggler"},T("togglericon"));return i.getJSXIcon(x?f.expandIcon||e.createElement(s,t):f.collapseIcon||e.createElement(u,t),t,{props:f})}return null},k=function(){var t=o({className:"p-fieldset-legend-text"},T("legendTitle")),n=o({id:I,"aria-expanded":!x,"aria-controls":N,href:"#"+N,tabIndex:f.toggleable?null:-1},T("toggler"));if(f.toggleable){var r=A();return e.createElement("a",n,r,e.createElement("span",t,f.legend),e.createElement(l,null))}return e.createElement("span",p({},t,{id:I}),f.legend)};e.useImperativeHandle(g,(function(){return{props:f,getElement:function(){return O.current},getContent:function(){return C.current}}}));var P,R,_=o({id:m,ref:O,style:f.style,className:a("p-fieldset p-component",{"p-fieldset-toggleable":f.toggleable},f.className),onClick:f.onClick},y.getOtherProps(f),T("root")),D=function(){var t=o({className:"p-fieldset-legend p-unselectable-text",onClick:j},T("legend"));if(null!=f.legend||f.toggleable){var n=k();return e.createElement("legend",t,n)}}(),F=(P=o({className:"p-fieldset-content"},T("content")),R=o({ref:C,id:N,"aria-hidden":x,role:"region","aria-labelledby":I,className:"p-toggleable-content"},T("toggleableContent")),e.createElement(t,{nodeRef:C,classNames:"p-toggleable-content",timeout:{enter:1e3,exit:450},in:!x,unmountOnExit:!0,options:f.transitionOptions},e.createElement("div",R,e.createElement("div",P,f.children))));return e.createElement("fieldset",_,D,F)}));h.displayName="Fieldset";export{h as Fieldset};

package/fieldset/fieldset.js

@@ -1,5 +1,5 @@
 this.primereact = this.primereact || {};
-this.primereact.fieldset = (function (exports, React, csstransition, hooks, ripple, utils, plus, minus) {
+this.primereact.fieldset = (function (exports, React, csstransition, hooks, ripple, utils, componentbase, plus, minus) {
   'use strict';
 
   function _interopNamespace(e) {
@@ -92,7 +92,7 @@ this.primereact.fieldset = (function (exports, React, csstransition, hooks, ripp
     return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
   }
 
-  var FieldsetBase = {
+  var FieldsetBase = componentbase.ComponentBase.extend({
     defaultProps: {
       __TYPE: 'Fieldset',
       id: null,
@@ -109,14 +109,8 @@ this.primereact.fieldset = (function (exports, React, csstransition, hooks, ripp
       onToggle: null,
       onClick: null,
       children: undefined
-    },
-    getProps: function getProps(props) {
-      return utils.ObjectUtils.getMergedProps(props, FieldsetBase.defaultProps);
-    },
-    getOtherProps: function getOtherProps(props) {
-      return utils.ObjectUtils.getDiffProps(props, FieldsetBase.defaultProps);
     }
-  };
+  });
 
   var Fieldset = /*#__PURE__*/React__namespace.forwardRef(function (inProps, ref) {
     var props = FieldsetBase.getProps(inProps);
@@ -133,6 +127,14 @@ this.primereact.fieldset = (function (exports, React, csstransition, hooks, ripp
     var contentRef = React__namespace.useRef(null);
     var headerId = idState + '_header';
     var contentId = idState + '_content';
+    var _FieldsetBase$setMeta = FieldsetBase.setMetaData({
+        props: props,
+        state: {
+          id: idState,
+          collapsed: collapsed
+        }
+      }),
+      ptm = _FieldsetBase$setMeta.ptm;
     var toggle = function toggle(event) {
       if (props.toggleable) {
         collapsed ? expand(event) : collapse(event);
@@ -163,6 +165,17 @@ this.primereact.fieldset = (function (exports, React, csstransition, hooks, ripp
       }
     });
     var createContent = function createContent() {
+      var contentProps = utils.mergeProps({
+        className: 'p-fieldset-content'
+      }, ptm('content'));
+      var toggleableProps = utils.mergeProps({
+        ref: contentRef,
+        id: contentId,
+        'aria-hidden': collapsed,
+        role: 'region',
+        'aria-labelledby': headerId,
+        className: 'p-toggleable-content'
+      }, ptm('toggleableContent'));
       return /*#__PURE__*/React__namespace.createElement(csstransition.CSSTransition, {
         nodeRef: contentRef,
         classNames: "p-toggleable-content",
@@ -173,28 +186,15 @@ this.primereact.fieldset = (function (exports, React, csstransition, hooks, ripp
         "in": !collapsed,
         unmountOnExit: true,
         options: props.transitionOptions
-      }, /*#__PURE__*/React__namespace.createElement("div", {
-        ref: contentRef,
-        id: contentId,
-        className: "p-toggleable-content",
-        "aria-hidden": collapsed,
-        role: "region",
-        "aria-labelledby": headerId
-      }, /*#__PURE__*/React__namespace.createElement("div", {
-        className: "p-fieldset-content"
-      }, props.children)));
+      }, /*#__PURE__*/React__namespace.createElement("div", toggleableProps, /*#__PURE__*/React__namespace.createElement("div", contentProps, props.children)));
     };
     var createToggleIcon = function createToggleIcon() {
       if (props.toggleable) {
-        var iconClassName = 'p-fieldset-toggler';
-        var icon = collapsed ? props.expandIcon || /*#__PURE__*/React__namespace.createElement(plus.PlusIcon, {
-          className: iconClassName
-        }) : props.collapseIcon || /*#__PURE__*/React__namespace.createElement(minus.MinusIcon, {
-          className: iconClassName
-        });
-        var toggleIcon = utils.IconUtils.getJSXIcon(icon, {
-          className: iconClassName
-        }, {
+        var togglerIconProps = utils.mergeProps({
+          className: 'p-fieldset-toggler'
+        }, ptm('togglericon'));
+        var icon = collapsed ? props.expandIcon || /*#__PURE__*/React__namespace.createElement(plus.PlusIcon, togglerIconProps) : props.collapseIcon || /*#__PURE__*/React__namespace.createElement(minus.MinusIcon, togglerIconProps);
+        var toggleIcon = utils.IconUtils.getJSXIcon(icon, togglerIconProps, {
           props: props
         });
         return toggleIcon;
@@ -202,30 +202,32 @@ this.primereact.fieldset = (function (exports, React, csstransition, hooks, ripp
       return null;
     };
     var createLegendContent = function createLegendContent() {
+      var legendTextProps = utils.mergeProps({
+        className: 'p-fieldset-legend-text'
+      }, ptm('legendTitle'));
+      var togglerProps = utils.mergeProps({
+        id: headerId,
+        'aria-expanded': !collapsed,
+        'aria-controls': contentId,
+        href: '#' + contentId,
+        tabIndex: props.toggleable ? null : -1
+      }, ptm('toggler'));
       if (props.toggleable) {
         var toggleIcon = createToggleIcon();
-        return /*#__PURE__*/React__namespace.createElement("a", {
-          href: '#' + contentId,
-          "aria-controls": contentId,
-          id: headerId,
-          "aria-expanded": !collapsed,
-          tabIndex: props.toggleable ? null : -1
-        }, toggleIcon, /*#__PURE__*/React__namespace.createElement("span", {
-          className: "p-fieldset-legend-text"
-        }, props.legend), /*#__PURE__*/React__namespace.createElement(ripple.Ripple, null));
+        return /*#__PURE__*/React__namespace.createElement("a", togglerProps, toggleIcon, /*#__PURE__*/React__namespace.createElement("span", legendTextProps, props.legend), /*#__PURE__*/React__namespace.createElement(ripple.Ripple, null));
       }
-      return /*#__PURE__*/React__namespace.createElement("span", {
-        className: "p-fieldset-legend-text",
+      return /*#__PURE__*/React__namespace.createElement("span", _extends({}, legendTextProps, {
         id: headerId
-      }, props.legend);
+      }), props.legend);
     };
     var createLegend = function createLegend() {
+      var legendProps = utils.mergeProps({
+        className: 'p-fieldset-legend p-unselectable-text',
+        onClick: toggle
+      }, ptm('legend'));
       if (props.legend != null || props.toggleable) {
         var legendContent = createLegendContent();
-        return /*#__PURE__*/React__namespace.createElement("legend", {
-          className: "p-fieldset-legend p-unselectable-text",
-          onClick: toggle
-        }, legendContent);
+        return /*#__PURE__*/React__namespace.createElement("legend", legendProps, legendContent);
       }
     };
     React__namespace.useImperativeHandle(ref, function () {
@@ -239,20 +241,18 @@ this.primereact.fieldset = (function (exports, React, csstransition, hooks, ripp
         }
       };
     });
-    var otherProps = FieldsetBase.getOtherProps(props);
-    var className = utils.classNames('p-fieldset p-component', {
-      'p-fieldset-toggleable': props.toggleable
-    }, props.className);
-    var legend = createLegend();
-    var content = createContent();
-    return /*#__PURE__*/React__namespace.createElement("fieldset", _extends({
+    var rootProps = utils.mergeProps({
       id: idState,
       ref: elementRef,
-      className: className,
-      style: props.style
-    }, otherProps, {
+      style: props.style,
+      className: utils.classNames('p-fieldset p-component', {
+        'p-fieldset-toggleable': props.toggleable
+      }, props.className),
       onClick: props.onClick
-    }), legend, content);
+    }, FieldsetBase.getOtherProps(props), ptm('root'));
+    var legend = createLegend();
+    var content = createContent();
+    return /*#__PURE__*/React__namespace.createElement("fieldset", rootProps, legend, content);
   });
   Fieldset.displayName = 'Fieldset';
 
@@ -262,4 +262,4 @@ this.primereact.fieldset = (function (exports, React, csstransition, hooks, ripp
 
   return exports;
 
-})({}, React, primereact.csstransition, primereact.hooks, primereact.ripple, primereact.utils, primereact.icons.plus, primereact.icons.minus);
+})({}, React, primereact.csstransition, primereact.hooks, primereact.ripple, primereact.utils, primereact.componentbase, primereact.icons.plus, primereact.icons.minus);

package/fieldset/fieldset.min.js

@@ -1 +1 @@
-this.primereact=this.primereact||{},this.primereact.fieldset=function(e,t,n,l,r,o,a,i){"use strict";function c(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(n){if("default"!==n){var l=Object.getOwnPropertyDescriptor(e,n);Object.defineProperty(t,n,l.get?l:{enumerable:!0,get:function(){return e[n]}})}})),t.default=e,Object.freeze(t)}var s=c(t);function u(){return u=Object.assign?Object.assign.bind():function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var l in n)Object.prototype.hasOwnProperty.call(n,l)&&(e[l]=n[l])}return e},u.apply(this,arguments)}function p(e){if(Array.isArray(e))return e}function f(e,t){var n=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=n){var l,r,o,a,i=[],c=!0,s=!1;try{if(o=(n=n.call(e)).next,0===t){if(Object(n)!==n)return;c=!1}else for(;!(c=(l=o.call(n)).done)&&(i.push(l.value),i.length!==t);c=!0);}catch(e){s=!0,r=e}finally{try{if(!c&&null!=n.return&&(a=n.return(),Object(a)!==a))return}finally{if(s)throw r}}return i}}function d(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,l=new Array(t);n<t;n++)l[n]=e[n];return l}function g(e,t){if(e){if("string"==typeof e)return d(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);return"Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n?Array.from(e):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?d(e,t):void 0}}function m(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function b(e,t){return p(e)||f(e,t)||g(e,t)||m()}var v={defaultProps:{__TYPE:"Fieldset",id:null,legend:null,className:null,style:null,toggleable:null,collapsed:null,collapseIcon:null,transitionOptions:null,expandIcon:null,onExpand:null,onCollapse:null,onToggle:null,onClick:null,children:void 0},getProps:function(e){return o.ObjectUtils.getMergedProps(e,v.defaultProps)},getOtherProps:function(e){return o.ObjectUtils.getDiffProps(e,v.defaultProps)}},y=s.forwardRef((function(e,t){var c=v.getProps(e),p=b(s.useState(c.id),2),f=p[0],d=p[1],g=b(s.useState(c.collapsed),2),m=g[1],y=!!c.toggleable&&(c.onToggle?c.collapsed:g[0]),h=s.useRef(null),O=s.useRef(null),E=f+"_header",j=f+"_content",P=function(e){c.toggleable&&(y?I(e):N(e),c.onToggle&&c.onToggle({originalEvent:e,value:!y})),e.preventDefault()},I=function(e){c.onToggle||m(!1),c.onExpand&&c.onExpand(e)},N=function(e){c.onToggle||m(!0),c.onCollapse&&c.onCollapse(e)};l.useMountEffect((function(){c.id||d(o.UniqueComponentId())}));var x=function(){if(c.toggleable){var e="p-fieldset-toggler";return o.IconUtils.getJSXIcon(y?c.expandIcon||s.createElement(a.PlusIcon,{className:e}):c.collapseIcon||s.createElement(i.MinusIcon,{className:e}),{className:e},{props:c})}return null},C=function(){if(c.toggleable){var e=x();return s.createElement("a",{href:"#"+j,"aria-controls":j,id:E,"aria-expanded":!y,tabIndex:c.toggleable?null:-1},e,s.createElement("span",{className:"p-fieldset-legend-text"},c.legend),s.createElement(r.Ripple,null))}return s.createElement("span",{className:"p-fieldset-legend-text",id:E},c.legend)};s.useImperativeHandle(t,(function(){return{props:c,getElement:function(){return h.current},getContent:function(){return O.current}}}));var S=v.getOtherProps(c),T=o.classNames("p-fieldset p-component",{"p-fieldset-toggleable":c.toggleable},c.className),_=function(){if(null!=c.legend||c.toggleable){var e=C();return s.createElement("legend",{className:"p-fieldset-legend p-unselectable-text",onClick:P},e)}}(),w=s.createElement(n.CSSTransition,{nodeRef:O,classNames:"p-toggleable-content",timeout:{enter:1e3,exit:450},in:!y,unmountOnExit:!0,options:c.transitionOptions},s.createElement("div",{ref:O,id:j,className:"p-toggleable-content","aria-hidden":y,role:"region","aria-labelledby":E},s.createElement("div",{className:"p-fieldset-content"},c.children)));return s.createElement("fieldset",u({id:f,ref:h,className:T,style:c.style},S,{onClick:c.onClick}),_,w)}));return y.displayName="Fieldset",e.Fieldset=y,Object.defineProperty(e,"__esModule",{value:!0}),e}({},React,primereact.csstransition,primereact.hooks,primereact.ripple,primereact.utils,primereact.icons.plus,primereact.icons.minus);
+this.primereact=this.primereact||{},this.primereact.fieldset=function(e,t,n,r,l,o,a,i,c){"use strict";function s(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(n){if("default"!==n){var r=Object.getOwnPropertyDescriptor(e,n);Object.defineProperty(t,n,r.get?r:{enumerable:!0,get:function(){return e[n]}})}})),t.default=e,Object.freeze(t)}var u=s(t);function p(){return p=Object.assign?Object.assign.bind():function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},p.apply(this,arguments)}function g(e){if(Array.isArray(e))return e}function d(e,t){var n=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=n){var r,l,o,a,i=[],c=!0,s=!1;try{if(o=(n=n.call(e)).next,0===t){if(Object(n)!==n)return;c=!1}else for(;!(c=(r=o.call(n)).done)&&(i.push(r.value),i.length!==t);c=!0);}catch(e){s=!0,l=e}finally{try{if(!c&&null!=n.return&&(a=n.return(),Object(a)!==a))return}finally{if(s)throw l}}return i}}function f(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r}function m(e,t){if(e){if("string"==typeof e)return f(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);return"Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n?Array.from(e):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?f(e,t):void 0}}function b(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function v(e,t){return g(e)||d(e,t)||m(e,t)||b()}var y=a.ComponentBase.extend({defaultProps:{__TYPE:"Fieldset",id:null,legend:null,className:null,style:null,toggleable:null,collapsed:null,collapseIcon:null,transitionOptions:null,expandIcon:null,onExpand:null,onCollapse:null,onToggle:null,onClick:null,children:void 0}}),h=u.forwardRef((function(e,t){var a=y.getProps(e),s=v(u.useState(a.id),2),g=s[0],d=s[1],f=v(u.useState(a.collapsed),2),m=f[1],b=!!a.toggleable&&(a.onToggle?a.collapsed:f[0]),h=u.useRef(null),E=u.useRef(null),O=g+"_header",P=g+"_content",j=y.setMetaData({props:a,state:{id:g,collapsed:b}}).ptm,I=function(e){a.toggleable&&(b?x(e):C(e),a.onToggle&&a.onToggle({originalEvent:e,value:!b})),e.preventDefault()},x=function(e){a.onToggle||m(!1),a.onExpand&&a.onExpand(e)},C=function(e){a.onToggle||m(!0),a.onCollapse&&a.onCollapse(e)};r.useMountEffect((function(){a.id||d(o.UniqueComponentId())}));var N=function(){if(a.toggleable){var e=o.mergeProps({className:"p-fieldset-toggler"},j("togglericon"));return o.IconUtils.getJSXIcon(b?a.expandIcon||u.createElement(i.PlusIcon,e):a.collapseIcon||u.createElement(c.MinusIcon,e),e,{props:a})}return null},S=function(){var e=o.mergeProps({className:"p-fieldset-legend-text"},j("legendTitle")),t=o.mergeProps({id:O,"aria-expanded":!b,"aria-controls":P,href:"#"+P,tabIndex:a.toggleable?null:-1},j("toggler"));if(a.toggleable){var n=N();return u.createElement("a",t,n,u.createElement("span",e,a.legend),u.createElement(l.Ripple,null))}return u.createElement("span",p({},e,{id:O}),a.legend)};u.useImperativeHandle(t,(function(){return{props:a,getElement:function(){return h.current},getContent:function(){return E.current}}}));var T,_,w=o.mergeProps({id:g,ref:h,style:a.style,className:o.classNames("p-fieldset p-component",{"p-fieldset-toggleable":a.toggleable},a.className),onClick:a.onClick},y.getOtherProps(a),j("root")),k=function(){var e=o.mergeProps({className:"p-fieldset-legend p-unselectable-text",onClick:I},j("legend"));if(null!=a.legend||a.toggleable){var t=S();return u.createElement("legend",e,t)}}(),A=(T=o.mergeProps({className:"p-fieldset-content"},j("content")),_=o.mergeProps({ref:E,id:P,"aria-hidden":b,role:"region","aria-labelledby":O,className:"p-toggleable-content"},j("toggleableContent")),u.createElement(n.CSSTransition,{nodeRef:E,classNames:"p-toggleable-content",timeout:{enter:1e3,exit:450},in:!b,unmountOnExit:!0,options:a.transitionOptions},u.createElement("div",_,u.createElement("div",T,a.children))));return u.createElement("fieldset",w,k,A)}));return h.displayName="Fieldset",e.Fieldset=h,Object.defineProperty(e,"__esModule",{value:!0}),e}({},React,primereact.csstransition,primereact.hooks,primereact.ripple,primereact.utils,primereact.componentbase,primereact.icons.plus,primereact.icons.minus);