From 041d6df418c73b1e066e1c4ae5aa9700a341163b Mon Sep 17 00:00:00 2001 From: Suraj Ahmed Date: Thu, 17 Nov 2022 18:30:33 +0530 Subject: [PATCH 1/3] chore: removed extra dependencies --- package.json | 7 ++----- src/components/composites/Menu/useMenu.tsx | 8 +++++--- yarn.lock | 15 +-------------- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 8da3da37f..651246579 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,8 @@ "source": "src/index", "typings": "lib/typescript/index.d.ts", "devDependencies": { + "@types/lodash.has": "^4.5.6", + "@types/use-subscription": "^1.0.0", "@commitlint/config-conventional": "^8.3.4", "@react-native-community/bob": "^0.16.2", "@react-native-community/eslint-config": "^2.0.0", @@ -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", @@ -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", @@ -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" diff --git a/src/components/composites/Menu/useMenu.tsx b/src/components/composites/Menu/useMenu.tsx index 7241a33ce..fdafe8f34 100644 --- a/src/components/composites/Menu/useMenu.tsx +++ b/src/components/composites/Menu/useMenu.tsx @@ -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'; @@ -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; } } diff --git a/yarn.lock b/yarn.lock index 04a29f6e7..4362ec3f0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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== @@ -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" From d8600cf4eaf92662d6fd9918d4980a2da2dac3e4 Mon Sep 17 00:00:00 2001 From: Viraj-10 Date: Fri, 18 Nov 2022 16:58:55 +0530 Subject: [PATCH 2/3] fix: responsive nextjs --- src/utils/useResponsiveQuery/useResponsiveQuery.web.tsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/utils/useResponsiveQuery/useResponsiveQuery.web.tsx b/src/utils/useResponsiveQuery/useResponsiveQuery.web.tsx index f9e9163c3..ba3967f13 100644 --- a/src/utils/useResponsiveQuery/useResponsiveQuery.web.tsx +++ b/src/utils/useResponsiveQuery/useResponsiveQuery.web.tsx @@ -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; }); }); From b9f7e9140fabf44f68e13f28927ba998230d2ab2 Mon Sep 17 00:00:00 2001 From: ankit-tailor Date: Fri, 18 Nov 2022 18:42:55 +0530 Subject: [PATCH 3/3] v3.4.23-rc.0 --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 651246579..1be5a4d85 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "prettier --write" ] }, - "version": "3.4.22", + "version": "3.4.23-rc.0", "license": "MIT", "private": false, "main": "lib/commonjs/index", @@ -46,8 +46,6 @@ "source": "src/index", "typings": "lib/typescript/index.d.ts", "devDependencies": { - "@types/lodash.has": "^4.5.6", - "@types/use-subscription": "^1.0.0", "@commitlint/config-conventional": "^8.3.4", "@react-native-community/bob": "^0.16.2", "@react-native-community/eslint-config": "^2.0.0", @@ -57,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", @@ -68,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",