Коммит
0bfcc9a6c2
|
@ -121,7 +121,9 @@
|
||||||
832341AE1AAA6A7D00B99B32 /* Libraries */,
|
832341AE1AAA6A7D00B99B32 /* Libraries */,
|
||||||
83CBBA001A601CBA00E9B192 /* Products */,
|
83CBBA001A601CBA00E9B192 /* Products */,
|
||||||
);
|
);
|
||||||
|
indentWidth = 2;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
tabWidth = 2;
|
||||||
};
|
};
|
||||||
83CBBA001A601CBA00E9B192 /* Products */ = {
|
83CBBA001A601CBA00E9B192 /* Products */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
|
|
|
@ -159,7 +159,9 @@
|
||||||
58C571FC1AA6124500CDF9C8 /* Libraries */,
|
58C571FC1AA6124500CDF9C8 /* Libraries */,
|
||||||
83CBBA001A601CBA00E9B192 /* Products */,
|
83CBBA001A601CBA00E9B192 /* Products */,
|
||||||
);
|
);
|
||||||
|
indentWidth = 2;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
tabWidth = 2;
|
||||||
};
|
};
|
||||||
83CBBA001A601CBA00E9B192 /* Products */ = {
|
83CBBA001A601CBA00E9B192 /* Products */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
|
|
|
@ -242,7 +242,9 @@
|
||||||
832341AE1AAA6A7D00B99B32 /* Libraries */,
|
832341AE1AAA6A7D00B99B32 /* Libraries */,
|
||||||
83CBBA001A601CBA00E9B192 /* Products */,
|
83CBBA001A601CBA00E9B192 /* Products */,
|
||||||
);
|
);
|
||||||
|
indentWidth = 2;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
tabWidth = 2;
|
||||||
};
|
};
|
||||||
83CBBA001A601CBA00E9B192 /* Products */ = {
|
83CBBA001A601CBA00E9B192 /* Products */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
|
|
|
@ -24,7 +24,7 @@ var SampleApp = React.createClass({
|
||||||
</Text>
|
</Text>
|
||||||
<Text style={styles.instructions}>
|
<Text style={styles.instructions}>
|
||||||
Press Cmd+R to reload,{'\n'}
|
Press Cmd+R to reload,{'\n'}
|
||||||
Cmd+Shift+Z for dev menu
|
Cmd+Control+Z for dev menu
|
||||||
</Text>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
);
|
);
|
||||||
|
|
|
@ -121,7 +121,9 @@
|
||||||
58C572071AA6126D00CDF9C8 /* Libraries */,
|
58C572071AA6126D00CDF9C8 /* Libraries */,
|
||||||
83CBBA001A601CBA00E9B192 /* Products */,
|
83CBBA001A601CBA00E9B192 /* Products */,
|
||||||
);
|
);
|
||||||
|
indentWidth = 2;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
tabWidth = 2;
|
||||||
};
|
};
|
||||||
83CBBA001A601CBA00E9B192 /* Products */ = {
|
83CBBA001A601CBA00E9B192 /* Products */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
|
|
|
@ -115,7 +115,7 @@ var BreadcrumbNavSample = React.createClass({
|
||||||
renderScene={this._renderScene}
|
renderScene={this._renderScene}
|
||||||
navigationBar={
|
navigationBar={
|
||||||
<Navigator.BreadcrumbNavigationBar
|
<Navigator.BreadcrumbNavigationBar
|
||||||
navigationBarRouteMapper={this._navBarRouteMapper}
|
routeMapper={this._navBarRouteMapper}
|
||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -121,8 +121,8 @@ var NavigationBarSample = React.createClass({
|
||||||
)}
|
)}
|
||||||
navigationBar={
|
navigationBar={
|
||||||
<Navigator.NavigationBar
|
<Navigator.NavigationBar
|
||||||
navigationBarRouteMapper={NavigationBarRouteMapper}
|
routeMapper={NavigationBarRouteMapper}
|
||||||
navigationBarStyles={styles.navBar}
|
style={styles.navBar}
|
||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -74,7 +74,7 @@ class NotificationExample extends React.Component {
|
||||||
_onNotification(notification) {
|
_onNotification(notification) {
|
||||||
AlertIOS.alert(
|
AlertIOS.alert(
|
||||||
'Notification Received',
|
'Notification Received',
|
||||||
`Alert message: ${notification.getMessage()}`,
|
'Alert message: ' + notification.getMessage(),
|
||||||
[{
|
[{
|
||||||
text: 'Dismiss',
|
text: 'Dismiss',
|
||||||
onPress: null,
|
onPress: null,
|
||||||
|
|
|
@ -305,7 +305,9 @@
|
||||||
004D289F1AAF61C70097A701 /* UIExplorerTests */,
|
004D289F1AAF61C70097A701 /* UIExplorerTests */,
|
||||||
83CBBA001A601CBA00E9B192 /* Products */,
|
83CBBA001A601CBA00E9B192 /* Products */,
|
||||||
);
|
);
|
||||||
|
indentWidth = 2;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
tabWidth = 2;
|
||||||
};
|
};
|
||||||
83CBBA001A601CBA00E9B192 /* Products */ = {
|
83CBBA001A601CBA00E9B192 /* Products */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
|
|
|
@ -0,0 +1,72 @@
|
||||||
|
diff a/Libraries/FBReactKit/js/react-native-github/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj b/Libraries/FBReactKit/js/react-native-github/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj (rejected hunks)
|
||||||
|
@@ -19,6 +19,7 @@
|
||||||
|
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
|
||||||
|
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
|
||||||
|
147CED4C1AB3532B00DA3E4C /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 147CED4B1AB34F8C00DA3E4C /* libRCTActionSheet.a */; };
|
||||||
|
+ D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D85B829C1AB6D5CE003F4FE2 /* libRCTVibration.a */; };
|
||||||
|
/* End PBXBuildFile section */
|
||||||
|
|
||||||
|
/* Begin PBXContainerItemProxy section */
|
||||||
|
@@ -78,6 +79,13 @@
|
||||||
|
remoteGlobalIDString = 134814201AA4EA6300B7C361;
|
||||||
|
remoteInfo = RCTActionSheet;
|
||||||
|
};
|
||||||
|
+ D85B829B1AB6D5CE003F4FE2 /* PBXContainerItemProxy */ = {
|
||||||
|
+ isa = PBXContainerItemProxy;
|
||||||
|
+ containerPortal = D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */;
|
||||||
|
+ proxyType = 2;
|
||||||
|
+ remoteGlobalIDString = 832C81801AAF6DEF007FA2F7;
|
||||||
|
+ remoteInfo = RCTVibration;
|
||||||
|
+ };
|
||||||
|
/* End PBXContainerItemProxy section */
|
||||||
|
|
||||||
|
/* Begin PBXFileReference section */
|
||||||
|
@@ -98,6 +106,7 @@
|
||||||
|
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||||
|
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
|
||||||
|
14E0EEC81AB118F7000DECC3 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = ../../Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj; sourceTree = "<group>"; };
|
||||||
|
+ D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = ../../Libraries/Vibration/RCTVibration.xcodeproj; sourceTree = "<group>"; };
|
||||||
|
/* End PBXFileReference section */
|
||||||
|
|
||||||
|
/* Begin PBXFrameworksBuildPhase section */
|
||||||
|
@@ -112,6 +121,7 @@
|
||||||
|
isa = PBXFrameworksBuildPhase;
|
||||||
|
buildActionMask = 2147483647;
|
||||||
|
files = (
|
||||||
|
+ D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */,
|
||||||
|
147CED4C1AB3532B00DA3E4C /* libRCTActionSheet.a in Frameworks */,
|
||||||
|
134454601AAFCABD003F0779 /* libRCTAdSupport.a in Frameworks */,
|
||||||
|
134A8A2A1AACED7A00945AAE /* libRCTGeolocation.a in Frameworks */,
|
||||||
|
@@ -145,6 +155,7 @@
|
||||||
|
1316A21D1AA397F400C0188E /* Libraries */ = {
|
||||||
|
isa = PBXGroup;
|
||||||
|
children = (
|
||||||
|
+ D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */,
|
||||||
|
14E0EEC81AB118F7000DECC3 /* RCTActionSheet.xcodeproj */,
|
||||||
|
13417FFA1AA91531003F314A /* ReactKit.xcodeproj */,
|
||||||
|
134454551AAFCAAE003F0779 /* RCTAdSupport.xcodeproj */,
|
||||||
|
@@ -334,6 +353,10 @@
|
||||||
|
ProjectRef = 13417FEA1AA914B8003F314A /* RCTText.xcodeproj */;
|
||||||
|
},
|
||||||
|
{
|
||||||
|
+ ProductGroup = D85B82921AB6D5CE003F4FE2 /* Products */;
|
||||||
|
+ ProjectRef = D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */;
|
||||||
|
+ },
|
||||||
|
+ {
|
||||||
|
ProductGroup = 13417FFB1AA91531003F314A /* Products */;
|
||||||
|
ProjectRef = 13417FFA1AA91531003F314A /* ReactKit.xcodeproj */;
|
||||||
|
},
|
||||||
|
@@ -396,6 +419,13 @@
|
||||||
|
remoteRef = 147CED4A1AB34F8C00DA3E4C /* PBXContainerItemProxy */;
|
||||||
|
sourceTree = BUILT_PRODUCTS_DIR;
|
||||||
|
};
|
||||||
|
+ D85B829C1AB6D5CE003F4FE2 /* libRCTVibration.a */ = {
|
||||||
|
+ isa = PBXReferenceProxy;
|
||||||
|
+ fileType = archive.ar;
|
||||||
|
+ path = libRCTVibration.a;
|
||||||
|
+ remoteRef = D85B829B1AB6D5CE003F4FE2 /* PBXContainerItemProxy */;
|
||||||
|
+ sourceTree = BUILT_PRODUCTS_DIR;
|
||||||
|
+ };
|
||||||
|
/* End PBXReferenceProxy section */
|
||||||
|
|
||||||
|
/* Begin PBXResourcesBuildPhase section */
|
|
@ -233,7 +233,9 @@
|
||||||
004D289F1AAF61C70097A701 /* IntegrationTestsTests */,
|
004D289F1AAF61C70097A701 /* IntegrationTestsTests */,
|
||||||
83CBBA001A601CBA00E9B192 /* Products */,
|
83CBBA001A601CBA00E9B192 /* Products */,
|
||||||
);
|
);
|
||||||
|
indentWidth = 2;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
tabWidth = 2;
|
||||||
};
|
};
|
||||||
83CBBA001A601CBA00E9B192 /* Products */ = {
|
83CBBA001A601CBA00E9B192 /* Products */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
|
|
|
@ -54,7 +54,9 @@
|
||||||
14C644C21AB0DFC900DE3C65 /* RCTActionSheetManager.m */,
|
14C644C21AB0DFC900DE3C65 /* RCTActionSheetManager.m */,
|
||||||
134814211AA4EA7D00B7C361 /* Products */,
|
134814211AA4EA7D00B7C361 /* Products */,
|
||||||
);
|
);
|
||||||
|
indentWidth = 2;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
tabWidth = 2;
|
||||||
};
|
};
|
||||||
/* End PBXGroup section */
|
/* End PBXGroup section */
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,9 @@
|
||||||
832C819B1AAF6E1A007FA2F7 /* RCTAdSupport.m */,
|
832C819B1AAF6E1A007FA2F7 /* RCTAdSupport.m */,
|
||||||
832C81811AAF6DEF007FA2F7 /* Products */,
|
832C81811AAF6DEF007FA2F7 /* Products */,
|
||||||
);
|
);
|
||||||
|
indentWidth = 2;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
tabWidth = 2;
|
||||||
};
|
};
|
||||||
832C81811AAF6DEF007FA2F7 /* Products */ = {
|
832C81811AAF6DEF007FA2F7 /* Products */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
|
|
|
@ -462,7 +462,7 @@ var Navigator = React.createClass({
|
||||||
this._emitDidFocus(presentedIndex);
|
this._emitDidFocus(presentedIndex);
|
||||||
this._removePoppedRoutes();
|
this._removePoppedRoutes();
|
||||||
if (AnimationsDebugModule) {
|
if (AnimationsDebugModule) {
|
||||||
AnimationsDebugModule.stopRecordingFps();
|
AnimationsDebugModule.stopRecordingFps(Date.now());
|
||||||
}
|
}
|
||||||
this._hideOtherScenes(presentedIndex);
|
this._hideOtherScenes(presentedIndex);
|
||||||
}
|
}
|
||||||
|
|
|
@ -77,7 +77,7 @@ var NavigatorBreadcrumbNavigationBar = React.createClass({
|
||||||
popToRoute: PropTypes.func,
|
popToRoute: PropTypes.func,
|
||||||
popToTop: PropTypes.func,
|
popToTop: PropTypes.func,
|
||||||
}),
|
}),
|
||||||
navigationBarRouteMapper: PropTypes.shape({
|
routeMapper: PropTypes.shape({
|
||||||
rightContentForRoute: PropTypes.func,
|
rightContentForRoute: PropTypes.func,
|
||||||
titleContentForRoute: PropTypes.func,
|
titleContentForRoute: PropTypes.func,
|
||||||
iconForRoute: PropTypes.func,
|
iconForRoute: PropTypes.func,
|
||||||
|
@ -87,7 +87,7 @@ var NavigatorBreadcrumbNavigationBar = React.createClass({
|
||||||
idStack: React.PropTypes.arrayOf(React.PropTypes.number),
|
idStack: React.PropTypes.arrayOf(React.PropTypes.number),
|
||||||
presentedIndex: React.PropTypes.number,
|
presentedIndex: React.PropTypes.number,
|
||||||
}),
|
}),
|
||||||
navigationBarStyles: View.propTypes.style,
|
style: View.propTypes.style,
|
||||||
},
|
},
|
||||||
|
|
||||||
statics: {
|
statics: {
|
||||||
|
@ -144,7 +144,7 @@ var NavigatorBreadcrumbNavigationBar = React.createClass({
|
||||||
var titles = navState.routeStack.map(this._renderOrReturnTitle);
|
var titles = navState.routeStack.map(this._renderOrReturnTitle);
|
||||||
var buttons = navState.routeStack.map(this._renderOrReturnRightButton);
|
var buttons = navState.routeStack.map(this._renderOrReturnRightButton);
|
||||||
return (
|
return (
|
||||||
<View style={[styles.breadCrumbContainer, this.props.navigationBarStyles]}>
|
<View style={[styles.breadCrumbContainer, this.props.style]}>
|
||||||
{titles}
|
{titles}
|
||||||
{icons}
|
{icons}
|
||||||
{buttons}
|
{buttons}
|
||||||
|
@ -154,7 +154,7 @@ var NavigatorBreadcrumbNavigationBar = React.createClass({
|
||||||
|
|
||||||
_renderOrReturnBreadcrumb: function(route, index) {
|
_renderOrReturnBreadcrumb: function(route, index) {
|
||||||
var uid = this.props.navState.idStack[index];
|
var uid = this.props.navState.idStack[index];
|
||||||
var navBarRouteMapper = this.props.navigationBarRouteMapper;
|
var navBarRouteMapper = this.props.routeMapper;
|
||||||
var navOps = this.props.navigator;
|
var navOps = this.props.navigator;
|
||||||
var alreadyRendered = this.refs['crumbContainer' + uid];
|
var alreadyRendered = this.refs['crumbContainer' + uid];
|
||||||
if (alreadyRendered) {
|
if (alreadyRendered) {
|
||||||
|
@ -199,7 +199,7 @@ var NavigatorBreadcrumbNavigationBar = React.createClass({
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
var navBarRouteMapper = this.props.navigationBarRouteMapper;
|
var navBarRouteMapper = this.props.routeMapper;
|
||||||
var titleContent = navBarRouteMapper.titleContentForRoute(
|
var titleContent = navBarRouteMapper.titleContentForRoute(
|
||||||
navState.routeStack[index],
|
navState.routeStack[index],
|
||||||
this.props.navigator
|
this.props.navigator
|
||||||
|
@ -219,7 +219,7 @@ var NavigatorBreadcrumbNavigationBar = React.createClass({
|
||||||
|
|
||||||
_renderOrReturnRightButton: function(route, index) {
|
_renderOrReturnRightButton: function(route, index) {
|
||||||
var navState = this.props.navState;
|
var navState = this.props.navState;
|
||||||
var navBarRouteMapper = this.props.navigationBarRouteMapper;
|
var navBarRouteMapper = this.props.routeMapper;
|
||||||
var uid = navState.idStack[index];
|
var uid = navState.idStack[index];
|
||||||
var alreadyRendered = this.refs['rightContainer' + uid];
|
var alreadyRendered = this.refs['rightContainer' + uid];
|
||||||
if (alreadyRendered) {
|
if (alreadyRendered) {
|
||||||
|
|
|
@ -46,7 +46,7 @@ var NavigatorNavigationBar = React.createClass({
|
||||||
|
|
||||||
propTypes: {
|
propTypes: {
|
||||||
navigator: React.PropTypes.object,
|
navigator: React.PropTypes.object,
|
||||||
navigationBarRouteMapper: React.PropTypes.shape({
|
routeMapper: React.PropTypes.shape({
|
||||||
Title: React.PropTypes.func.isRequired,
|
Title: React.PropTypes.func.isRequired,
|
||||||
LeftButton: React.PropTypes.func.isRequired,
|
LeftButton: React.PropTypes.func.isRequired,
|
||||||
RightButton: React.PropTypes.func.isRequired,
|
RightButton: React.PropTypes.func.isRequired,
|
||||||
|
@ -56,7 +56,7 @@ var NavigatorNavigationBar = React.createClass({
|
||||||
idStack: React.PropTypes.arrayOf(React.PropTypes.number),
|
idStack: React.PropTypes.arrayOf(React.PropTypes.number),
|
||||||
presentedIndex: React.PropTypes.number,
|
presentedIndex: React.PropTypes.number,
|
||||||
}),
|
}),
|
||||||
navigationBarStyles: View.propTypes.style,
|
style: View.propTypes.style,
|
||||||
},
|
},
|
||||||
|
|
||||||
statics: {
|
statics: {
|
||||||
|
@ -133,7 +133,7 @@ var NavigatorNavigationBar = React.createClass({
|
||||||
}, this);
|
}, this);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={[styles.navBarContainer, this.props.navigationBarStyles]}>
|
<View style={[styles.navBarContainer, this.props.style]}>
|
||||||
{components}
|
{components}
|
||||||
</View>
|
</View>
|
||||||
);
|
);
|
||||||
|
@ -145,7 +145,6 @@ var NavigatorNavigationBar = React.createClass({
|
||||||
/*number*/index
|
/*number*/index
|
||||||
) /*object*/ {
|
) /*object*/ {
|
||||||
var navState = this.props.navState;
|
var navState = this.props.navState;
|
||||||
var navBarRouteMapper = this.props.navigationBarRouteMapper;
|
|
||||||
var uid = navState.idStack[index];
|
var uid = navState.idStack[index];
|
||||||
var containerRef = componentName + 'Container' + uid;
|
var containerRef = componentName + 'Container' + uid;
|
||||||
var alreadyRendered = this.refs[containerRef];
|
var alreadyRendered = this.refs[containerRef];
|
||||||
|
@ -160,7 +159,7 @@ var NavigatorNavigationBar = React.createClass({
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
var content = navBarRouteMapper[componentName](
|
var content = this.props.routeMapper[componentName](
|
||||||
navState.routeStack[index],
|
navState.routeStack[index],
|
||||||
this.props.navigator,
|
this.props.navigator,
|
||||||
index,
|
index,
|
||||||
|
|
|
@ -54,7 +54,9 @@
|
||||||
134814051AA4E45400B7C361 /* RCTLocationObserver.m */,
|
134814051AA4E45400B7C361 /* RCTLocationObserver.m */,
|
||||||
134814211AA4EA7D00B7C361 /* Products */,
|
134814211AA4EA7D00B7C361 /* Products */,
|
||||||
);
|
);
|
||||||
|
indentWidth = 2;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
tabWidth = 2;
|
||||||
};
|
};
|
||||||
/* End PBXGroup section */
|
/* End PBXGroup section */
|
||||||
|
|
||||||
|
|
|
@ -56,35 +56,33 @@ var warning = require('warning');
|
||||||
|
|
||||||
var Image = React.createClass({
|
var Image = React.createClass({
|
||||||
propTypes: {
|
propTypes: {
|
||||||
source: PropTypes.shape({
|
|
||||||
/**
|
/**
|
||||||
* A string representing the resource identifier for the image, which
|
* `uri` is a string representing the resource identifier for the image, which
|
||||||
* could be an http address, a local file path, or the name of a static image
|
* could be an http address, a local file path, or the name of a static image
|
||||||
* resource (which should be wrapped in the `ix` function).
|
* resource (which should be wrapped in the `required('image!name')` function).
|
||||||
*/
|
*/
|
||||||
|
source: PropTypes.shape({
|
||||||
uri: PropTypes.string,
|
uri: PropTypes.string,
|
||||||
}),
|
}),
|
||||||
/**
|
/**
|
||||||
* accessible - Whether this element should be revealed as an accessible
|
* Whether this element should be revealed as an accessible element.
|
||||||
* element.
|
|
||||||
*/
|
*/
|
||||||
accessible: PropTypes.bool,
|
accessible: PropTypes.bool,
|
||||||
/**
|
/**
|
||||||
* accessibilityLabel - Custom string to display for accessibility.
|
* Custom string to display for accessibility.
|
||||||
*/
|
*/
|
||||||
accessibilityLabel: PropTypes.string,
|
accessibilityLabel: PropTypes.string,
|
||||||
/**
|
/**
|
||||||
* capInsets - When the image is resized, the corners of the size specified
|
* When the image is resized, the corners of the size specified
|
||||||
* by capInsets will stay a fixed size, but the center content and borders
|
* by capInsets will stay a fixed size, but the center content and borders
|
||||||
* of the image will be stretched. This is useful for creating resizable
|
* of the image will be stretched. This is useful for creating resizable
|
||||||
* rounded buttons, shadows, and other resizable assets. More info:
|
* rounded buttons, shadows, and other resizable assets. More info on
|
||||||
*
|
* [Apple documentation](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIImage_Class/index.html#//apple_ref/occ/instm/UIImage/resizableImageWithCapInsets)
|
||||||
* https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIImage_Class/index.html#//apple_ref/occ/instm/UIImage/resizableImageWithCapInsets:
|
|
||||||
*/
|
*/
|
||||||
capInsets: EdgeInsetsPropType,
|
capInsets: EdgeInsetsPropType,
|
||||||
style: StyleSheetPropType(ImageStylePropTypes),
|
style: StyleSheetPropType(ImageStylePropTypes),
|
||||||
/**
|
/**
|
||||||
* testID - A unique identifier for this element to be used in UI Automation
|
* A unique identifier for this element to be used in UI Automation
|
||||||
* testing scripts.
|
* testing scripts.
|
||||||
*/
|
*/
|
||||||
testID: PropTypes.string,
|
testID: PropTypes.string,
|
||||||
|
|
|
@ -81,7 +81,9 @@
|
||||||
1304D5AA1AA8C4A30002E2BE /* RCTStaticImageManager.m */,
|
1304D5AA1AA8C4A30002E2BE /* RCTStaticImageManager.m */,
|
||||||
58B5115E1A9E6B3D00147676 /* Products */,
|
58B5115E1A9E6B3D00147676 /* Products */,
|
||||||
);
|
);
|
||||||
|
indentWidth = 2;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
tabWidth = 2;
|
||||||
};
|
};
|
||||||
58B5115E1A9E6B3D00147676 /* Products */ = {
|
58B5115E1A9E6B3D00147676 /* Products */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
|
|
|
@ -51,7 +51,9 @@
|
||||||
1372B7361AB03E7B00659ED6 /* RCTReachability.m */,
|
1372B7361AB03E7B00659ED6 /* RCTReachability.m */,
|
||||||
58B511DC1A9E6C8500147676 /* Products */,
|
58B511DC1A9E6C8500147676 /* Products */,
|
||||||
);
|
);
|
||||||
|
indentWidth = 2;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
tabWidth = 2;
|
||||||
};
|
};
|
||||||
58B511DC1A9E6C8500147676 /* Products */ = {
|
58B511DC1A9E6C8500147676 /* Products */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
|
|
|
@ -54,7 +54,9 @@
|
||||||
148699CE1ABD045300480536 /* RCTPushNotificationManager.m */,
|
148699CE1ABD045300480536 /* RCTPushNotificationManager.m */,
|
||||||
134814211AA4EA7D00B7C361 /* Products */,
|
134814211AA4EA7D00B7C361 /* Products */,
|
||||||
);
|
);
|
||||||
|
indentWidth = 2;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
tabWidth = 2;
|
||||||
};
|
};
|
||||||
/* End PBXGroup section */
|
/* End PBXGroup section */
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,9 @@
|
||||||
58E64FE31AB964CD007446E2 /* FBSnapshotTestCase */,
|
58E64FE31AB964CD007446E2 /* FBSnapshotTestCase */,
|
||||||
580C37701AB104AF0015E709 /* Products */,
|
580C37701AB104AF0015E709 /* Products */,
|
||||||
);
|
);
|
||||||
|
indentWidth = 2;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
tabWidth = 2;
|
||||||
};
|
};
|
||||||
580C37701AB104AF0015E709 /* Products */ = {
|
580C37701AB104AF0015E709 /* Products */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
|
|
|
@ -51,7 +51,9 @@
|
||||||
00D277151AB8C32C00DC1E48 /* RCTWebSocketExecutor.m */,
|
00D277151AB8C32C00DC1E48 /* RCTWebSocketExecutor.m */,
|
||||||
832C81811AAF6DEF007FA2F7 /* Products */,
|
832C81811AAF6DEF007FA2F7 /* Products */,
|
||||||
);
|
);
|
||||||
|
indentWidth = 2;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
tabWidth = 2;
|
||||||
};
|
};
|
||||||
832C81811AAF6DEF007FA2F7 /* Products */ = {
|
832C81811AAF6DEF007FA2F7 /* Products */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
|
|
|
@ -66,7 +66,9 @@
|
||||||
58B511CD1A9E6C5C00147676 /* RCTTextManager.m */,
|
58B511CD1A9E6C5C00147676 /* RCTTextManager.m */,
|
||||||
58B5119C1A9E6C1200147676 /* Products */,
|
58B5119C1A9E6C1200147676 /* Products */,
|
||||||
);
|
);
|
||||||
|
indentWidth = 2;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
tabWidth = 2;
|
||||||
};
|
};
|
||||||
58B5119C1A9E6C1200147676 /* Products */ = {
|
58B5119C1A9E6C1200147676 /* Products */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
|
|
|
@ -46,7 +46,9 @@
|
||||||
832C819B1AAF6E1A007FA2F7 /* RCTVibration.m */,
|
832C819B1AAF6E1A007FA2F7 /* RCTVibration.m */,
|
||||||
832C81811AAF6DEF007FA2F7 /* Products */,
|
832C81811AAF6DEF007FA2F7 /* Products */,
|
||||||
);
|
);
|
||||||
|
indentWidth = 2;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
tabWidth = 2;
|
||||||
};
|
};
|
||||||
832C81811AAF6DEF007FA2F7 /* Products */ = {
|
832C81811AAF6DEF007FA2F7 /* Products */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
|
|
|
@ -547,7 +547,11 @@ RCT_CGSTRUCT_CONVERTER(CGAffineTransform, (@[
|
||||||
|
|
||||||
UIImage *image = nil;
|
UIImage *image = nil;
|
||||||
NSString *path = json;
|
NSString *path = json;
|
||||||
if ([path isAbsolutePath]) {
|
if ([path hasPrefix:@"data:"]) {
|
||||||
|
NSURL *url = [NSURL URLWithString:path];
|
||||||
|
NSData *imageData = [NSData dataWithContentsOfURL:url];
|
||||||
|
image = [UIImage imageWithData:imageData];
|
||||||
|
} else if ([path isAbsolutePath]) {
|
||||||
image = [UIImage imageWithContentsOfFile:path];
|
image = [UIImage imageWithContentsOfFile:path];
|
||||||
} else {
|
} else {
|
||||||
image = [UIImage imageNamed:path];
|
image = [UIImage imageNamed:path];
|
||||||
|
|
|
@ -321,7 +321,9 @@
|
||||||
83CBBA2F1A601D0F00E9B192 /* React */,
|
83CBBA2F1A601D0F00E9B192 /* React */,
|
||||||
83CBBA001A601CBA00E9B192 /* Products */,
|
83CBBA001A601CBA00E9B192 /* Products */,
|
||||||
);
|
);
|
||||||
|
indentWidth = 2;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
tabWidth = 2;
|
||||||
};
|
};
|
||||||
83CBBA001A601CBA00E9B192 /* Products */ = {
|
83CBBA001A601CBA00E9B192 /* Products */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "react-native",
|
"name": "react-native",
|
||||||
"version": "0.3.3",
|
"version": "0.3.1",
|
||||||
"description": "A framework for building native apps using React",
|
"description": "A framework for building native apps using React",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
|
Загрузка…
Ссылка в новой задаче