mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
9caf99162d
Summary: When the parent view that wraps a button has height 0, the button is still shown partially because of the padding given for text inside Button component for iOS. Here is the issue raised for that: https://github.com/facebook/react-native/issues/26421 Probably, we should not hard code these values, rather provide a way to provide custom style ? This is my first PR so not making big change. :D ## Changelog [iOS] [Fixed] - Give margin instead of padding to text in Button component Pull Request resolved: https://github.com/facebook/react-native/pull/26435 Test Plan: When using this block of code, ``` <View style={{height:0}}> <Button title="There is an issue"></Button> </View> ``` Before: <img width="284" alt="image" src="https://user-images.githubusercontent.com/5866078/64905271-6c129700-d6f5-11e9-86c1-c301eb8123f3.png"> After: <img width="283" alt="image" src="https://user-images.githubusercontent.com/5866078/64905284-8cdaec80-d6f5-11e9-9589-28d8d01c8ba1.png"> Differential Revision: D17661181 Pulled By: cpojer fbshipit-source-id: 62b04123d9edb4d760bd54d96ae0615c1ccff7ab
238 lines
5.7 KiB
JavaScript
238 lines
5.7 KiB
JavaScript
/**
|
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*
|
|
* @format
|
|
* @flow
|
|
*/
|
|
|
|
'use strict';
|
|
|
|
const Platform = require('../Utilities/Platform');
|
|
const React = require('react');
|
|
const StyleSheet = require('../StyleSheet/StyleSheet');
|
|
const Text = require('../Text/Text');
|
|
const TouchableNativeFeedback = require('./Touchable/TouchableNativeFeedback');
|
|
const TouchableOpacity = require('./Touchable/TouchableOpacity');
|
|
const View = require('./View/View');
|
|
|
|
const invariant = require('invariant');
|
|
|
|
import type {PressEvent} from '../Types/CoreEventTypes';
|
|
|
|
type ButtonProps = $ReadOnly<{|
|
|
/**
|
|
* Text to display inside the button
|
|
*/
|
|
title: string,
|
|
|
|
/**
|
|
* Handler to be called when the user taps the button
|
|
*/
|
|
onPress: (event?: PressEvent) => mixed,
|
|
|
|
/**
|
|
* If true, doesn't play system sound on touch (Android Only)
|
|
**/
|
|
touchSoundDisabled?: ?boolean,
|
|
|
|
/**
|
|
* Color of the text (iOS), or background color of the button (Android)
|
|
*/
|
|
color?: ?string,
|
|
|
|
/**
|
|
* TV preferred focus (see documentation for the View component).
|
|
*/
|
|
hasTVPreferredFocus?: ?boolean,
|
|
|
|
/**
|
|
* TV next focus down (see documentation for the View component).
|
|
*
|
|
* @platform android
|
|
*/
|
|
nextFocusDown?: ?number,
|
|
|
|
/**
|
|
* TV next focus forward (see documentation for the View component).
|
|
*
|
|
* @platform android
|
|
*/
|
|
nextFocusForward?: ?number,
|
|
|
|
/**
|
|
* TV next focus left (see documentation for the View component).
|
|
*
|
|
* @platform android
|
|
*/
|
|
nextFocusLeft?: ?number,
|
|
|
|
/**
|
|
* TV next focus right (see documentation for the View component).
|
|
*
|
|
* @platform android
|
|
*/
|
|
nextFocusRight?: ?number,
|
|
|
|
/**
|
|
* TV next focus up (see documentation for the View component).
|
|
*
|
|
* @platform android
|
|
*/
|
|
nextFocusUp?: ?number,
|
|
|
|
/**
|
|
* Text to display for blindness accessibility features
|
|
*/
|
|
accessibilityLabel?: ?string,
|
|
|
|
/**
|
|
* If true, disable all interactions for this component.
|
|
*/
|
|
disabled?: ?boolean,
|
|
|
|
/**
|
|
* Used to locate this view in end-to-end tests.
|
|
*/
|
|
testID?: ?string,
|
|
|}>;
|
|
|
|
/**
|
|
* A basic button component that should render nicely on any platform. Supports
|
|
* a minimal level of customization.
|
|
*
|
|
* <center><img src="img/buttonExample.png"></img></center>
|
|
*
|
|
* If this button doesn't look right for your app, you can build your own
|
|
* button using [TouchableOpacity](docs/touchableopacity.html)
|
|
* or [TouchableNativeFeedback](docs/touchablenativefeedback.html).
|
|
* For inspiration, look at the [source code for this button component](https://github.com/facebook/react-native/blob/master/Libraries/Components/Button.js).
|
|
* Or, take a look at the [wide variety of button components built by the community](https://js.coach/react-native?search=button).
|
|
*
|
|
* Example usage:
|
|
*
|
|
* ```
|
|
* import { Button } from 'react-native';
|
|
* ...
|
|
*
|
|
* <Button
|
|
* onPress={onPressLearnMore}
|
|
* title="Learn More"
|
|
* color="#841584"
|
|
* accessibilityLabel="Learn more about this purple button"
|
|
* />
|
|
* ```
|
|
*
|
|
*/
|
|
|
|
class Button extends React.Component<ButtonProps> {
|
|
render(): React.Node {
|
|
const {
|
|
accessibilityLabel,
|
|
color,
|
|
onPress,
|
|
touchSoundDisabled,
|
|
title,
|
|
hasTVPreferredFocus,
|
|
nextFocusDown,
|
|
nextFocusForward,
|
|
nextFocusLeft,
|
|
nextFocusRight,
|
|
nextFocusUp,
|
|
disabled,
|
|
testID,
|
|
} = this.props;
|
|
const buttonStyles = [styles.button];
|
|
const textStyles = [styles.text];
|
|
if (color) {
|
|
if (Platform.OS === 'ios') {
|
|
textStyles.push({color: color});
|
|
} else {
|
|
buttonStyles.push({backgroundColor: color});
|
|
}
|
|
}
|
|
const accessibilityState = {};
|
|
if (disabled) {
|
|
buttonStyles.push(styles.buttonDisabled);
|
|
textStyles.push(styles.textDisabled);
|
|
accessibilityState.disabled = true;
|
|
}
|
|
invariant(
|
|
typeof title === 'string',
|
|
'The title prop of a Button must be a string',
|
|
);
|
|
const formattedTitle =
|
|
Platform.OS === 'android' ? title.toUpperCase() : title;
|
|
const Touchable =
|
|
Platform.OS === 'android' ? TouchableNativeFeedback : TouchableOpacity;
|
|
return (
|
|
<Touchable
|
|
accessibilityLabel={accessibilityLabel}
|
|
accessibilityRole="button"
|
|
accessibilityState={accessibilityState}
|
|
hasTVPreferredFocus={hasTVPreferredFocus}
|
|
nextFocusDown={nextFocusDown}
|
|
nextFocusForward={nextFocusForward}
|
|
nextFocusLeft={nextFocusLeft}
|
|
nextFocusRight={nextFocusRight}
|
|
nextFocusUp={nextFocusUp}
|
|
testID={testID}
|
|
disabled={disabled}
|
|
onPress={onPress}
|
|
touchSoundDisabled={touchSoundDisabled}>
|
|
<View style={buttonStyles}>
|
|
<Text style={textStyles} disabled={disabled}>
|
|
{formattedTitle}
|
|
</Text>
|
|
</View>
|
|
</Touchable>
|
|
);
|
|
}
|
|
}
|
|
|
|
const styles = StyleSheet.create({
|
|
button: Platform.select({
|
|
ios: {},
|
|
android: {
|
|
elevation: 4,
|
|
// Material design blue from https://material.google.com/style/color.html#color-color-palette
|
|
backgroundColor: '#2196F3',
|
|
borderRadius: 2,
|
|
},
|
|
}),
|
|
text: {
|
|
textAlign: 'center',
|
|
margin: 8,
|
|
...Platform.select({
|
|
ios: {
|
|
// iOS blue from https://developer.apple.com/ios/human-interface-guidelines/visual-design/color/
|
|
color: '#007AFF',
|
|
fontSize: 18,
|
|
},
|
|
android: {
|
|
color: 'white',
|
|
fontWeight: '500',
|
|
},
|
|
}),
|
|
},
|
|
buttonDisabled: Platform.select({
|
|
ios: {},
|
|
android: {
|
|
elevation: 0,
|
|
backgroundColor: '#dfdfdf',
|
|
},
|
|
}),
|
|
textDisabled: Platform.select({
|
|
ios: {
|
|
color: '#cdcdcd',
|
|
},
|
|
android: {
|
|
color: '#a1a1a1',
|
|
},
|
|
}),
|
|
});
|
|
|
|
module.exports = Button;
|