@@ -206,16 +206,21 @@ const ScrollView = createReactClass({
206206 /**
207207 * Determines whether the keyboard gets dismissed in response to a drag.
208208 *
209+ * *Cross platform*
210+ *
209211 * - `'none'` (the default), drags do not dismiss the keyboard.
210212 * - `'on-drag'`, the keyboard is dismissed when a drag begins.
213+ *
214+ * *iOS Only*
215+ *
211216 * - `'interactive'`, the keyboard is dismissed interactively with the drag and moves in
212217 * synchrony with the touch; dragging upwards cancels the dismissal.
213218 * On android this is not supported and it will have the same behavior as 'none'.
214219 */
215220 keyboardDismissMode : PropTypes . oneOf ( [
216221 'none' , // default
217- 'interactive' ,
218- 'on-drag' ,
222+ 'on-drag' , // Cross-platform ,
223+ 'interactive' , // iOS-only
219224 ] ) ,
220225 /**
221226 * Determines when the keyboard should stay visible after a tap.
@@ -240,6 +245,14 @@ const ScrollView = createReactClass({
240245 * @platform ios
241246 */
242247 minimumZoomScale : PropTypes . number ,
248+ /**
249+ * Called when the momentum scroll starts (scroll which occurs as the ScrollView glides to a stop).
250+ */
251+ onMomentumScrollBegin : PropTypes . func ,
252+ /**
253+ * Called when the momentum scroll ends (scroll which occurs as the ScrollView glides to a stop).
254+ */
255+ onMomentumScrollEnd : PropTypes . func ,
243256 /**
244257 * Fires at most once per frame during scrolling. The frequency of the
245258 * events can be controlled using the `scrollEventThrottle` prop.
@@ -259,8 +272,16 @@ const ScrollView = createReactClass({
259272 * When true, the scroll view stops on multiples of the scroll view's size
260273 * when scrolling. This can be used for horizontal pagination. The default
261274 * value is false.
275+ *
276+ * Note: Vertical pagination is not supported on Android
262277 */
263278 pagingEnabled : PropTypes . bool ,
279+ /**
280+ * When true, ScrollView allows use of pinch gestures to zoom in and out.
281+ * The default value is true.
282+ * @platform ios
283+ */
284+ pinchGestureEnabled : PropTypes . bool ,
264285 /**
265286 * When false, the view cannot be scrolled via touch interaction
266287 * The default value is true.
@@ -349,6 +370,19 @@ const ScrollView = createReactClass({
349370 */
350371 zoomScale : PropTypes . number ,
351372
373+ /**
374+ * This property specifies how the safe area insets are used to modify the
375+ * content area of the scroll view. The default value of this property is
376+ * "never". Available on iOS 11 and later.
377+ * @platform ios
378+ */
379+ contentInsetAdjustmentBehavior : PropTypes . oneOf ( [
380+ 'automatic' ,
381+ 'scrollableAxes' ,
382+ 'never' , // default
383+ 'always' ,
384+ ] ) ,
385+
352386 /**
353387 * A RefreshControl component, used to provide pull-to-refresh
354388 * functionality for the ScrollView. Only works for vertical ScrollViews
0 commit comments