Skip to content

Commit 31c4ff0

Browse files
amasadamasad
committed
Update from Friday March 27
- [React Native] Sync from github | Amjad Masad - [react-packager] Watch asset roots for changes to update dependency graph | Amjad Masad - Fix sourceTree of RCTActionSheet.xcodeproj | Alex Kotliarskyi - Cancel contents animation before setting new contents in RCTNetworkImageView | Alex Akers - [react-packager] move dependencies to root package.json | Amjad Masad - Fix font crash on iOS < 8.2 | Nick Lockwood - [react-packager] Fix node v0.11.14 query parse bug | Amjad Masad - [ReactNative][Docs] Remove references to ReactNavigator from docs | Tadeu Zagallo - [CLI] react-native start won't run from dir with spaces | Amjad Masad - Revert .buckversion bumps. | Jakub Zika - [react_native] Update default bundle name to org.reactjs.native.* | Krzysztof Magiera - [react-packager] better error when main file not found | Amjad Masad - [React Kit] Remove embarrassing TODOs | Alex Akers - [ReactNative][MAdMan] Clean up after D1942269 | Philipp von Weitershausen - flowify a few more Libraries | Basil Hosmer - [ReactNative] PushNotificationIOS documentation | Eric Vicenti - [ReactNative][CustomComponents] Update old headers | Tadeu Zagallo - [ReactNative] UIViewControllerBasedStatusBarAppearance = NO in SampleApp | Alex Kotliarskyi - [React Native] Fix CocoaPods spec | Alex Akers - [ReactNative] Navigator Example Overhaul | Eric Vicenti - [React Native] Fix incorrect if-statement in RCTGeolocation | Alex Akers - [ReactNative] s/ReactKit/React/g | Tadeu Zagallo - [React Native] [FRC - Don't accept] View border support | Nick Lockwood - [Assets] Allow scripts to override assetRoots | Amjad Masad - [ReactNative] Navigator docs | Eric Vicenti - [ReactNative] License headers and renaming | Eric Vicenti - [React Native] Add CocoaPods spec | Tadeu Zagallo - Added explicit types for all view properties | Nick Lockwood - [ReactNative] s/ReactNavigator/Navigator/ | Tadeu Zagallo - [ReactNative] Add copyright header for code copied from the jQuery UI project | Martin Konicek - [ReactNative] PanResponder documentation | Eric Vicenti - [ReactNative] Add deep linking api | Tadeu Zagallo - [ReactNative] Add gitignore example for SampleApp | Alex Kotliarskyi - [ReactNative] Add react-native-start bin to react-native packge | Alex Kotliarskyi - [ReactNative] Update package.json to be npm-ready | Christopher Chedeau - [RFC][ReactNative] Integrate dev menu directly into RootView | Alex Kotliarskyi - flowify Libraries/ReactIOS | Marshall Roch - [WIP] Added support for italics and additional font weights | Nick Lockwood - [ReactNative] Improve View documentation | Christopher Chedeau - [react-packager] Readme | Amjad Masad - Fix for incorrect contentSize reported by RCTScrollView | Nick Lockwood - [ReactNative] Flow and doc formatting for NetInfo | Eric Vicenti - [ReactNative] Document AppStateIOS | Eric Vicenti - [MAdMan][Android] Make things look more Androidy | Philipp von Weitershausen - flowified Libraries from Avik | Basil Hosmer - flowify some Libraries | Basil Hosmer - [ReactKit] Add shake development menu | Alex Kotliarskyi - [ReactNative] Add debugger and change SampleApp files structure | Alex Kotliarskyi - Flowify ReactIOSEventEmitter | Marshall Roch - [react_native] JS files from D1941151: Allow fontWeight to be 100,200,...,900 | Krzysztof Magiera - [ReactNative] Add snapshot tests for examples | Spencer Ahrens - [ReactNative] bring back some native modules | Spencer Ahrens - [ReactNative] Rename JSNavigationStack to ReactNavigator, rename scene config | Eric Vicenti - [ReactNative] cleanup view example | Spencer Ahrens - Flowify a bunch of Libraries | Marshall Roch - [ReactNative] JSNavigationStack - Use key to blow away old scenes | Eric Vicenti - [ReactNative] Add more logging to RCTJSONParse | Sumeet Vaidya - Unfork UIManager | Nick Lockwood - [react-packager] kill non-standard RAW_SOURCE_MAP | Amjad Masad - Flowify Libraries/StyleSheet and Libraries/Text | Marshall Roch - [ReactNative] Fix OSS Dependency Issues | Eric Vicenti - [react-packager] Fix more issues with node modules | Amjad Masad - [ReactNative] rename navigationOperations to navigator | Eric Vicenti - JS files from D1936817: Add to XMLHttpRequest android and share code with ios | Olivia Bishop - flowify some Libraries | Basil Hosmer - last batch of UIExplorer flowification | Basil Hosmer - [ReactNative] JSNavigationStack rename routeMapper to renderSceneForRoute | Eric Vicenti - Flowify renderApplication | Marshall Roch - [ReactNative] OSS Responder example | Eric Vicenti - [ReactNative] Use oss TimerMixin | Tadeu Zagallo - [ReactNative] Remove auto permission request from setAppIconBadgeNumber | Tadeu Zagallo - [ReactNative] OSS snapshot tests | Spencer Ahrens - [ReactNative] OSS JSNavigationStack w/ Examples | Eric Vicenti - Fix build - remove relative import path | Jakub Zika - Bump .buckversion to a5b8b8ef45d714018ba3542cf98d48ef6aab7088. | Jakub Zika - [ReactNative] Open Source PushNotifications and move Badge Number methods and permission into it | Tadeu Zagallo - [react-packager] Fix regression with transform errors | Amjad Masad - Flowify TextStylePropTypes and fix a bug with unsupported props | Marshall Roch - [ReactNative] Remove `arc build` instructions from require | Alex Kotliarskyi - Flowify Library/Utilities/ | Marshall Roch - [react-packager] Default to index.js from main if it's a dir | Amjad Masad - [ReactNative] Use deprecated ix in TabBarExample | Amjad Masad - [ReactNative] Expanded license on obj-c files | Christopher Chedeau - [ReactNative] Expanded license on js files | Christopher Chedeau - [ReactNative] Fix React Devtools integration | Alex Kotliarskyi - [Text] Account for font leading so descenders are not clipped | Alex Kotliarskyi - [ReactNative] Expanded license on js packager files | Christopher Chedeau - more UIExplorer flow | Basil Hosmer - [react-packager] Pick up package changes while running | Amjad Masad - Added a graph view and a ReactNative metric that displays current queue and execution time for the JS thread. | Bryce Redd - [ReactNative] Add NativeModules and DeviceEventEmitter to react-native exports | Alex Kotliarskyi - [React Native] Fix iOS 7 crashes b/c missing Photos.fmwk | Alex Akers - UIExplorer flowification | Basil Hosmer - Add clearImmediate module | Marshall Roch - [ReactNative] Print directories packager is serving files from | Alex Kotliarskyi - Work around flow bug with exports | Marshall Roch - [ReactNative] Move packager/init.sh to GitHub | Alex Kotliarskyi - [ReactNative] Remove react-native/package.json | Christopher Chedeau - [ReactNative] Returning actual contentSize for RCTScrollViewManager | Henry Lung - declare timeoutID | Basil Hosmer - [ReactNative] Add root package.json name back | Tadeu Zagallo - [react-packager] Allow entry point extensions like .ios.js | Amjad Masad - [react-native] Use SpreadProperty to make react-docgen happy | Felix Kling - clean Examples/2048 | Basil Hosmer - [ReactNative] Adjust packager default root when running from within node_modules | Alex Kotliarskyi - [ReactNative] Add missing websocket dependency | Alex Kotliarskyi - [react-packager] change all but one `ix` to `require` | Amjad Masad - [react-packager] Make sure projectRoots is converted to an array | Amjad Masad - [ReactNative] Init script that bootstraps new Xcode project | Alex Kotliarskyi - [ReactNative] New SampleApp | Alex Kotliarskyi - [ReactNative] Touchable invoke press on longPress when longPress handler missing | Eric Vicenti - [ReactNative] Commit missing RCTWebSocketDebugger.xcodeproj | Alex Kotliarskyi
1 parent 3b7bd74 commit 31c4ff0

