From 3580ee24747db5120977b8dc1d80dd853f3d4d44 Mon Sep 17 00:00:00 2001 From: mcallisto Date: Mon, 16 Sep 2019 09:45:55 +0200 Subject: [PATCH 1/2] English typo (#637) --- components/radio/demo/basic.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/radio/demo/basic.tsx b/components/radio/demo/basic.tsx index 47bfa6702..09df05fb8 100644 --- a/components/radio/demo/basic.tsx +++ b/components/radio/demo/basic.tsx @@ -50,7 +50,7 @@ export default class BasicRadioExample extends React.Component { } }} > - Use Ant Desgin Component + Use Ant Design Component { } }} > - Use Ant Desgin Component + Use Ant Design Component Set disabled From 73bc9422dc2e882c4b600e9c37aba7c4f390b849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?web=E5=89=8D=E7=AB=AF?= <664176494@qq.com> Date: Fri, 27 Sep 2019 11:38:56 +0800 Subject: [PATCH 2/2] pr #568 (#615) --- components/tabs/Tabs.tsx | 3 +- package.json | 1 + .../antd_mobile_rn.xcodeproj/project.pbxproj | 64 ++++++++++++++++++- yarn.lock | 5 ++ 4 files changed, 69 insertions(+), 4 deletions(-) diff --git a/components/tabs/Tabs.tsx b/components/tabs/Tabs.tsx index 2c5d32ede..794a25e5b 100644 --- a/components/tabs/Tabs.tsx +++ b/components/tabs/Tabs.tsx @@ -1,5 +1,6 @@ import React from 'react'; -import { Animated, Dimensions, LayoutChangeEvent, NativeScrollEvent, NativeSyntheticEvent, Platform, ScrollView, ViewPagerAndroid } from 'react-native'; +import { Animated, Dimensions, LayoutChangeEvent, NativeScrollEvent, NativeSyntheticEvent, Platform, ScrollView } from 'react-native'; +import ViewPagerAndroid from '@react-native-community/viewpager'; import { WithTheme, WithThemeStyles } from '../style'; import View from '../view'; import { DefaultTabBar } from './DefaultTabBar'; diff --git a/package.json b/package.json index 28e631f51..431b60e47 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "@ant-design/icons-react-native": "^1.0.2", "@bang88/react-native-drawer-layout": "^2.0.3", "@bang88/react-native-ultimate-listview": "^3.3.0", + "@react-native-community/viewpager": "^1.1.7", "array-tree-filter": "~2.1.0", "babel-runtime": "^6.x", "deepmerge": "^3.0.0", diff --git a/rn-kitchen-sink/ios/antd_mobile_rn.xcodeproj/project.pbxproj b/rn-kitchen-sink/ios/antd_mobile_rn.xcodeproj/project.pbxproj index 22e800b8e..7ddfeac21 100644 --- a/rn-kitchen-sink/ios/antd_mobile_rn.xcodeproj/project.pbxproj +++ b/rn-kitchen-sink/ios/antd_mobile_rn.xcodeproj/project.pbxproj @@ -5,7 +5,6 @@ }; objectVersion = 46; objects = { - /* Begin PBXBuildFile section */ 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; }; 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; }; @@ -41,6 +40,7 @@ 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; 91B69CCFCA0A4931B1246C22 /* antoutline.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A07C67ED8BB74DFCB83435DE /* antoutline.ttf */; }; ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; }; + 27A80BCF60E6400D82F9C297 /* libRNCViewpager.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 53C495410E1144158D502423 /* libRNCViewpager.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -356,6 +356,8 @@ 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; A07C67ED8BB74DFCB83435DE /* antoutline.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = antoutline.ttf; path = "../../node_modules/@ant-design/icons-react-native/fonts/antoutline.ttf"; sourceTree = ""; }; ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = ""; }; + 1E67DE4D40644BB8A45FBF33 /* RNCViewpager.xcodeproj */ = {isa = PBXFileReference; name = "RNCViewpager.xcodeproj"; path = "../../node_modules/@react-native-community/viewpager/ios/RNCViewpager.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; + 53C495410E1144158D502423 /* libRNCViewpager.a */ = {isa = PBXFileReference; name = "libRNCViewpager.a"; path = "libRNCViewpager.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -384,6 +386,7 @@ 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */, 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */, 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */, + 27A80BCF60E6400D82F9C297 /* libRNCViewpager.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -588,6 +591,7 @@ 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */, 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */, 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */, + 1E67DE4D40644BB8A45FBF33 /* RNCViewpager.xcodeproj */, ); name = Libraries; sourceTree = ""; @@ -1227,6 +1231,14 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/antd_mobile_rn.app/antd_mobile_rn"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)\..\..\node_modules\@react-native-community\viewpager\ios", + ); }; name = Debug; }; @@ -1245,6 +1257,14 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/antd_mobile_rn.app/antd_mobile_rn"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)\..\..\node_modules\@react-native-community\viewpager\ios", + ); }; name = Release; }; @@ -1254,7 +1274,10 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CURRENT_PROJECT_VERSION = 1; DEAD_CODE_STRIPPING = NO; - HEADER_SEARCH_PATHS = ""; + HEADER_SEARCH_PATHS = ( + "", + "$(SRCROOT)\..\..\node_modules\@react-native-community\viewpager\ios", + ); INFOPLIST_FILE = antd_mobile_rn/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = ( @@ -1273,7 +1296,10 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CURRENT_PROJECT_VERSION = 1; - HEADER_SEARCH_PATHS = ""; + HEADER_SEARCH_PATHS = ( + "", + "$(SRCROOT)\..\..\node_modules\@react-native-community\viewpager\ios", + ); INFOPLIST_FILE = antd_mobile_rn/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = ( @@ -1310,6 +1336,14 @@ SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.2; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)\..\..\node_modules\@react-native-community\viewpager\ios", + ); }; name = Debug; }; @@ -1336,6 +1370,14 @@ SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.2; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)\..\..\node_modules\@react-native-community\viewpager\ios", + ); }; name = Release; }; @@ -1361,6 +1403,14 @@ SDKROOT = appletvos; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/antd_mobile_rn-tvOS.app/antd_mobile_rn-tvOS"; TVOS_DEPLOYMENT_TARGET = 10.1; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)\..\..\node_modules\@react-native-community\viewpager\ios", + ); }; name = Debug; }; @@ -1386,6 +1436,14 @@ SDKROOT = appletvos; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/antd_mobile_rn-tvOS.app/antd_mobile_rn-tvOS"; TVOS_DEPLOYMENT_TARGET = 10.1; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)\..\..\node_modules\@react-native-community\viewpager\ios", + ); }; name = Release; }; diff --git a/yarn.lock b/yarn.lock index ff4fc0c91..5da0069c1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -736,6 +736,11 @@ log-update "^2.3.0" strip-ansi "^3.0.1" +"@react-native-community/viewpager@^1.1.7": + version "1.1.7" + resolved "https://registry.npm.taobao.org/@react-native-community/viewpager/download/@react-native-community/viewpager-1.1.7.tgz#7d3b1631f1ec91145db92a8e25c80d53027e96ba" + integrity sha1-fTsWMfHskRRduSqOJcgNUwJ+lro= + "@samverschueren/stream-to-observable@^0.3.0": version "0.3.0" resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"