diff --git a/package.json b/package.json index 77f21b1ecd..528ac9faa6 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "lint": "yarn lint-no-fix --fix", "lint-no-fix": "eslint --ext '.js,.ts,.tsx' .", "test": "jest", - "prepack": "bob build && node ./scripts/generate-mappings.js", + "prepare": "bob build && node ./scripts/generate-mappings.js", "release": "release-it", "bootstrap": "yarn --cwd example && yarn --cwd docs && yarn", "docs": "yarn --cwd docs", diff --git a/src/components/List/ListAccordion.tsx b/src/components/List/ListAccordion.tsx index 7c85098898..4154a67906 100644 --- a/src/components/List/ListAccordion.tsx +++ b/src/components/List/ListAccordion.tsx @@ -12,6 +12,7 @@ import { ViewProps, ViewStyle, PressableAndroidRippleConfig, + Platform, } from 'react-native'; import { ListAccordionGroupContext } from './ListAccordionGroup'; @@ -121,6 +122,10 @@ export type Props = { * `pointerEvents` passed to the `View` container */ pointerEvents?: ViewProps['pointerEvents']; + /** + * containerStyle that is passed to the wrapping TouchableRipple element View. + */ + containerStyle?: StyleProp; }; /** @@ -160,6 +165,7 @@ export type Props = { * export default MyComponent; * ``` */ +// 168 fork inspection const ListAccordion = ({ left, right, @@ -184,6 +190,7 @@ const ListAccordion = ({ pointerEvents = 'none', titleMaxFontSizeMultiplier, descriptionMaxFontSizeMultiplier, + containerStyle, }: Props) => { const theme = useInternalTheme(themeOverrides); const [expanded, setExpanded] = React.useState( @@ -236,7 +243,7 @@ const ListAccordion = ({ : handlePressAction; return ( - + {left ? left({ @@ -263,6 +272,7 @@ const ListAccordion = ({ : null} {right ? ( right({ @@ -375,6 +386,7 @@ const styles = StyleSheet.create({ }, itemV3: { paddingLeft: 16, + }, child: { paddingLeft: 64, @@ -388,4 +400,4 @@ const styles = StyleSheet.create({ }, }); -export default ListAccordion; +export default ListAccordion; \ No newline at end of file diff --git a/src/components/TextInput/Addons/Outline.tsx b/src/components/TextInput/Addons/Outline.tsx index 45b675fd8b..1e7203e916 100644 --- a/src/components/TextInput/Addons/Outline.tsx +++ b/src/components/TextInput/Addons/Outline.tsx @@ -5,6 +5,7 @@ import { StyleProp, View, ViewStyle, + Platform, } from 'react-native'; import { TextInputLabelProp } from '../types'; @@ -47,6 +48,7 @@ export const Outline = ({ }, style, ]} + accessible={Platform.OS === 'ios'? false: true} /> ); diff --git a/src/components/TextInput/TextInputOutlined.tsx b/src/components/TextInput/TextInputOutlined.tsx index 7f1fe926e8..e208fd8914 100644 --- a/src/components/TextInput/TextInputOutlined.tsx +++ b/src/components/TextInput/TextInputOutlined.tsx @@ -333,7 +333,7 @@ const TextInputOutlined = ({ } return ( - + {/* Render the outline separately from the container This is so that the label can overlap the outline @@ -358,6 +358,7 @@ const TextInputOutlined = ({ minHeight, }, ]} + accessible={Platform.OS !== 'ios'} > {label ? ( ) : null} {render?.({ diff --git a/src/components/TextInput/helpers.tsx b/src/components/TextInput/helpers.tsx index 4a5da1d24a..37e4feef24 100644 --- a/src/components/TextInput/helpers.tsx +++ b/src/components/TextInput/helpers.tsx @@ -460,8 +460,10 @@ const getOutlinedOutlineInputColor = ({ if (theme.isV3) { if (disabled) { if (theme.dark) { + if(customOutlineColor) return customOutlineColor return 'transparent'; } + if(customOutlineColor) return customOutlineColor return theme.colors.surfaceDisabled; }