37 files changed

Lines changed: 750 additions & 672 deletions

File tree

‎Examples/SampleApp/SampleApp.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
/* Begin PBXFileReference section */
9393
00481BDB1AC0C7FA00671115 /* RCTWebSocketDebugger.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocketDebugger.xcodeproj; path = ../../Libraries/RCTWebSocketDebugger/RCTWebSocketDebugger.xcodeproj; sourceTree = "<group>"; };
9494
00481BE91AC0C89D00671115 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; };
95-
00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = ../../Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj; sourceTree = "<absolute>"; };
95+
00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = ../../Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj; sourceTree = "<group>"; };
9696
00C302AF1ABCB8E700DB3ED1 /* RCTAdSupport.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAdSupport.xcodeproj; path = ../../Libraries/AdSupport/RCTAdSupport.xcodeproj; sourceTree = "<group>"; };
9797
00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTGeolocation.xcodeproj; path = ../../Libraries/Geolocation/RCTGeolocation.xcodeproj; sourceTree = "<group>"; };
9898
00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = ../../Libraries/Image/RCTImage.xcodeproj; sourceTree = "<group>"; };

‎Examples/UIExplorer/Navigator/BreadcrumbNavSample.js‎

Lines changed: 88 additions & 204 deletions
Original file line numberDiff line numberDiff line change
@@ -15,245 +15,133 @@
1515

1616
var React = require('react-native');
1717
var {
18+
PixelRatio,
1819
Navigator,
19-
ScrollView,
2020
StyleSheet,
21-
TabBarIOS,
21+
ScrollView,
2222
Text,
23-
View,
2423
TouchableHighlight,
24+
TouchableOpacity,
25+
View,
2526
} = React;
2627

27-
var SAMPLE_TEXT = 'Top Pushes. Middle Replaces. Bottom Pops.';
28-
2928
var _getRandomRoute = function() {
3029
return {
31-
backButtonTitle: 'Back' + ('' + 10 * Math.random()).substr(0, 1),
32-
content:
33-
SAMPLE_TEXT + '\nHere\'s a random number ' + Math.random(),
34-
title: Math.random() > 0.5 ? 'Hello' : 'There',
35-
rightButtonTitle: Math.random() > 0.5 ? 'Right' : 'Button',
30+
title: '#' + Math.ceil(Math.random() * 1000),
3631
};
3732
};
3833

39-
40-
var SampleNavigationBarRouteMapper = {
41-
rightContentForRoute: function(route, navigator) {
42-
if (route.rightButtonTitle) {
43-
return (
44-
<Text style={[styles.titleText, styles.filterText]}>
45-
{route.rightButtonTitle}
46-
</Text>
47-
);
48-
} else {
49-
return null;
50-
}
51-
},
52-
titleContentForRoute: function(route, navigator) {
34+
class NavButton extends React.Component {
35+
render() {
5336
return (
5437
<TouchableHighlight
55-
onPress={() => navigator.push(_getRandomRoute())}>
56-
<View>
57-
<Text style={styles.titleText}>{route.title}</Text>
58-
</View>
59-
</TouchableHighlight>
60-
);
61-
},
62-
iconForRoute: function(route, navigator) {
63-
var onPress =
64-
navigator.popToRoute.bind(navigator, route);
65-
return (
66-
<TouchableHighlight onPress={onPress}>
67-
<View style={styles.crumbIconPlaceholder} />
68-
</TouchableHighlight>
69-
);
70-
},
71-
separatorForRoute: function(route, navigator) {
72-
return (
73-
<TouchableHighlight onPress={navigator.pop}>
74-
<View style={styles.crumbSeparatorPlaceholder} />
38+
style={styles.button}
39+
underlayColor="#B5B5B5"
40+
onPress={this.props.onPress}>
41+
<Text style={styles.buttonText}>{this.props.text}</Text>
7542
</TouchableHighlight>
7643
);
7744
}
78-
};
79-
80-
var _delay = 400; // Just to test for race conditions with native nav.
81-
82-
var renderScene = function(route, navigator) {
83-
var content = route.content;
84-
return (
85-
<ScrollView>
86-
<View style={styles.scene}>
87-
<TouchableHighlight
88-
onPress={_pushRouteLater(navigator.push)}>
89-
<View style={styles.button}>
90-
<Text style={styles.buttonText}>request push soon</Text>
91-
</View>
92-
</TouchableHighlight>
93-
<TouchableHighlight
94-
onPress={_pushRouteLater(navigator.replace)}>
95-
<View style={styles.button}>
96-
<Text>{content}</Text>
97-
</View>
98-
</TouchableHighlight>
99-
<TouchableHighlight
100-
onPress={_pushRouteLater(navigator.replace)}>
101-
<View style={styles.button}>
102-
<Text>{content}</Text>
103-
</View>
104-
</TouchableHighlight>
105-
<TouchableHighlight
106-
onPress={_pushRouteLater(navigator.replace)}>
107-
<View style={styles.button}>
108-
<Text>{content}</Text>
109-
</View>
110-
</TouchableHighlight>
111-
<TouchableHighlight
112-
onPress={_pushRouteLater(navigator.replace)}>
113-
<View style={styles.button}>
114-
<Text>{content}</Text>
115-
</View>
116-
</TouchableHighlight>
117-
<TouchableHighlight
118-
onPress={_pushRouteLater(navigator.replace)}>
119-
<View style={styles.button}>
120-
<Text>{content}</Text>
121-
</View>
122-
</TouchableHighlight>
123-
<TouchableHighlight
124-
onPress={_popRouteLater(navigator.pop)}>
125-
<View style={styles.button}>
126-
<Text style={styles.buttonText}>request pop soon</Text>
127-
</View>
128-
</TouchableHighlight>
129-
<TouchableHighlight
130-
onPress={
131-
_immediatelySetTwoItemsLater(
132-
navigator.immediatelyResetRouteStack
133-
)
134-
}>
135-
<View style={styles.button}>
136-
<Text style={styles.buttonText}>Immediate set two routes</Text>
137-
</View>
138-
</TouchableHighlight>
139-
<TouchableHighlight
140-
onPress={_popToTopLater(navigator.popToTop)}>
141-
<View style={styles.button}>
142-
<Text style={styles.buttonText}>pop to top soon</Text>
143-
</View>
144-
</TouchableHighlight>
145-
</View>
146-
</ScrollView>
147-
);
148-
};
149-
150-
var _popToTopLater = function(popToTop) {
151-
return () => setTimeout(popToTop, _delay);
152-
};
153-
154-
var _pushRouteLater = function(push) {
155-
return () => setTimeout(
156-
() => push(_getRandomRoute()),
157-
_delay
158-
);
159-
};
160-
161-
var _immediatelySetTwoItemsLater = function(immediatelyResetRouteStack) {
162-
return () => setTimeout(
163-
() => immediatelyResetRouteStack([
164-
_getRandomRoute(),
165-
_getRandomRoute(),
166-
])
167-
);
168-
};
169-
170-
var _popRouteLater = function(pop) {
171-
return () => setTimeout(pop, _delay);
172-
};
45+
}
17346

17447
var BreadcrumbNavSample = React.createClass({
17548

176-
getInitialState: function() {
177-
return {
178-
selectedTab: 0,
49+
componentWillMount: function() {
50+
this._navBarRouteMapper = {
51+
rightContentForRoute: function(route, navigator) {
52+
return null;
53+
},
54+
titleContentForRoute: function(route, navigator) {
55+
return (
56+
<TouchableOpacity
57+
onPress={() => navigator.push(_getRandomRoute())}>
58+
<View>
59+
<Text style={styles.titleText}>{route.title}</Text>
60+
</View>
61+
</TouchableOpacity>
62+
);
63+
},
64+
iconForRoute: function(route, navigator) {
65+
return (
66+
<TouchableOpacity onPress={() => {
67+
navigator.popToRoute(route);
68+
}}>
69+
<View style={styles.crumbIconPlaceholder} />
70+
</TouchableOpacity>
71+
);
72+
},
73+
separatorForRoute: function(route, navigator) {
74+
return (
75+
<TouchableOpacity onPress={navigator.pop}>
76+
<View style={styles.crumbSeparatorPlaceholder} />
77+
</TouchableOpacity>
78+
);
79+
}
17980
};
18081
},
18182

83+
_renderScene: function(route, navigator) {
84+
return (
85+
<ScrollView style={styles.scene}>
86+
<NavButton
87+
onPress={() => { navigator.push(_getRandomRoute()) }}
88+
text="Push"
89+
/>
90+
<NavButton
91+
onPress={() => { navigator.immediatelyResetRouteStack([_getRandomRoute(), _getRandomRoute()]) }}
92+
text="Reset w/ 2 scenes"
93+
/>
94+
<NavButton
95+
onPress={() => { navigator.popToTop() }}
96+
text="Pop to top"
97+
/>
98+
<NavButton
99+
onPress={() => { navigator.replace(_getRandomRoute()) }}
100+
text="Replace"
101+
/>
102+
<NavButton
103+
onPress={() => { this.props.navigator.pop(); }}
104+
text="Close breadcrumb example"
105+
/>
106+
</ScrollView>
107+
);
108+
},
109+
182110
render: function() {
183-
var initialRoute = {
184-
backButtonTitle: 'Start', // no back button for initial scene
185-
content: SAMPLE_TEXT,
186-
title: 'Campaigns',
187-
rightButtonTitle: 'Filter',
188-
};
189111
return (
190-
<TabBarIOS>
191-
<TabBarIOS.Item
192-
selected={this.state.selectedTab === 0}
193-
onPress={this.onTabSelect.bind(this, 0)}
194-
icon={require('image!tabnav_list')}
195-
title="One">
196-
<Navigator
197-
debugOverlay={false}
198-
style={[styles.appContainer]}
199-
initialRoute={initialRoute}
200-
renderScene={renderScene}
201-
navigationBar={
202-
<Navigator.BreadcrumbNavigationBar
203-
navigationBarRouteMapper={SampleNavigationBarRouteMapper}
204-
/>
205-
}
206-
/>
207-
</TabBarIOS.Item>
208-
<TabBarIOS.Item
209-
selected={this.state.selectedTab === 1}
210-
onPress={this.onTabSelect.bind(this, 1)}
211-
icon={require('image!tabnav_notification')}
212-
title="Two">
213-
<Navigator
214-
configureScene={() => Navigator.SceneConfigs.FloatFromBottom}
215-
debugOverlay={false}
216-
style={[styles.appContainer]}
217-
initialRoute={initialRoute}
218-
renderScene={renderScene}
219-
navigationBar={
220-
<Navigator.BreadcrumbNavigationBar
221-
navigationBarRouteMapper={SampleNavigationBarRouteMapper}
222-
/>
223-
}
112+
<Navigator
113+
style={styles.container}
114+
initialRoute={_getRandomRoute()}
115+
renderScene={this._renderScene}
116+
navigationBar={
117+
<Navigator.BreadcrumbNavigationBar
118+
navigationBarRouteMapper={this._navBarRouteMapper}
224119
/>
225-
</TabBarIOS.Item>
226-
</TabBarIOS>
120+
}
121+
/>
227122
);
228123
},
229124

230-
onTabSelect: function(tab, event) {
231-
if (this.state.selectedTab !== tab) {
232-
this.setState({selectedTab: tab});
233-
}
234-
},
125+
235126

236127
});
237128

238129
var styles = StyleSheet.create({
239-
navigationItem: {
240-
backgroundColor: '#eeeeee',
241-
},
242130
scene: {
243131
paddingTop: 50,
244132
flex: 1,
245133
},
246134
button: {
247-
backgroundColor: '#cccccc',
248-
margin: 50,
249-
marginTop: 26,
250-
padding: 10,
135+
backgroundColor: 'white',
136+
padding: 15,
137+
borderBottomWidth: 1 / PixelRatio.get(),
138+
borderBottomColor: '#CDCDCD',
251139
},
252140
buttonText: {
253-
fontSize: 12,
254-
textAlign: 'center',
141+
fontSize: 17,
142+
fontWeight: '500',
255143
},
256-
appContainer: {
144+
container: {
257145
overflow: 'hidden',
258146
backgroundColor: '#dddddd',
259147
flex: 1,
@@ -262,13 +150,9 @@ var styles = StyleSheet.create({
262150
fontSize: 18,
263151
color: '#666666',
264152
textAlign: 'center',
265-
fontWeight: '500',
153+
fontWeight: 'bold',
266154
lineHeight: 32,
267155
},
268-
filterText: {
269-
color: '#5577ff',
270-
},
271-
// TODO: Accept icons from route.
272156
crumbIconPlaceholder: {
273157
flex: 1,
274158
backgroundColor: '#666666',

0 commit comments

Comments
 (0)