Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
b2f154f
Apple TV support 4: support for input (tvOS focus engine)
douglowder Oct 6, 2016
eabed2c
Apple TV: fix flow check error
douglowder Oct 6, 2016
611c716
Apple TV: reenable stubbed StatusBar and PushNotification so tests ca…
douglowder Oct 7, 2016
3b50f41
Fix Apple TV target after merge
douglowder Oct 12, 2016
9c5f17a
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Oct 17, 2016
cb5eb6a
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Oct 18, 2016
018d89b
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Oct 18, 2016
5982227
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Oct 19, 2016
0dfb52f
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Oct 21, 2016
8769c73
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Oct 23, 2016
35d539e
Disable TabBar snapshot test for tvOS
douglowder Oct 23, 2016
4e9bddf
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Oct 23, 2016
b8dd305
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Oct 24, 2016
9169c3c
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Oct 24, 2016
64fd859
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Oct 25, 2016
e6760ad
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Oct 27, 2016
48d3ee7
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Oct 28, 2016
ba43848
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Nov 1, 2016
538b803
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Nov 4, 2016
09fab63
Add '@platform ios' to Apple TV comment blocks
douglowder Nov 4, 2016
9b470e3
Respond to review comments in PR #10427
douglowder Nov 4, 2016
2c3ae46
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Nov 4, 2016
8bb8842
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Nov 8, 2016
aaf66ad
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Nov 9, 2016
9217bb3
Merge branch 'tvOSfocusengine' of https://github.com/dlowder-salesfor…
douglowder Nov 9, 2016
a48b6be
Disable Apple TV snapshot tests
douglowder Nov 9, 2016
f241804
Apple TV: extract TV-specific code and properties to TVView
douglowder Nov 9, 2016
776b5e6
Fix eslint issues
douglowder Nov 9, 2016
5a0b3b1
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Nov 9, 2016
d0ceaff
Clean up after TVView refactor, remove unused properties
douglowder Nov 9, 2016
c629e14
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Nov 9, 2016
eee9c84
Merge branch 'tvOSfocusengine' of https://github.com/dlowder-salesfor…
douglowder Nov 9, 2016
15a0fa9
One more whitespace cleanup
douglowder Nov 9, 2016
c10af49
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Nov 12, 2016
f596a6f
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Nov 13, 2016
a8eaa27
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Nov 15, 2016
a021421
Apple TV: remove onTVNavEvent property, use custom event emitter instead
douglowder Nov 15, 2016
d1b9331
Whitespace fixes
douglowder Nov 15, 2016
4db4bcf
Fix eslint-bot issues
douglowder Nov 16, 2016
8ab2cc0
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Nov 16, 2016
585d2c4
Add missing sources to Xcode project after merge
douglowder Nov 16, 2016
e7406f5
Make TVEventHandler a regular class not a component
douglowder Nov 16, 2016
8411560
TVView should not extend View
douglowder Nov 17, 2016
bae9fb8
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Nov 17, 2016
c442ed6
Remove unneeded default TV properties
douglowder Nov 17, 2016
957b7b4
TVEventHandler should be regular JS class, not a React component
douglowder Nov 17, 2016
de8bc0b
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Nov 17, 2016
dd57c9d
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Nov 21, 2016
0548018
Add SystemName to iOS Platform object, allow JS layer to know we are …
douglowder Nov 21, 2016
79a2a31
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Nov 22, 2016
066a6cc
Platform.ios.js SystemName property and related changes
douglowder Nov 22, 2016
f27cea9
Fix code styling and lint issues
douglowder Nov 22, 2016
fc5bdb6
Remove unused tvOS snapshot reference images
douglowder Nov 22, 2016
fed1eec
Code cleanup in TVEventHandler
douglowder Nov 22, 2016
d123fcb
Code cleanup in TVView.ios.js and ReactNativeViewAttributes
douglowder Nov 22, 2016
2055912
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Nov 23, 2016
7250d8b
Remove unneeded lines in RCTTVRemoteHandler
douglowder Nov 23, 2016
82e41d0
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Nov 24, 2016
6130a1f
Don't expose TVView to JS layer
douglowder Nov 28, 2016
f109364
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Nov 28, 2016
0d5a2d1
TVView fixes
douglowder Nov 28, 2016
1b2599a
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Nov 30, 2016
d077def
Merge branch 'tvOSfocusengine' of https://github.com/dlowder-salesfor…
douglowder Nov 30, 2016
69a13ea
Apple TV focus engine refactor (remove onTVSelect, etc., simplify oth…
douglowder Nov 30, 2016
a482142
Fix eslint-bot issues
douglowder Nov 30, 2016
9892f8f
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Dec 1, 2016
0f8c148
Remove unneeded Apple TV code in TabBarItemIOS and RCTTabBarItem
douglowder Dec 1, 2016
8c1245e
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Dec 6, 2016
e04307b
Merge branch 'tvOSfocusengine' of https://github.com/dlowder-salesfor…
douglowder Dec 6, 2016
3e49ee1
Remove unused properties in RCTTabBar
douglowder Dec 6, 2016
52436c8
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Dec 7, 2016
0c85910
Fix UIExplorer and snapshot tests for Apple TV
douglowder Dec 7, 2016
c0e3c35
Platform changes and other fixes for Apple TV
douglowder Dec 7, 2016
50fa6e0
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Dec 7, 2016
52feb25
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Dec 8, 2016
4e6af6c
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Dec 9, 2016
d0d9292
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Dec 9, 2016
ffff19e
Move to iOS 10 for tvOS tests
douglowder Dec 9, 2016
db7cdaa
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Dec 9, 2016
6788996
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Dec 9, 2016
a3619ec
Disable TabBarExample snapshot test for tvOS
douglowder Dec 9, 2016
1bc6611
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Dec 12, 2016
ead063c
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Dec 14, 2016
77e0e98
Merge branch 'tvOSfocusengine' of https://github.com/dlowder-salesfor…
douglowder Dec 14, 2016
6d4fcbe
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Dec 15, 2016
6bd575b
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Dec 16, 2016
90a6985
Merge remote-tracking branch 'upstream/master' into tvOSfocusengine
douglowder Dec 16, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,14 @@ - (void)test##name \
[_runner runTest:_cmd module:@#name]; \
}

#if !TARGET_OS_TV // None of these will run in tvOS due to StatusBar not existing
RCT_TEST(ViewExample)
RCT_TEST(LayoutExample)
RCT_TEST(TextExample)
#if !TARGET_OS_TV
// No switch or slider available on tvOS
RCT_TEST(SwitchExample)
RCT_TEST(SliderExample)
// TabBarExample on tvOS passes locally but not on Travis
RCT_TEST(TabBarExample)
#endif

Expand Down
3 changes: 3 additions & 0 deletions Examples/UIExplorer/UIExplorerUnitTests/RCTAllocationTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,10 @@ - (void)testContentViewIsInvalidated
(void)rootView;
}

