diff --git a/src/components/List/ListAccordion.tsx b/src/components/List/ListAccordion.tsx index 7c85098898..0f053f8966 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; }; /** @@ -184,6 +189,7 @@ const ListAccordion = ({ pointerEvents = 'none', titleMaxFontSizeMultiplier, descriptionMaxFontSizeMultiplier, + containerStyle, }: Props) => { const theme = useInternalTheme(themeOverrides); const [expanded, setExpanded] = React.useState( @@ -236,7 +242,7 @@ const ListAccordion = ({ : handlePressAction; return ( - + {left ? left({ @@ -263,6 +271,7 @@ const ListAccordion = ({ : null} {right ? ( right({ @@ -388,4 +398,4 @@ const styles = StyleSheet.create({ }, }); -export default ListAccordion; +export default ListAccordion; \ No newline at end of file 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; }