From f99d586309bb89abdd0e201423caa13f8d74a513 Mon Sep 17 00:00:00 2001 From: Sergey Petushkov Date: Thu, 23 Jun 2022 19:06:55 +0200 Subject: [PATCH] chore(compass-components): Update react-aria; Make sure onFocus / onBlur always makes it to the component --- package-lock.json | 300 +++++++++--------- packages/compass-aggregations/package.json | 2 +- packages/compass-components/package.json | 6 +- .../document-list/element-editors.tsx | 17 +- .../compass-databases-navigation/package.json | 4 +- .../package.json | 2 +- .../databases-collections-list/package.json | 2 +- packages/databases-collections/package.json | 2 +- 8 files changed, 168 insertions(+), 167 deletions(-) diff --git a/package-lock.json b/package-lock.json index 63819e4502c..1cd9b67fcae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8174,157 +8174,157 @@ "integrity": "sha512-88p7+M0QGxKpmnkfXjS4V26AnoC/eiqZutE8GLdaI5X12NY75bXSdTY9NkmYb2Xyk1O+MmkuO6Frmsj84V6I8Q==" }, "node_modules/@react-aria/focus": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@react-aria/focus/-/focus-3.5.0.tgz", - "integrity": "sha512-Eib75Q6QgQdn8VVVByg5Vipaaj/C//8Bs++sQY7nkomRx4sdArOnXbDppul3YHP6mRfU9VRLvAigEUlReQF/Xw==", + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/@react-aria/focus/-/focus-3.6.1.tgz", + "integrity": "sha512-4IHAu+826jC3SjWwuaYhCr0qhWg4XwmJIUEhcL1wbw3fq2dsjIBwEJ5HoayhluiVCfjGbcQcJNf1L4Vj3VTp4w==", "dependencies": { "@babel/runtime": "^7.6.2", - "@react-aria/interactions": "^3.6.0", - "@react-aria/utils": "^3.9.0", - "@react-types/shared": "^3.9.0", + "@react-aria/interactions": "^3.9.1", + "@react-aria/utils": "^3.13.1", + "@react-types/shared": "^3.13.1", "clsx": "^1.1.1" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" } }, "node_modules/@react-aria/interactions": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.6.0.tgz", - "integrity": "sha512-dMEGYIIhJ3uxDd19Z/rxuqQp9Rx9c46AInrfzAiOijQj/fTmb4ubCsuFOAQrc0sy1HCY1/ntnRZQuRgT/iS74w==", + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.9.1.tgz", + "integrity": "sha512-qPTJpUwIiis2OwpVzDd3I8dBjBkelDnvAW+dJkX+8B840JP5a7E1zVoAuR7OOAXqKa95R7miwK+5la1aSeWoDg==", "dependencies": { "@babel/runtime": "^7.6.2", - "@react-aria/utils": "^3.9.0", - "@react-types/shared": "^3.9.0" + "@react-aria/utils": "^3.13.1", + "@react-types/shared": "^3.13.1" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" } }, "node_modules/@react-aria/ssr": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.1.2.tgz", - "integrity": "sha512-amXY11ImpokvkTMeKRHjsSsG7v1yzzs6yeqArCyBIk60J3Yhgxwx9Cah+Uu/804ATFwqzN22AXIo7SdtIaMP+g==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.2.0.tgz", + "integrity": "sha512-wwJFdkl+Q8NU5yJ4NvdAOqx5LM3QtUVoSjuK7Ey8jZ4WS4bB0EqT3Kr3IInBs257HzZ5nXCiKXKE4NGXXuIRWA==", "dependencies": { "@babel/runtime": "^7.6.2" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" } }, "node_modules/@react-aria/tooltip": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@react-aria/tooltip/-/tooltip-3.1.3.tgz", - "integrity": "sha512-l2/BS1XBKrLpg+dovI3xy6NdCgJ5n82TS4p8vQJa7GcynI1I64R0IjOUFv0lc6ZZsr1G8Wg71SNYfmlgTrPr2w==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@react-aria/tooltip/-/tooltip-3.2.1.tgz", + "integrity": "sha512-wcX87K1UdoMFVugNlbkevgjbqshmfdr00hb5N8GnRT3KlilWnlmDtxQBOYNao4uMQvkwkc4/xcvvpOpuuB1FoQ==", "dependencies": { "@babel/runtime": "^7.6.2", - "@react-aria/focus": "^3.4.1", - "@react-aria/interactions": "^3.5.1", - "@react-aria/utils": "^3.8.2", - "@react-stately/tooltip": "^3.0.5", - "@react-types/shared": "^3.8.0", - "@react-types/tooltip": "^3.1.2" + "@react-aria/focus": "^3.6.1", + "@react-aria/interactions": "^3.9.1", + "@react-aria/utils": "^3.13.1", + "@react-stately/tooltip": "^3.1.1", + "@react-types/shared": "^3.13.1", + "@react-types/tooltip": "^3.2.1" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" } }, "node_modules/@react-aria/utils": { - "version": "3.11.3", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.11.3.tgz", - "integrity": "sha512-EH3SyA3FtbhuOj1cgGveiEYidKe3CgGYkP8D57O46rlTWcgTxhGHUEibGeJw3PFXxmbgm5RIOdBo29YwItvtcQ==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.13.1.tgz", + "integrity": "sha512-usW6RoLKil4ylgDbRcaQ5YblNGv5ZihI4I9NB8pdazhw53cSRyLaygLdmHO33xgpPnAhb6Nb/tv8d5p6cAde+A==", "dependencies": { "@babel/runtime": "^7.6.2", - "@react-aria/ssr": "^3.1.2", - "@react-stately/utils": "^3.4.1", - "@react-types/shared": "^3.11.2", + "@react-aria/ssr": "^3.2.0", + "@react-stately/utils": "^3.5.0", + "@react-types/shared": "^3.13.1", "clsx": "^1.1.1" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" } }, "node_modules/@react-aria/visually-hidden": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.2.3.tgz", - "integrity": "sha512-iAe5EFI7obEOwTnIdAwWrKq+CrIJFGTw85v8fXnQ7CIVGRDblX85GOUww9bzQNPDLLRYWS4VF702ii8kV4+JCw==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.3.1.tgz", + "integrity": "sha512-HDdYIaRq9BFEwQQ2vkySHcHEj+FaJ/S6bJ4nO+CQwxzVMUcfbVXDS4lfGzsQdDLoV5PaKYajryUZQbUAk0Cfng==", "dependencies": { "@babel/runtime": "^7.6.2", - "@react-aria/interactions": "^3.5.1", - "@react-aria/utils": "^3.8.2", + "@react-aria/interactions": "^3.9.1", + "@react-aria/utils": "^3.13.1", "clsx": "^1.1.1" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" } }, "node_modules/@react-stately/overlays": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.1.3.tgz", - "integrity": "sha512-X8H/h9F8ZjevwJ7P8ak7v500qQd5x4Y76LsXUXrR6LtcO8FXfp2I+W8sGmBtLZwLQpTJiF1U0WMQqXLE1g6eLA==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.3.1.tgz", + "integrity": "sha512-IRaK8x9OnwP6p9sojs39hF4nXNqRTt1qydbQMTw876SU94kG2pdqk/vHe4qdGVEaHB/mZ/8wRMntitQ0C6XFKA==", "dependencies": { "@babel/runtime": "^7.6.2", - "@react-stately/utils": "^3.2.2", - "@react-types/overlays": "^3.5.1" + "@react-stately/utils": "^3.5.0", + "@react-types/overlays": "^3.6.1" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" } }, "node_modules/@react-stately/tooltip": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@react-stately/tooltip/-/tooltip-3.0.5.tgz", - "integrity": "sha512-rHqPSfkxbx0T0B/j+WDl4G2CfLjFeBfyaifGiIUJWHO/0Kwvh5am88VeHtuTVzC2DPEGTdtXqYns21EuJOrDlQ==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@react-stately/tooltip/-/tooltip-3.1.1.tgz", + "integrity": "sha512-Y+qyIrmnVTLKD+JaePEKx3AZ634+dcJPDLCA4KkmKqVPRIUW3s4N3BE0Jw+uFlBi+xl5tLEdID+bQGd0fl7avA==", "dependencies": { "@babel/runtime": "^7.6.2", - "@react-stately/overlays": "^3.1.3", - "@react-stately/utils": "^3.2.2", - "@react-types/tooltip": "^3.1.2" + "@react-stately/overlays": "^3.3.1", + "@react-stately/utils": "^3.5.0", + "@react-types/tooltip": "^3.2.1" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" } }, "node_modules/@react-stately/utils": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.4.1.tgz", - "integrity": "sha512-mjFbKklj/W8KRw1CQSpUJxHd7lhUge4i00NwJTwGxbzmiJgsTWlKKS/1rBf48ey9hUBopXT5x5vG/AxQfWTQug==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.5.0.tgz", + "integrity": "sha512-WzzwlQtJrf7egaN+lt02/f/wkFKbcscsbinmXs9pL7QyYm+BCQ9xXj01w0juzt93piZgB/kfIYJqInEdpudh1A==", "dependencies": { "@babel/runtime": "^7.6.2" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" } }, "node_modules/@react-types/overlays": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/@react-types/overlays/-/overlays-3.5.1.tgz", - "integrity": "sha512-T3o6wQ5NNm1rSniIa01bIa6fALC8jbwpYxFMaQRrdEpIvwktt0Fi5Xo6/97+oe4HvzzU0JMhtwWDTdRySvgeZw==", + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/@react-types/overlays/-/overlays-3.6.1.tgz", + "integrity": "sha512-vkVSC7KvRLugfr9HP2dyV4J5wmI5KxfKyAFdT4j3Q+YfSYQwKa7OT+iTeRHDOIR3ubKnxgoIdQpjurBQTjCWwg==", "dependencies": { - "@react-types/shared": "^3.8.0" + "@react-types/shared": "^3.13.1" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" } }, "node_modules/@react-types/shared": { - "version": "3.11.2", - "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.11.2.tgz", - "integrity": "sha512-MIjjjkFi/DTzMVmeFJJrpc51eS/PLNzLZEv6o/QJPhQ9uOMElYqA790qAcG75u3tR0XGU2Vv9RyeOC7+ppw8/Q==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.13.1.tgz", + "integrity": "sha512-EHQqILDJeDvnloy5VV9lnnEjpCMwH1ghptCfa/lz9Ht9nwco3qGCvUABkWyND7yU1Adt3A/1oJxhpRUu3eTlyg==", "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" } }, "node_modules/@react-types/tooltip": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@react-types/tooltip/-/tooltip-3.1.2.tgz", - "integrity": "sha512-puyiRi3IaEeKH25AErZzQKthnxk1McU+7S+Qo2kFLy3F3PyXV0cmSqvKKOhH6kU5Cw4ZnuAlNjCI0tV8PYdlYA==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@react-types/tooltip/-/tooltip-3.2.1.tgz", + "integrity": "sha512-1YkpJaIvcVevYbQlOvPqPua5fdwAMrRm4BkLtVRbUL0DerCazCrB/osdQINGOU67XmLU1JIv/xTBMK0Say5Jvg==", "dependencies": { - "@react-types/overlays": "^3.5.1", - "@react-types/shared": "^3.8.0" + "@react-types/overlays": "^3.6.1", + "@react-types/shared": "^3.13.1" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" } }, "node_modules/@samverschueren/stream-to-observable": { @@ -56388,7 +56388,7 @@ "@mongodb-js/prettier-config-compass": "^0.5.0", "@mongodb-js/tsconfig-compass": "^0.6.0", "@mongodb-js/webpack-config-compass": "^0.9.0", - "@react-aria/utils": "^3.11.3", + "@react-aria/utils": "^3.13.1", "@testing-library/react": "^12.1.4", "@testing-library/user-event": "^13.5.0", "@types/decomment": "^0.9.2", @@ -62777,9 +62777,9 @@ "@leafygreen-ui/tooltip": "^6.3.1", "@leafygreen-ui/typography": "^8.1.0", "@mongodb-js/compass-logging": "^0.12.0", - "@react-aria/interactions": "^3.6.0", - "@react-aria/tooltip": "^3.1.3", - "@react-aria/utils": "^3.9.0", + "@react-aria/interactions": "^3.9.1", + "@react-aria/tooltip": "^3.2.1", + "@react-aria/utils": "^3.13.1", "@react-stately/tooltip": "^3.0.5", "bson": "^4.6.1", "hadron-document": "^7.11.0", @@ -64125,8 +64125,8 @@ "license": "SSPL", "dependencies": { "@mongodb-js/compass-components": "^0.15.0", - "@react-aria/utils": "^3.9.0", - "@react-aria/visually-hidden": "^3.2.3", + "@react-aria/utils": "^3.13.1", + "@react-aria/visually-hidden": "^3.3.1", "react": "^16.14.0", "react-dom": "^16.14.0", "react-virtualized-auto-sizer": "^1.0.6", @@ -77682,7 +77682,7 @@ "@mongodb-js/compass-components": "^0.15.0", "@mongodb-js/compass-logging": "^0.12.0", "@mongodb-js/compass-query-history": "^8.23.0", - "@react-aria/utils": "^3.11.0", + "@react-aria/utils": "^3.13.1", "bson": "^4.6.1", "fuse.js": "^6.5.3", "mongodb-ns": "^2.4.0", @@ -95269,7 +95269,7 @@ "version": "0.24.0", "license": "SSPL", "dependencies": { - "@react-aria/utils": "^3.11.0", + "@react-aria/utils": "^3.13.1", "lodash": "^4.17.15" }, "devDependencies": { @@ -95371,7 +95371,7 @@ "license": "SSPL", "dependencies": { "@mongodb-js/compass-components": "^0.15.0", - "@react-aria/utils": "^3.10.0", + "@react-aria/utils": "^3.13.1", "react": "^16.14.0", "react-dom": "^16.14.0" }, @@ -108306,7 +108306,7 @@ "@mongodb-js/prettier-config-compass": "^0.5.0", "@mongodb-js/tsconfig-compass": "^0.6.0", "@mongodb-js/webpack-config-compass": "^0.9.0", - "@react-aria/utils": "^3.11.3", + "@react-aria/utils": "^3.13.1", "@testing-library/react": "^12.1.4", "@testing-library/user-event": "^13.5.0", "@types/decomment": "^0.9.2", @@ -112956,9 +112956,9 @@ "@mongodb-js/mocha-config-compass": "^0.10.0", "@mongodb-js/prettier-config-compass": "^0.5.0", "@mongodb-js/tsconfig-compass": "^0.6.0", - "@react-aria/interactions": "^3.6.0", - "@react-aria/tooltip": "^3.1.3", - "@react-aria/utils": "^3.9.0", + "@react-aria/interactions": "^3.9.1", + "@react-aria/tooltip": "^3.2.1", + "@react-aria/utils": "^3.13.1", "@react-stately/tooltip": "^3.0.5", "@testing-library/dom": "^8.11.1", "@testing-library/react": "^12.0.0", @@ -113911,7 +113911,7 @@ "@mongodb-js/compass-logging": "^0.12.0", "@mongodb-js/databases-collections-list": "^0.8.0", "@mongodb-js/mocha-config-compass": "^0.10.0", - "@react-aria/utils": "^3.11.0", + "@react-aria/utils": "^3.13.1", "autoprefixer": "^9.7.4", "babel-loader": "^8.2.2", "bson": "^4.4.1", @@ -114240,8 +114240,8 @@ "@mongodb-js/mocha-config-compass": "^0.10.0", "@mongodb-js/prettier-config-compass": "^0.5.0", "@mongodb-js/tsconfig-compass": "^0.6.0", - "@react-aria/utils": "^3.9.0", - "@react-aria/visually-hidden": "^3.2.3", + "@react-aria/utils": "^3.13.1", + "@react-aria/visually-hidden": "3.3.1", "@testing-library/react": "^12.0.0", "@testing-library/user-event": "^13.5.0", "@types/chai": "^4.2.21", @@ -122576,7 +122576,7 @@ "@mongodb-js/prettier-config-compass": "^0.5.0", "@mongodb-js/tsconfig-compass": "^0.6.0", "@mongodb-js/webpack-config-compass": "^0.9.0", - "@react-aria/utils": "^3.11.0", + "@react-aria/utils": "^3.13.1", "@testing-library/react": "^12.0.0", "@testing-library/react-hooks": "^7.0.2", "@testing-library/user-event": "^13.5.0", @@ -133917,7 +133917,7 @@ "@mongodb-js/mocha-config-compass": "^0.10.0", "@mongodb-js/prettier-config-compass": "^0.5.0", "@mongodb-js/tsconfig-compass": "^0.6.0", - "@react-aria/utils": "^3.10.0", + "@react-aria/utils": "^3.13.1", "@testing-library/react": "^12.0.0", "@testing-library/user-event": "^13.5.0", "@types/chai": "^4.2.21", @@ -139093,121 +139093,121 @@ "integrity": "sha512-88p7+M0QGxKpmnkfXjS4V26AnoC/eiqZutE8GLdaI5X12NY75bXSdTY9NkmYb2Xyk1O+MmkuO6Frmsj84V6I8Q==" }, "@react-aria/focus": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@react-aria/focus/-/focus-3.5.0.tgz", - "integrity": "sha512-Eib75Q6QgQdn8VVVByg5Vipaaj/C//8Bs++sQY7nkomRx4sdArOnXbDppul3YHP6mRfU9VRLvAigEUlReQF/Xw==", + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/@react-aria/focus/-/focus-3.6.1.tgz", + "integrity": "sha512-4IHAu+826jC3SjWwuaYhCr0qhWg4XwmJIUEhcL1wbw3fq2dsjIBwEJ5HoayhluiVCfjGbcQcJNf1L4Vj3VTp4w==", "requires": { "@babel/runtime": "^7.6.2", - "@react-aria/interactions": "^3.6.0", - "@react-aria/utils": "^3.9.0", - "@react-types/shared": "^3.9.0", + "@react-aria/interactions": "^3.9.1", + "@react-aria/utils": "^3.13.1", + "@react-types/shared": "^3.13.1", "clsx": "^1.1.1" } }, "@react-aria/interactions": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.6.0.tgz", - "integrity": "sha512-dMEGYIIhJ3uxDd19Z/rxuqQp9Rx9c46AInrfzAiOijQj/fTmb4ubCsuFOAQrc0sy1HCY1/ntnRZQuRgT/iS74w==", + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.9.1.tgz", + "integrity": "sha512-qPTJpUwIiis2OwpVzDd3I8dBjBkelDnvAW+dJkX+8B840JP5a7E1zVoAuR7OOAXqKa95R7miwK+5la1aSeWoDg==", "requires": { "@babel/runtime": "^7.6.2", - "@react-aria/utils": "^3.9.0", - "@react-types/shared": "^3.9.0" + "@react-aria/utils": "^3.13.1", + "@react-types/shared": "^3.13.1" } }, "@react-aria/ssr": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.1.2.tgz", - "integrity": "sha512-amXY11ImpokvkTMeKRHjsSsG7v1yzzs6yeqArCyBIk60J3Yhgxwx9Cah+Uu/804ATFwqzN22AXIo7SdtIaMP+g==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.2.0.tgz", + "integrity": "sha512-wwJFdkl+Q8NU5yJ4NvdAOqx5LM3QtUVoSjuK7Ey8jZ4WS4bB0EqT3Kr3IInBs257HzZ5nXCiKXKE4NGXXuIRWA==", "requires": { "@babel/runtime": "^7.6.2" } }, "@react-aria/tooltip": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@react-aria/tooltip/-/tooltip-3.1.3.tgz", - "integrity": "sha512-l2/BS1XBKrLpg+dovI3xy6NdCgJ5n82TS4p8vQJa7GcynI1I64R0IjOUFv0lc6ZZsr1G8Wg71SNYfmlgTrPr2w==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@react-aria/tooltip/-/tooltip-3.2.1.tgz", + "integrity": "sha512-wcX87K1UdoMFVugNlbkevgjbqshmfdr00hb5N8GnRT3KlilWnlmDtxQBOYNao4uMQvkwkc4/xcvvpOpuuB1FoQ==", "requires": { "@babel/runtime": "^7.6.2", - "@react-aria/focus": "^3.4.1", - "@react-aria/interactions": "^3.5.1", - "@react-aria/utils": "^3.8.2", - "@react-stately/tooltip": "^3.0.5", - "@react-types/shared": "^3.8.0", - "@react-types/tooltip": "^3.1.2" + "@react-aria/focus": "^3.6.1", + "@react-aria/interactions": "^3.9.1", + "@react-aria/utils": "^3.13.1", + "@react-stately/tooltip": "^3.1.1", + "@react-types/shared": "^3.13.1", + "@react-types/tooltip": "^3.2.1" } }, "@react-aria/utils": { - "version": "3.11.3", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.11.3.tgz", - "integrity": "sha512-EH3SyA3FtbhuOj1cgGveiEYidKe3CgGYkP8D57O46rlTWcgTxhGHUEibGeJw3PFXxmbgm5RIOdBo29YwItvtcQ==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.13.1.tgz", + "integrity": "sha512-usW6RoLKil4ylgDbRcaQ5YblNGv5ZihI4I9NB8pdazhw53cSRyLaygLdmHO33xgpPnAhb6Nb/tv8d5p6cAde+A==", "requires": { "@babel/runtime": "^7.6.2", - "@react-aria/ssr": "^3.1.2", - "@react-stately/utils": "^3.4.1", - "@react-types/shared": "^3.11.2", + "@react-aria/ssr": "^3.2.0", + "@react-stately/utils": "^3.5.0", + "@react-types/shared": "^3.13.1", "clsx": "^1.1.1" } }, "@react-aria/visually-hidden": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.2.3.tgz", - "integrity": "sha512-iAe5EFI7obEOwTnIdAwWrKq+CrIJFGTw85v8fXnQ7CIVGRDblX85GOUww9bzQNPDLLRYWS4VF702ii8kV4+JCw==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.3.1.tgz", + "integrity": "sha512-HDdYIaRq9BFEwQQ2vkySHcHEj+FaJ/S6bJ4nO+CQwxzVMUcfbVXDS4lfGzsQdDLoV5PaKYajryUZQbUAk0Cfng==", "requires": { "@babel/runtime": "^7.6.2", - "@react-aria/interactions": "^3.5.1", - "@react-aria/utils": "^3.8.2", + "@react-aria/interactions": "^3.9.1", + "@react-aria/utils": "^3.13.1", "clsx": "^1.1.1" } }, "@react-stately/overlays": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.1.3.tgz", - "integrity": "sha512-X8H/h9F8ZjevwJ7P8ak7v500qQd5x4Y76LsXUXrR6LtcO8FXfp2I+W8sGmBtLZwLQpTJiF1U0WMQqXLE1g6eLA==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.3.1.tgz", + "integrity": "sha512-IRaK8x9OnwP6p9sojs39hF4nXNqRTt1qydbQMTw876SU94kG2pdqk/vHe4qdGVEaHB/mZ/8wRMntitQ0C6XFKA==", "requires": { "@babel/runtime": "^7.6.2", - "@react-stately/utils": "^3.2.2", - "@react-types/overlays": "^3.5.1" + "@react-stately/utils": "^3.5.0", + "@react-types/overlays": "^3.6.1" } }, "@react-stately/tooltip": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@react-stately/tooltip/-/tooltip-3.0.5.tgz", - "integrity": "sha512-rHqPSfkxbx0T0B/j+WDl4G2CfLjFeBfyaifGiIUJWHO/0Kwvh5am88VeHtuTVzC2DPEGTdtXqYns21EuJOrDlQ==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@react-stately/tooltip/-/tooltip-3.1.1.tgz", + "integrity": "sha512-Y+qyIrmnVTLKD+JaePEKx3AZ634+dcJPDLCA4KkmKqVPRIUW3s4N3BE0Jw+uFlBi+xl5tLEdID+bQGd0fl7avA==", "requires": { "@babel/runtime": "^7.6.2", - "@react-stately/overlays": "^3.1.3", - "@react-stately/utils": "^3.2.2", - "@react-types/tooltip": "^3.1.2" + "@react-stately/overlays": "^3.3.1", + "@react-stately/utils": "^3.5.0", + "@react-types/tooltip": "^3.2.1" } }, "@react-stately/utils": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.4.1.tgz", - "integrity": "sha512-mjFbKklj/W8KRw1CQSpUJxHd7lhUge4i00NwJTwGxbzmiJgsTWlKKS/1rBf48ey9hUBopXT5x5vG/AxQfWTQug==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.5.0.tgz", + "integrity": "sha512-WzzwlQtJrf7egaN+lt02/f/wkFKbcscsbinmXs9pL7QyYm+BCQ9xXj01w0juzt93piZgB/kfIYJqInEdpudh1A==", "requires": { "@babel/runtime": "^7.6.2" } }, "@react-types/overlays": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/@react-types/overlays/-/overlays-3.5.1.tgz", - "integrity": "sha512-T3o6wQ5NNm1rSniIa01bIa6fALC8jbwpYxFMaQRrdEpIvwktt0Fi5Xo6/97+oe4HvzzU0JMhtwWDTdRySvgeZw==", + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/@react-types/overlays/-/overlays-3.6.1.tgz", + "integrity": "sha512-vkVSC7KvRLugfr9HP2dyV4J5wmI5KxfKyAFdT4j3Q+YfSYQwKa7OT+iTeRHDOIR3ubKnxgoIdQpjurBQTjCWwg==", "requires": { - "@react-types/shared": "^3.8.0" + "@react-types/shared": "^3.13.1" } }, "@react-types/shared": { - "version": "3.11.2", - "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.11.2.tgz", - "integrity": "sha512-MIjjjkFi/DTzMVmeFJJrpc51eS/PLNzLZEv6o/QJPhQ9uOMElYqA790qAcG75u3tR0XGU2Vv9RyeOC7+ppw8/Q==" + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.13.1.tgz", + "integrity": "sha512-EHQqILDJeDvnloy5VV9lnnEjpCMwH1ghptCfa/lz9Ht9nwco3qGCvUABkWyND7yU1Adt3A/1oJxhpRUu3eTlyg==" }, "@react-types/tooltip": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@react-types/tooltip/-/tooltip-3.1.2.tgz", - "integrity": "sha512-puyiRi3IaEeKH25AErZzQKthnxk1McU+7S+Qo2kFLy3F3PyXV0cmSqvKKOhH6kU5Cw4ZnuAlNjCI0tV8PYdlYA==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@react-types/tooltip/-/tooltip-3.2.1.tgz", + "integrity": "sha512-1YkpJaIvcVevYbQlOvPqPua5fdwAMrRm4BkLtVRbUL0DerCazCrB/osdQINGOU67XmLU1JIv/xTBMK0Say5Jvg==", "requires": { - "@react-types/overlays": "^3.5.1", - "@react-types/shared": "^3.8.0" + "@react-types/overlays": "^3.6.1", + "@react-types/shared": "^3.13.1" } }, "@samverschueren/stream-to-observable": { diff --git a/packages/compass-aggregations/package.json b/packages/compass-aggregations/package.json index 480afcec573..3a0161e19f8 100644 --- a/packages/compass-aggregations/package.json +++ b/packages/compass-aggregations/package.json @@ -62,7 +62,7 @@ "@mongodb-js/prettier-config-compass": "^0.5.0", "@mongodb-js/tsconfig-compass": "^0.6.0", "@mongodb-js/webpack-config-compass": "^0.9.0", - "@react-aria/utils": "^3.11.3", + "@react-aria/utils": "^3.13.1", "@testing-library/react": "^12.1.4", "@testing-library/user-event": "^13.5.0", "@types/decomment": "^0.9.2", diff --git a/packages/compass-components/package.json b/packages/compass-components/package.json index e3a0b205f83..e5c6c69d93b 100644 --- a/packages/compass-components/package.json +++ b/packages/compass-components/package.json @@ -62,9 +62,9 @@ "@leafygreen-ui/tooltip": "^6.3.1", "@leafygreen-ui/typography": "^8.1.0", "@mongodb-js/compass-logging": "^0.12.0", - "@react-aria/interactions": "^3.6.0", - "@react-aria/tooltip": "^3.1.3", - "@react-aria/utils": "^3.9.0", + "@react-aria/interactions": "^3.9.1", + "@react-aria/tooltip": "^3.2.1", + "@react-aria/utils": "^3.13.1", "@react-stately/tooltip": "^3.0.5", "bson": "^4.6.1", "hadron-document": "^7.11.0", diff --git a/packages/compass-components/src/components/document-list/element-editors.tsx b/packages/compass-components/src/components/document-list/element-editors.tsx index 410cfe5745f..f045c08090d 100644 --- a/packages/compass-components/src/components/document-list/element-editors.tsx +++ b/packages/compass-components/src/components/document-list/element-editors.tsx @@ -7,6 +7,7 @@ import { uiColors } from '@leafygreen-ui/palette'; import { spacing } from '@leafygreen-ui/tokens'; import BSONValue, { hasCustomColor, VALUE_COLOR_BY_TYPE } from '../bson-value'; import { Tooltip } from '../tooltip'; +import { mergeProps } from '../../utils/merge-props'; const maxWidth = css({ maxWidth: '100%', @@ -222,7 +223,12 @@ export const ValueEditor: React.FunctionComponent<{ onMouseDown, /* eslint-enable @typescript-eslint/no-unused-vars */ ...triggerProps - }: React.HTMLProps) => { + }: React.HTMLProps) => { + // NB: Order is important, if triggerProps has onFocus / onBlur we + // want to merge them with ours, if they are not passed, we want our + // listeners to overwrite undefined keys + const mergedProps = mergeProps(triggerProps, { onBlur, onFocus }); + return (
{type === 'String' ? ( @@ -235,8 +241,6 @@ export const ValueEditor: React.FunctionComponent<{ onChange={(evt) => { onChange(evt.currentTarget.value); }} - onFocus={onFocus} - onBlur={onBlur} // See ./element.tsx // eslint-disable-next-line jsx-a11y/no-autofocus autoFocus={autoFocus} @@ -248,7 +252,7 @@ export const ValueEditor: React.FunctionComponent<{ )} spellCheck="false" style={inputStyle} - {...(triggerProps as React.HTMLProps)} + {...(mergedProps as React.HTMLProps)} >
) : ( @@ -259,20 +263,17 @@ export const ValueEditor: React.FunctionComponent<{ onChange={(evt) => { onChange(evt.currentTarget.value); }} - onFocus={onFocus} - onBlur={onBlur} // See ./element.tsx // eslint-disable-next-line jsx-a11y/no-autofocus autoFocus={autoFocus} className={cx( editorReset, editorOutline, - getCustomColorStyle(type), !valid && editorInvalid )} style={inputStyle} spellCheck="false" - {...triggerProps} + {...(mergedProps as React.HTMLProps)} > )} {children} diff --git a/packages/compass-databases-navigation/package.json b/packages/compass-databases-navigation/package.json index e0f09aa45a3..6c2934017c3 100644 --- a/packages/compass-databases-navigation/package.json +++ b/packages/compass-databases-navigation/package.json @@ -53,8 +53,8 @@ }, "dependencies": { "@mongodb-js/compass-components": "^0.15.0", - "@react-aria/utils": "^3.9.0", - "@react-aria/visually-hidden": "^3.2.3", + "@react-aria/utils": "^3.13.1", + "@react-aria/visually-hidden": "^3.3.1", "react": "^16.14.0", "react-dom": "^16.14.0", "react-virtualized-auto-sizer": "^1.0.6", diff --git a/packages/compass-saved-aggregations-queries/package.json b/packages/compass-saved-aggregations-queries/package.json index 98b0d3ba9eb..4e3094c9f67 100644 --- a/packages/compass-saved-aggregations-queries/package.json +++ b/packages/compass-saved-aggregations-queries/package.json @@ -65,7 +65,7 @@ "@mongodb-js/compass-components": "^0.15.0", "@mongodb-js/compass-logging": "^0.12.0", "@mongodb-js/compass-query-history": "^8.23.0", - "@react-aria/utils": "^3.11.0", + "@react-aria/utils": "^3.13.1", "bson": "^4.6.1", "fuse.js": "^6.5.3", "mongodb-ns": "^2.4.0", diff --git a/packages/databases-collections-list/package.json b/packages/databases-collections-list/package.json index 3f22eaed23a..8ee36edf132 100644 --- a/packages/databases-collections-list/package.json +++ b/packages/databases-collections-list/package.json @@ -54,7 +54,7 @@ }, "dependencies": { "@mongodb-js/compass-components": "^0.15.0", - "@react-aria/utils": "^3.10.0", + "@react-aria/utils": "^3.13.1", "react": "^16.14.0", "react-dom": "^16.14.0" }, diff --git a/packages/databases-collections/package.json b/packages/databases-collections/package.json index 79d4ad83315..2cbd0fd7a73 100644 --- a/packages/databases-collections/package.json +++ b/packages/databases-collections/package.json @@ -120,7 +120,7 @@ "webpack-node-externals": "^3.0.0" }, "dependencies": { - "@react-aria/utils": "^3.11.0", + "@react-aria/utils": "^3.13.1", "lodash": "^4.17.15" }, "homepage": "https://github.com/mongodb-js/compass",