Skip to content

chore(compass-components): Update react-aria; Make sure onFocus / onBlur always makes it to the component COMPASS-5917 #3206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 24, 2022
Merged

chore(compass-components): Update react-aria; Make sure onFocus / onBlur always makes it to the component COMPASS-5917 #3206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
300 changes: 150 additions & 150 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/compass-aggregations/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions packages/compass-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
17 changes: 9 additions & 8 deletions packages/compass-components/src/components/document-list/element-editors.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%',
Expand Down Expand Up @@ -222,7 +223,12 @@ export const ValueEditor: React.FunctionComponent<{
onMouseDown,
/* eslint-enable @typescript-eslint/no-unused-vars */
...triggerProps
}: React.HTMLProps<HTMLInputElement>) => {
}: React.HTMLProps<HTMLElement>) => {
// 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 (
<div className={className}>
{type === 'String' ? (
Expand All @@ -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}
Expand All @@ -248,7 +252,7 @@ export const ValueEditor: React.FunctionComponent<{
)}
spellCheck="false"
style={inputStyle}
{...(triggerProps as React.HTMLProps<HTMLTextAreaElement>)}
{...(mergedProps as React.HTMLProps<HTMLTextAreaElement>)}
></textarea>
</div>
) : (
Expand All @@ -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<HTMLInputElement>)}
></input>
)}
{children}
Expand Down
4 changes: 2 additions & 2 deletions packages/compass-databases-navigation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/compass-saved-aggregations-queries/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/databases-collections-list/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/databases-collections/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down