diff --git a/Examples/2048/2048.xcodeproj/project.pbxproj b/Examples/2048/2048.xcodeproj/project.pbxproj index 18f1ec2a9..d792a2d62 100644 --- a/Examples/2048/2048.xcodeproj/project.pbxproj +++ b/Examples/2048/2048.xcodeproj/project.pbxproj @@ -7,23 +7,16 @@ objects = { /* Begin PBXBuildFile section */ - 13ACB6741AC2117000FF4204 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13ACB6711AC2113600FF4204 /* libRCTAnimation.a */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 1461632D1AC3E23900C2F5AD /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1461632C1AC3E22900C2F5AD /* libReact.a */; }; + 58C1E40E1ACF54E9006D1A47 /* libRCTAnimationExperimental.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58C1E40B1ACF54B4006D1A47 /* libRCTAnimationExperimental.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 13ACB6701AC2113600FF4204 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 13ACB66C1AC2113500FF4204 /* RCTAnimation.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 134814201AA4EA6300B7C361; - remoteInfo = RCTAnimation; - }; 1461632B1AC3E22900C2F5AD /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 146163271AC3E22900C2F5AD /* React.xcodeproj */; @@ -31,6 +24,13 @@ remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; remoteInfo = React; }; + 58C1E40A1ACF54B4006D1A47 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 13ACB66C1AC2113500FF4204 /* RCTAnimationExperimental.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 134814201AA4EA6300B7C361; + remoteInfo = RCTAnimationExperimental; + }; 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */; @@ -41,7 +41,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 13ACB66C1AC2113500FF4204 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = ../../Libraries/Animation/RCTAnimation.xcodeproj; sourceTree = ""; }; + 13ACB66C1AC2113500FF4204 /* RCTAnimationExperimental.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimationExperimental.xcodeproj; path = ../../Libraries/Animation/RCTAnimationExperimental.xcodeproj; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* 2048.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = 2048.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = 2048/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = 2048/AppDelegate.m; sourceTree = ""; }; @@ -59,7 +59,7 @@ buildActionMask = 2147483647; files = ( 1461632D1AC3E23900C2F5AD /* libReact.a in Frameworks */, - 13ACB6741AC2117000FF4204 /* libRCTAnimation.a in Frameworks */, + 58C1E40E1ACF54E9006D1A47 /* libRCTAnimationExperimental.a in Frameworks */, 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -67,14 +67,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 13ACB66D1AC2113500FF4204 /* Products */ = { - isa = PBXGroup; - children = ( - 13ACB6711AC2113600FF4204 /* libRCTAnimation.a */, - ); - name = Products; - sourceTree = ""; - }; 13B07FAE1A68108700A75B9A /* 2048 */ = { isa = PBXGroup; children = ( @@ -96,12 +88,20 @@ name = Products; sourceTree = ""; }; + 58C1E4071ACF54B4006D1A47 /* Products */ = { + isa = PBXGroup; + children = ( + 58C1E40B1ACF54B4006D1A47 /* libRCTAnimationExperimental.a */, + ); + name = Products; + sourceTree = ""; + }; 832341AE1AAA6A7D00B99B32 /* Libraries */ = { isa = PBXGroup; children = ( 146163271AC3E22900C2F5AD /* React.xcodeproj */, 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */, - 13ACB66C1AC2113500FF4204 /* RCTAnimation.xcodeproj */, + 13ACB66C1AC2113500FF4204 /* RCTAnimationExperimental.xcodeproj */, ); name = Libraries; sourceTree = ""; @@ -175,8 +175,8 @@ projectDirPath = ""; projectReferences = ( { - ProductGroup = 13ACB66D1AC2113500FF4204 /* Products */; - ProjectRef = 13ACB66C1AC2113500FF4204 /* RCTAnimation.xcodeproj */; + ProductGroup = 58C1E4071ACF54B4006D1A47 /* Products */; + ProjectRef = 13ACB66C1AC2113500FF4204 /* RCTAnimationExperimental.xcodeproj */; }, { ProductGroup = 832341B11AAA6A8300B99B32 /* Products */; @@ -195,13 +195,6 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 13ACB6711AC2113600FF4204 /* libRCTAnimation.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTAnimation.a; - remoteRef = 13ACB6701AC2113600FF4204 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 1461632C1AC3E22900C2F5AD /* libReact.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -209,6 +202,13 @@ remoteRef = 1461632B1AC3E22900C2F5AD /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 58C1E40B1ACF54B4006D1A47 /* libRCTAnimationExperimental.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRCTAnimationExperimental.a; + remoteRef = 58C1E40A1ACF54B4006D1A47 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 832341B51AAA6A8300B99B32 /* libRCTText.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -266,6 +266,10 @@ ); INFOPLIST_FILE = "$(SRCROOT)/2048/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "/Users/sahrens/src/fbobjc-hg/Libraries/FBReactKit/js/react-native-github/Libraries/Animation/build/Debug-iphoneos", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = 2048; }; @@ -282,6 +286,10 @@ ); INFOPLIST_FILE = "$(SRCROOT)/2048/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "/Users/sahrens/src/fbobjc-hg/Libraries/FBReactKit/js/react-native-github/Libraries/Animation/build/Debug-iphoneos", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = 2048; }; diff --git a/Examples/2048/Game2048.js b/Examples/2048/Game2048.js index 03abfcd69..a6e12ff13 100644 --- a/Examples/2048/Game2048.js +++ b/Examples/2048/Game2048.js @@ -18,13 +18,13 @@ var React = require('react-native'); var { - Animation, AppRegistry, StyleSheet, Text, View, } = React; +var AnimationExperimental = require('AnimationExperimental'); var GameBoard = require('GameBoard'); var TouchableBounce = require('TouchableBounce'); @@ -77,17 +77,15 @@ class Tile extends React.Component { animationPosition(tile.toColumn()), animationPosition(tile.toRow()), ]; - Animation.startAnimation(this.refs['this'], 100, 0, 'easeInOutQuad', {position: point}); + AnimationExperimental.startAnimation(this.refs['this'], 100, 0, 'easeInOutQuad', {position: point}); } return offset; } + componentDidMount() { - setTimeout(() => { - Animation.startAnimation(this.refs['this'], 300, 0, 'easeInOutQuad', {scaleXY: [1, 1]}); - Animation.startAnimation(this.refs['this'], 100, 0, 'easeInOutQuad', {opacity: 1}); - }, 0); + AnimationExperimental.startAnimation(this.refs['this'], 100, 0, 'easeInOutQuad', {opacity: 1}); } render() { diff --git a/Libraries/Animation/Animation.js b/Libraries/Animation/AnimationExperimental.js similarity index 56% rename from Libraries/Animation/Animation.js rename to Libraries/Animation/AnimationExperimental.js index 019802f5e..79daa4550 100644 --- a/Libraries/Animation/Animation.js +++ b/Libraries/Animation/AnimationExperimental.js @@ -6,18 +6,25 @@ * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. * - * @providesModule Animation + * @providesModule AnimationExperimental * @flow */ 'use strict'; -var RCTAnimationManager = require('NativeModules').AnimationManager; +var RCTAnimationManager = require('NativeModules').AnimationExperimentalManager; var AnimationUtils = require('AnimationUtils'); type EasingFunction = (t: number) => number; -var Animation = { - Mixin: require('AnimationMixin'), +/** + * This is an experimental module that is under development, incomplete, + * potentially buggy, not used in any production apps, and will probably change + * in non-backward compatible ways. + * + * Use at your own risk. + */ +var AnimationExperimental = { + Mixin: require('AnimationExperimentalMixin'), startAnimation: function( node: any, @@ -28,7 +35,14 @@ var Animation = { ): number { var nodeHandle = +node.getNodeHandle(); var easingSample = AnimationUtils.evaluateEasingFunction(duration, easing); - var tag: number = RCTAnimationManager.startAnimation(nodeHandle, AnimationUtils.allocateTag(), duration, delay, easingSample, properties); + var tag: number = RCTAnimationManager.startAnimation( + nodeHandle, + AnimationUtils.allocateTag(), + duration, + delay, + easingSample, + properties + ); return tag; }, @@ -37,4 +51,4 @@ var Animation = { }, }; -module.exports = Animation; +module.exports = AnimationExperimental; diff --git a/Libraries/Animation/AnimationMixin.js b/Libraries/Animation/AnimationExperimentalMixin.js similarity index 74% rename from Libraries/Animation/AnimationMixin.js rename to Libraries/Animation/AnimationExperimentalMixin.js index 8cb9680ef..7cee9b72b 100644 --- a/Libraries/Animation/AnimationMixin.js +++ b/Libraries/Animation/AnimationExperimentalMixin.js @@ -6,19 +6,26 @@ * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. * - * @providesModule AnimationMixin + * @providesModule AnimationExperimentalMixin * @flow */ 'use strict'; var AnimationUtils = require('AnimationUtils'); -var RCTAnimationManager = require('NativeModules').AnimationManager; +var RCTAnimationManager = require('NativeModules').AnimationExperimentalManager; var invariant = require('invariant'); type EasingFunction = (t: number) => number; -var AnimationMixin = { +/** + * This is an experimental module that is under development, incomplete, + * potentially buggy, not used in any production apps, and will probably change + * in non-backward compatible ways. + * + * Use at your own risk. + */ +var AnimationExperimentalMixin = { getInitialState: function(): Object { return {}; }, @@ -48,4 +55,4 @@ var AnimationMixin = { }, }; -module.exports = AnimationMixin; +module.exports = AnimationExperimentalMixin; diff --git a/Libraries/Animation/RCTAnimation.xcodeproj/project.pbxproj b/Libraries/Animation/RCTAnimationExperimental.xcodeproj/project.pbxproj similarity index 80% rename from Libraries/Animation/RCTAnimation.xcodeproj/project.pbxproj rename to Libraries/Animation/RCTAnimationExperimental.xcodeproj/project.pbxproj index 81eb52c70..038ec7252 100644 --- a/Libraries/Animation/RCTAnimation.xcodeproj/project.pbxproj +++ b/Libraries/Animation/RCTAnimationExperimental.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 13BE3DEE1AC21097009241FE /* RCTAnimationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13BE3DED1AC21097009241FE /* RCTAnimationManager.m */; }; + 13BE3DEE1AC21097009241FE /* RCTAnimationExperimentalManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13BE3DED1AC21097009241FE /* RCTAnimationExperimentalManager.m */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -23,9 +23,9 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 134814201AA4EA6300B7C361 /* libRCTAnimation.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTAnimation.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 13BE3DEC1AC21097009241FE /* RCTAnimationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTAnimationManager.h; sourceTree = ""; }; - 13BE3DED1AC21097009241FE /* RCTAnimationManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTAnimationManager.m; sourceTree = ""; }; + 134814201AA4EA6300B7C361 /* libRCTAnimationExperimental.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTAnimationExperimental.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 13BE3DEC1AC21097009241FE /* RCTAnimationExperimentalManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTAnimationExperimentalManager.h; sourceTree = ""; }; + 13BE3DED1AC21097009241FE /* RCTAnimationExperimentalManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTAnimationExperimentalManager.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -42,7 +42,7 @@ 134814211AA4EA7D00B7C361 /* Products */ = { isa = PBXGroup; children = ( - 134814201AA4EA6300B7C361 /* libRCTAnimation.a */, + 134814201AA4EA6300B7C361 /* libRCTAnimationExperimental.a */, ); name = Products; sourceTree = ""; @@ -50,8 +50,8 @@ 58B511D21A9E6C8500147676 = { isa = PBXGroup; children = ( - 13BE3DEC1AC21097009241FE /* RCTAnimationManager.h */, - 13BE3DED1AC21097009241FE /* RCTAnimationManager.m */, + 13BE3DEC1AC21097009241FE /* RCTAnimationExperimentalManager.h */, + 13BE3DED1AC21097009241FE /* RCTAnimationExperimentalManager.m */, 134814211AA4EA7D00B7C361 /* Products */, ); sourceTree = ""; @@ -59,9 +59,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 58B511DA1A9E6C8500147676 /* RCTAnimation */ = { + 58B511DA1A9E6C8500147676 /* RCTAnimationExperimental */ = { isa = PBXNativeTarget; - buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTAnimation" */; + buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTAnimationExperimental" */; buildPhases = ( 58B511D71A9E6C8500147676 /* Sources */, 58B511D81A9E6C8500147676 /* Frameworks */, @@ -71,9 +71,9 @@ ); dependencies = ( ); - name = RCTAnimation; + name = RCTAnimationExperimental; productName = RCTDataManager; - productReference = 134814201AA4EA6300B7C361 /* libRCTAnimation.a */; + productReference = 134814201AA4EA6300B7C361 /* libRCTAnimationExperimental.a */; productType = "com.apple.product-type.library.static"; }; /* End PBXNativeTarget section */ @@ -90,7 +90,7 @@ }; }; }; - buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RCTAnimation" */; + buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RCTAnimationExperimental" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -102,7 +102,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 58B511DA1A9E6C8500147676 /* RCTAnimation */, + 58B511DA1A9E6C8500147676 /* RCTAnimationExperimental */, ); }; /* End PBXProject section */ @@ -112,7 +112,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 13BE3DEE1AC21097009241FE /* RCTAnimationManager.m in Sources */, + 13BE3DEE1AC21097009241FE /* RCTAnimationExperimentalManager.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -203,7 +203,7 @@ ); LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = RCTAnimation; + PRODUCT_NAME = RCTAnimationExperimental; SKIP_INSTALL = YES; }; name = Debug; @@ -218,7 +218,7 @@ ); LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = RCTAnimation; + PRODUCT_NAME = RCTAnimationExperimental; SKIP_INSTALL = YES; }; name = Release; @@ -226,7 +226,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RCTAnimation" */ = { + 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RCTAnimationExperimental" */ = { isa = XCConfigurationList; buildConfigurations = ( 58B511ED1A9E6C8500147676 /* Debug */, @@ -235,7 +235,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTAnimation" */ = { + 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTAnimationExperimental" */ = { isa = XCConfigurationList; buildConfigurations = ( 58B511F01A9E6C8500147676 /* Debug */, diff --git a/Libraries/Animation/RCTAnimationManager.h b/Libraries/Animation/RCTAnimationExperimentalManager.h similarity index 85% rename from Libraries/Animation/RCTAnimationManager.h rename to Libraries/Animation/RCTAnimationExperimentalManager.h index 1211143da..0affc5233 100644 --- a/Libraries/Animation/RCTAnimationManager.h +++ b/Libraries/Animation/RCTAnimationExperimentalManager.h @@ -12,6 +12,6 @@ #import "RCTBridgeModule.h" -@interface RCTAnimationManager : NSObject +@interface RCTAnimationExperimentalManager : NSObject @end diff --git a/Libraries/Animation/RCTAnimationManager.m b/Libraries/Animation/RCTAnimationExperimentalManager.m similarity index 94% rename from Libraries/Animation/RCTAnimationManager.m rename to Libraries/Animation/RCTAnimationExperimentalManager.m index a6e342db6..88bb5fe28 100644 --- a/Libraries/Animation/RCTAnimationManager.m +++ b/Libraries/Animation/RCTAnimationExperimentalManager.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTAnimationManager.h" +#import "RCTAnimationExperimentalManager.h" #import @@ -20,7 +20,7 @@ #define CG_APPEND(PREFIX, SUFFIX_F, SUFFIX_D) PREFIX##SUFFIX_F #endif -@implementation RCTAnimationManager +@implementation RCTAnimationExperimentalManager { RCTSparseArray *_animationRegistry; // Main thread only; animation tag -> view tag } @@ -65,9 +65,9 @@ { RCT_EXPORT(startAnimation); - __weak RCTAnimationManager *weakSelf = self; + __weak RCTAnimationExperimentalManager *weakSelf = self; [_bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, RCTSparseArray *viewRegistry) { - RCTAnimationManager *strongSelf = weakSelf; + RCTAnimationExperimentalManager *strongSelf = weakSelf; UIView *view = viewRegistry[reactTag]; if (!view) { @@ -182,9 +182,9 @@ { RCT_EXPORT(stopAnimation); - __weak RCTAnimationManager *weakSelf = self; + __weak RCTAnimationExperimentalManager *weakSelf = self; [_bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, RCTSparseArray *viewRegistry) { - RCTAnimationManager *strongSelf = weakSelf; + RCTAnimationExperimentalManager *strongSelf = weakSelf; NSNumber *reactTag = strongSelf->_animationRegistry[animationTag]; if (!reactTag) return; diff --git a/Libraries/Components/Touchable/TouchableBounce.js b/Libraries/Components/Touchable/TouchableBounce.js index d575657e9..ffcc8e737 100644 --- a/Libraries/Components/Touchable/TouchableBounce.js +++ b/Libraries/Components/Touchable/TouchableBounce.js @@ -14,7 +14,7 @@ var NativeMethodsMixin = require('NativeMethodsMixin'); var React = require('React'); var POPAnimation = require('POPAnimation'); -var Animation = require('Animation'); +var AnimationExperimental = require('AnimationExperimental'); var Touchable = require('Touchable'); var merge = require('merge'); @@ -79,7 +79,7 @@ var TouchableBounce = React.createClass({ this.state.animationID = POPAnimation.createSpringAnimation(anim); this.addAnimation(this.state.animationID, callback); } else { - Animation.startAnimation(this, 300, 0, 'easeOutBack', {scaleXY: [value, value]}); + AnimationExperimental.startAnimation(this, 300, 0, 'easeOutBack', {scaleXY: [value, value]}); if (fromValue && typeof fromValue === 'function') { callback = fromValue; } diff --git a/Libraries/react-native/react-native.js b/Libraries/react-native/react-native.js index 46148bd86..1aa978f46 100644 --- a/Libraries/react-native/react-native.js +++ b/Libraries/react-native/react-native.js @@ -41,7 +41,6 @@ var ReactNative = Object.assign(Object.create(require('React')), { // APIs AlertIOS: require('AlertIOS'), - Animation: require('Animation'), AppRegistry: require('AppRegistry'), AppStateIOS: require('AppStateIOS'), AsyncStorage: require('AsyncStorage'), diff --git a/React.podspec b/React.podspec index 8abc2a5ba..65dc93eb0 100644 --- a/React.podspec +++ b/React.podspec @@ -44,9 +44,9 @@ Pod::Spec.new do |s| ss.preserve_paths = "Libraries/AdSupport/*.js" end - s.subspec 'RCTAnimation' do |ss| + s.subspec 'RCTAnimationExperimental' do |ss| ss.dependency 'React/Core' - ss.source_files = "Libraries/Animation/*.{h,m}" + ss.source_files = "Libraries/Animation/RCTAnimationExperimental*.{h,m}" ss.preserve_paths = "Libraries/Animation/*.js" end