Skip to content
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.

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

release 3.4.23-rc.0 #5566

Merged
merged 5 commits into from
Nov 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 3 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"prettier --write"
]
},
"version": "3.4.22",
"version": "3.4.23-rc.0",
"license": "MIT",
"private": false,
"main": "lib/commonjs/index",
Expand All @@ -55,6 +55,7 @@
"@types/jest": "^26.0.0",
"@types/lodash.clonedeep": "^4.5.6",
"@types/lodash.get": "^4.4.6",
"@types/lodash.has": "^4.5.6",
"@types/lodash.isempty": "^4.4.6",
"@types/lodash.isequal": "^4.5.5",
"@types/lodash.isnil": "^4.0.6",
Expand All @@ -66,6 +67,7 @@
"@types/react": "^16.9.19",
"@types/react-native": "~0.63.2",
"@types/tinycolor2": "^1.4.2",
"@types/use-subscription": "^1.0.0",
"babel-plugin-transform-remove-console": "^6.9.4",
"commitlint": "^8.3.5",
"eslint": "^7.10.0",
Expand Down Expand Up @@ -174,8 +176,6 @@
]
},
"dependencies": {
"@react-aria/focus": "3.2.3",
"@react-aria/utils": "^3.6.0",
"@react-aria/visually-hidden": "^3.2.1",
"@react-native-aria/button": "^0.2.4",
"@react-native-aria/checkbox": "^0.2.2",
Expand All @@ -195,8 +195,6 @@
"@react-stately/slider": "3.0.1",
"@react-stately/tabs": "3.0.0-alpha.1",
"@react-stately/toggle": "3.2.1",
"@types/lodash.has": "^4.5.6",
"@types/use-subscription": "^1.0.0",
"inline-style-prefixer": "^6.0.1",
"lodash.clonedeep": "^4.5.0",
"lodash.get": "^4.4.2",
Expand All @@ -209,7 +207,6 @@
"lodash.omit": "^4.5.0",
"lodash.omitby": "^4.6.0",
"lodash.pick": "^4.4.0",
"react-native-keyboard-aware-scroll-view": "^0.9.5",
"stable-hash": "^0.0.2",
"tinycolor2": "^1.4.2",
"use-subscription": "^1.8.0"
Expand Down
8 changes: 5 additions & 3 deletions src/components/composites/Menu/useMenu.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { useFocusManager } from '@react-aria/focus';
import { useFocusManager } from '@react-native-aria/focus';
import { useId } from '@react-native-aria/utils';
import { AccessibilityRole, Platform } from 'react-native';
import { ResponsiveQueryContext } from '../../../utils/useResponsiveQuery/ResponsiveQueryProvider';
Expand Down Expand Up @@ -42,12 +42,14 @@ export const useMenu = () => {
switch (e.key) {
case 'ArrowDown': {
e.preventDefault();
focusManager.focusNext({ wrap: true });
//@ts-ignore
focusManager?.focusNext({ wrap: true });
break;
}
case 'ArrowUp': {
e.preventDefault();
focusManager.focusPrevious({ wrap: true });
//@ts-ignore
focusManager?.focusPrevious({ wrap: true });
break;
}
}
Expand Down
9 changes: 5 additions & 4 deletions src/utils/useResponsiveQuery/useResponsiveQuery.web.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,11 @@ const getResponsiveStyles = (
const oldIdentifier = compiledStyle[key];
compiledOrderedRules.forEach(([rules, _order]: any) => {
// Rule returned by atomic has css selectors, so we'll replace it with data-attr selector
const newRule = rules[0].replace(
'.' + oldIdentifier,
newIdentifier
);

let newRule = '';
if (rules[0].includes(oldIdentifier)) {
newRule = rules[0].replace('.' + oldIdentifier, newIdentifier);
}
mediaRules += newRule;
});
});
Expand Down
15 changes: 1 addition & 14 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1957,7 +1957,7 @@
"@react-types/combobox" "3.0.0-alpha.1"
"@react-types/shared" "^3.4.0"

"@react-aria/focus@3.2.3", "@react-aria/focus@^3.2.2", "@react-aria/focus@^3.2.3":
"@react-aria/focus@^3.2.2", "@react-aria/focus@^3.2.3":
version "3.2.3"
resolved "https://registry.yarnpkg.com/@react-aria/focus/-/focus-3.2.3.tgz#3e4137498a7fb5235d056c30fd94ab4a82e73aea"
integrity sha512-+OWmJMivrq3f8ApWihH1KJYqYj3rZV34YJORacBohcAsF1Qd1V1/P+w3dMkf24kV0wqAiWePCF1FwgnrL/rYzQ==
Expand Down Expand Up @@ -10549,19 +10549,6 @@ react-is@^17.0.1:
resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==

react-native-iphone-x-helper@^1.0.3:
version "1.3.1"
resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz#20c603e9a0e765fd6f97396638bdeb0e5a60b010"
integrity sha512-HOf0jzRnq2/aFUcdCJ9w9JGzN3gdEg0zFE4FyYlp4jtidqU03D5X7ZegGKfT1EWteR0gPBGp9ye5T5FvSWi9Yg==

react-native-keyboard-aware-scroll-view@^0.9.5:
version "0.9.5"
resolved "https://registry.yarnpkg.com/react-native-keyboard-aware-scroll-view/-/react-native-keyboard-aware-scroll-view-0.9.5.tgz#e2e9665d320c188e6b1f22f151b94eb358bf9b71"
integrity sha512-XwfRn+T/qBH9WjTWIBiJD2hPWg0yJvtaEw6RtPCa5/PYHabzBaWxYBOl0usXN/368BL1XktnZPh8C2lmTpOREA==
dependencies:
prop-types "^15.6.2"
react-native-iphone-x-helper "^1.0.3"

react-native-safe-area-context@^3.1.9:
version "3.1.9"
resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-3.1.9.tgz#48864ea976b0fa57142a2cc523e1fd3314e7247e"
Expand Down