diff --git a/packages/trigger/package.json b/packages/trigger/package.json index e06cf0d2f..5d6188628 100644 --- 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 index 9f496d769..fec2744ac 100644 --- a/packages/trigger/src/trigger.tsx +++ b/packages/trigger/src/trigger.tsx @@ -173,7 +173,7 @@ export const Trigger: FC = (props) => { const closeContent =
{content}
- const childrenRef = useRef(null) + const childrenRef = useRef((props.children as any).ref) let centerNode: ReactElement = <> @@ -397,12 +397,12 @@ export const Trigger: FC = (props) => { }, }), )} - - {!disabled && ( - - {finalVisible && ( + {!disabled && ( + + {finalVisible && ( +
= (props) => { > {tipsNode}
- )} -
- )} -
+ + )} + + )} ) } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bb3508ea7..a7092f0f8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1843,8 +1843,8 @@ importers: specifier: ^11.11.1 version: 11.11.1(@types/react@18.2.21)(react@18.2.0) '@floating-ui/react': - specifier: ^0.26.1 - version: 0.26.1(react-dom@18.2.0)(react@18.2.0) + specifier: ^0.26.4 + version: 0.26.4(react-dom@18.2.0)(react@18.2.0) '@illa-design/config-provider': specifier: workspace:* version: link:../config-provider @@ -4011,14 +4011,26 @@ packages: '@floating-ui/dom': 1.5.2 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) + dev: true - /@floating-ui/react@0.26.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-5gyJIJ2tZOPMgmZ/vEcVhdmQiy75b7LPO71sYIiDsxGcZ4hxLuygQWCuT0YXHqppt//Eese+L6t5KnX/gZ3tVA==} + /@floating-ui/react-dom@2.0.4(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-CF8k2rgKeh/49UrnIBs4BdxPUV6vize/Db1d/YbCLyp9GiVZ0BEwf5AiDSxJRCr6yOkGqTFHtmrULxkEfYZ7dQ==} peerDependencies: react: '>=16.8.0' react-dom: '>=16.8.0' dependencies: - '@floating-ui/react-dom': 2.0.2(react-dom@18.2.0)(react@18.2.0) + '@floating-ui/dom': 1.5.2 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + dev: false + + /@floating-ui/react@0.26.4(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-pRiEz+SiPyfTcckAtLkEf3KJ/sUbB4X4fWMcDm27HT2kfAq+dH+hMc2VoOkNaGpDE35a2PKo688ugWeHaToL3g==} + peerDependencies: + react: '>=16.8.0' + react-dom: '>=16.8.0' + dependencies: + '@floating-ui/react-dom': 2.0.4(react-dom@18.2.0)(react@18.2.0) '@floating-ui/utils': 0.1.6 react: 18.2.0 react-dom: 18.2.0(react@18.2.0)