#if !TARGET_OS_TV // userInteractionEnabled is true for Apple TV views
XCTAssertFalse(rootContentView.userInteractionEnabled, @"RCTContentView should have been invalidated");
#endif

}

- (void)testUnderlyingBridgeIsDeallocated
Expand Down
14 changes: 8 additions & 6 deletions Examples/UIExplorer/js/TextExample.ios.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
*/
'use strict';

const Platform = require('Platform');

var React = require('react');
var ReactNative = require('react-native');
var {
Expand Down Expand Up @@ -190,10 +192,10 @@ exports.examples = [
render: function() {
return (
<View>
<Text style={{fontFamily: 'Cochin'}}>
<Text style={{fontFamily: (Platform.isTVOS ? 'Times' : 'Cochin')}}>
Cochin
</Text>
<Text style={{fontFamily: 'Cochin', fontWeight: 'bold'}}>
<Text style={{fontFamily: (Platform.isTVOS ? 'Times' : 'Cochin'), fontWeight: 'bold'}}>
Cochin bold
</Text>
<Text style={{fontFamily: 'Helvetica'}}>
Expand All @@ -202,10 +204,10 @@ exports.examples = [
<Text style={{fontFamily: 'Helvetica', fontWeight: 'bold'}}>
Helvetica bold
</Text>
<Text style={{fontFamily: 'Verdana'}}>
<Text style={{fontFamily: (Platform.isTVOS ? 'Courier' : 'Verdana')}}>
Verdana
</Text>
<Text style={{fontFamily: 'Verdana', fontWeight: 'bold'}}>
<Text style={{fontFamily: (Platform.isTVOS ? 'Courier' : 'Verdana'), fontWeight: 'bold'}}>
Verdana bold
</Text>
</View>
Expand Down Expand Up @@ -565,10 +567,10 @@ exports.examples = [
<Text style={{fontVariant: ['small-caps']}}>
Small Caps{'\n'}
</Text>
<Text style={{fontFamily: 'Hoefler Text', fontVariant: ['oldstyle-nums']}}>
<Text style={{fontFamily: (Platform.isTVOS ? 'Times' : 'Hoefler Text'), fontVariant: ['oldstyle-nums']}}>
Old Style nums 0123456789{'\n'}
</Text>
<Text style={{fontFamily: 'Hoefler Text', fontVariant: ['lining-nums']}}>
<Text style={{fontFamily: (Platform.isTVOS ? 'Times' : 'Hoefler Text'), fontVariant: ['lining-nums']}}>
Lining nums 0123456789{'\n'}
</Text>
<Text style={{fontVariant: ['tabular-nums']}}>
Expand Down
4 changes: 3 additions & 1 deletion Examples/UIExplorer/js/UIExplorerExampleList.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ const View = require('View');
const UIExplorerActions = require('./UIExplorerActions');
const UIExplorerStatePersister = require('./UIExplorerStatePersister');

const Platform = require('Platform');

import type {
UIExplorerExample,
} from './UIExplorerList.ios';
Expand Down Expand Up @@ -66,7 +68,7 @@ class UIExplorerExampleList extends React.Component {
render(): ?React.Element<any> {
const filterText = this.props.persister.state.filter;
const filterRegex = new RegExp(String(filterText), 'i');
const filter = (example) => filterRegex.test(example.module.title);
const filter = (example) => filterRegex.test(example.module.title) && (!Platform.isTVOS || example.supportsTVOS);

const dataSource = ds.cloneWithRowsAndSections({
components: this.props.list.ComponentExamples.filter(filter),
Expand Down
Loading