diff --git a/src/TreeSelect.tsx b/src/TreeSelect.tsx
index e8046954..065b9f6f 100644
--- a/src/TreeSelect.tsx
+++ b/src/TreeSelect.tsx
@@ -34,6 +34,7 @@ import type {
   DefaultValueType,
   FieldNames,
   LegacyDataNode,
+  DefaultOptionType,
 } from './interface';
 
 export interface TreeSelectProps<ValueType = any, OptionType extends DataNode = DataNode>
@@ -45,7 +46,11 @@ export interface TreeSelectProps<ValueType = any, OptionType extends DataNode =
   // >>> Value
   value?: ValueType;
   defaultValue?: ValueType;
-  onChange?: (value: ValueType, labelList: React.ReactNode[], extra: ChangeEventExtra) => void;
+  onChange?: (
+    value: ValueType,
+    labelList: React.ReactNode[],
+    extra: ChangeEventExtra & { option?: DefaultOptionType },
+  ) => void;
 
   // >>> Search
   searchValue?: string;
@@ -410,7 +415,7 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
   const triggerChange = useRefFunc(
     (
       newRawValues: SafeKey[],
-      extra: { triggerValue?: SafeKey; selected?: boolean },
+      extra: { triggerValue?: SafeKey; selected?: boolean; nodes?: DefaultOptionType },
       source: SelectSource,
     ) => {
       const labeledValues = convert2LabelValues(newRawValues);
@@ -456,7 +461,8 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
           // [Legacy] Always return as array contains label & value
           preValue: rawLabeledValues,
           triggerValue,
-        } as ChangeEventExtra;
+          option: extra.nodes,
+        } as ChangeEventExtra & { option?: DefaultOptionType };
 
         // [Legacy] Fill legacy data if user query.
         // This is expansive that we only fill when user query
@@ -505,7 +511,11 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
       // Never be falsy but keep it safe
       if (!mergedMultiple) {
         // Single mode always set value
-        triggerChange([selectedValue], { selected: true, triggerValue: selectedValue }, 'option');
+        triggerChange(
+          [selectedValue],
+          { selected: true, triggerValue: selectedValue, nodes: node as DefaultOptionType },
+          'option',
+        );
       } else {
         let newRawValues = selected
           ? [...rawValues, selectedValue]
@@ -535,7 +545,11 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
             ...checkedKeys.map(key => keyEntities[key as SafeKey].node[mergedFieldNames.value]),
           ];
         }
-        triggerChange(newRawValues, { selected, triggerValue: selectedValue }, source || 'option');
+        triggerChange(
+          newRawValues,
+          { selected, triggerValue: selectedValue, nodes: node as DefaultOptionType },
+          source || 'option',
+        );
       }
 
       // Trigger select event
diff --git a/src/interface.ts b/src/interface.ts
index ccacc8cb..54d3ed88 100644
--- a/src/interface.ts
+++ b/src/interface.ts
@@ -3,6 +3,19 @@ import type { SafeKey, Key, DataNode as TreeDataNode } from 'rc-tree/lib/interfa
 
 export type { SafeKey, Key };
 
