Merge pull request #837 from illacloud/beta

Merge/develop
illacloud · Dec 22, 2023 · b3de73c · b3de73c
2 parents 642f224 + 07b58d8
commit b3de73c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/packages/trigger/package.json b/packages/trigger/package.json
@@ -44,7 +44,7 @@
     "@illa-design/config-provider": "workspace:*",
     "@illa-design/theme": "workspace:*",
     "@illa-design/system": "workspace:*",
-    "@floating-ui/react": "^0.26.1",
+    "@floating-ui/react": "^0.26.4",
     "framer-motion": "^10.16.4"
   },
   "peerDependencies": {

diff --git a/packages/trigger/src/trigger.tsx b/packages/trigger/src/trigger.tsx
@@ -173,7 +173,7 @@ export const Trigger: FC<TriggerProps> = (props) => {
 
   const closeContent = <div css={applyDefaultContentSize}>{content}</div>
 
-  const childrenRef = useRef<HTMLElement>(null)
+  const childrenRef = useRef<HTMLElement>((props.children as any).ref)
 
   let centerNode: ReactElement = <></>
 
@@ -397,12 +397,12 @@ export const Trigger: FC<TriggerProps> = (props) => {
           },
         }),
       )}
-      <FloatingPortal
-        root={_popupContainer ?? childrenRef?.current ?? document.body}
-      >
-        {!disabled && (
-          <AnimatePresence>
-            {finalVisible && (
+      {!disabled && (
+        <AnimatePresence>
+          {finalVisible && (
+            <FloatingPortal
+              root={_popupContainer ?? childrenRef?.current ?? document.body}
+            >
               <div
                 onFocus={onFocus}
                 onBlur={onBlur}
@@ -433,10 +433,10 @@ export const Trigger: FC<TriggerProps> = (props) => {
               >
                 {tipsNode}
               </div>
-            )}
-          </AnimatePresence>
-        )}
-      </FloatingPortal>
+            </FloatingPortal>
+          )}
+        </AnimatePresence>
+      )}
     </>
   )
 }

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml