Skip to content

fix(overlay): pass missing props #1143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 28, 2023
Merged

fix(overlay): pass missing props #1143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f61bb79
fix(overlay): pass missing props
sungik-choi Feb 27, 2023
3485665
fix(overlay): pass missing interpolation prop
sungik-choi Feb 27, 2023
2a7e5a1
chore(changeset): add changeset
sungik-choi Feb 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/dirty-shrimps-talk.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@channel.io/bezier-react": patch
---

Fix to pass missing property of `Overlay` component.
2 changes: 2 additions & 0 deletions packages/bezier-react/src/components/Overlay/Overlay.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,6 @@ export const Overlay = styled.div<StyledOverlayProps>`
foundation?.transition?.TransitionDuration.S,
)
)};

${({ interpolation }) => interpolation}
`
17 changes: 12 additions & 5 deletions packages/bezier-react/src/components/Overlay/Overlay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ function Overlay(
enableClickOutside = false,
children,
onHide = noop,
onTransitionEnd = noop,
...rest
}: OverlayProps,
forwardedRef: Ref<any>,
forwardedRef: Ref<HTMLDivElement>,
) {
// NOTE: DOM render 가 필요한지 여부를 결정하는 state
const [shouldRender, setShouldRender] = useState(false)
Expand All @@ -67,7 +69,7 @@ function Overlay(
}, [])

const handleContainerRect = useCallback(() => {
const containerElement = container || getRootElement() as HTMLElement
const containerElement = container || getRootElement()

const {
width: containerWidth,
Expand Down Expand Up @@ -126,11 +128,15 @@ function Overlay(
handleTargetRect,
])

const handleTransitionEnd = useCallback(() => {
const handleTransitionEnd = useCallback<React.TransitionEventHandler<HTMLDivElement>>((event) => {
onTransitionEnd(event)
if (!show) {
setShouldRender(false)
}
}, [show])
}, [
show,
onTransitionEnd,
])

const handleBlockMouseWheel = useCallback((event: HTMLElementEventMap['wheel']) => {
event.stopPropagation()
Expand Down Expand Up @@ -176,6 +182,7 @@ function Overlay(
marginY={marginY}
keepInContainer={keepInContainer}
onTransitionEnd={handleTransitionEnd}
{...rest}
>
{ children }
</Styled.Overlay>
Expand Down Expand Up @@ -276,7 +283,7 @@ function Overlay(

return ReactDOM.createPortal(
overlay,
container || getRootElement() as HTMLElement,
container || getRootElement(),
)
}

Expand Down