Skip to content

Commit

Permalink
[@mantine/core] ScrollArea: Fix flickering
Browse files Browse the repository at this point in the history
  • Loading branch information
rtivital committed Dec 5, 2022
1 parent 693d25d commit 4f91eb7
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 16 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -132,7 +132,7 @@
"@emotion/server": "11.4.0",
"@emotion/styled": "^11.10.0",
"@floating-ui/react-dom-interactions": "^0.10.1",
"@radix-ui/react-scroll-area": "1.0.0",
"@radix-ui/react-scroll-area": "1.0.2",
"@tabler/icons": "^1.68.0",
"@tiptap/extension-code-block-lowlight": "^2.0.0-beta.202",
"@tiptap/extension-color": "^2.0.0-beta.202",
Expand Down
2 changes: 1 addition & 1 deletion src/mantine-core/package.json
Expand Up @@ -34,7 +34,7 @@
"dependencies": {
"@mantine/utils": "5.9.1",
"@mantine/styles": "5.9.1",
"@radix-ui/react-scroll-area": "1.0.0",
"@radix-ui/react-scroll-area": "1.0.2",
"react-textarea-autosize": "8.3.4",
"@floating-ui/react-dom-interactions": "^0.10.1"
},
Expand Down
3 changes: 3 additions & 0 deletions src/mantine-core/src/ScrollArea/ScrollArea.styles.ts
Expand Up @@ -68,6 +68,7 @@ export default createStyles(
position: 'relative',
transition: 'background-color 150ms ease',
display: hidden ? 'none' : undefined,
overflow: 'hidden',

'&::before': {
content: '""',
Expand All @@ -77,6 +78,8 @@ export default createStyles(
transform: 'translate(-50%, -50%)',
width: '100%',
height: '100%',
minWidth: 44,
minHeight: 44,
},
},

Expand Down
28 changes: 14 additions & 14 deletions yarn.lock
Expand Up @@ -2379,18 +2379,18 @@
"@radix-ui/react-compose-refs" "1.0.0"
"@radix-ui/react-use-layout-effect" "1.0.0"

"@radix-ui/react-primitive@1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-1.0.0.tgz#376cd72b0fcd5e0e04d252ed33eb1b1f025af2b0"
integrity sha512-EyXe6mnRlHZ8b6f4ilTDrXmkLShICIuOTTj0GX4w1rp+wSxf3+TD05u1UOITC8VsJ2a9nwHvdXtOXEOl0Cw/zQ==
"@radix-ui/react-primitive@1.0.1":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-1.0.1.tgz#c1ebcce283dd2f02e4fbefdaa49d1cb13dbc990a"
integrity sha512-fHbmislWVkZaIdeF6GZxF0A/NH/3BjrGIYj+Ae6eTmTCr7EB0RQAAVEiqsXK6p3/JcRqVSBQoceZroj30Jj3XA==
dependencies:
"@babel/runtime" "^7.13.10"
"@radix-ui/react-slot" "1.0.0"
"@radix-ui/react-slot" "1.0.1"

"@radix-ui/react-scroll-area@1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@radix-ui/react-scroll-area/-/react-scroll-area-1.0.0.tgz#10d0262a52266af528798f36947145f7e3a3a52c"
integrity sha512-3SNFukAjS5remgtpAVR9m3Zgo23ZojBZ8V3TCyR3A+56x2mtVqKlPV4+e8rScZUFMuvtbjIdQCmsJBFBazKZig==
"@radix-ui/react-scroll-area@1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@radix-ui/react-scroll-area/-/react-scroll-area-1.0.2.tgz#26c906d351b56835c0301126b24574c9e9c7b93b"
integrity sha512-k8VseTxI26kcKJaX0HPwkvlNBPTs56JRdYzcZ/vzrNUkDlvXBy8sMc7WvCpYzZkHgb+hd72VW9MqkqecGtuNgg==
dependencies:
"@babel/runtime" "^7.13.10"
"@radix-ui/number" "1.0.0"
Expand All @@ -2399,14 +2399,14 @@
"@radix-ui/react-context" "1.0.0"
"@radix-ui/react-direction" "1.0.0"
"@radix-ui/react-presence" "1.0.0"
"@radix-ui/react-primitive" "1.0.0"
"@radix-ui/react-primitive" "1.0.1"
"@radix-ui/react-use-callback-ref" "1.0.0"
"@radix-ui/react-use-layout-effect" "1.0.0"

"@radix-ui/react-slot@1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.0.0.tgz#7fa805b99891dea1e862d8f8fbe07f4d6d0fd698"
integrity sha512-3mrKauI/tWXo1Ll+gN5dHcxDPdm/Df1ufcDLCecn+pnCIVcdWE7CujXo8QaXOWRJyZyQWWbpB8eFwHzWXlv5mQ==
"@radix-ui/react-slot@1.0.1":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.0.1.tgz#e7868c669c974d649070e9ecbec0b367ee0b4d81"
integrity sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==
dependencies:
"@babel/runtime" "^7.13.10"
"@radix-ui/react-compose-refs" "1.0.0"
Expand Down

0 comments on commit 4f91eb7

Please sign in to comment.