mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
099be9b356
Summary:
As currently defined, accessibilityStates is an array of strings, which represents the state of an object. The array of strings notion doesn't well encapsulate how various states are related, nor enforce any level of correctness.
This PR converts accessibilityStates to an object with a specific definition. So, rather than:
<View
...
accessibilityStates={['unchecked']}>
We have:
<View
accessibilityStates={{'checked': false}}>
And specifically define the checked state to either take a boolean or the "mixed" string (to represent mixed checkboxes).
We feel this API is easier to understand an implement, and provides better semantic definition of the states themselves, and how states are related to one another.
## Changelog
[general] [change] - Convert accessibilityStates to an object instead of an array of strings.
Pull Request resolved: https://github.com/facebook/react-native/pull/24608
Differential Revision: D15467980
Pulled By: cpojer
fbshipit-source-id: f0414c0ef6add3f10f7f551d323d82d978754278
213 lines
7.0 KiB
JavaScript
213 lines
7.0 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.
|
|
*
|
|
* @flow
|
|
* @format
|
|
*/
|
|
'use strict';
|
|
|
|
const Animated = require('../../Animated/src/Animated');
|
|
const DeprecatedViewPropTypes = require('../../DeprecatedPropTypes/DeprecatedViewPropTypes');
|
|
const DeprecatedEdgeInsetsPropType = require('../../DeprecatedPropTypes/DeprecatedEdgeInsetsPropType');
|
|
const NativeMethodsMixin = require('../../Renderer/shims/NativeMethodsMixin');
|
|
const Platform = require('../../Utilities/Platform');
|
|
const PropTypes = require('prop-types');
|
|
const React = require('react');
|
|
const Touchable = require('./Touchable');
|
|
const TouchableWithoutFeedback = require('./TouchableWithoutFeedback');
|
|
|
|
const createReactClass = require('create-react-class');
|
|
|
|
import type {EdgeInsetsProp} from '../../StyleSheet/EdgeInsetsPropType';
|
|
import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
|
|
import type {Props as TouchableWithoutFeedbackProps} from './TouchableWithoutFeedback';
|
|
import type {PressEvent} from '../../Types/CoreEventTypes';
|
|
|
|
type State = {
|
|
animationID: ?number,
|
|
scale: Animated.Value,
|
|
};
|
|
|
|
const PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
|
|
|
|
type Props = $ReadOnly<{|
|
|
...TouchableWithoutFeedbackProps,
|
|
|
|
onPressWithCompletion?: ?(fn: () => void) => void,
|
|
onPressAnimationComplete?: ?() => void,
|
|
pressRetentionOffset?: ?EdgeInsetsProp,
|
|
releaseVelocity?: ?number,
|
|
releaseBounciness?: ?number,
|
|
style?: ?ViewStyleProp,
|
|
|}>;
|
|
|
|
/**
|
|
* Example of using the `TouchableMixin` to play well with other responder
|
|
* locking views including `ScrollView`. `TouchableMixin` provides touchable
|
|
* hooks (`this.touchableHandle*`) that we forward events to. In turn,
|
|
* `TouchableMixin` expects us to implement some abstract methods to handle
|
|
* interesting interactions such as `handleTouchablePress`.
|
|
*/
|
|
const TouchableBounce = ((createReactClass({
|
|
displayName: 'TouchableBounce',
|
|
mixins: [Touchable.Mixin.withoutDefaultFocusAndBlur, NativeMethodsMixin],
|
|
|
|
propTypes: {
|
|
/* $FlowFixMe(>=0.89.0 site=react_native_fb) This comment suppresses an
|
|
* error found when Flow v0.89 was deployed. To see the error, delete this
|
|
* comment and run Flow. */
|
|
...TouchableWithoutFeedback.propTypes,
|
|
// The function passed takes a callback to start the animation which should
|
|
// be run after this onPress handler is done. You can use this (for example)
|
|
// to update UI before starting the animation.
|
|
onPressWithCompletion: PropTypes.func,
|
|
// the function passed is called after the animation is complete
|
|
onPressAnimationComplete: PropTypes.func,
|
|
/**
|
|
* When the scroll view is disabled, this defines how far your touch may
|
|
* move off of the button, before deactivating the button. Once deactivated,
|
|
* try moving it back and you'll see that the button is once again
|
|
* reactivated! Move it back and forth several times while the scroll view
|
|
* is disabled. Ensure you pass in a constant to reduce memory allocations.
|
|
*/
|
|
pressRetentionOffset: DeprecatedEdgeInsetsPropType,
|
|
releaseVelocity: PropTypes.number.isRequired,
|
|
releaseBounciness: PropTypes.number.isRequired,
|
|
/**
|
|
* Style to apply to the container/underlay. Most commonly used to make sure
|
|
* rounded corners match the wrapped component.
|
|
*/
|
|
style: DeprecatedViewPropTypes.style,
|
|
},
|
|
|
|
getDefaultProps: function() {
|
|
return {releaseBounciness: 10, releaseVelocity: 10};
|
|
},
|
|
|
|
getInitialState: function(): State {
|
|
return {
|
|
...this.touchableGetInitialState(),
|
|
scale: new Animated.Value(1),
|
|
};
|
|
},
|
|
|
|
bounceTo: function(
|
|
value: number,
|
|
velocity: number,
|
|
bounciness: number,
|
|
callback?: ?() => void,
|
|
) {
|
|
Animated.spring(this.state.scale, {
|
|
toValue: value,
|
|
velocity,
|
|
bounciness,
|
|
useNativeDriver: true,
|
|
}).start(callback);
|
|
},
|
|
|
|
/**
|
|
* `Touchable.Mixin` self callbacks. The mixin will invoke these if they are
|
|
* defined on your component.
|
|
*/
|
|
touchableHandleActivePressIn: function(e: PressEvent) {
|
|
this.bounceTo(0.93, 0.1, 0);
|
|
this.props.onPressIn && this.props.onPressIn(e);
|
|
},
|
|
|
|
touchableHandleActivePressOut: function(e: PressEvent) {
|
|
this.bounceTo(1, 0.4, 0);
|
|
this.props.onPressOut && this.props.onPressOut(e);
|
|
},
|
|
|
|
touchableHandleFocus: function(e: Event) {
|
|
if (Platform.isTV) {
|
|
this.bounceTo(0.93, 0.1, 0);
|
|
}
|
|
this.props.onFocus && this.props.onFocus(e);
|
|
},
|
|
|
|
touchableHandleBlur: function(e: Event) {
|
|
if (Platform.isTV) {
|
|
this.bounceTo(1, 0.4, 0);
|
|
}
|
|
this.props.onBlur && this.props.onBlur(e);
|
|
},
|
|
|
|
touchableHandlePress: function(e: PressEvent) {
|
|
const onPressWithCompletion = this.props.onPressWithCompletion;
|
|
if (onPressWithCompletion) {
|
|
onPressWithCompletion(() => {
|
|
this.state.scale.setValue(0.93);
|
|
this.bounceTo(
|
|
1,
|
|
this.props.releaseVelocity,
|
|
this.props.releaseBounciness,
|
|
this.props.onPressAnimationComplete,
|
|
);
|
|
});
|
|
return;
|
|
}
|
|
|
|
this.bounceTo(
|
|
1,
|
|
this.props.releaseVelocity,
|
|
this.props.releaseBounciness,
|
|
this.props.onPressAnimationComplete,
|
|
);
|
|
this.props.onPress && this.props.onPress(e);
|
|
},
|
|
|
|
touchableGetPressRectOffset: function(): typeof PRESS_RETENTION_OFFSET {
|
|
return this.props.pressRetentionOffset || PRESS_RETENTION_OFFSET;
|
|
},
|
|
|
|
touchableGetHitSlop: function(): ?EdgeInsetsProp {
|
|
return this.props.hitSlop;
|
|
},
|
|
|
|
touchableGetHighlightDelayMS: function(): number {
|
|
return 0;
|
|
},
|
|
|
|
render: function(): React.Element<any> {
|
|
return (
|
|
<Animated.View
|
|
style={[{transform: [{scale: this.state.scale}]}, this.props.style]}
|
|
accessible={this.props.accessible !== false}
|
|
accessibilityLabel={this.props.accessibilityLabel}
|
|
accessibilityHint={this.props.accessibilityHint}
|
|
accessibilityRole={this.props.accessibilityRole}
|
|
accessibilityStates={this.props.accessibilityStates}
|
|
accessibilityState={this.props.accessibilityState}
|
|
nativeID={this.props.nativeID}
|
|
testID={this.props.testID}
|
|
hitSlop={this.props.hitSlop}
|
|
clickable={
|
|
this.props.clickable !== false &&
|
|
this.props.onPress !== undefined &&
|
|
!this.props.disabled
|
|
}
|
|
onClick={this.touchableHandlePress}
|
|
onStartShouldSetResponder={this.touchableHandleStartShouldSetResponder}
|
|
onResponderTerminationRequest={
|
|
this.touchableHandleResponderTerminationRequest
|
|
}
|
|
onResponderGrant={this.touchableHandleResponderGrant}
|
|
onResponderMove={this.touchableHandleResponderMove}
|
|
onResponderRelease={this.touchableHandleResponderRelease}
|
|
onResponderTerminate={this.touchableHandleResponderTerminate}>
|
|
{this.props.children}
|
|
{Touchable.renderDebugView({
|
|
color: 'orange',
|
|
hitSlop: this.props.hitSlop,
|
|
})}
|
|
</Animated.View>
|
|
);
|
|
},
|
|
}): any): React.ComponentType<Props>);
|
|
|
|
module.exports = TouchableBounce;
|