@react-native-aria/disclosure 0.2.4 → 0.2.6

package/lib/commonjs/useDisclosureButton.js

@@ -9,13 +9,11 @@ var _utils = require("@react-aria/utils");
 
 function useDisclosureButton(props, state) {
   const onPress = state.toggle;
-  const accessibilityState = props.accessibilityState || {};
-  accessibilityState.expanded = state.isSelected;
   return {
     buttonProps: (0, _utils.mergeProps)(props, {
       onPress,
-      accessibilityState,
-      accessibilityRole: 'button'
+      'aria-expanded': state.isSelected,
+      'role': 'button'
     })
   };
 }

package/lib/commonjs/useDisclosureButton.js.map

@@ -1 +1 @@
-{"version":3,"sources":["useDisclosureButton.ts"],"names":["useDisclosureButton","props","state","onPress","toggle","accessibilityState","expanded","isSelected","buttonProps","accessibilityRole"],"mappings":";;;;;;;AACA;;AAGO,SAASA,mBAAT,CACLC,KADK,EAELC,KAFK,EAGL;AACA,QAAMC,OAAO,GAAGD,KAAK,CAACE,MAAtB;AAEA,QAAMC,kBAAkB,GAAGJ,KAAK,CAACI,kBAAN,IAA4B,EAAvD;AAEAA,EAAAA,kBAAkB,CAACC,QAAnB,GAA8BJ,KAAK,CAACK,UAApC;AAEA,SAAO;AACLC,IAAAA,WAAW,EAAE,uBAAWP,KAAX,EAAkB;AAC7BE,MAAAA,OAD6B;AAE7BE,MAAAA,kBAF6B;AAG7BI,MAAAA,iBAAiB,EAAE;AAHU,KAAlB;AADR,GAAP;AAOD","sourcesContent":["import { ToggleState } from '@react-stately/toggle';\nimport { mergeProps } from '@react-aria/utils';\nimport { PressableProps } from 'react-native';\n\nexport function useDisclosureButton(\n  props: Partial<PressableProps>,\n  state: ToggleState\n) {\n  const onPress = state.toggle;\n\n  const accessibilityState = props.accessibilityState || {};\n\n  accessibilityState.expanded = state.isSelected;\n\n  return {\n    buttonProps: mergeProps(props, {\n      onPress,\n      accessibilityState,\n      accessibilityRole: 'button',\n    }),\n  };\n}\n"]}
+{"version":3,"sources":["useDisclosureButton.ts"],"names":["useDisclosureButton","props","state","onPress","toggle","buttonProps","isSelected"],"mappings":";;;;;;;AACA;;AAGO,SAASA,mBAAT,CACLC,KADK,EAELC,KAFK,EAGL;AACA,QAAMC,OAAO,GAAGD,KAAK,CAACE,MAAtB;AAEA,SAAO;AACLC,IAAAA,WAAW,EAAE,uBAAWJ,KAAX,EAAkB;AAC7BE,MAAAA,OAD6B;AAE7B,uBAAiBD,KAAK,CAACI,UAFM;AAG7B,cAAQ;AAHqB,KAAlB;AADR,GAAP;AAOD","sourcesContent":["import { ToggleState } from '@react-stately/toggle';\nimport { mergeProps } from '@react-aria/utils';\nimport { PressableProps } from 'react-native';\n\nexport function useDisclosureButton(\n  props: Partial<PressableProps>,\n  state: ToggleState\n) {\n  const onPress = state.toggle;\n\n  return {\n    buttonProps: mergeProps(props, {\n      onPress,\n      'aria-expanded': state.isSelected,\n      'role': 'button',\n    }),\n  };\n}\n"]}

package/lib/commonjs/useDisclosureButton.web.js

@@ -25,7 +25,7 @@ function useDisclosureButton(props, state) {
     buttonProps: (0, _utils.mergeProps)(props, {
       onPress,
       ...ariaProps,
-      accessibilityRole: 'button'
+      role: 'button'
     })
   };
 }

