diff --git a/package.json b/package.json index cf74b692b..be5d24623 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "react-intl": "5.19.0", "react-markdown": "^6.0.2", "react-select": "^4.3.1", - "react-spring": "^8.0.27", + "react-spring": "^9.2.3", "react-toast-notifications": "^2.4.4", "react-transition-group": "^4.4.2", "react-truncate-markup": "^5.1.0", diff --git a/src/components/Slider/index.tsx b/src/components/Slider/index.tsx index d183342bf..8dd5f8b51 100644 --- a/src/components/Slider/index.tsx +++ b/src/components/Slider/index.tsx @@ -89,9 +89,9 @@ const Slider: React.FC = ({ const [, setX] = useSpring(() => ({ from: { x: 0 }, to: { x: 0 }, - onFrame: (props: { x: number }) => { + onChange: (results) => { if (containerRef.current) { - containerRef.current.scrollLeft = props.x; + containerRef.current.scrollLeft = results.value.x; } }, })); @@ -111,14 +111,12 @@ const Slider: React.FC = ({ scrollPosition - scrollOffset - visibleItems * cardWidth, 0 ); - setX({ + setX.start({ from: { x: scrollPosition }, - to: { - x: newX, - }, - onFrame: (props: { x: number }) => { + to: { x: newX }, + onChange: (results) => { if (containerRef.current) { - containerRef.current.scrollLeft = props.x; + containerRef.current.scrollLeft = results.value.x; } }, reset: true, @@ -135,14 +133,12 @@ const Slider: React.FC = ({ scrollPosition - scrollOffset + visibleItems * cardWidth, containerRef.current?.scrollWidth ?? 0 - clientWidth ); - setX({ + setX.start({ from: { x: scrollPosition }, - to: { - x: newX, - }, - onFrame: (props: { x: number }) => { + to: { x: newX }, + onChange: (results) => { if (containerRef.current) { - containerRef.current.scrollLeft = props.x; + containerRef.current.scrollLeft = results.value.x; } }, reset: true, diff --git a/yarn.lock b/yarn.lock index ebe59a024..95d6356c6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -982,7 +982,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.5", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": +"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.5", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": version "7.14.0" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz#46794bc20b612c5f75e62dd071e24dfd95f1cbe6" integrity sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA== @@ -1792,6 +1792,86 @@ resolved "https://registry.yarnpkg.com/@opentelemetry/context-base/-/context-base-0.14.0.tgz#c67fc20a4d891447ca1a855d7d70fa79a3533001" integrity sha512-sDOAZcYwynHFTbLo6n8kIbLiVF3a3BLkrmehJUyEbT9F+Smbi47kLGS2gG2g0fjBLR/Lr1InPD7kXL7FaTqEkw== +"@react-spring/animated@~9.2.0": + version "9.2.0" + resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.2.0.tgz#02ea2a75c3b1557c9878f248227451119a9eb874" + integrity sha512-EqbtouICa7BDr7oXN++lYA97S9/3Ypr4q/VyL5HMpp0b9mmy+rVPdEOus40VpJR6L3LLu76zCBF0s5gTq8uZpA== + dependencies: + "@react-spring/shared" "~9.2.0" + "@react-spring/types" "~9.2.0" + +"@react-spring/core@~9.2.0": + version "9.2.0" + resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.2.0.tgz#068bc2dea0e509ba0b1cd8b30d4082aa190b9bc7" + integrity sha512-gdSCBjE/U+IUmqzGw/EbGW8/Mhjt74ql3tZB9fe5gewSc+n6lXhYq780CxywiLi0OnKLjNWxHCr2VGAZWFrvcQ== + dependencies: + "@react-spring/animated" "~9.2.0" + "@react-spring/shared" "~9.2.0" + "@react-spring/types" "~9.2.0" + +"@react-spring/konva@~9.2.0": + version "9.2.0" + resolved "https://registry.yarnpkg.com/@react-spring/konva/-/konva-9.2.0.tgz#3a05804aab33942ed4bfbb4b59be32642a4c4ba4" + integrity sha512-vDroO7ghCvIhuflOGcG4aUBgTQ1P7KxkYChYRGQqWIokMn5lQ7GZ/IUKgcMQrv9Cwyc5cHH8QaIj/FUfWtcoJg== + dependencies: + "@react-spring/animated" "~9.2.0" + "@react-spring/core" "~9.2.0" + "@react-spring/shared" "~9.2.0" + "@react-spring/types" "~9.2.0" + +"@react-spring/native@~9.2.0": + version "9.2.0" + resolved "https://registry.yarnpkg.com/@react-spring/native/-/native-9.2.0.tgz#7991d401e052f774f2e7ff60f31c405a50bce44c" + integrity sha512-XloosvHkrLzNZR2WlVkmXxwGPCpSmbV9Mv9o9DylA+jHGffkA8EgkrrUJFmU6XXW4fPDimO1nEyDfzjWTNDnJQ== + dependencies: + "@react-spring/animated" "~9.2.0" + "@react-spring/core" "~9.2.0" + "@react-spring/shared" "~9.2.0" + "@react-spring/types" "~9.2.0" + +"@react-spring/shared@~9.2.0": + version "9.2.0" + resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.2.0.tgz#cadef0d98463227bcabd1b3ae970134813f68eb3" + integrity sha512-puKnAYOgK0mRWGpBDWQUDK2KhSlimzXLic1aTRaa/e4lVTWTvkekdyJ403LmPg9/rSkP/9rue6nyGqcW1tD1DQ== + dependencies: + "@react-spring/types" "~9.2.0" + rafz "^0.1.13" + +"@react-spring/three@~9.2.0": + version "9.2.0" + resolved "https://registry.yarnpkg.com/@react-spring/three/-/three-9.2.0.tgz#8ac8bfd28ee9555469415c9247ee6f438d9e4d55" + integrity sha512-lY60M5ogunIsltyem6z+cey7zb6JE/sEOslCKr1E4fMzrZQmvWTMPvzl4IOovF81blzskOSAO8A5k1hjnHXmSw== + dependencies: + "@react-spring/animated" "~9.2.0" + "@react-spring/core" "~9.2.0" + "@react-spring/shared" "~9.2.0" + "@react-spring/types" "~9.2.0" + +"@react-spring/types@~9.2.0": + version "9.2.0" + resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.2.0.tgz#0fdbfd9e7ae3ead68e0bac2bb71f51a07844c6e3" + integrity sha512-cVAPmFkXciBlWP2v5D+4kIJYiVMTROiKbg/FGzjNrGT0jyk+ii/qtuO+RGdzXqGwoK/eUV34lDE1UU4djPV3Rg== + +"@react-spring/web@~9.2.0": + version "9.2.0" + resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.2.0.tgz#667f5e4e2226d1515e01b100c143093efab5943b" + integrity sha512-YWNPRCmC1MiCH+3MZQUTfhf4OzKR1w+0BVxpw7HkHgCz8lJNlvlDeiBdQzYhh+YmmbaF4y1swhCYmI0y4VCZXQ== + dependencies: + "@react-spring/animated" "~9.2.0" + "@react-spring/core" "~9.2.0" + "@react-spring/shared" "~9.2.0" + "@react-spring/types" "~9.2.0" + +"@react-spring/zdog@~9.2.0": + version "9.2.0" + resolved "https://registry.yarnpkg.com/@react-spring/zdog/-/zdog-9.2.0.tgz#53884b94883caf1746ecb4295a3d4076ae5a47b2" + integrity sha512-Kn/aHH8H655aOdnHo70HUcQ20GjAQcqQrDlqZ+aOKu80Oh2rTTEJQthFmzjV9yf8OVlPWS7w4fBZaU7Lsq7cKg== + dependencies: + "@react-spring/animated" "~9.2.0" + "@react-spring/core" "~9.2.0" + "@react-spring/shared" "~9.2.0" + "@react-spring/types" "~9.2.0" + "@semantic-release/changelog@^5.0.1": version "5.0.1" resolved "https://registry.yarnpkg.com/@semantic-release/changelog/-/changelog-5.0.1.tgz#50a84b63e5d391b7debfe021421589fa2bcdafe4" @@ -11230,6 +11310,11 @@ qw@~1.0.1: resolved "https://registry.yarnpkg.com/qw/-/qw-1.0.1.tgz#efbfdc740f9ad054304426acb183412cc8b996d4" integrity sha1-77/cdA+a0FQwRCassYNBLMi5ltQ= +rafz@^0.1.13: + version "0.1.14" + resolved "https://registry.yarnpkg.com/rafz/-/rafz-0.1.14.tgz#164f01cf7cc6094e08467247ef351ef5c8d278fe" + integrity sha512-YiQkedSt1urYtYbvHhTQR3l67M8SZbUvga5eJFM/v4vx/GmDdtXlE2hjJIyRjhhO/PjcdGC+CXCYOUA4onit8w== + random-bytes@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b" @@ -11392,13 +11477,17 @@ react-select@^4.3.1: react-input-autosize "^3.0.0" react-transition-group "^4.3.0" -react-spring@^8.0.27: - version "8.0.27" - resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-8.0.27.tgz#97d4dee677f41e0b2adcb696f3839680a3aa356a" - integrity sha512-nDpWBe3ZVezukNRandTeLSPcwwTMjNVu1IDq9qA/AMiUqHuRN4BeSWvKr3eIxxg1vtiYiOLy4FqdfCP5IoP77g== - dependencies: - "@babel/runtime" "^7.3.1" - prop-types "^15.5.8" +react-spring@^9.2.2: + version "9.2.2" + resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-9.2.2.tgz#315bf14202a3d0d68b2652ba571a91b71e05be8b" + integrity sha512-tYlW4Qmfph8mS18HBTFu7QOX/TCXr6cf+BnHcHnMMB9BVPtAZ7UOTGTHyxbnmkMMMKdeP4QwGqffWfTo3BFvWg== + dependencies: + "@react-spring/core" "~9.2.0" + "@react-spring/konva" "~9.2.0" + "@react-spring/native" "~9.2.0" + "@react-spring/three" "~9.2.0" + "@react-spring/web" "~9.2.0" + "@react-spring/zdog" "~9.2.0" react-toast-notifications@*, react-toast-notifications@^2.4.4: version "2.4.4"