Skip to content
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.

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

feat(playground): home screen. Closes #203 #205

Merged
merged 3 commits into from
Dec 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"@types/jest": "^23.3.8",
"@types/react": "^16.4.18",
"@types/react-native": "^0.57.7",
"@types/react-navigation": "^2.13.7",
"@types/react-test-renderer": "^16.0.3",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^23.6.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ export const StyledComponent = <T extends React.Component, P extends object>(Com
};

const RefForwardingComponent = React.forwardRef<T, P>(RefForwardingFactory as any);

RefForwardingComponent.displayName = Component.displayName || Component.name;
hoistNonReactStatics(RefForwardingComponent, Component);

return RefForwardingComponent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ export const withStyles = <T extends React.Component, P extends object>(Componen
};

const RefForwardingComponent = React.forwardRef<T, P>(RefForwardingFactory as any);

RefForwardingComponent.displayName = Component.displayName || Component.name;
hoistNonReactStatics(RefForwardingComponent, Component);

return RefForwardingComponent;
Expand Down
9 changes: 0 additions & 9 deletions src/framework/ui/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +0,0 @@
import { StyledComponent } from '@rk-kit/theme';
import { Sample, Props } from './sample/sample.component';

const StyledSample = StyledComponent<Sample, Props>(Sample);