package/lib/commonjs/useDisclosureButton.web.js.map

@@ -1 +1 @@
-{"version":3,"sources":["useDisclosureButton.web.ts"],"names":["useDisclosureButton","props","state","id","disclosureIds","set","onPress","toggle","ariaProps","isSelected","undefined","buttonProps","accessibilityRole"],"mappings":";;;;;;;AACA;;AACA;;AAEA;;AAEO,SAASA,mBAAT,CAA6BC,KAA7B,EAAoDC,KAApD,EAAwE;AAC7E,QAAMC,EAAE,GAAG,mBAAX;;AAEAC,wBAAcC,GAAd,CAAkBH,KAAlB,EAAyBC,EAAzB;;AAEA,QAAMG,OAAO,GAAGJ,KAAK,CAACK,MAAtB;AAEA,QAAMC,SAAS,GAAG,6BAAgB;AAChC,qBAAiBN,KAAK,CAACO,UADS;AAEhC,qBAAiBP,KAAK,CAACO,UAAN,GAAmBN,EAAnB,GAAwBO;AAFT,GAAhB,CAAlB;AAKA,SAAO;AACLC,IAAAA,WAAW,EAAE,uBAAWV,KAAX,EAAkB;AAC7BK,MAAAA,OAD6B;AAE7B,SAAGE,SAF0B;AAG7BI,MAAAA,iBAAiB,EAAE;AAHU,KAAlB;AADR,GAAP;AAOD","sourcesContent":["import { ToggleState } from '@react-stately/toggle';\nimport { useId, mergeProps } from '@react-aria/utils';\nimport { mapDomPropsToRN } from '@react-native-aria/utils';\nimport { PressableProps } from 'react-native';\nimport { disclosureIds } from './utils';\n\nexport function useDisclosureButton(props: PressableProps, state: ToggleState) {\n  const id = useId();\n\n  disclosureIds.set(state, id);\n\n  const onPress = state.toggle;\n\n  const ariaProps = mapDomPropsToRN({\n    'aria-expanded': state.isSelected,\n    'aria-controls': state.isSelected ? id : undefined,\n  });\n\n  return {\n    buttonProps: mergeProps(props, {\n      onPress,\n      ...ariaProps,\n      accessibilityRole: 'button',\n    }),\n  };\n}\n"]}
+{"version":3,"sources":["useDisclosureButton.web.ts"],"names":["useDisclosureButton","props","state","id","disclosureIds","set","onPress","toggle","ariaProps","isSelected","undefined","buttonProps","role"],"mappings":";;;;;;;AACA;;AACA;;AAEA;;AAEO,SAASA,mBAAT,CAA6BC,KAA7B,EAAoDC,KAApD,EAAwE;AAC7E,QAAMC,EAAE,GAAG,mBAAX;;AAEAC,wBAAcC,GAAd,CAAkBH,KAAlB,EAAyBC,EAAzB;;AAEA,QAAMG,OAAO,GAAGJ,KAAK,CAACK,MAAtB;AAEA,QAAMC,SAAS,GAAG,6BAAgB;AAChC,qBAAiBN,KAAK,CAACO,UADS;AAEhC,qBAAiBP,KAAK,CAACO,UAAN,GAAmBN,EAAnB,GAAwBO;AAFT,GAAhB,CAAlB;AAKA,SAAO;AACLC,IAAAA,WAAW,EAAE,uBAAWV,KAAX,EAAkB;AAC7BK,MAAAA,OAD6B;AAE7B,SAAGE,SAF0B;AAG7BI,MAAAA,IAAI,EAAE;AAHuB,KAAlB;AADR,GAAP;AAOD","sourcesContent":["import { ToggleState } from '@react-stately/toggle';\nimport { useId, mergeProps } from '@react-aria/utils';\nimport { mapDomPropsToRN } from '@react-native-aria/utils';\nimport { PressableProps } from 'react-native';\nimport { disclosureIds } from './utils';\n\nexport function useDisclosureButton(props: PressableProps, state: ToggleState) {\n  const id = useId();\n\n  disclosureIds.set(state, id);\n\n  const onPress = state.toggle;\n\n  const ariaProps = mapDomPropsToRN({\n    'aria-expanded': state.isSelected,\n    'aria-controls': state.isSelected ? id : undefined,\n  });\n\n  return {\n    buttonProps: mergeProps(props, {\n      onPress,\n      ...ariaProps,\n      role: 'button',\n    }),\n  };\n}\n"]}

