diff --git a/notNeededPackages.json b/notNeededPackages.json index 3b3c3f8ea1..50d71d2165 100644 --- a/notNeededPackages.json +++ b/notNeededPackages.json @@ -430,7 +430,7 @@ "libraryName": "qiniu", "typingsPackageName": "qiniu", "sourceRepoURL": "https://github.com/qiniu/nodejs-sdk", - "asOfVersion": "6.1.0" + "asOfVersion": "7.0.1" }, { "libraryName": "Raven JS", diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts index 8bd26696c3..17e15ae698 100644 --- a/types/react-native/index.d.ts +++ b/types/react-native/index.d.ts @@ -891,7 +891,7 @@ export interface TextProperties extends TextPropertiesIOS, TextPropertiesAndroid /** * @see https://facebook.github.io/react-native/docs/text.html#style */ - style?: TextStyle + style?: TextStyle | Array /** * Used to locate this view in end-to-end tests. @@ -1644,6 +1644,8 @@ export interface ViewPropertiesAndroid { } +export type ViewStyleProp = ViewStyle | Array; + /** * @see https://facebook.github.io/react-native/docs/view.html#props */ @@ -1671,7 +1673,6 @@ export interface ViewProperties extends ViewPropertiesAndroid, ViewPropertiesIOS * the Z-index of sibling views always takes precedence if a touch * hits two overlapping views. */ - hitSlop?: Insets /** @@ -1724,7 +1725,7 @@ export interface ViewProperties extends ViewPropertiesAndroid, ViewPropertiesIOS */ removeClippedSubviews?: boolean - style?: ViewStyle; + style?: ViewStyleProp; /** * Used to locate this view in end-to-end tests. @@ -3376,7 +3377,7 @@ export interface ImageProperties extends ImagePropertiesIOS, ImagePropertiesAndr * * Style */ - style?: ImageStyle; + style?: ImageStyle | Array; /** * A unique identifier for this element to be used in UI Automation testing scripts. @@ -4283,7 +4284,7 @@ export interface TouchableWithoutFeedbackProperties extends TouchableWithoutFeed /** * //FIXME: not in doc but available in examples */ - style?: ViewStyle + style?: ViewStyleProp /** * When the scroll view is disabled, this defines how far your @@ -4341,8 +4342,7 @@ export interface TouchableHighlightProperties extends TouchableWithoutFeedbackPr /** * @see https://facebook.github.io/react-native/docs/view.html#style */ - style?: ViewStyle - + style?: ViewStyleProp /** * The color of the underlay that will show through when the touch is active. @@ -5977,12 +5977,12 @@ export interface ScrollViewProperties extends ViewProperties, ScrollViewProperti */ onScrollBeginDrag?: (event?: NativeSyntheticEvent) => void -/** + /** * Fires when a user has finished scrolling. */ onScrollEndDrag?: (event?: NativeSyntheticEvent) => void -/** + /** * Fires when scroll view has finished moving */ onMomentumScrollEnd?: (event?: NativeSyntheticEvent) => void @@ -6025,7 +6025,7 @@ export interface ScrollViewProperties extends ViewProperties, ScrollViewProperti /** * Style */ - style?: ScrollViewStyle + style?: ScrollViewStyle | Array /** * A RefreshControl component, used to provide pull-to-refresh