archive-gh-me/nextui
1
0
Fork 0
mirror of https://github.com/nextui-org/nextui.git synced 2025-12-08 19:26:11 +00:00
Code Issues Projects Releases Wiki Activity

refactor(tooltip): style prop merged with the passed one (#1413)

Browse Source
This commit is contained in:
Junior Garcia 2023-08-15 20:28:23 -03:00 committed by GitHub
parent 6d7372ede1
commit f068552774
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.changeset/little-comics-report.md Normal file
View File

@ -0,0 +1,6 @@
---
"@nextui-org/tooltip": patch
"@nextui-org/modal": patch
---
Tooltip style prop merged, this allows users change the z-index

2
packages/components/modal/src/use-modal.ts
View File

@ -109,7 +109,7 @@ export function useModal(originalProps: UseModalProps) {
const headerId = useId();
const bodyId = useId();
// Sync ref with popoverRef from passed ref.
// Sync ref with modalRef from passed ref.
useImperativeHandle(ref, () =>
// @ts-ignore
createDOMRef(dialogRef),

3
packages/components/tooltip/src/use-tooltip.ts
View File

@ -219,7 +219,8 @@ export function useTooltip(originalProps: UseTooltipProps) {
"data-disabled": dataAttr(isDisabled),
"data-placement": getArrowPlacement(placement, placementProp),
className: slots.base({class: baseStyles}),
...mergeProps(tooltipProps, positionProps, overlayProps, otherProps),
...mergeProps(tooltipProps, overlayProps, otherProps),
style: mergeProps(positionProps.style, otherProps.style, props.style),
id: tooltipId,
}),
[