export {
StyledSample as Sample,
Props as SampleProps,
};
3 changes: 2 additions & 1 deletion src/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"dependencies": {
"expo": "^31.0.4",
"react": "16.5.0",
"react-native": "https://github.com/expo/react-native/archive/sdk-31.0.1.tar.gz"
"react-native": "https://github.com/expo/react-native/archive/sdk-31.0.1.tar.gz",
"react-navigation": "^3.0.7"
},
"devDependencies": {
"react-native-typescript-transformer": "^1.2.10"
Expand Down
16 changes: 5 additions & 11 deletions src/playground/src/app.component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import {
ThemeMappingType,
ThemeType,
} from '@rk-kit/theme';
import { Sample } from '@rk-kit/ui';
import {
Mappings,
Theme,
} from './theme-token';
import { withNavigation } from './navigation';
import * as Screens from './ui/screen';

interface State {
mappings: ThemeMappingType[];
Expand All @@ -17,8 +18,6 @@ interface State {

export default class App extends React.Component<any, State> {

sampleRef = undefined;

constructor(props) {
super(props);
this.state = {
Expand All @@ -27,17 +26,12 @@ export default class App extends React.Component<any, State> {
};
}

setSampleRef = (ref) => {
this.sampleRef = ref;
};

render() {
const { HomeScreen: RootScreen, ...nestedScreens } = Screens;
const Router = withNavigation(RootScreen, nestedScreens);
return (
<StyleProvider theme={this.state.theme} mapping={this.state.mappings}>
<Sample
ref={this.setSampleRef}
variant='dark success'
/>
<Router/>
</StyleProvider>
);
}
Expand Down
5 changes: 5 additions & 0 deletions src/playground/src/navigation/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export {
withNavigation,
Props as NavigatorProps,
RouteType,
} from './navigation.component';
63 changes: 63 additions & 0 deletions src/playground/src/navigation/navigation.component.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import React from 'react';
import {
// @ts-ignore: createAppContainer is not exported
createAppContainer,
createStackNavigator,
NavigationRouteConfigMap,
} from 'react-navigation';
import hoistNonReactStatics from 'hoist-non-react-statics';

export interface RouteType {
name: string;
}

export interface Props {
routes?: RouteType[];
}

const ROUTE_INITIAL = 'root';

export const withNavigation = <P extends object>(Root: React.ComponentType<P>,
routes: NavigationRouteConfigMap) => {

type WrapperProps = Props & P;

class RootWrapper extends React.Component<WrapperProps> {

getComponentName = (Component: React.ComponentType) => Component.displayName || Component.name;

createCustomProps = (): Props => {
const toRoute = (key: string): RouteType => ({ name: key });
return {
routes: Object.keys(routes).filter(key => {
const rootComponentName = this.getComponentName(Root);
const componentName = this.getComponentName(routes[key]);
return rootComponentName !== componentName;
}).map(toRoute),
};
};

render() {
return (
<Root
{...this.createCustomProps()}
{...this.props}
/>
);
}
}

const routeConfig: NavigationRouteConfigMap = {
[ROUTE_INITIAL]: RootWrapper,
...routes,
};
const stackConfig: NavigationRouteConfigMap = {
initialRouteName: ROUTE_INITIAL,
};

hoistNonReactStatics(RootWrapper, Root);

// FIXME:
// @ts-ignore: createAppContainer is not exported
return createAppContainer(createStackNavigator(routeConfig, stackConfig));
};
9 changes: 9 additions & 0 deletions src/playground/src/ui/component/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { StyledComponent } from '@rk-kit/theme';
import { Sample, Props } from './sample.component';

const StyledSample = StyledComponent<Sample, Props>(Sample);

export {
StyledSample as Sample,
Props as SampleProps,
};
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,14 @@ export class Sample extends React.Component<Props, {}> {
render() {
const { themedStyle } = this.props;
return (
<View style={[styles.container, { backgroundColor: themedStyle.backgroundColor }]}>
<View style={{ backgroundColor: themedStyle.backgroundColor }}>
<Text style={[styles.text, { color: themedStyle.textColor }]}>{this.props.text}</Text>
</View>
);
}
}

const styles = StyleSheet.create({
container: {
flex: 1,
justifyContent: 'center',
alignItems: 'center',
padding: 16,
},
text: {
textAlign: 'center',
fontSize: 16,
Expand Down
67 changes: 67 additions & 0 deletions src/playground/src/ui/screen/home.component.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
import React from 'react';
import { NavigationScreenProps } from 'react-navigation';
import {
FlatList,
Text,
TouchableOpacity,
ListRenderItemInfo,
} from 'react-native';
import {
withStyles,
ThemeType,
ThemedComponentProps,
} from '@rk-kit/theme';
import {
NavigatorProps,
RouteType,
} from '../../navigation';

type Props = NavigatorProps & ThemedComponentProps & NavigationScreenProps;

class Home extends React.Component<Props> {

static navigationOptions = {
title: 'Home',
};

onItemPress = (route: RouteType) => {
this.props.navigation.navigate(route.name);
};

extractItemKey = (item: RouteType, index: number) => `${index}`;

renderItem = (info: ListRenderItemInfo<any>) => (
<TouchableOpacity
style={this.props.themedStyle.itemContainer}
key={info.index}
onPress={() => this.onItemPress(info.item)}>
<Text style={this.props.themedStyle.itemText}>{info.item.name}</Text>
</TouchableOpacity>
);

render() {
return (
<FlatList
keyExtractor={this.extractItemKey}
style={this.props.themedStyle.container}
data={this.props.routes}
renderItem={this.renderItem}
/>
);
}
}

export const HomeScreen = withStyles(Home, (theme: ThemeType) => ({
container: {
flex: 1,
paddingHorizontal: 16,
paddingVertical: 16,
},
itemContainer: {
paddingVertical: 8,
},
itemText: {
fontSize: 20,
fontWeight: '500',
},
}));
2 changes: 2 additions & 0 deletions src/playground/src/ui/screen/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export { HomeScreen } from './home.component';
export { SampleScreen } from './sample.component';
34 changes: 34 additions & 0 deletions src/playground/src/ui/screen/sample.component.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import React from 'react';
import { View } from 'react-native';
import { NavigationScreenProps } from 'react-navigation';
import {
withStyles,
ThemeType,
ThemedComponentProps,
} from '@rk-kit/theme';
import { Sample as SampleComponent } from '../component';

type Props = & ThemedComponentProps & NavigationScreenProps;

class Sample extends React.Component<Props> {

static navigationOptions = {
title: 'Sample',
};

render() {
return (
<View style={this.props.themedStyle.container}>
<SampleComponent variant='dark success'/>
</View>
);
}
}

export const SampleScreen = withStyles(Sample, (theme: ThemeType) => ({
container: {
flex: 1,
justifyContent: 'center',
alignItems: 'center',
},
}));