From 1df0c01e2258b842b6d7f57c03ebf51a688db0cf Mon Sep 17 00:00:00 2001 From: richbachman Date: Mon, 17 May 2021 17:32:53 -0600 Subject: [PATCH 1/3] chore(modal-dialog-primitive): upgrade reach dialog --- .changeset/tender-icons-obey.md | 6 + .../primitives/modal-dialog/package.json | 2 +- yarn.lock | 180 ++++++++---------- 3 files changed, 90 insertions(+), 98 deletions(-) create mode 100644 .changeset/tender-icons-obey.md diff --git a/.changeset/tender-icons-obey.md b/.changeset/tender-icons-obey.md new file mode 100644 index 0000000000..32010a8032 --- /dev/null +++ b/.changeset/tender-icons-obey.md @@ -0,0 +1,6 @@ +--- +'@twilio-paste/modal-dialog-primitive': patch +'@twilio-paste/core': patch +--- + +Bumped the version of Reach/Dialog to 0.15.0 diff --git a/packages/paste-core/primitives/modal-dialog/package.json b/packages/paste-core/primitives/modal-dialog/package.json index 050cd431b5..74740079a6 100644 --- a/packages/paste-core/primitives/modal-dialog/package.json +++ b/packages/paste-core/primitives/modal-dialog/package.json @@ -25,7 +25,7 @@ "tsc": "tsc" }, "dependencies": { - "@reach/dialog": "0.11.2" + "@reach/dialog": "0.15.0" }, "peerDependencies": { "react": "^16.8.6", diff --git a/yarn.lock b/yarn.lock index 13247cd4a1..412c3902da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -24,11 +24,6 @@ dependencies: tunnel "0.0.6" -"@alloc/types@^1.2.1": - version "1.2.5" - resolved "https://registry.yarnpkg.com/@alloc/types/-/types-1.2.5.tgz#108e4c1d9c593723e9702efc21e59d50093e972d" - integrity sha512-/P8+QHJCG+xhXlFa9XH/Udy6Q8BFonQOJGzb2n6OVVlOa7VWoNGOJgkEGcJj7PkP4pMYFry9iIgprRLSAqN1Aw== - "@ampproject/toolbox-core@2.7.4", "@ampproject/toolbox-core@^2.7.1-alpha.0": version "2.7.4" resolved "https://registry.yarnpkg.com/@ampproject/toolbox-core/-/toolbox-core-2.7.4.tgz#8355136f16301458ce942acf6c55952c9a415627" @@ -5189,30 +5184,30 @@ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.2.tgz#adea7b6953cbb34651766b0548468e743c6a2353" integrity sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q== -"@reach/dialog@0.11.2": - version "0.11.2" - resolved "https://registry.yarnpkg.com/@reach/dialog/-/dialog-0.11.2.tgz#44d99b4918cb211d4458f7cce3bee01c27c9c8ed" - integrity sha512-S3o+FbaiWDgjo6vrHWOGlHSnJRsnmLvh6u8auLu+/g4LBDcxW89zJFITLIvZxMHKHBuBG7q7bd7aSecSoKtcjA== +"@reach/dialog@0.15.0": + version "0.15.0" + resolved "https://registry.yarnpkg.com/@reach/dialog/-/dialog-0.15.0.tgz#e1dd2d30ea060a65fc8810b9a7e16f1a5bc64d69" + integrity sha512-ivZr4ukUcEr/tU1wYpHJt0XZF1kZunaZmNeQwIqaVrjpvwIVbWJtEmDvXDSuUYiNOxJ7L9iCt4nrN8sZhf78XA== dependencies: - "@reach/portal" "0.11.2" - "@reach/utils" "0.11.2" + "@reach/portal" "0.15.0" + "@reach/utils" "0.15.0" prop-types "^15.7.2" - react-focus-lock "^2.3.1" - react-remove-scroll "^2.3.0" - tslib "^2.0.0" + react-focus-lock "^2.5.0" + react-remove-scroll "^2.4.1" + tslib "^2.1.0" "@reach/observe-rect@^1.1.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@reach/observe-rect/-/observe-rect-1.2.0.tgz#d7a6013b8aafcc64c778a0ccb83355a11204d3b2" integrity sha512-Ba7HmkFgfQxZqqaeIWWkNK0rEhpxVQHIoVyW1YDSkGsGIXzcaW4deC8B0pZrNSSyLTdIk7y+5olKt5+g0GmFIQ== -"@reach/portal@0.11.2": - version "0.11.2" - resolved "https://registry.yarnpkg.com/@reach/portal/-/portal-0.11.2.tgz#19a671be9ff010a345892b81e710cb6e4d9f9762" - integrity sha512-/53A/rY5oX2Y7D5TpvsP+V5cSd+4MPY6f21mAmVn4DCVwpkCFOlJ059ZL7ixS85M0Jz48YQnnvBJUqwkxqUG/g== +"@reach/portal@0.15.0": + version "0.15.0" + resolved "https://registry.yarnpkg.com/@reach/portal/-/portal-0.15.0.tgz#b137582a1ecc4e04c60ce9a9c672dd2d23a2f1cc" + integrity sha512-Aulqjk/PIRu+R7yhINYAAYfYh++ZdC30qwHDWDtGk2cmTEJT7m9AlvBX+W7T+Q3Ux6Wy5f37eV+TTGid1CcjFw== dependencies: - "@reach/utils" "0.11.2" - tslib "^2.0.0" + "@reach/utils" "0.15.0" + tslib "^2.1.0" "@reach/router@^1.3.3": version "1.3.3" @@ -5234,54 +5229,53 @@ prop-types "^15.6.1" react-lifecycles-compat "^3.0.4" -"@reach/utils@0.11.2": - version "0.11.2" - resolved "https://registry.yarnpkg.com/@reach/utils/-/utils-0.11.2.tgz#be1f03650db56fd67a16d3fc70e5262cdb139cec" - integrity sha512-fBTolYj+rKTROXmf0zHO0rCWSvw7J0ALmYj5QxW4DmITMOH5uyRuWDWOfqohIGFbOtF/sum50WTB3tvx76d+Aw== +"@reach/utils@0.15.0": + version "0.15.0" + resolved "https://registry.yarnpkg.com/@reach/utils/-/utils-0.15.0.tgz#5b183d668f9bb900b2dec7a33c028a2a828d27b2" + integrity sha512-JHHN7T5ucFiuQbqkgv8ECbRWKfRiJxrO/xHR3fHf+f2C7mVs/KkJHhYtovS1iEapR4silygX9PY0+QUmHPOTYw== dependencies: - "@types/warning" "^3.0.0" - tslib "^2.0.0" - warning "^4.0.3" + tiny-warning "^1.0.3" + tslib "^2.1.0" -"@react-spring/animated@9.0.0-rc.3": - version "9.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.0.0-rc.3.tgz#e792cb76aacecfc78db2be6020ac11ce96503eb5" - integrity sha512-dAvgtKhkYpzzr+EkmZ4ZuJ5CujxCW0LaT109DvO/2MQNk3EWIxcgl+ik4tSulSbgau1GN8RlkRKyDp0wISdQ3Q== +"@react-spring/animated@~9.1.2": + version "9.1.2" + resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.1.2.tgz#e43b122160f8f4cbb0caac8a7f57acd76dd12369" + integrity sha512-nKOGk+3aWbNp46V/CB1J2vR3GJI/Vork8N1WTI5mt+32QekrSsBn5/YFt4/iPaDGhLjukFxF0IjLs6hRLqSObw== dependencies: - "@babel/runtime" "^7.3.1" - "@react-spring/shared" "9.0.0-rc.3" - react-layout-effect "^1.0.1" + "@react-spring/shared" "~9.1.2" + "@react-spring/types" "~9.1.2" -"@react-spring/core@9.0.0-rc.3": - version "9.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.0.0-rc.3.tgz#c8e697573936c525bd0f6ca0c0869f75c86e8a83" - integrity sha512-3OzsVFxpfMJNkkQj8TwAH3NhUAX76AXu6WkslQF4EgBeEoG5eY3m+VvM9RsAsGWDuBKpscZ/wBpFt5Ih6KdGHA== +"@react-spring/core@~9.1.2": + version "9.1.2" + resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.1.2.tgz#6d854a12fe9c3caa7942e51e708cb5fb4e2d1124" + integrity sha512-rgobYPCcLdDwbHBVqAmvtXhhX92G7MoPltJlzUge843yp1dNr47tkagFdCtw9NMGp6eHu/CE5byh/imlhLLAxw== dependencies: - "@babel/runtime" "^7.3.1" - "@react-spring/animated" "9.0.0-rc.3" - "@react-spring/shared" "9.0.0-rc.3" - react-layout-effect "^1.0.1" - use-memo-one "^1.1.0" + "@react-spring/animated" "~9.1.2" + "@react-spring/shared" "~9.1.2" + "@react-spring/types" "~9.1.2" -"@react-spring/shared@9.0.0-rc.3": - version "9.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.0.0-rc.3.tgz#3f4c9d90accc20fef51a283a7806d78390b84161" - integrity sha512-dd50TxwwMWd+dSB0InjndUN9w17cbnMCPy+0sag6zRxxKIo7eOyWSliOtLKxvufgmdC8Prm4M3GT5dmB1yxKEQ== +"@react-spring/shared@9.1.2", "@react-spring/shared@~9.1.2": + version "9.1.2" + resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.1.2.tgz#c36d077d7eb31fd2cbcf8956d9d35037b2998613" + integrity sha512-sj/RrhFZAteCWAMk+W0t6Ku/skn/lbskCCs8B7ZnHNLMGPM+Zb3MOk+aVbX3T/D0iq/oTnKWyQYqrXDKiFcZ7g== dependencies: - "@alloc/types" "^1.2.1" - "@babel/runtime" "^7.3.1" - fluids "^0.1.6" - tslib "^1.11.1" + "@react-spring/types" "~9.1.2" + rafz "^0.1.14" -"@react-spring/web@9.0.0-rc.3": - version "9.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.0.0-rc.3.tgz#da977382f91d9af4c400e4aa7dc37d3db07b87e0" - integrity sha512-rEvipblmihiz8+Eo01zDp5dqWn6XfYk8q2rlN9c18YIOL4o6nuY/VplDoocUMHYfH4liurpO4o1QudKOO1nAiQ== +"@react-spring/types@~9.1.2": + version "9.1.2" + resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.1.2.tgz#3273a182f825b38f44ead2a2f3984344abad1e2b" + integrity sha512-NZNImL0ymRFbss1cGKX2qSEeFdFoOgnIJZEW4Uczt+wm04J7g0Zuf23Hf8hM35JtxDr8QO5okp8BBtCM5FzzMg== + +"@react-spring/web@9.1.2": + version "9.1.2" + resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.1.2.tgz#6ec409e8559676834b67aa33f0a2d57643c3c555" + integrity sha512-E5W9Hmi2bO6CPorCNV/2iv12ux9LxHJAbpXmrBPKWFRqZixysiHoNQKKPG0DmSvUU1uKkvCvMC4VoB6pj/2kxw== dependencies: - "@babel/runtime" "^7.3.1" - "@react-spring/animated" "9.0.0-rc.3" - "@react-spring/core" "9.0.0-rc.3" - "@react-spring/shared" "9.0.0-rc.3" + "@react-spring/animated" "~9.1.2" + "@react-spring/core" "~9.1.2" + "@react-spring/shared" "~9.1.2" + "@react-spring/types" "~9.1.2" "@samverschueren/stream-to-observable@^0.3.0": version "0.3.1" @@ -7277,11 +7271,6 @@ "@types/expect" "^1.20.4" "@types/node" "*" -"@types/warning@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/warning/-/warning-3.0.0.tgz#0d2501268ad8f9962b740d387c4654f5f8e23e52" - integrity sha1-DSUBJorY+ZYrdA04fEZU9fjiPlI= - "@types/webpack-env@^1.13.9": version "1.15.2" resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.15.2.tgz#927997342bb9f4a5185a86e6579a0a18afc33b0a" @@ -15021,11 +15010,6 @@ flow-parser@0.*: resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.137.0.tgz#8c05612ff9344648d8bcdeaa4c58d131e875d842" integrity sha512-i3KXJZ8lhlQI0n+BoZzIeH/rv+fNvAiu1i9/s64MklBV+HuhFbycUML7367J2eng0gapLnwvYPFNaPZys8POsA== -fluids@^0.1.6: - version "0.1.8" - resolved "https://registry.yarnpkg.com/fluids/-/fluids-0.1.8.tgz#0a708b4f917f96ed9453dc21ab167d4bae9877c3" - integrity sha512-tl3nUHkZeqCJs6FnlN4hTLmOzwDNXWqRbTIXGOkUT6HUAAuWsd28CyxwLOy9KAIbJNY2Bgn2C2gZVRiEhdCtBg== - flush-write-stream@^1.0.0, flush-write-stream@^1.0.2: version "1.1.1" resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" @@ -15034,10 +15018,12 @@ flush-write-stream@^1.0.0, flush-write-stream@^1.0.2: inherits "^2.0.3" readable-stream "^2.3.6" -focus-lock@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.7.0.tgz#b2bfb0ca7beacc8710a1ff74275fe0dc60a1d88a" - integrity sha512-LI7v2mH02R55SekHYdv9pRHR9RajVNyIJ2N5IEkWbg7FT5ZmJ9Hw4mWxHeEUcd+dJo0QmzztHvDvWcc7prVFsw== +focus-lock@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.9.1.tgz#e8ec7d4821631112193ae09258107f531588da01" + integrity sha512-/2Nj60Cps6yOLSO+CkVbeSKfwfns5XbX6HOedIK9PdzODP04N9c3xqOcPXayN0WsT9YjJvAnXmI0NdqNIDf5Kw== + dependencies: + tslib "^2.0.3" follow-redirects@1.5.10: version "1.5.10" @@ -24624,6 +24610,11 @@ raf@^3.4.1: dependencies: performance-now "^2.1.0" +rafz@^0.1.14: + version "0.1.14" + resolved "https://registry.yarnpkg.com/rafz/-/rafz-0.1.14.tgz#164f01cf7cc6094e08467247ef351ef5c8d278fe" + integrity sha512-YiQkedSt1urYtYbvHhTQR3l67M8SZbUvga5eJFM/v4vx/GmDdtXlE2hjJIyRjhhO/PjcdGC+CXCYOUA4onit8w== + railroad-diagrams@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e" @@ -24927,13 +24918,13 @@ react-fast-compare@^3.2.0: resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA== -react-focus-lock@^2.3.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.4.1.tgz#e842cc93da736b5c5d331799012544295cbcee4f" - integrity sha512-c5ZP56KSpj9EAxzScTqQO7bQQNPltf/W1ZEBDqNDOV1XOIwvAyHX0O7db9ekiAtxyKgnqZjQlLppVg94fUeL9w== +react-focus-lock@^2.5.0: + version "2.5.1" + resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.5.1.tgz#e2060c5d7b02c62d79c4f103d0fc5a1288bc8f75" + integrity sha512-gOToRZKVEymGEjFaTRUKgJsdYQrNosoiK7yZnXnnd8bYew4vMzk3Rxb0Q4nyrGwsFuUmgQiSAulQirA0J+v4hA== dependencies: "@babel/runtime" "^7.0.0" - focus-lock "^0.7.0" + focus-lock "^0.9.1" prop-types "^15.6.2" react-clientside-effect "^1.2.2" use-callback-ref "^1.2.1" @@ -25005,11 +24996,6 @@ react-is@^17.0.2: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== -react-layout-effect@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/react-layout-effect/-/react-layout-effect-1.0.5.tgz#0dc4e24452aee5de66c93c166f0ec512dfb1be80" - integrity sha512-zdRXHuch+OBHU6bvjTelOGUCM+UDr/iCY+c0wXLEAc+G4/FlcJruD/hUOzlKH5XgO90Y/BUJPNhI/g9kl+VAsA== - react-lifecycles-compat@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" @@ -25074,10 +25060,10 @@ react-remove-scroll-bar@^2.1.0: react-style-singleton "^2.1.0" tslib "^1.0.0" -react-remove-scroll@^2.3.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.4.0.tgz#190c16eb508c5927595935499e8f5dd9ab0e75cf" - integrity sha512-BZIO3GaEs0Or1OhA5C//n1ibUP1HdjJmqUVUsOCMxwoIpaCocbB9TFKwHOkBa/nyYy3slirqXeiPYGwdSDiseA== +react-remove-scroll@^2.4.1: + version "2.4.2" + resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.4.2.tgz#5b7e3eb8c3389d3636234716d2feb618729fc4d9" + integrity sha512-mMSIZYQF3jS2uRJXeFDRaVGA+BGs/hIryV64YUKsHFtpgwZloOUcdu0oW8K6OU8uLHt/kM5d0lUZbdpIVwgXtQ== dependencies: react-remove-scroll-bar "^2.1.0" react-style-singleton "^2.1.0" @@ -28737,6 +28723,11 @@ tiny-invariant@^1.1.0: resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz#634c5f8efdc27714b7f386c35e6760991d230875" integrity sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw== +tiny-warning@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" + integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== + tinycolor2@1.4.1, tinycolor2@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8" @@ -29016,11 +29007,6 @@ tslib@^1.0.0, tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== -tslib@^1.11.1: - version "1.13.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" - integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== - tslib@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.1.tgz#410eb0d113e5b6356490eec749603725b021b43e" @@ -29031,6 +29017,11 @@ tslib@^2.0.1, tslib@^2.0.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c" integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ== +tslib@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c" + integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w== + tsutils@^3.17.1: version "3.17.1" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759" @@ -29782,11 +29773,6 @@ use-latest@^1.0.0: dependencies: use-isomorphic-layout-effect "^1.0.0" -use-memo-one@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.1.tgz#39e6f08fe27e422a7d7b234b5f9056af313bd22c" - integrity sha512-oFfsyun+bP7RX8X2AskHNTxu+R3QdE/RC5IefMbqptmACAA/gfol1KDD5KRzPsGMa62sWxGZw+Ui43u6x4ddoQ== - use-resize-observer@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/use-resize-observer/-/use-resize-observer-7.0.0.tgz#15f0efbd5a4e08a8cc51901f21a89ba836f2116e" From afde8be5a44164f3484b7059a94a4017e85ddf98 Mon Sep 17 00:00:00 2001 From: richbachman Date: Mon, 17 May 2021 17:33:21 -0600 Subject: [PATCH 2/3] chore(animation-library): upgrade react-spring --- .changeset/giant-beers-draw.md | 6 ++++++ packages/paste-libraries/animation/package.json | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 .changeset/giant-beers-draw.md diff --git a/.changeset/giant-beers-draw.md b/.changeset/giant-beers-draw.md new file mode 100644 index 0000000000..829dc7b558 --- /dev/null +++ b/.changeset/giant-beers-draw.md @@ -0,0 +1,6 @@ +--- +'@twilio-paste/animation-library': patch +'@twilio-paste/core': patch +--- + +Bumped the version of React-Spring to 9.1.2 in order to fix a TS issue. diff --git a/packages/paste-libraries/animation/package.json b/packages/paste-libraries/animation/package.json index 58a827d7de..5c4558b419 100644 --- a/packages/paste-libraries/animation/package.json +++ b/packages/paste-libraries/animation/package.json @@ -25,8 +25,8 @@ "tsc": "tsc" }, "dependencies": { - "@react-spring/shared": "9.0.0-rc.3", - "@react-spring/web": "9.0.0-rc.3" + "@react-spring/shared": "9.1.2", + "@react-spring/web": "9.1.2" }, "peerDependencies": { "react": "^16.8.6", From ff985564d7a745e8a530829aef1760b1f7bbd914 Mon Sep 17 00:00:00 2001 From: richbachman Date: Tue, 18 May 2021 11:06:43 -0600 Subject: [PATCH 3/3] chore(modal): add safelySpreadBoxProps and test --- .../components/modal/__tests__/index.spec.tsx | 27 ++++++++++++++----- .../paste-core/components/modal/src/Modal.tsx | 4 +-- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/packages/paste-core/components/modal/__tests__/index.spec.tsx b/packages/paste-core/components/modal/__tests__/index.spec.tsx index e8cb443bef..5d6fa0dccd 100644 --- a/packages/paste-core/components/modal/__tests__/index.spec.tsx +++ b/packages/paste-core/components/modal/__tests__/index.spec.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import {useUID} from '@twilio-paste/uid-library'; import {render} from 'react-dom'; -import {render as testRender, fireEvent, cleanup} from '@testing-library/react'; +import {render as testRender, fireEvent} from '@testing-library/react'; import {Theme} from '@twilio-paste/theme'; import {Button} from '@twilio-paste/button'; import {Box} from '@twilio-paste/box'; @@ -102,7 +102,6 @@ describe('Modal', () => { const {getByTestId} = testRender(); expect(getByTestId('modal').getAttribute('role')).toEqual('dialog'); expect(getByTestId('modal').getAttribute('aria-modal')).toEqual('true'); - cleanup(); }); it('should be labelled by the correct heading', () => { @@ -110,33 +109,47 @@ describe('Modal', () => { expect(getByTestId('modal').getAttribute('aria-labelledby')).toEqual( getByTestId('modal-heading').getAttribute('id') ); - cleanup(); }); it('should be be able to take arbitrary html attributes on the container', () => { const {getByTestId} = testRender(); expect(getByTestId('modal').getAttribute('aria-busy')).toEqual('true'); expect(getByTestId('modal').getAttribute('id')).toEqual('a-new-id'); - cleanup(); + }); + + it('should render with focusable elements in the modal content', () => { + const {getByTestId} = testRender( + + + + + + + + + + + + + + ); + expect(getByTestId('modal')).toBeDefined(); }); it('should focus on the first focusable element in the modal, the close button', () => { const {getByTestId} = testRender(); expect(document.activeElement).toEqual(getByTestId('modal-header').querySelector('button')); - cleanup(); }); it('should focus on the element provided as the initialFocus element in the modal', () => { const {getByTestId} = testRender(); expect(document.activeElement).toEqual(getByTestId('modal-body').querySelector('input')); - cleanup(); }); it('should call the onDismiss function when the close button is clicked', () => { const {getByTestId} = testRender(); fireEvent.click(getByTestId('modal-header').querySelector('button') as HTMLButtonElement); expect(handleCloseMock).toHaveBeenCalled(); - cleanup(); }); it('Should have no accessibility violations', async () => { diff --git a/packages/paste-core/components/modal/src/Modal.tsx b/packages/paste-core/components/modal/src/Modal.tsx index e40697f56a..d3c35cb8f2 100644 --- a/packages/paste-core/components/modal/src/Modal.tsx +++ b/packages/paste-core/components/modal/src/Modal.tsx @@ -2,6 +2,7 @@ import * as React from 'react'; import * as PropTypes from 'prop-types'; import {styled, css} from '@twilio-paste/styling-library'; import {useTransition, animated} from '@twilio-paste/animation-library'; +import {safelySpreadBoxProps} from '@twilio-paste/box'; import {pasteBaseStyles} from '@twilio-paste/theme'; import {ModalDialogPrimitiveOverlay, ModalDialogPrimitiveContent} from '@twilio-paste/modal-dialog-primitive'; import {ModalContext} from './ModalContext'; @@ -130,8 +131,7 @@ const Modal = React.forwardRef( >