package/lib/module/useDisclosureButton.js

@@ -1,13 +1,11 @@
 import { mergeProps } from '@react-aria/utils';
 export function useDisclosureButton(props, state) {
   const onPress = state.toggle;
-  const accessibilityState = props.accessibilityState || {};
-  accessibilityState.expanded = state.isSelected;
   return {
     buttonProps: mergeProps(props, {
       onPress,
-      accessibilityState,
-      accessibilityRole: 'button'
+      'aria-expanded': state.isSelected,
+      'role': 'button'
     })
   };
 }

package/lib/module/useDisclosureButton.js.map

@@ -1 +1 @@
-{"version":3,"sources":["useDisclosureButton.ts"],"names":["mergeProps","useDisclosureButton","props","state","onPress","toggle","accessibilityState","expanded","isSelected","buttonProps","accessibilityRole"],"mappings":"AACA,SAASA,UAAT,QAA2B,mBAA3B;AAGA,OAAO,SAASC,mBAAT,CACLC,KADK,EAELC,KAFK,EAGL;AACA,QAAMC,OAAO,GAAGD,KAAK,CAACE,MAAtB;AAEA,QAAMC,kBAAkB,GAAGJ,KAAK,CAACI,kBAAN,IAA4B,EAAvD;AAEAA,EAAAA,kBAAkB,CAACC,QAAnB,GAA8BJ,KAAK,CAACK,UAApC;AAEA,SAAO;AACLC,IAAAA,WAAW,EAAET,UAAU,CAACE,KAAD,EAAQ;AAC7BE,MAAAA,OAD6B;AAE7BE,MAAAA,kBAF6B;AAG7BI,MAAAA,iBAAiB,EAAE;AAHU,KAAR;AADlB,GAAP;AAOD","sourcesContent":["import { ToggleState } from '@react-stately/toggle';\nimport { mergeProps } from '@react-aria/utils';\nimport { PressableProps } from 'react-native';\n\nexport function useDisclosureButton(\n  props: Partial<PressableProps>,\n  state: ToggleState\n) {\n  const onPress = state.toggle;\n\n  const accessibilityState = props.accessibilityState || {};\n\n  accessibilityState.expanded = state.isSelected;\n\n  return {\n    buttonProps: mergeProps(props, {\n      onPress,\n      accessibilityState,\n      accessibilityRole: 'button',\n    }),\n  };\n}\n"]}
+{"version":3,"sources":["useDisclosureButton.ts"],"names":["mergeProps","useDisclosureButton","props","state","onPress","toggle","buttonProps","isSelected"],"mappings":"AACA,SAASA,UAAT,QAA2B,mBAA3B;AAGA,OAAO,SAASC,mBAAT,CACLC,KADK,EAELC,KAFK,EAGL;AACA,QAAMC,OAAO,GAAGD,KAAK,CAACE,MAAtB;AAEA,SAAO;AACLC,IAAAA,WAAW,EAAEN,UAAU,CAACE,KAAD,EAAQ;AAC7BE,MAAAA,OAD6B;AAE7B,uBAAiBD,KAAK,CAACI,UAFM;AAG7B,cAAQ;AAHqB,KAAR;AADlB,GAAP;AAOD","sourcesContent":["import { ToggleState } from '@react-stately/toggle';\nimport { mergeProps } from '@react-aria/utils';\nimport { PressableProps } from 'react-native';\n\nexport function useDisclosureButton(\n  props: Partial<PressableProps>,\n  state: ToggleState\n) {\n  const onPress = state.toggle;\n\n  return {\n    buttonProps: mergeProps(props, {\n      onPress,\n      'aria-expanded': state.isSelected,\n      'role': 'button',\n    }),\n  };\n}\n"]}

