Skip to content

Commit

Permalink
Merge branch 'yarnlock'
Browse files Browse the repository at this point in the history
  • Loading branch information
JF-Cozy committed Mar 15, 2021
2 parents bb0c573 + 715390c commit fa78c7a
Show file tree
Hide file tree
Showing 2 changed files with 1,903 additions and 1,593 deletions.
5 changes: 4 additions & 1 deletion src/BottomSheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,8 @@ export const BottomSheet: FC<BottomSheetProps> = props => {
initial: () => [
0,
containerRef.current?.scrollTop
? -containerRef.current.scrollTop + Math.min(...stops)
? // @ts-ignore
-containerRef.current.scrollTop + Math.min(...stops)
: y.goal,
],
bounds: { top: 0 },
Expand Down Expand Up @@ -321,6 +322,7 @@ export const BottomSheet: FC<BottomSheetProps> = props => {
<a.div
{...bind()}
ref={containerRef}
// @ts-ignore
style={{ ...styles.root, ...userStyles.root, y, ...sheetStyle }}
>
<div ref={measureRef}>{props.children}</div>
Expand All @@ -338,6 +340,7 @@ export const BottomSheet: FC<BottomSheetProps> = props => {
</a.div>
)}
<a.div
// @ts-ignore
style={{ ...styles.backdrop, ...userStyles.backdrop, ...backdropStyle }}
/>
</>
Expand Down
Loading

0 comments on commit fa78c7a

Please sign in to comment.