diff --git a/package.json b/package.json index 6a3b3bc9b..053ff30f6 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "prettier --write" ] }, - "version": "3.4.26", + "version": "3.4.27", "license": "MIT", "private": false, "main": "lib/commonjs/index", @@ -179,7 +179,7 @@ "dependencies": { "@react-aria/visually-hidden": "^3.2.1", "@react-native-aria/button": "^0.2.4", - "@react-native-aria/checkbox": "^0.2.2", + "@react-native-aria/checkbox": "^0.2.3", "@react-native-aria/combobox": "^0.2.4-alpha.0", "@react-native-aria/focus": "^0.2.6", "@react-native-aria/interactions": "^0.2.2", @@ -189,7 +189,7 @@ "@react-native-aria/slider": "^0.2.5-alpha.1", "@react-native-aria/tabs": "^0.2.7", "@react-native-aria/utils": "^0.2.8", - "@react-stately/checkbox": "3.0.3", + "@react-stately/checkbox": "3.4.0", "@react-stately/collections": "3.3.0", "@react-stately/combobox": "3.0.0-alpha.1", "@react-stately/radio": "3.2.1", diff --git a/src/components/primitives/Checkbox/CheckboxGroup.tsx b/src/components/primitives/Checkbox/CheckboxGroup.tsx index eea9b4d7f..9491c3b23 100644 --- a/src/components/primitives/Checkbox/CheckboxGroup.tsx +++ b/src/components/primitives/Checkbox/CheckboxGroup.tsx @@ -1,4 +1,4 @@ -import React, { createContext, memo, forwardRef } from 'react'; +import React, { createContext, memo, forwardRef, useMemo } from 'react'; import { useCheckboxGroupState } from '@react-stately/checkbox'; import { useCheckboxGroup } from '@react-native-aria/checkbox'; import { useFormControlContext } from '../../composites/FormControl'; @@ -22,23 +22,25 @@ function CheckboxGroup( { 'aria-label': props.accessibilityLabel, ...props }, state ); - const formControlContext = useFormControlContext(); + const value = useMemo( + () => ({ + size, + colorScheme, + ..._checkbox, + ...formControlContext, + state, + }), + [_checkbox, colorScheme, formControlContext, size, state] + ); + //TODO: refactor for responsive prop if (useHasResponsiveProps({ ...props, size, colorScheme })) { return null; } return ( - + // @ts-ignore + {children} diff --git a/yarn.lock b/yarn.lock index 92f72c64d..d6c0bae75 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2271,15 +2271,15 @@ "@react-stately/toggle" "^3.2.1" "@react-types/checkbox" "^3.2.1" -"@react-native-aria/checkbox@^0.2.2": - version "0.2.2" - resolved "https://registry.yarnpkg.com/@react-native-aria/checkbox/-/checkbox-0.2.2.tgz#fc63537bee8eace82755c27d93249bfd9377aa83" - integrity sha512-Jtl5A1TTbQbF9QrABm/3fJ2RtHtal/LSgnMoyrfW24UZk4PytMnLxhcPCKipSaivUV6CAxQPkaLUk7lDHzVt2g== +"@react-native-aria/checkbox@^0.2.3": + version "0.2.3" + resolved "https://registry.yarnpkg.com/@react-native-aria/checkbox/-/checkbox-0.2.3.tgz#b6c99c215677df872f1bb4e596b54573f1c7a5f0" + integrity sha512-YtWtXGg5tvOaV6v1CmbusXoOZvGRAVYygms9qNeUF7/B8/iDNGSKjlxHE5LVOLRtJO/B9ndZnr6RkL326ceyng== dependencies: "@react-aria/checkbox" "^3.2.1" - "@react-aria/utils" "^3.5.0" - "@react-native-aria/toggle" "^0.2.2-alpha.0" - "@react-native-aria/utils" "^0.2.2" + "@react-aria/utils" "^3.6.0" + "@react-native-aria/toggle" "^0.2.3" + "@react-native-aria/utils" "^0.2.6" "@react-stately/toggle" "^3.2.1" "@react-native-aria/combobox@^0.2.4-alpha.0": @@ -2301,15 +2301,6 @@ dependencies: "@react-aria/focus" "^3.2.3" -"@react-native-aria/interactions@^0.2.1": - version "0.2.1" - resolved "https://registry.yarnpkg.com/@react-native-aria/interactions/-/interactions-0.2.1.tgz#6984809f6fc5f666e9028b3961f958ad87ac161b" - integrity sha512-zWa8hz7t5H7aLtXKOpbmjS+1hIH31jAq1qb3+M3aNhUzgnTFmJ/9OuHgyiZBwkr/4nQreQ9RBH24QMGNtEN8kg== - dependencies: - "@react-aria/interactions" "^3.3.2" - "@react-aria/utils" "^3.5.0" - "@react-native-aria/utils" "^0.2.1" - "@react-native-aria/interactions@^0.2.2": version "0.2.2" resolved "https://registry.yarnpkg.com/@react-native-aria/interactions/-/interactions-0.2.2.tgz#93d27c7af348802978461b72eb92513f44fa05d2" @@ -2399,19 +2390,19 @@ "@react-stately/tabs" "3.0.0-alpha.1" "@react-types/tabs" "3.0.0-alpha.2" -"@react-native-aria/toggle@^0.2.2-alpha.0": - version "0.2.2-alpha.0" - resolved "https://registry.yarnpkg.com/@react-native-aria/toggle/-/toggle-0.2.2-alpha.0.tgz#b50e285c7403fe4475b320297f02904cba73ae4d" - integrity sha512-c9SD7hJtzVOOqaj5MDUFHdn/TmYdgXQzdDfJMx2QZtQk8XWcQ7gB/hDuK0BtyjlGXpINvjJycQ0xgX4lz/1JpA== +"@react-native-aria/toggle@^0.2.3": + version "0.2.3" + resolved "https://registry.yarnpkg.com/@react-native-aria/toggle/-/toggle-0.2.3.tgz#a387f03480aa0d97dc0191acbcae66122f7bcf7f" + integrity sha512-3aOlchMxpR0b2h3Z7V0aYZaQMVJD6uKOWKWJm82VsLrni4iDnDX/mLv30ujuuK3+LclUhVlJd2kRuCl+xnf3XQ== dependencies: "@react-aria/focus" "^3.2.3" - "@react-aria/utils" "^3.5.0" - "@react-native-aria/interactions" "^0.2.1" - "@react-native-aria/utils" "^0.2.1" + "@react-aria/utils" "^3.6.0" + "@react-native-aria/interactions" "^0.2.3" + "@react-native-aria/utils" "^0.2.6" "@react-stately/toggle" "^3.2.1" "@react-types/checkbox" "^3.2.1" -"@react-native-aria/utils@^0.2.1", "@react-native-aria/utils@^0.2.2", "@react-native-aria/utils@^0.2.4", "@react-native-aria/utils@^0.2.6", "@react-native-aria/utils@^0.2.7": +"@react-native-aria/utils@^0.2.2", "@react-native-aria/utils@^0.2.4", "@react-native-aria/utils@^0.2.6", "@react-native-aria/utils@^0.2.7": version "0.2.7" resolved "https://registry.npmjs.org/@react-native-aria/utils/-/utils-0.2.7.tgz#53d1f4a44cad382bd9d1a6b5af6cb86624e70f76" integrity sha512-mozajHovHHYjNY28j5lrIzUQ3p3mQ7EnaKlukd0EuSaAwBboPQ1sVK9ToxPLyyixkxGe4pxy+br5ahzd6wlf5Q== @@ -2598,15 +2589,16 @@ resolved "https://registry.yarnpkg.com/@react-native-community/eslint-plugin/-/eslint-plugin-1.1.0.tgz#e42b1bef12d2415411519fd528e64b593b1363dc" integrity sha512-W/J0fNYVO01tioHjvYWQ9m6RgndVtbElzYozBq1ZPrHO/iCzlqoySHl4gO/fpCl9QEFjvJfjPgtPMTMlsoq5DQ== -"@react-stately/checkbox@3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@react-stately/checkbox/-/checkbox-3.0.3.tgz#18ee6bd3b544334b6f853bb5c5f7017ac3bb9c37" - integrity sha512-amT889DTLdbjAVjZ9j9TytN73PszynGIspKi1QSUCvXeA2OVyCwShxhV0Pn7yYX8cMinvGXrjhWdhn0nhYeMdg== +"@react-stately/checkbox@3.4.0": + version "3.4.0" + resolved "https://registry.yarnpkg.com/@react-stately/checkbox/-/checkbox-3.4.0.tgz#34712864e6b6dbae033b30a279dc32a26bbc1a9b" + integrity sha512-zqwHMmlzza1exS6Bbqj4Mom3ygtG8pLguHweZ9OO7BFQLwBmzJsrFNqDcj7xh8iEWxXKQfZ2YOuhkaGvu4GRjA== dependencies: - "@babel/runtime" "^7.6.2" - "@react-stately/toggle" "^3.2.3" - "@react-stately/utils" "^3.2.2" - "@react-types/checkbox" "^3.2.3" + "@react-stately/toggle" "^3.5.0" + "@react-stately/utils" "^3.6.0" + "@react-types/checkbox" "^3.4.2" + "@react-types/shared" "^3.17.0" + "@swc/helpers" "^0.4.14" "@react-stately/checkbox@^3.0.1": version "3.0.1" @@ -2773,15 +2765,15 @@ "@react-types/checkbox" "^3.2.1" "@react-types/shared" "^3.2.1" -"@react-stately/toggle@^3.2.3": - version "3.2.6" - resolved "https://registry.yarnpkg.com/@react-stately/toggle/-/toggle-3.2.6.tgz#4f4558d13700d5f9486037e45a585daf9b2ed1c9" - integrity sha512-M/+iX6eHYZScKfaOQvp3KqityOuRTWLOgskCNlnQBTq5VSszuD2p4uWxJQWXq3DbU+q872Fz4vJ7eTc2l9YA/Q== +"@react-stately/toggle@^3.5.0": + version "3.5.0" + resolved "https://registry.yarnpkg.com/@react-stately/toggle/-/toggle-3.5.0.tgz#fee5a29d7699e43867c52981834af5393f47c1c4" + integrity sha512-vKwLLkFsiIve4pXIQC/dqLAz7Z+qtzJ8+D00EXXO1Nf8YHcyIMDkTmi3NTM8Qtvmt4xX2hbJFiPDF6WvF6mBIg== dependencies: - "@babel/runtime" "^7.6.2" - "@react-stately/utils" "^3.4.1" - "@react-types/checkbox" "^3.2.6" - "@react-types/shared" "^3.11.2" + "@react-stately/utils" "^3.6.0" + "@react-types/checkbox" "^3.4.2" + "@react-types/shared" "^3.17.0" + "@swc/helpers" "^0.4.14" "@react-stately/tree@^3.1.2": version "3.1.2" @@ -2815,12 +2807,12 @@ dependencies: "@babel/runtime" "^7.6.2" -"@react-stately/utils@^3.4.1": - version "3.4.1" - resolved "https://registry.yarnpkg.com/@react-stately/utils/-/utils-3.4.1.tgz#56f049aa1704d338968b5973c796ee606e9c0c62" - integrity sha512-mjFbKklj/W8KRw1CQSpUJxHd7lhUge4i00NwJTwGxbzmiJgsTWlKKS/1rBf48ey9hUBopXT5x5vG/AxQfWTQug== +"@react-stately/utils@^3.6.0": + version "3.6.0" + resolved "https://registry.yarnpkg.com/@react-stately/utils/-/utils-3.6.0.tgz#f273e7fcb348254347d2e88c8f0c45571060c207" + integrity sha512-rptF7iUWDrquaYvBAS4QQhOBQyLBncDeHF03WnHXAxnuPJXNcr9cXJtjJPGCs036ZB8Q2hc9BGG5wNyMkF5v+Q== dependencies: - "@babel/runtime" "^7.6.2" + "@swc/helpers" "^0.4.14" "@react-stately/virtualizer@^3.1.2": version "3.1.2" @@ -2852,12 +2844,12 @@ dependencies: "@react-types/shared" "^3.2.1" -"@react-types/checkbox@^3.2.3", "@react-types/checkbox@^3.2.6": - version "3.2.6" - resolved "https://registry.yarnpkg.com/@react-types/checkbox/-/checkbox-3.2.6.tgz#61fd70857bdd2d6da9289892ea366f305ab47ed6" - integrity sha512-bOQAnnDEpXL1P4oRBiwjnOskKQtawc+JcRZzQk/9k7NwKWfv5MHG/MFDJsW057GPm9Ks0onNATohtw6LFvzAQA== +"@react-types/checkbox@^3.4.2": + version "3.4.2" + resolved "https://registry.yarnpkg.com/@react-types/checkbox/-/checkbox-3.4.2.tgz#6089e9ef2d023415a5f871e312f30bae54143ba5" + integrity sha512-/NWFCEQLvVgo25afPt2jv4syxYvZeY/D/n2Y92IGtoNV4akdz4AuQ65+1X+JOhQc/ZbAblWw5fFWUZoQs3CLZg== dependencies: - "@react-types/shared" "^3.11.2" + "@react-types/shared" "^3.17.0" "@react-types/combobox@3.0.0-alpha.1": version "3.0.0-alpha.1" @@ -2916,10 +2908,10 @@ dependencies: "@react-types/shared" "^3.4.0" -"@react-types/shared@^3.11.2": - version "3.11.2" - resolved "https://registry.yarnpkg.com/@react-types/shared/-/shared-3.11.2.tgz#b269c0cf6223664ac42d980b7add1b67b51b87d4" - integrity sha512-MIjjjkFi/DTzMVmeFJJrpc51eS/PLNzLZEv6o/QJPhQ9uOMElYqA790qAcG75u3tR0XGU2Vv9RyeOC7+ppw8/Q== +"@react-types/shared@^3.17.0": + version "3.17.0" + resolved "https://registry.yarnpkg.com/@react-types/shared/-/shared-3.17.0.tgz#b7c5e318664aadb315d305a27dd2a209d1837d95" + integrity sha512-1SNZ/RhVrrQ1e6yE0bPV7d5Sfp+Uv0dfUEhwF9MAu2v5msu7AMewnsiojKNA0QA6Ing1gpDLjHCxtayQfuxqcg== "@react-types/shared@^3.2.1", "@react-types/shared@^3.3.0": version "3.3.0" @@ -3007,6 +2999,13 @@ dependencies: "@sinonjs/commons" "^1.7.0" +"@swc/helpers@^0.4.14": + version "0.4.14" + resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.4.14.tgz#1352ac6d95e3617ccb7c1498ff019654f1e12a74" + integrity sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw== + dependencies: + tslib "^2.4.0" + "@szmarczak/http-timer@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" @@ -12135,6 +12134,11 @@ tslib@^2.1.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== +tslib@^2.4.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" + integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== + tsutils@^3.17.1: version "3.17.1" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"