From d5625feea80e871ca662a72d450dcd0659967739 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <>
Date: Sun, 18 Feb 2024 15:08:51 +0000
Subject: [PATCH] Update API doc

---
 components/doc/common/apidoc/index.json | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/components/doc/common/apidoc/index.json b/components/doc/common/apidoc/index.json
index 7264ba2359..727c56b467 100644
--- a/components/doc/common/apidoc/index.json
+++ b/components/doc/common/apidoc/index.json
@@ -39798,13 +39798,15 @@
                             "name": "mergeSections",
                             "optional": true,
                             "readonly": false,
-                            "type": "boolean"
+                            "type": "boolean",
+                            "description": "Should the passthrough merge sections?"
                         },
                         {
                             "name": "mergeProps",
                             "optional": true,
                             "readonly": false,
-                            "type": "boolean"
+                            "type": "boolean",
+                            "description": "Should the passthrough merge properties?"
                         },
                         {
                             "name": "classNameMergeFunction",
@@ -54509,19 +54511,22 @@
                     ],
                     "returnType": "string | undefined"
                 },
-                "_mergeProps": {
-                    "name": "_mergeProps",
+                "mergeProps": {
+                    "name": "mergeProps",
                     "parameters": [
                         {
                             "name": "args",
-                            "type": "object[]"
+                            "type": "object[]",
+                            "description": "the array of object properties to merge"
                         },
                         {
                             "name": "options",
-                            "type": "any"
+                            "type": "PassThroughOptions",
+                            "description": "either empty or could contain a custom merge function like TailwindMerge"
                         }
                     ],
-                    "returnType": "object | undefined"
+                    "returnType": "object | undefined",
+                    "description": "Merges properties together taking an Array of props and merging into one single set of\nproperties. The options can contain a \"classNameMergeFunction\" which can be something\nlike Tailwind Merge for properly merging Tailwind classes."
                 },
                 "EventBus": {
                     "name": "EventBus",