package/lib/module/useDisclosureButton.web.js

@@ -13,7 +13,7 @@ export function useDisclosureButton(props, state) {
     buttonProps: mergeProps(props, {
       onPress,
       ...ariaProps,
-      accessibilityRole: 'button'
+      role: 'button'
     })
   };
 }

package/lib/module/useDisclosureButton.web.js.map

@@ -1 +1 @@
-{"version":3,"sources":["useDisclosureButton.web.ts"],"names":["useId","mergeProps","mapDomPropsToRN","disclosureIds","useDisclosureButton","props","state","id","set","onPress","toggle","ariaProps","isSelected","undefined","buttonProps","accessibilityRole"],"mappings":"AACA,SAASA,KAAT,EAAgBC,UAAhB,QAAkC,mBAAlC;AACA,SAASC,eAAT,QAAgC,0BAAhC;AAEA,SAASC,aAAT,QAA8B,SAA9B;AAEA,OAAO,SAASC,mBAAT,CAA6BC,KAA7B,EAAoDC,KAApD,EAAwE;AAC7E,QAAMC,EAAE,GAAGP,KAAK,EAAhB;AAEAG,EAAAA,aAAa,CAACK,GAAd,CAAkBF,KAAlB,EAAyBC,EAAzB;AAEA,QAAME,OAAO,GAAGH,KAAK,CAACI,MAAtB;AAEA,QAAMC,SAAS,GAAGT,eAAe,CAAC;AAChC,qBAAiBI,KAAK,CAACM,UADS;AAEhC,qBAAiBN,KAAK,CAACM,UAAN,GAAmBL,EAAnB,GAAwBM;AAFT,GAAD,CAAjC;AAKA,SAAO;AACLC,IAAAA,WAAW,EAAEb,UAAU,CAACI,KAAD,EAAQ;AAC7BI,MAAAA,OAD6B;AAE7B,SAAGE,SAF0B;AAG7BI,MAAAA,iBAAiB,EAAE;AAHU,KAAR;AADlB,GAAP;AAOD","sourcesContent":["import { ToggleState } from '@react-stately/toggle';\nimport { useId, mergeProps } from '@react-aria/utils';\nimport { mapDomPropsToRN } from '@react-native-aria/utils';\nimport { PressableProps } from 'react-native';\nimport { disclosureIds } from './utils';\n\nexport function useDisclosureButton(props: PressableProps, state: ToggleState) {\n  const id = useId();\n\n  disclosureIds.set(state, id);\n\n  const onPress = state.toggle;\n\n  const ariaProps = mapDomPropsToRN({\n    'aria-expanded': state.isSelected,\n    'aria-controls': state.isSelected ? id : undefined,\n  });\n\n  return {\n    buttonProps: mergeProps(props, {\n      onPress,\n      ...ariaProps,\n      accessibilityRole: 'button',\n    }),\n  };\n}\n"]}
+{"version":3,"sources":["useDisclosureButton.web.ts"],"names":["useId","mergeProps","mapDomPropsToRN","disclosureIds","useDisclosureButton","props","state","id","set","onPress","toggle","ariaProps","isSelected","undefined","buttonProps","role"],"mappings":"AACA,SAASA,KAAT,EAAgBC,UAAhB,QAAkC,mBAAlC;AACA,SAASC,eAAT,QAAgC,0BAAhC;AAEA,SAASC,aAAT,QAA8B,SAA9B;AAEA,OAAO,SAASC,mBAAT,CAA6BC,KAA7B,EAAoDC,KAApD,EAAwE;AAC7E,QAAMC,EAAE,GAAGP,KAAK,EAAhB;AAEAG,EAAAA,aAAa,CAACK,GAAd,CAAkBF,KAAlB,EAAyBC,EAAzB;AAEA,QAAME,OAAO,GAAGH,KAAK,CAACI,MAAtB;AAEA,QAAMC,SAAS,GAAGT,eAAe,CAAC;AAChC,qBAAiBI,KAAK,CAACM,UADS;AAEhC,qBAAiBN,KAAK,CAACM,UAAN,GAAmBL,EAAnB,GAAwBM;AAFT,GAAD,CAAjC;AAKA,SAAO;AACLC,IAAAA,WAAW,EAAEb,UAAU,CAACI,KAAD,EAAQ;AAC7BI,MAAAA,OAD6B;AAE7B,SAAGE,SAF0B;AAG7BI,MAAAA,IAAI,EAAE;AAHuB,KAAR;AADlB,GAAP;AAOD","sourcesContent":["import { ToggleState } from '@react-stately/toggle';\nimport { useId, mergeProps } from '@react-aria/utils';\nimport { mapDomPropsToRN } from '@react-native-aria/utils';\nimport { PressableProps } from 'react-native';\nimport { disclosureIds } from './utils';\n\nexport function useDisclosureButton(props: PressableProps, state: ToggleState) {\n  const id = useId();\n\n  disclosureIds.set(state, id);\n\n  const onPress = state.toggle;\n\n  const ariaProps = mapDomPropsToRN({\n    'aria-expanded': state.isSelected,\n    'aria-controls': state.isSelected ? id : undefined,\n  });\n\n  return {\n    buttonProps: mergeProps(props, {\n      onPress,\n      ...ariaProps,\n      role: 'button',\n    }),\n  };\n}\n"]}

