mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Samuel Susla
c429ee9974
Summary: Changelog: [internal] Fabric's ScrollView was ignoring value of `ScrollView.contentInsetAdjustmentBehavior`, this diff fixes that. Reviewed By: shergin Differential Revision: D23102235 fbshipit-source-id: 8cf42e730b560a21d56d7e007059109ccd01154e
288 lines
9.9 KiB
C++
288 lines
9.9 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
#include "ScrollViewProps.h"
|
|
|
|
#include <react/renderer/components/scrollview/conversions.h>
|
|
#include <react/renderer/debug/debugStringConvertibleUtils.h>
|
|
#include <react/renderer/graphics/conversions.h>
|
|
|
|
#include <react/renderer/core/propsConversions.h>
|
|
|
|
namespace facebook {
|
|
namespace react {
|
|
|
|
ScrollViewProps::ScrollViewProps(
|
|
ScrollViewProps const &sourceProps,
|
|
RawProps const &rawProps)
|
|
: ViewProps(sourceProps, rawProps),
|
|
alwaysBounceHorizontal(convertRawProp(
|
|
rawProps,
|
|
"alwaysBounceHorizontal",
|
|
sourceProps.alwaysBounceHorizontal,
|
|
{})),
|
|
alwaysBounceVertical(convertRawProp(
|
|
rawProps,
|
|
"alwaysBounceVertical",
|
|
sourceProps.alwaysBounceVertical,
|
|
{})),
|
|
bounces(convertRawProp(rawProps, "bounces", sourceProps.bounces, true)),
|
|
bouncesZoom(convertRawProp(
|
|
rawProps,
|
|
"bouncesZoom",
|
|
sourceProps.bouncesZoom,
|
|
true)),
|
|
canCancelContentTouches(convertRawProp(
|
|
rawProps,
|
|
"canCancelContentTouches",
|
|
sourceProps.canCancelContentTouches,
|
|
true)),
|
|
centerContent(convertRawProp(
|
|
rawProps,
|
|
"centerContent",
|
|
sourceProps.centerContent,
|
|
{})),
|
|
automaticallyAdjustContentInsets(convertRawProp(
|
|
rawProps,
|
|
"automaticallyAdjustContentInsets",
|
|
sourceProps.automaticallyAdjustContentInsets,
|
|
{})),
|
|
decelerationRate(convertRawProp(
|
|
rawProps,
|
|
"decelerationRate",
|
|
sourceProps.decelerationRate,
|
|
(Float)0.998)),
|
|
directionalLockEnabled(convertRawProp(
|
|
rawProps,
|
|
"directionalLockEnabled",
|
|
sourceProps.directionalLockEnabled,
|
|
{})),
|
|
indicatorStyle(convertRawProp(
|
|
rawProps,
|
|
"indicatorStyle",
|
|
sourceProps.indicatorStyle,
|
|
{})),
|
|
keyboardDismissMode(convertRawProp(
|
|
rawProps,
|
|
"keyboardDismissMode",
|
|
sourceProps.keyboardDismissMode,
|
|
{})),
|
|
maximumZoomScale(convertRawProp(
|
|
rawProps,
|
|
"maximumZoomScale",
|
|
sourceProps.maximumZoomScale,
|
|
(Float)1.0)),
|
|
minimumZoomScale(convertRawProp(
|
|
rawProps,
|
|
"minimumZoomScale",
|
|
sourceProps.minimumZoomScale,
|
|
(Float)1.0)),
|
|
scrollEnabled(convertRawProp(
|
|
rawProps,
|
|
"scrollEnabled",
|
|
sourceProps.scrollEnabled,
|
|
true)),
|
|
pagingEnabled(convertRawProp(
|
|
rawProps,
|
|
"pagingEnabled",
|
|
sourceProps.pagingEnabled,
|
|
{})),
|
|
pinchGestureEnabled(convertRawProp(
|
|
rawProps,
|
|
"pinchGestureEnabled",
|
|
sourceProps.pinchGestureEnabled,
|
|
true)),
|
|
scrollsToTop(convertRawProp(
|
|
rawProps,
|
|
"scrollsToTop",
|
|
sourceProps.scrollsToTop,
|
|
true)),
|
|
showsHorizontalScrollIndicator(convertRawProp(
|
|
rawProps,
|
|
"showsHorizontalScrollIndicator",
|
|
sourceProps.showsHorizontalScrollIndicator,
|
|
true)),
|
|
showsVerticalScrollIndicator(convertRawProp(
|
|
rawProps,
|
|
"showsVerticalScrollIndicator",
|
|
sourceProps.showsVerticalScrollIndicator,
|
|
true)),
|
|
scrollEventThrottle(convertRawProp(
|
|
rawProps,
|
|
"scrollEventThrottle",
|
|
sourceProps.scrollEventThrottle,
|
|
{})),
|
|
zoomScale(convertRawProp(
|
|
rawProps,
|
|
"zoomScale",
|
|
sourceProps.zoomScale,
|
|
(Float)1.0)),
|
|
contentInset(convertRawProp(
|
|
rawProps,
|
|
"contentInset",
|
|
sourceProps.contentInset,
|
|
{})),
|
|
contentOffset(convertRawProp(
|
|
rawProps,
|
|
"contentOffset",
|
|
sourceProps.contentOffset,
|
|
{})),
|
|
scrollIndicatorInsets(convertRawProp(
|
|
rawProps,
|
|
"scrollIndicatorInsets",
|
|
sourceProps.scrollIndicatorInsets,
|
|
{})),
|
|
snapToInterval(convertRawProp(
|
|
rawProps,
|
|
"snapToInterval",
|
|
sourceProps.snapToInterval,
|
|
{})),
|
|
snapToAlignment(convertRawProp(
|
|
rawProps,
|
|
"snapToAlignment",
|
|
sourceProps.snapToAlignment,
|
|
{})),
|
|
disableIntervalMomentum(convertRawProp(
|
|
rawProps,
|
|
"disableIntervalMomentum",
|
|
sourceProps.disableIntervalMomentum,
|
|
{})),
|
|
snapToOffsets(convertRawProp(
|
|
rawProps,
|
|
"snapToOffsets",
|
|
sourceProps.snapToOffsets,
|
|
{})),
|
|
snapToStart(
|
|
convertRawProp(rawProps, "snapToStart", sourceProps.snapToStart, {})),
|
|
snapToEnd(
|
|
convertRawProp(rawProps, "snapToEnd", sourceProps.snapToEnd, {})),
|
|
contentInsetAdjustmentBehavior(convertRawProp(
|
|
rawProps,
|
|
"contentInsetAdjustmentBehavior",
|
|
sourceProps.contentInsetAdjustmentBehavior,
|
|
{ContentInsetAdjustmentBehavior::Never})) {}
|
|
|
|
#pragma mark - DebugStringConvertible
|
|
|
|
#if RN_DEBUG_STRING_CONVERTIBLE
|
|
SharedDebugStringConvertibleList ScrollViewProps::getDebugProps() const {
|
|
auto defaultScrollViewProps = ScrollViewProps{};
|
|
|
|
return ViewProps::getDebugProps() +
|
|
SharedDebugStringConvertibleList{
|
|
debugStringConvertibleItem(
|
|
"alwaysBounceHorizontal",
|
|
alwaysBounceHorizontal,
|
|
defaultScrollViewProps.alwaysBounceHorizontal),
|
|
debugStringConvertibleItem(
|
|
"alwaysBounceVertical",
|
|
alwaysBounceVertical,
|
|
defaultScrollViewProps.alwaysBounceVertical),
|
|
debugStringConvertibleItem(
|
|
"bounces", bounces, defaultScrollViewProps.bounces),
|
|
debugStringConvertibleItem(
|
|
"bouncesZoom", bouncesZoom, defaultScrollViewProps.bouncesZoom),
|
|
debugStringConvertibleItem(
|
|
"canCancelContentTouches",
|
|
canCancelContentTouches,
|
|
defaultScrollViewProps.canCancelContentTouches),
|
|
debugStringConvertibleItem(
|
|
"centerContent",
|
|
centerContent,
|
|
defaultScrollViewProps.centerContent),
|
|
debugStringConvertibleItem(
|
|
"automaticallyAdjustContentInsets",
|
|
automaticallyAdjustContentInsets,
|
|
defaultScrollViewProps.automaticallyAdjustContentInsets),
|
|
debugStringConvertibleItem(
|
|
"decelerationRate",
|
|
decelerationRate,
|
|
defaultScrollViewProps.decelerationRate),
|
|
debugStringConvertibleItem(
|
|
"directionalLockEnabled",
|
|
directionalLockEnabled,
|
|
defaultScrollViewProps.directionalLockEnabled),
|
|
debugStringConvertibleItem(
|
|
"indicatorStyle",
|
|
indicatorStyle,
|
|
defaultScrollViewProps.indicatorStyle),
|
|
debugStringConvertibleItem(
|
|
"keyboardDismissMode",
|
|
keyboardDismissMode,
|
|
defaultScrollViewProps.keyboardDismissMode),
|
|
debugStringConvertibleItem(
|
|
"maximumZoomScale",
|
|
maximumZoomScale,
|
|
defaultScrollViewProps.maximumZoomScale),
|
|
debugStringConvertibleItem(
|
|
"minimumZoomScale",
|
|
minimumZoomScale,
|
|
defaultScrollViewProps.minimumZoomScale),
|
|
debugStringConvertibleItem(
|
|
"scrollEnabled",
|
|
scrollEnabled,
|
|
defaultScrollViewProps.scrollEnabled),
|
|
debugStringConvertibleItem(
|
|
"pagingEnabled",
|
|
pagingEnabled,
|
|
defaultScrollViewProps.pagingEnabled),
|
|
debugStringConvertibleItem(
|
|
"pinchGestureEnabled",
|
|
pinchGestureEnabled,
|
|
defaultScrollViewProps.pinchGestureEnabled),
|
|
debugStringConvertibleItem(
|
|
"scrollsToTop",
|
|
scrollsToTop,
|
|
defaultScrollViewProps.scrollsToTop),
|
|
debugStringConvertibleItem(
|
|
"showsHorizontalScrollIndicator",
|
|
showsHorizontalScrollIndicator,
|
|
defaultScrollViewProps.showsHorizontalScrollIndicator),
|
|
debugStringConvertibleItem(
|
|
"showsVerticalScrollIndicator",
|
|
showsVerticalScrollIndicator,
|
|
defaultScrollViewProps.showsVerticalScrollIndicator),
|
|
debugStringConvertibleItem(
|
|
"scrollEventThrottle",
|
|
scrollEventThrottle,
|
|
defaultScrollViewProps.scrollEventThrottle),
|
|
debugStringConvertibleItem(
|
|
"zoomScale", zoomScale, defaultScrollViewProps.zoomScale),
|
|
debugStringConvertibleItem(
|
|
"contentInset",
|
|
contentInset,
|
|
defaultScrollViewProps.contentInset),
|
|
debugStringConvertibleItem(
|
|
"contentOffset",
|
|
contentOffset,
|
|
defaultScrollViewProps.contentOffset),
|
|
debugStringConvertibleItem(
|
|
"scrollIndicatorInsets",
|
|
scrollIndicatorInsets,
|
|
defaultScrollViewProps.scrollIndicatorInsets),
|
|
debugStringConvertibleItem(
|
|
"snapToInterval",
|
|
snapToInterval,
|
|
defaultScrollViewProps.snapToInterval),
|
|
debugStringConvertibleItem(
|
|
"snapToAlignment",
|
|
snapToAlignment,
|
|
defaultScrollViewProps.snapToAlignment),
|
|
debugStringConvertibleItem(
|
|
"disableIntervalMomentum",
|
|
disableIntervalMomentum,
|
|
defaultScrollViewProps.disableIntervalMomentum),
|
|
debugStringConvertibleItem(
|
|
"snapToStart", snapToStart, defaultScrollViewProps.snapToStart),
|
|
debugStringConvertibleItem(
|
|
"snapToEnd", snapToEnd, defaultScrollViewProps.snapToEnd)};
|
|
}
|
|
#endif
|
|
|
|
} // namespace react
|
|
} // namespace facebook
|