+export interface BaseOptionType {
+  disabled?: boolean;
+  className?: string;
+  title?: string;
+  [name: string]: any;
+}
+
+export interface DefaultOptionType extends BaseOptionType {
+  label?: React.ReactNode;
+  value?: string | number | null;
+  children?: Omit<DefaultOptionType, 'children'>[];
+}
+
 export interface DataNode extends Record<string, any>, Omit<TreeDataNode, 'key' | 'children'> {
   key?: Key;
   value?: SafeKey;
diff --git a/tests/Select.props.spec.js b/tests/Select.props.spec.js
index 6055a84a..3f576d73 100644
--- a/tests/Select.props.spec.js
+++ b/tests/Select.props.spec.js
@@ -310,6 +310,24 @@ describe('TreeSelect.props', () => {
   });
 
   describe('showCheckedStrategy', () => {
+    const treeData = {
+      key: 'key 0',
+      title: 'Title 0',
+      value: 'Value 0',
+      children: [
+        {
+          key: 'key 0-0',
+          title: 'Title 0-0',
+          value: 'Value 0-0',
+        },
+        {
+          key: 'key 0-1',
+          title: 'Title 0-1',
+          value: 'Value 0-1',
+        },
+      ],
+    };
+
     const testList = [
       {
         strategy: SHOW_ALL,
@@ -324,6 +342,7 @@ describe('TreeSelect.props', () => {
             }),
           ],
           checked: true,
+          option: expect.objectContaining(treeData),
           preValue: [],
           triggerNode: expect.anything(),
           triggerValue: 'Value 0',
@@ -342,6 +361,7 @@ describe('TreeSelect.props', () => {
             }),
           ],
           checked: true,
+          option: expect.objectContaining(treeData),
           preValue: [],
           triggerNode: expect.anything(),
           triggerValue: 'Value 0',
@@ -360,6 +380,7 @@ describe('TreeSelect.props', () => {
             }),
           ],
           checked: true,
+          option: expect.objectContaining(treeData),
           preValue: [],
           triggerNode: expect.anything(),
           triggerValue: 'Value 0',
diff --git a/tests/__snapshots__/Select.checkable.spec.tsx.snap b/tests/__snapshots__/Select.checkable.spec.tsx.snap
index 5fc75a90..1f498737 100644
--- a/tests/__snapshots__/Select.checkable.spec.tsx.snap
+++ b/tests/__snapshots__/Select.checkable.spec.tsx.snap
@@ -8,121 +8,125 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 1
     <div
       class="rc-tree-select-selector"
     >
-      <div
-        class="rc-tree-select-selection-overflow"
+      <span
+        class="rc-tree-select-selection-wrap"
       >
         <div
-          class="rc-tree-select-selection-overflow-item"
-          style="opacity: 1;"
+          class="rc-tree-select-selection-overflow"
         >
-          <span
-            class="rc-tree-select-selection-item"
-            title="0"
+          <div
+            class="rc-tree-select-selection-overflow-item"
+            style="opacity: 1;"
           >
             <span
-              class="rc-tree-select-selection-item-content"
-            >
-              0
-            </span>
-            <span
-              aria-hidden="true"
-              class="rc-tree-select-selection-item-remove"
-              style="user-select: none;"
-              unselectable="on"
+              class="rc-tree-select-selection-item"
+              title="0"
             >
               <span
-                class="rc-tree-select-selection-item-remove-icon"
+                class="rc-tree-select-selection-item-content"
+              >
+                0
+              </span>
+              <span
+                aria-hidden="true"
+                class="rc-tree-select-selection-item-remove"
+                style="user-select: none;"
+                unselectable="on"
               >
-                ×
+                <span
+                  class="rc-tree-select-selection-item-remove-icon"
+                >
+                  ×
+                </span>
               </span>
             </span>
-          </span>
-        </div>
-        <div
-          class="rc-tree-select-selection-overflow-item"
-          style="opacity: 1;"
-        >
-          <span
-            class="rc-tree-select-selection-item"
-            title="0-0"
+          </div>
+          <div
+            class="rc-tree-select-selection-overflow-item"
+            style="opacity: 1;"
           >
             <span
-              class="rc-tree-select-selection-item-content"
-            >
-              0-0
-            </span>
-            <span
-              aria-hidden="true"
-              class="rc-tree-select-selection-item-remove"
-              style="user-select: none;"
-              unselectable="on"
+              class="rc-tree-select-selection-item"
+              title="0-0"
             >
               <span
-                class="rc-tree-select-selection-item-remove-icon"
+                class="rc-tree-select-selection-item-content"
+              >
+                0-0
+              </span>
+              <span
+                aria-hidden="true"
+                class="rc-tree-select-selection-item-remove"
+                style="user-select: none;"
+                unselectable="on"
               >
-                ×
+                <span
+                  class="rc-tree-select-selection-item-remove-icon"
+                >
+                  ×
+                </span>
               </span>
             </span>
-          </span>
-        </div>
-        <div
-          class="rc-tree-select-selection-overflow-item"
-          style="opacity: 1;"
-        >
-          <span
-            class="rc-tree-select-selection-item"
-            title="0-0-0"
+          </div>
+          <div
+            class="rc-tree-select-selection-overflow-item"
+            style="opacity: 1;"
           >
             <span
-              class="rc-tree-select-selection-item-content"
-            >
-              0-0-0
-            </span>
-            <span
-              aria-hidden="true"
-              class="rc-tree-select-selection-item-remove"
-              style="user-select: none;"
-              unselectable="on"
+              class="rc-tree-select-selection-item"
+              title="0-0-0"
             >
               <span
-                class="rc-tree-select-selection-item-remove-icon"
+                class="rc-tree-select-selection-item-content"
+              >
+                0-0-0
+              </span>
+              <span
+                aria-hidden="true"
+                class="rc-tree-select-selection-item-remove"
+                style="user-select: none;"
+                unselectable="on"
               >
-                ×
+                <span
+                  class="rc-tree-select-selection-item-remove-icon"
+                >
+                  ×
+                </span>
               </span>
             </span>
-          </span>
-        </div>
-        <div
-          class="rc-tree-select-selection-overflow-item rc-tree-select-selection-overflow-item-suffix"
-          style="opacity: 1;"
-        >
+          </div>
           <div
-            class="rc-tree-select-selection-search"
-            style="width: 0px;"
+            class="rc-tree-select-selection-overflow-item rc-tree-select-selection-overflow-item-suffix"
+            style="opacity: 1;"
           >
-            <input
-              aria-autocomplete="list"
-              aria-controls="rc_select_TEST_OR_SSR_list"
-              aria-expanded="true"
-              aria-haspopup="listbox"
-              aria-owns="rc_select_TEST_OR_SSR_list"
-              autocomplete="off"
-              class="rc-tree-select-selection-search-input"
-              id="rc_select_TEST_OR_SSR"
-              role="combobox"
-              style=""
-              type="search"
-              value=""
-            />
-            <span
-              aria-hidden="true"
-              class="rc-tree-select-selection-search-mirror"
+            <div
+              class="rc-tree-select-selection-search"
+              style="width: 0px;"
             >
-               
-            </span>
+              <input
+                aria-autocomplete="list"
+                aria-controls="rc_select_TEST_OR_SSR_list"
+                aria-expanded="true"
+                aria-haspopup="listbox"
+                aria-owns="rc_select_TEST_OR_SSR_list"
+                autocomplete="off"
+                class="rc-tree-select-selection-search-input"
+                id="rc_select_TEST_OR_SSR"
+                role="combobox"
+                style=""
+                type="search"
+                value=""
+              />
+              <span
+                aria-hidden="true"
+                class="rc-tree-select-selection-search-mirror"
+              >
+                 
+              </span>
+            </div>
           </div>
         </div>
-      </div>
+      </span>
     </div>
     <div
       class="rc-tree-select-dropdown rc-tree-select-dropdown-placement-bottomLeft"
@@ -286,43 +290,47 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 2
     <div
       class="rc-tree-select-selector"
     >
-      <div
-        class="rc-tree-select-selection-overflow"
+      <span
+        class="rc-tree-select-selection-wrap"
       >
         <div
-          class="rc-tree-select-selection-overflow-item rc-tree-select-selection-overflow-item-suffix"
-          style="opacity: 1;"
+          class="rc-tree-select-selection-overflow"
         >
           <div
-            class="rc-tree-select-selection-search"
-            style="width: 0px;"
+            class="rc-tree-select-selection-overflow-item rc-tree-select-selection-overflow-item-suffix"
+            style="opacity: 1;"
           >
-            <input
-              aria-autocomplete="list"
-              aria-controls="rc_select_TEST_OR_SSR_list"
-              aria-expanded="true"
-              aria-haspopup="listbox"
-              aria-owns="rc_select_TEST_OR_SSR_list"
-              autocomplete="off"
-              class="rc-tree-select-selection-search-input"
-              id="rc_select_TEST_OR_SSR"
-              role="combobox"
-              style=""
-              type="search"
-              value=""
-            />
-            <span
-              aria-hidden="true"
-              class="rc-tree-select-selection-search-mirror"
+            <div
+              class="rc-tree-select-selection-search"
+              style="width: 0px;"
             >
-               
-            </span>
+              <input
+                aria-autocomplete="list"
+                aria-controls="rc_select_TEST_OR_SSR_list"
+                aria-expanded="true"
+                aria-haspopup="listbox"
+                aria-owns="rc_select_TEST_OR_SSR_list"
+                autocomplete="off"
+                class="rc-tree-select-selection-search-input"
+                id="rc_select_TEST_OR_SSR"
+                role="combobox"
+                style=""
+                type="search"
+                value=""
+              />
+              <span
+                aria-hidden="true"
+                class="rc-tree-select-selection-search-mirror"
+              >
+                 
+              </span>
+            </div>
           </div>
         </div>
-      </div>
-      <span
-        class="rc-tree-select-selection-placeholder"
-      />
+        <span
+          class="rc-tree-select-selection-placeholder"
+        />
+      </span>
     </div>
     <div
       class="rc-tree-select-dropdown rc-tree-select-dropdown-placement-bottomLeft"
@@ -486,121 +494,125 @@ exports[`TreeSelect.checkable uncheck remove by tree check 1`] = `
     <div
       class="rc-tree-select-selector"
     >
-      <div
-        class="rc-tree-select-selection-overflow"
+      <span
+        class="rc-tree-select-selection-wrap"
       >
         <div
-          class="rc-tree-select-selection-overflow-item"
-          style="opacity: 1;"
+          class="rc-tree-select-selection-overflow"
         >
-          <span
-            class="rc-tree-select-selection-item"
-            title="0"
+          <div
+            class="rc-tree-select-selection-overflow-item"
+            style="opacity: 1;"
           >
             <span
-              class="rc-tree-select-selection-item-content"
-            >
-              0
-            </span>
-            <span
-              aria-hidden="true"
-              class="rc-tree-select-selection-item-remove"
-              style="user-select: none;"
-              unselectable="on"
+              class="rc-tree-select-selection-item"
+              title="0"
             >
               <span
-                class="rc-tree-select-selection-item-remove-icon"
+                class="rc-tree-select-selection-item-content"
+              >
+                0
+              </span>
+              <span
+                aria-hidden="true"
+                class="rc-tree-select-selection-item-remove"
+                style="user-select: none;"
+                unselectable="on"
               >
-                ×
+                <span
+                  class="rc-tree-select-selection-item-remove-icon"
+                >
+                  ×
+                </span>
               </span>
             </span>
-          </span>
-        </div>
-        <div
-          class="rc-tree-select-selection-overflow-item"
-          style="opacity: 1;"
-        >
-          <span
-            class="rc-tree-select-selection-item"
-            title="0-0"
+          </div>
+          <div
+            class="rc-tree-select-selection-overflow-item"
+            style="opacity: 1;"
           >
             <span
-              class="rc-tree-select-selection-item-content"
-            >
-              0-0
-            </span>
-            <span
-              aria-hidden="true"
-              class="rc-tree-select-selection-item-remove"
-              style="user-select: none;"
-              unselectable="on"
+              class="rc-tree-select-selection-item"
+              title="0-0"
             >
               <span
-                class="rc-tree-select-selection-item-remove-icon"
+                class="rc-tree-select-selection-item-content"
+              >
+                0-0
+              </span>
+              <span
+                aria-hidden="true"
+                class="rc-tree-select-selection-item-remove"
+                style="user-select: none;"
+                unselectable="on"
               >
-                ×
+                <span
+                  class="rc-tree-select-selection-item-remove-icon"
+                >
+                  ×
+                </span>
               </span>
             </span>
-          </span>
-        </div>
-        <div
-          class="rc-tree-select-selection-overflow-item"
-          style="opacity: 1;"
-        >
-          <span
-            class="rc-tree-select-selection-item"
-            title="0-0-0"
+          </div>
+          <div
+            class="rc-tree-select-selection-overflow-item"
+            style="opacity: 1;"
           >
             <span
-              class="rc-tree-select-selection-item-content"
-            >
-              0-0-0
-            </span>
-            <span
-              aria-hidden="true"
-              class="rc-tree-select-selection-item-remove"
-              style="user-select: none;"
-              unselectable="on"
+              class="rc-tree-select-selection-item"
+              title="0-0-0"
             >
               <span
-                class="rc-tree-select-selection-item-remove-icon"
+                class="rc-tree-select-selection-item-content"
               >
-                ×
+                0-0-0
+              </span>
+              <span
+                aria-hidden="true"
+                class="rc-tree-select-selection-item-remove"
+                style="user-select: none;"
+                unselectable="on"
+              >
+                <span
+                  class="rc-tree-select-selection-item-remove-icon"
+                >
+                  ×
+                </span>
               </span>
             </span>
-          </span>
-        </div>
-        <div
-          class="rc-tree-select-selection-overflow-item rc-tree-select-selection-overflow-item-suffix"
-          style="opacity: 1;"
-        >
+          </div>
           <div
-            class="rc-tree-select-selection-search"
-            style="width: 0px;"
+            class="rc-tree-select-selection-overflow-item rc-tree-select-selection-overflow-item-suffix"
+            style="opacity: 1;"
           >
-            <input
-              aria-autocomplete="list"
-              aria-controls="rc_select_TEST_OR_SSR_list"
-              aria-expanded="true"
-              aria-haspopup="listbox"
-              aria-owns="rc_select_TEST_OR_SSR_list"
-              autocomplete="off"
-              class="rc-tree-select-selection-search-input"
-              id="rc_select_TEST_OR_SSR"
-              role="combobox"
-              style=""
-              type="search"
-              value="0"
-            />
-            <span
-              aria-hidden="true"
-              class="rc-tree-select-selection-search-mirror"
+            <div
+              class="rc-tree-select-selection-search"
+              style="width: 0px;"
             >
-              0 
-            </span>
+              <input
+                aria-autocomplete="list"
+                aria-controls="rc_select_TEST_OR_SSR_list"
+                aria-expanded="true"
+                aria-haspopup="listbox"
+                aria-owns="rc_select_TEST_OR_SSR_list"
+                autocomplete="off"
+                class="rc-tree-select-selection-search-input"
+                id="rc_select_TEST_OR_SSR"
+                role="combobox"
+                style=""
+                type="search"
+                value="0"
+              />
+              <span
+                aria-hidden="true"
+                class="rc-tree-select-selection-search-mirror"
+              >
+                0 
+              </span>
+            </div>
           </div>
         </div>
-      </div>
+      </span>
     </div>
     <div
       class="rc-tree-select-dropdown rc-tree-select-dropdown-placement-bottomLeft"
@@ -764,40 +776,44 @@ exports[`TreeSelect.checkable uncheck remove by tree check 2`] = `
     <div
       class="rc-tree-select-selector"
     >
-      <div
-        class="rc-tree-select-selection-overflow"
+      <span
+        class="rc-tree-select-selection-wrap"
       >
         <div
-          class="rc-tree-select-selection-overflow-item rc-tree-select-selection-overflow-item-suffix"
-          style="opacity: 1;"
+          class="rc-tree-select-selection-overflow"
         >
           <div
-            class="rc-tree-select-selection-search"
-            style="width: 0px;"
+            class="rc-tree-select-selection-overflow-item rc-tree-select-selection-overflow-item-suffix"
+            style="opacity: 1;"
           >
-            <input
-              aria-autocomplete="list"
-              aria-controls="rc_select_TEST_OR_SSR_list"
-              aria-expanded="true"
-              aria-haspopup="listbox"
-              aria-owns="rc_select_TEST_OR_SSR_list"
-              autocomplete="off"
-              class="rc-tree-select-selection-search-input"
-              id="rc_select_TEST_OR_SSR"
-              role="combobox"
-              style=""
-              type="search"
-              value="0"
-            />
-            <span
-              aria-hidden="true"
-              class="rc-tree-select-selection-search-mirror"
+            <div
+              class="rc-tree-select-selection-search"
+              style="width: 0px;"
             >
-              0 
-            </span>
+              <input
+                aria-autocomplete="list"
+                aria-controls="rc_select_TEST_OR_SSR_list"
+                aria-expanded="true"
+                aria-haspopup="listbox"
+                aria-owns="rc_select_TEST_OR_SSR_list"
+                autocomplete="off"
+                class="rc-tree-select-selection-search-input"
+                id="rc_select_TEST_OR_SSR"
+                role="combobox"
+                style=""
+                type="search"
+                value="0"
+              />
+              <span
+                aria-hidden="true"
+                class="rc-tree-select-selection-search-mirror"
+              >
+                0 
+              </span>
+            </div>
           </div>
         </div>
-      </div>
+      </span>
     </div>
     <div
       class="rc-tree-select-dropdown rc-tree-select-dropdown-placement-bottomLeft"
diff --git a/tests/__snapshots__/Select.multiple.spec.js.snap b/tests/__snapshots__/Select.multiple.spec.js.snap
index 083a80a8..3f5d9f8a 100644
--- a/tests/__snapshots__/Select.multiple.spec.js.snap
+++ b/tests/__snapshots__/Select.multiple.spec.js.snap
@@ -7,45 +7,49 @@ exports[`TreeSelect.multiple can hide search box by showSearch = false 1`] = `
   <div
     class="rc-tree-select-selector"
   >
-    <div
-      class="rc-tree-select-selection-overflow"
+    <span
+      class="rc-tree-select-selection-wrap"
     >
       <div
-        class="rc-tree-select-selection-overflow-item rc-tree-select-selection-overflow-item-suffix"
-        style="opacity: 1;"
+        class="rc-tree-select-selection-overflow"
       >
         <div
-          class="rc-tree-select-selection-search"
-          style="width: 0px;"
+          class="rc-tree-select-selection-overflow-item rc-tree-select-selection-overflow-item-suffix"
+          style="opacity: 1;"
         >
-          <input
-            aria-autocomplete="list"
-            aria-controls="rc_select_TEST_OR_SSR_list"
-            aria-expanded="false"
-            aria-haspopup="listbox"
-            aria-owns="rc_select_TEST_OR_SSR_list"
-            autocomplete="off"
-            class="rc-tree-select-selection-search-input"
-            id="rc_select_TEST_OR_SSR"
-            readonly=""
-            role="combobox"
-            style="opacity: 0;"
-            type="search"
-            unselectable="on"
-            value=""
-          />
-          <span
-            aria-hidden="true"
-            class="rc-tree-select-selection-search-mirror"
+          <div
+            class="rc-tree-select-selection-search"
+            style="width: 0px;"
           >
-             
-          </span>
+            <input
+              aria-autocomplete="list"
+              aria-controls="rc_select_TEST_OR_SSR_list"
+              aria-expanded="false"
+              aria-haspopup="listbox"
+              aria-owns="rc_select_TEST_OR_SSR_list"
+              autocomplete="off"
+              class="rc-tree-select-selection-search-input"
+              id="rc_select_TEST_OR_SSR"
+              readonly=""
+              role="combobox"
+              style="opacity: 0;"
+              type="search"
+              unselectable="on"
+              value=""
+            />
+            <span
+              aria-hidden="true"
+              class="rc-tree-select-selection-search-mirror"
+            >
+               
+            </span>
+          </div>
         </div>
       </div>
-    </div>
-    <span
-      class="rc-tree-select-selection-placeholder"
-    />
+      <span
+        class="rc-tree-select-selection-placeholder"
+      />
+    </span>
   </div>
 </div>
 `;
diff --git a/tests/__snapshots__/Select.spec.tsx.snap b/tests/__snapshots__/Select.spec.tsx.snap
index 5b633006..1442f0c2 100644
--- a/tests/__snapshots__/Select.spec.tsx.snap
+++ b/tests/__snapshots__/Select.spec.tsx.snap
@@ -8,28 +8,32 @@ exports[`TreeSelect.basic render renders TreeNode correctly 1`] = `
     class="rc-tree-select-selector"
   >
     <span
-      class="rc-tree-select-selection-search"
+      class="rc-tree-select-selection-wrap"
     >
-      <input
-        aria-autocomplete="list"
-        aria-controls="rc_select_TEST_OR_SSR_list"
-        aria-expanded="true"
-        aria-haspopup="listbox"
-        aria-owns="rc_select_TEST_OR_SSR_list"
-        autocomplete="off"
-        class="rc-tree-select-selection-search-input"
-        id="rc_select_TEST_OR_SSR"
-        readonly=""
-        role="combobox"
-        style="opacity: 0;"
-        type="search"
-        unselectable="on"
-        value=""
+      <span
+        class="rc-tree-select-selection-search"
+      >
+        <input
+          aria-autocomplete="list"
+          aria-controls="rc_select_TEST_OR_SSR_list"
+          aria-expanded="true"
+          aria-haspopup="listbox"
+          aria-owns="rc_select_TEST_OR_SSR_list"
+          autocomplete="off"
+          class="rc-tree-select-selection-search-input"
+          id="rc_select_TEST_OR_SSR"
+          readonly=""
+          role="combobox"
+          style="opacity: 0;"
+          type="search"
+          unselectable="on"
+          value=""
+        />
+      </span>
+      <span
+        class="rc-tree-select-selection-placeholder"
       />
     </span>
-    <span
-      class="rc-tree-select-selection-placeholder"
-    />
   </div>
   <div
     class="rc-tree-select-dropdown rc-tree-select-dropdown-placement-bottomLeft"
@@ -206,28 +210,32 @@ exports[`TreeSelect.basic render renders TreeNode correctly with falsy child 1`]
     class="rc-tree-select-selector"
   >
     <span
-      class="rc-tree-select-selection-search"
+      class="rc-tree-select-selection-wrap"
     >
-      <input
-        aria-autocomplete="list"
-        aria-controls="rc_select_TEST_OR_SSR_list"
-        aria-expanded="true"
-        aria-haspopup="listbox"
-        aria-owns="rc_select_TEST_OR_SSR_list"
-        autocomplete="off"
-        class="rc-tree-select-selection-search-input"
-        id="rc_select_TEST_OR_SSR"
-        readonly=""
-        role="combobox"
-        style="opacity: 0;"
-        type="search"
-        unselectable="on"
-        value=""
+      <span
+        class="rc-tree-select-selection-search"
+      >
+        <input
+          aria-autocomplete="list"
+          aria-controls="rc_select_TEST_OR_SSR_list"
+          aria-expanded="true"
+          aria-haspopup="listbox"
+          aria-owns="rc_select_TEST_OR_SSR_list"
+          autocomplete="off"
+          class="rc-tree-select-selection-search-input"
+          id="rc_select_TEST_OR_SSR"
+          readonly=""
+          role="combobox"
+          style="opacity: 0;"
+          type="search"
+          unselectable="on"
+          value=""
+        />
+      </span>
+      <span
+        class="rc-tree-select-selection-placeholder"
       />
     </span>
-    <span
-      class="rc-tree-select-selection-placeholder"
-    />
   </div>
   <div
     class="rc-tree-select-dropdown rc-tree-select-dropdown-placement-bottomLeft"
@@ -404,45 +412,49 @@ exports[`TreeSelect.basic render renders correctly 1`] = `
   <div
     class="awesome-selector"
   >
-    <div
-      class="awesome-selection-overflow"
+    <span
+      class="awesome-selection-wrap"
     >
       <div
-        class="awesome-selection-overflow-item awesome-selection-overflow-item-suffix"
-        style="opacity: 1;"
+        class="awesome-selection-overflow"
       >
         <div
-          class="awesome-selection-search"
-          style="width: 0px;"
+          class="awesome-selection-overflow-item awesome-selection-overflow-item-suffix"
+          style="opacity: 1;"
         >
-          <input
-            aria-autocomplete="list"
-            aria-controls="rc_select_TEST_OR_SSR_list"
-            aria-expanded="false"
-            aria-haspopup="listbox"
-            aria-owns="rc_select_TEST_OR_SSR_list"
-            autocomplete="off"
-            class="awesome-selection-search-input"
-            id="rc_select_TEST_OR_SSR"
-            readonly=""
-            role="combobox"
-            style="opacity: 0;"
-            type="search"
-            unselectable="on"
-            value=""
-          />
-          <span
-            aria-hidden="true"
-            class="awesome-selection-search-mirror"
+          <div
+            class="awesome-selection-search"
+            style="width: 0px;"
           >
-             
-          </span>
+            <input
+              aria-autocomplete="list"
+              aria-controls="rc_select_TEST_OR_SSR_list"
+              aria-expanded="false"
+              aria-haspopup="listbox"
+              aria-owns="rc_select_TEST_OR_SSR_list"
+              autocomplete="off"
+              class="awesome-selection-search-input"
+              id="rc_select_TEST_OR_SSR"
+              readonly=""
+              role="combobox"
+              style="opacity: 0;"
+              type="search"
+              unselectable="on"
+              value=""
+            />
+            <span
+              aria-hidden="true"
+              class="awesome-selection-search-mirror"
+            >
+               
+            </span>
+          </div>
         </div>
       </div>
-    </div>
-    <span
-      class="awesome-selection-placeholder"
-    />
+      <span
+        class="awesome-selection-placeholder"
+      />
+    </span>
   </div>
 </div>
 `;
@@ -455,29 +467,33 @@ exports[`TreeSelect.basic render renders disabled correctly 1`] = `
     class="rc-tree-select-selector"
   >
     <span
-      class="rc-tree-select-selection-search"
+      class="rc-tree-select-selection-wrap"
     >
-      <input
-        aria-autocomplete="list"
-        aria-controls="rc_select_TEST_OR_SSR_list"
-        aria-expanded="false"
-        aria-haspopup="listbox"
-        aria-owns="rc_select_TEST_OR_SSR_list"
-        autocomplete="off"
-        class="rc-tree-select-selection-search-input"
-        disabled=""
-        id="rc_select_TEST_OR_SSR"
-        readonly=""
-        role="combobox"
-        style="opacity: 0;"
-        type="search"
-        unselectable="on"
-        value=""
+      <span
+        class="rc-tree-select-selection-search"
+      >
+        <input
+          aria-autocomplete="list"
+          aria-controls="rc_select_TEST_OR_SSR_list"
+          aria-expanded="false"
+          aria-haspopup="listbox"
+          aria-owns="rc_select_TEST_OR_SSR_list"
+          autocomplete="off"
+          class="rc-tree-select-selection-search-input"
+          disabled=""
+          id="rc_select_TEST_OR_SSR"
+          readonly=""
+          role="combobox"
+          style="opacity: 0;"
+          type="search"
+          unselectable="on"
+          value=""
+        />
+      </span>
+      <span
+        class="rc-tree-select-selection-placeholder"
       />
     </span>
-    <span
-      class="rc-tree-select-selection-placeholder"
-    />
   </div>
 </div>
 `;
@@ -489,45 +505,49 @@ exports[`TreeSelect.basic render renders tree correctly 1`] = `
   <div
     class="rc-tree-select-selector"
   >
-    <div
-      class="rc-tree-select-selection-overflow"
+    <span
+      class="rc-tree-select-selection-wrap"
     >
       <div
-        class="rc-tree-select-selection-overflow-item rc-tree-select-selection-overflow-item-suffix"
-        style="opacity: 1;"
+        class="rc-tree-select-selection-overflow"
       >
         <div
-          class="rc-tree-select-selection-search"
-          style="width: 0px;"
+          class="rc-tree-select-selection-overflow-item rc-tree-select-selection-overflow-item-suffix"
+          style="opacity: 1;"
         >
-          <input
-            aria-autocomplete="list"
-            aria-controls="rc_select_TEST_OR_SSR_list"
-            aria-expanded="false"
-            aria-haspopup="listbox"
-            aria-owns="rc_select_TEST_OR_SSR_list"
-            autocomplete="off"
-            class="rc-tree-select-selection-search-input"
-            id="rc_select_TEST_OR_SSR"
-            readonly=""
-            role="combobox"
-            style="opacity: 0;"
-            type="search"
-            unselectable="on"
-            value=""
-          />
-          <span
-            aria-hidden="true"
-            class="rc-tree-select-selection-search-mirror"
+          <div
+            class="rc-tree-select-selection-search"
+            style="width: 0px;"
           >
-             
-          </span>
+            <input
+              aria-autocomplete="list"
+              aria-controls="rc_select_TEST_OR_SSR_list"
+              aria-expanded="false"
+              aria-haspopup="listbox"
+              aria-owns="rc_select_TEST_OR_SSR_list"
+              autocomplete="off"
+              class="rc-tree-select-selection-search-input"
+              id="rc_select_TEST_OR_SSR"
+              readonly=""
+              role="combobox"
+              style="opacity: 0;"
+              type="search"
+              unselectable="on"
+              value=""
+            />
+            <span
+              aria-hidden="true"
+              class="rc-tree-select-selection-search-mirror"
+            >
+               
+            </span>
+          </div>
         </div>
       </div>
-    </div>
-    <span
-      class="rc-tree-select-selection-placeholder"
-    />
+      <span
+        class="rc-tree-select-selection-placeholder"
+      />
+    </span>
   </div>
 </div>
 `;
@@ -541,28 +561,32 @@ exports[`TreeSelect.basic render renders treeDataSimpleMode correctly 1`] = `
       class="rc-tree-select-selector"
     >
       <span
-        class="rc-tree-select-selection-search"
+        class="rc-tree-select-selection-wrap"
       >
-        <input
-          aria-autocomplete="list"
-          aria-controls="rc_select_TEST_OR_SSR_list"
-          aria-expanded="true"
-          aria-haspopup="listbox"
-          aria-owns="rc_select_TEST_OR_SSR_list"
-          autocomplete="off"
-          class="rc-tree-select-selection-search-input"
-          id="rc_select_TEST_OR_SSR"
-          readonly=""
-          role="combobox"
-          style="opacity: 0;"
-          type="search"
-          unselectable="on"
-          value=""
+        <span
+          class="rc-tree-select-selection-search"
+        >
+          <input
+            aria-autocomplete="list"
+            aria-controls="rc_select_TEST_OR_SSR_list"
+            aria-expanded="true"
+            aria-haspopup="listbox"
+            aria-owns="rc_select_TEST_OR_SSR_list"
+            autocomplete="off"
+            class="rc-tree-select-selection-search-input"
+            id="rc_select_TEST_OR_SSR"
+            readonly=""
+            role="combobox"
+            style="opacity: 0;"
+            type="search"
+            unselectable="on"
+            value=""
+          />
+        </span>
+        <span
+          class="rc-tree-select-selection-placeholder"
         />
       </span>
-      <span
-        class="rc-tree-select-selection-placeholder"
-      />
     </div>
     <div
       class="rc-tree-select-dropdown rc-tree-select-dropdown-placement-bottomLeft"
@@ -685,26 +709,30 @@ exports[`TreeSelect.basic search nodes check tree changed by filter 1`] = `
       class="rc-tree-select-selector"
     >
       <span
-        class="rc-tree-select-selection-search"
+        class="rc-tree-select-selection-wrap"
       >
-        <input
-          aria-autocomplete="list"
-          aria-controls="rc_select_TEST_OR_SSR_list"
-          aria-expanded="true"
-          aria-haspopup="listbox"
-          aria-owns="rc_select_TEST_OR_SSR_list"
-          autocomplete="off"
-          class="rc-tree-select-selection-search-input"
-          id="rc_select_TEST_OR_SSR"
-          role="combobox"
-          type="search"
-          value="a"
+        <span
+          class="rc-tree-select-selection-search"
+        >
+          <input
+            aria-autocomplete="list"
+            aria-controls="rc_select_TEST_OR_SSR_list"
+            aria-expanded="true"
+            aria-haspopup="listbox"
+            aria-owns="rc_select_TEST_OR_SSR_list"
+            autocomplete="off"
+            class="rc-tree-select-selection-search-input"
+            id="rc_select_TEST_OR_SSR"
+            role="combobox"
+            type="search"
+            value="a"
+          />
+        </span>
+        <span
+          class="rc-tree-select-selection-placeholder"
+          style="visibility: hidden;"
         />
       </span>
-      <span
-        class="rc-tree-select-selection-placeholder"
-        style="visibility: hidden;"
-      />
     </div>
     <div
       class="rc-tree-select-dropdown rc-tree-select-dropdown-placement-bottomLeft"
@@ -797,26 +825,30 @@ exports[`TreeSelect.basic search nodes check tree changed by filter 2`] = `
       class="rc-tree-select-selector"
     >
       <span
-        class="rc-tree-select-selection-search"
+        class="rc-tree-select-selection-wrap"
       >
-        <input
-          aria-autocomplete="list"
-          aria-controls="rc_select_TEST_OR_SSR_list"
-          aria-expanded="true"
-          aria-haspopup="listbox"
-          aria-owns="rc_select_TEST_OR_SSR_list"
-          autocomplete="off"
-          class="rc-tree-select-selection-search-input"
-          id="rc_select_TEST_OR_SSR"
-          role="combobox"
-          type="search"
-          value=""
+        <span
+          class="rc-tree-select-selection-search"
+        >
+          <input
+            aria-autocomplete="list"
+            aria-controls="rc_select_TEST_OR_SSR_list"
+            aria-expanded="true"
+            aria-haspopup="listbox"
+            aria-owns="rc_select_TEST_OR_SSR_list"
+            autocomplete="off"
+            class="rc-tree-select-selection-search-input"
+            id="rc_select_TEST_OR_SSR"
+            role="combobox"
+            type="search"
+            value=""
+          />
+        </span>
+        <span
+          class="rc-tree-select-selection-placeholder"
+          style=""
         />
       </span>
-      <span
-        class="rc-tree-select-selection-placeholder"
-        style=""
-      />
     </div>
     <div
       class="rc-tree-select-dropdown rc-tree-select-dropdown-placement-bottomLeft"
@@ -935,26 +967,30 @@ exports[`TreeSelect.basic search nodes filter node but not remove then 1`] = `
       class="rc-tree-select-selector"
     >
       <span
-        class="rc-tree-select-selection-search"
+        class="rc-tree-select-selection-wrap"
       >
-        <input
-          aria-autocomplete="list"
-          aria-controls="rc_select_TEST_OR_SSR_list"
-          aria-expanded="true"
-          aria-haspopup="listbox"
-          aria-owns="rc_select_TEST_OR_SSR_list"
-          autocomplete="off"
-          class="rc-tree-select-selection-search-input"
-          id="rc_select_TEST_OR_SSR"
-          role="combobox"
-          type="search"
-          value="a"
+        <span
+          class="rc-tree-select-selection-search"
+        >
+          <input
+            aria-autocomplete="list"
+            aria-controls="rc_select_TEST_OR_SSR_list"
+            aria-expanded="true"
+            aria-haspopup="listbox"
+            aria-owns="rc_select_TEST_OR_SSR_list"
+            autocomplete="off"
+            class="rc-tree-select-selection-search-input"
+            id="rc_select_TEST_OR_SSR"
+            role="combobox"
+            type="search"
+            value="a"
+          />
+        </span>
+        <span
+          class="rc-tree-select-selection-placeholder"
+          style="visibility: hidden;"
         />
       </span>
-      <span
-        class="rc-tree-select-selection-placeholder"
-        style="visibility: hidden;"
-      />
     </div>
     <div
       class="rc-tree-select-dropdown rc-tree-select-dropdown-placement-bottomLeft"
@@ -1072,25 +1108,29 @@ exports[`TreeSelect.basic search nodes renders search input 1`] = `
     class="rc-tree-select-selector"
   >
     <span
-      class="rc-tree-select-selection-search"
+      class="rc-tree-select-selection-wrap"
     >
-      <input
-        aria-autocomplete="list"
-        aria-controls="rc_select_TEST_OR_SSR_list"
-        aria-expanded="true"
-        aria-haspopup="listbox"
-        aria-owns="rc_select_TEST_OR_SSR_list"
-        autocomplete="off"
-        class="rc-tree-select-selection-search-input"
-        id="rc_select_TEST_OR_SSR"
-        role="combobox"
-        type="search"
-        value=""
+      <span
+        class="rc-tree-select-selection-search"
+      >
+        <input
+          aria-autocomplete="list"
+          aria-controls="rc_select_TEST_OR_SSR_list"
+          aria-expanded="true"
+          aria-haspopup="listbox"
+          aria-owns="rc_select_TEST_OR_SSR_list"
+          autocomplete="off"
+          class="rc-tree-select-selection-search-input"
+          id="rc_select_TEST_OR_SSR"
+          role="combobox"
+          type="search"
+          value=""
+        />
+      </span>
+      <span
+        class="rc-tree-select-selection-placeholder"
       />
     </span>
-    <span
-      class="rc-tree-select-selection-placeholder"
-    />
   </div>
   <div
     class="rc-tree-select-dropdown rc-tree-select-dropdown-placement-bottomLeft"