package/lib/typescript/useDisclosure.web.d.ts

@@ -2,6 +2,6 @@ import { ToggleState } from '@react-stately/toggle';
 import { ViewProps } from 'react-native';
 export declare function useDisclosure(props: ViewProps, state: ToggleState): {
     disclosureProps: ViewProps & {
-        nativeID: string | undefined;
+        nativeID: string;
     };
 };

package/lib/typescript/useDisclosureButton.d.ts

@@ -3,7 +3,7 @@ import { PressableProps } from 'react-native';
 export declare function useDisclosureButton(props: Partial<PressableProps>, state: ToggleState): {
     buttonProps: Partial<PressableProps> & {
         onPress: () => void;
-        accessibilityState: import("react-native").AccessibilityState;
-        accessibilityRole: string;
+        'aria-expanded': boolean;
+        role: string;
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-aria/disclosure",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "mono repo setup with bob",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -48,13 +48,13 @@
     "registry": "https://registry.npmjs.org/"
   },
   "peerDependencies": {
+    "@react-stately/toggle": "*",
     "react": "*",
-    "react-native": "*",
-    "@react-stately/toggle":"*" 
+    "react-native": "*"
   },
   "dependencies": {
-    "@react-aria/utils":"^3.6.0",
-    "@react-native-aria/utils":"^0.2.4"
+    "@react-aria/utils": "^3.6.0",
+    "@react-native-aria/utils": "^0.2.10"
   },
   "jest": {
     "preset": "react-native",

package/src/useDisclosureButton.ts

@@ -8,15 +8,11 @@ export function useDisclosureButton(
 ) {
   const onPress = state.toggle;
 
-  const accessibilityState = props.accessibilityState || {};
-
-  accessibilityState.expanded = state.isSelected;
-
   return {
     buttonProps: mergeProps(props, {
       onPress,
-      accessibilityState,
-      accessibilityRole: 'button',
+      'aria-expanded': state.isSelected,
+      'role': 'button',
     }),
   };
 }

package/src/useDisclosureButton.web.ts

@@ -20,7 +20,7 @@ export function useDisclosureButton(props: PressableProps, state: ToggleState) {
     buttonProps: mergeProps(props, {
       onPress,
       ...ariaProps,
-      accessibilityRole: 'button',
+      role: 'button',
     }),
   };
 }