mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Пётр Потапов
d9a8ac5071
Summary: Fixes #22752 On line 1021 you are passing base style to props: `style: [baseStyle, this.props.style],` Explicitly passing base style to ScrollView just overrides this line and doesn't let developers to customise style of any inheritors of ScrollView (not only FlatList) with custom RefreshControl. So this line (1113) seems to be removed. ## Changelog [GENERAL] [Fixed] - fix of Android's bug that doesn't let override ScrollView's Style with custom RefreshControl. Pull Request resolved: https://github.com/facebook/react-native/pull/24411 Differential Revision: D15713061 Pulled By: cpojer fbshipit-source-id: 461259800f867af15e53e0743a5057ea4528ae69
63 lines
1.3 KiB
JavaScript
63 lines
1.3 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 strict-local
|
|
*/
|
|
|
|
'use strict';
|
|
|
|
import type {DangerouslyImpreciseStyle} from './StyleSheet';
|
|
|
|
const OUTER_PROPS = Object.assign(Object.create(null), {
|
|
margin: true,
|
|
marginHorizontal: true,
|
|
marginVertical: true,
|
|
marginBottom: true,
|
|
marginTop: true,
|
|
marginLeft: true,
|
|
marginRight: true,
|
|
flex: true,
|
|
flexGrow: true,
|
|
flexShrink: true,
|
|
flexBasis: true,
|
|
alignSelf: true,
|
|
height: true,
|
|
minHeight: true,
|
|
maxHeight: true,
|
|
width: true,
|
|
minWidth: true,
|
|
maxWidth: true,
|
|
position: true,
|
|
left: true,
|
|
right: true,
|
|
bottom: true,
|
|
top: true,
|
|
});
|
|
|
|
function splitLayoutProps(
|
|
props: ?DangerouslyImpreciseStyle,
|
|
): {
|
|
outer: DangerouslyImpreciseStyle,
|
|
inner: DangerouslyImpreciseStyle,
|
|
} {
|
|
const inner = {};
|
|
const outer = {};
|
|
if (props) {
|
|
Object.keys(props).forEach(k => {
|
|
const value: $ElementType<DangerouslyImpreciseStyle, typeof k> = props[k];
|
|
if (OUTER_PROPS[k]) {
|
|
outer[k] = value;
|
|
} else {
|
|
inner[k] = value;
|
|
}
|
|
});
|
|
}
|
|
return {outer, inner};
|
|
}
|
|
|
|
module.exports = splitLayoutProps;
|