Merge branch 'master' of https://github.com/primefaces/primereact

primefaces · Jul 29, 2024 · 63016c8 · 63016c8
2 parents 8eba2a1 + dd0e15a
commit 63016c8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 26 deletions.
diff --git a/components/doc/common/apidoc/index.json b/components/doc/common/apidoc/index.json
@@ -37071,13 +37071,6 @@
                             "type": "MultiSelectPassThroughType<HTMLAttributes<HTMLDivElement>>",
                             "description": "Uses to pass attributes to the header checkbox's container DOM element."
                         },
-                        {
-                            "name": "headerCheckboxIcon",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "MultiSelectPassThroughType<HTMLAttributes<HTMLSpanElement> | SVGProps<SVGSVGElement>>",
-                            "description": "Uses to pass attributes to the header checkbox icon's DOM element."
-                        },
                         {
                             "name": "headerSelectAllLabel",
                             "optional": true,
@@ -37166,16 +37159,9 @@
                             "name": "checkbox",
                             "optional": true,
                             "readonly": false,
-                            "type": "MultiSelectPassThroughType<HTMLAttributes<HTMLDivElement>>",
+                            "type": "CheckboxPassThroughOptions",
                             "description": "Uses to pass attributes to the checkbox's DOM element."
                         },
-                        {
-                            "name": "checkboxIcon",
-                            "optional": true,
-                            "readonly": false,
-                            "type": "MultiSelectPassThroughType<HTMLAttributes<HTMLSpanElement> | SVGProps<SVGSVGElement>>",
-                            "description": "Uses to pass attributes to the checkbox icon's DOM element."
-                        },
                         {
                             "name": "emptyMessage",
                             "optional": true,

diff --git a/components/lib/multiselect/MultiSelectHeader.js b/components/lib/multiselect/MultiSelectHeader.js
@@ -117,7 +117,7 @@ export const MultiSelectHeader = React.memo((props) => {
         {
             className: cx('headerCheckboxIcon')
         },
-        getPTOptions('headerCheckboxIcon')
+        getPTOptions('headerCheckbox.icon')
     );
 
     const headerCheckboxContainerProps = mergeProps(

diff --git a/components/lib/multiselect/MultiSelectItem.js b/components/lib/multiselect/MultiSelectItem.js
@@ -46,7 +46,7 @@ export const MultiSelectItem = React.memo((props) => {
         {
             className: cx('checkboxIcon')
         },
-        getPTOptions('checkboxIcon')
+        getPTOptions('checkbox.icon')
     );
 
     const icon = props.checkboxIcon || <CheckIcon {...checkboxIconProps} />;

diff --git a/components/lib/multiselect/multiselect.d.ts b/components/lib/multiselect/multiselect.d.ts
@@ -96,10 +96,6 @@ export interface MultiSelectPassThroughOptions {
      * Uses to pass attributes to the header checkbox's container DOM element.
      */
     headerCheckboxContainer?: MultiSelectPassThroughType<React.HTMLAttributes<HTMLDivElement>>;
-    /**
-     * Uses to pass attributes to the header checkbox icon's DOM element.
-     */
-    headerCheckboxIcon?: MultiSelectPassThroughType<React.SVGProps<SVGSVGElement> | React.HTMLAttributes<HTMLSpanElement>>;
     /**
      * Uses to pass attributes to the header checkbox's DOM element.
      */
@@ -152,11 +148,7 @@ export interface MultiSelectPassThroughOptions {
     /**
      * Uses to pass attributes to the checkbox's DOM element.
      */
-    checkbox?: MultiSelectPassThroughType<React.HTMLAttributes<HTMLDivElement>>;
-    /**
-     * Uses to pass attributes to the checkbox icon's DOM element.
-     */
-    checkboxIcon?: MultiSelectPassThroughType<React.SVGProps<SVGSVGElement> | React.HTMLAttributes<HTMLSpanElement>>;
+    checkbox?: CheckboxPassThroughOptions;
     /**
      * Uses to pass attributes to the emptyMessage's DOM element.
      */