More updates

This commit is contained in:
Alex Kotliarskyi 2015-07-27 14:47:32 -07:00
commit 62b7920b9d
3 changed files with 16 additions and 6 deletions

View File

@ -9,11 +9,14 @@
# Ignore react-tools where there are overlaps, but don't ignore anything that # Ignore react-tools where there are overlaps, but don't ignore anything that
# react-native relies on # react-native relies on
.*/node_modules/react-tools/src/vendor/core/ExecutionEnvironment.js .*/node_modules/react-tools/src/React.js
.*/node_modules/react-tools/src/browser/eventPlugins/ResponderEventPlugin.js .*/node_modules/react-tools/src/renderers/shared/reconciler/ReactInstanceHandles.js
.*/node_modules/react-tools/src/browser/ui/React.js .*/node_modules/react-tools/src/renderers/shared/event/EventPropagators.js
.*/node_modules/react-tools/src/core/ReactInstanceHandles.js .*/node_modules/react-tools/src/renderers/shared/event/eventPlugins/ResponderEventPlugin.js
.*/node_modules/react-tools/src/event/EventPropagators.js .*/node_modules/react-tools/src/renderers/shared/event/eventPlugins/ResponderSyntheticEvent.js
.*/node_modules/react-tools/src/renderers/shared/event/eventPlugins/ResponderTouchHistoryStore.js
.*/node_modules/react-tools/src/shared/vendor/core/ExecutionEnvironment.js
# Ignore commoner tests # Ignore commoner tests
.*/node_modules/commoner/test/.* .*/node_modules/commoner/test/.*

View File

@ -390,6 +390,13 @@ var ListView = React.createClass({
Object.assign(props, { Object.assign(props, {
onScroll: this._onScroll, onScroll: this._onScroll,
stickyHeaderIndices: sectionHeaderIndices, stickyHeaderIndices: sectionHeaderIndices,
// Do not pass these events downstream to ScrollView since they will be
// registered in ListView's own ScrollResponder.Mixin
onKeyboardWillShow: undefined,
onKeyboardWillHide: undefined,
onKeyboardDidShow: undefined,
onKeyboardDidHide: undefined,
}); });
// TODO(ide): Use function refs so we can compose with the scroll // TODO(ide): Use function refs so we can compose with the scroll

View File

@ -294,7 +294,7 @@ var PanResponder = {
return false; return false;
} }
PanResponder._updateGestureStateOnMove(gestureState, touchHistory); PanResponder._updateGestureStateOnMove(gestureState, touchHistory);
return config.onMoveShouldSetResponderCapture ? return config.onMoveShouldSetPanResponderCapture ?
config.onMoveShouldSetPanResponderCapture(e, gestureState) : false; config.onMoveShouldSetPanResponderCapture(e, gestureState) : false;
}, },