Skip to content

Fix a couple of places RNTester is using non-theme values #31479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
acoates-ms wants to merge 3 commits into from
Closed

Fix a couple of places RNTester is using non-theme values #31479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aec57a8
Fix a couple of places RNTester is using non-theme values
acoates-ms May 4, 2021
1dfb29d
Fix example pages too
acoates-ms May 4, 2021
506840e
lint fix
acoates-ms May 6, 2021
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
Binary file removed packages/rn-tester/js/assets/bottom-nav-center-box.png
View file
Open in desktop
Binary file not shown.
6 changes: 4 additions & 2 deletions packages/rn-tester/js/components/ExamplePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import * as React from 'react';
import {StyleSheet, View, Text} from 'react-native';
import {RNTesterThemeContext} from './RNTesterTheme';

type Props = $ReadOnly<{|
children?: React.Node,
Expand All @@ -22,9 +23,11 @@ type Props = $ReadOnly<{|

export default function ExamplePage(props: Props): React.Node {
const description = props.description ?? '';
const theme = React.useContext(RNTesterThemeContext);
return (
<>
<View style={styles.titleView}>
<View
style={[styles.titleView, {backgroundColor: theme.BackgroundColor}]}>
<Text style={styles.title}>{props.title}</Text>
<Text style={styles.description}>{description}</Text>
</View>
Expand All @@ -35,7 +38,6 @@ export default function ExamplePage(props: Props): React.Node {

const styles = StyleSheet.create({
titleView: {
backgroundColor: '#F3F8FF',
paddingHorizontal: 25,
paddingTop: 4,
paddingBottom: 8,
Expand Down
20 changes: 15 additions & 5 deletions packages/rn-tester/js/components/RNTesterBlock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,23 @@ type Props = $ReadOnly<{|
const RNTesterBlock = ({description, title, children}: Props): React.Node => {
const theme = React.useContext(RNTesterThemeContext);
return (
<View style={[[styles.container], {borderColor: theme.SeparatorColor}]}>
<View
style={[
[styles.container],
{
borderColor: theme.SeparatorColor,
backgroundColor: theme.SystemBackgroundColor,
},
]}>
<View style={[styles.titleContainer]}>
<Text style={[styles.titleText]}>{title}</Text>
<Text style={[styles.titleText, {color: theme.LabelColor}]}>
{title}
</Text>
<Text
style={[styles.descriptionText, {marginTop: description ? 10 : 0}]}>
style={[
styles.descriptionText,
{color: theme.LabelColor, marginTop: description ? 10 : 0},
]}>
{description}
</Text>
</View>
Expand All @@ -40,7 +52,6 @@ const styles = StyleSheet.create({
borderWidth: 1,
marginTop: 30,
marginHorizontal: 20,
backgroundColor: 'white',
},
titleText: {
fontSize: 18,
Expand All @@ -53,7 +64,6 @@ const styles = StyleSheet.create({
descriptionText: {
fontSize: 12,
opacity: 0.5,
color: 'black',
},
children: {
paddingTop: 10,
Expand Down
6 changes: 5 additions & 1 deletion packages/rn-tester/js/components/RNTesterExampleFilter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,11 @@ class RNTesterExampleFilter extends React.Component<Props, State> {
<RNTesterThemeContext.Consumer>
{theme => {
return (
<View style={[styles.searchRow, {backgroundColor: '#F3F8FF'}]}>
<View
style={[
styles.searchRow,
{backgroundColor: theme.BackgroundColor},
]}>
<View style={styles.textInputStyle}>
<Image
source={require('../assets/search-icon.png')}
Expand Down
2 changes: 1 addition & 1 deletion packages/rn-tester/js/components/RNTesterHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const HeaderAndroid = ({
const theme = React.useContext(RNTesterThemeContext);
return (
<SafeAreaView>
<View style={[styles.toolbar, {backgroundColor: '#F3F8FF'}]}>
<View style={[styles.toolbar, {backgroundColor: theme.BackgroundColor}]}>
<View style={styles.toolbarCenter}>
<Text style={[styles.title, {color: theme.LabelColor}]}>{title}</Text>
{documentationURL && (
Expand Down
8 changes: 5 additions & 3 deletions packages/rn-tester/js/components/RNTesterNavbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ import {RNTesterThemeContext} from './RNTesterTheme';

const BookmarkTab = ({handleNavBarPress, isBookmarkActive, theme}) => (
<View style={styles.centerBox}>
<Image
style={styles.centralBoxCutout}
source={require('./../assets/bottom-nav-center-box.png')}
<View
style={[
styles.centralBoxCutout,
{backgroundColor: theme.BackgroundColor},
]}
/>
<View style={styles.floatContainer}>
<Pressable
Expand Down
12 changes: 8 additions & 4 deletions packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,8 +567,9 @@ const SnapToOptions = () => {
<Picker
selectedValue={snapToAlignment}
onValueChange={value => {
if (value === 'start' || value === 'center' || value === 'end')
if (value === 'start' || value === 'center' || value === 'end') {
setSnapToAlignment(value);
}
}}
itemStyle={styles.pickerItem}>
{snapToAlignmentModes.map(label => {
Expand Down Expand Up @@ -754,8 +755,9 @@ const OnScrollOptions = () => {
<Picker
selectedValue={overScrollMode}
onValueChange={value => {
if (value === 'always' || value === 'auto' || value === 'never')
if (value === 'always' || value === 'auto' || value === 'never') {
setOverScrollMode(value);
}
}}
itemStyle={styles.pickerItem}>
{overScrollModeOptions.map(label => {
Expand Down Expand Up @@ -892,8 +894,9 @@ const KeyboardExample = () => {
value === 'none' ||
value === 'on-drag' ||
value === 'interactive'
)
) {
setKeyboardDismissMode(value);
}
}}
itemStyle={styles.pickerItem}>
{dismissOptions.map(label => {
Expand All @@ -904,8 +907,9 @@ const KeyboardExample = () => {
<Picker
selectedValue={keyboardShouldPersistTaps}
onValueChange={value => {
if (value === 'never' || value === 'always' || value === 'handled')
if (value === 'never' || value === 'always' || value === 'handled') {
setKeyboardShouldPersistTaps(value);
}
}}
itemStyle={styles.pickerItem}>
{persistOptions.map(label => {
Expand Down