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.

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

Jump to bottom

fix(theme): theme change fix #399

Merged
merged 5 commits into from
May 22, 2019
Merged

fix(theme): theme change fix #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
752f928
fix(theme): application provider theme changing fix
32penkin May 21, 2019
94c0f30
Merge branch 'next' into fix/theming
32penkin May 21, 2019
731cb5d
refactor(test): snapshots update
32penkin May 21, 2019
6f94b74
Merge 'next' branch into current.
32penkin May 22, 2019
a58bb3d
fix(app): missing lock-file return
32penkin May 22, 2019
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
10,354 changes: 5,878 additions & 4,476 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

48 changes: 48 additions & 0 deletions src/framework/theme/application/application.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import React from 'react';
import {
View,
Button,
} from 'react-native';
import {
fireEvent,
render,
RenderAPI,
shallow,
Expand All @@ -12,10 +17,39 @@ import {
import {
mapping,
theme,
themeInverse,
} from '../support/tests';
import { ThemeType } from '@kitten/theme';

describe('@app: application wrapper check', () => {

interface TestAppState {
theme: ThemeType;
}

class TestApp extends React.Component<any, TestAppState> {

public state: TestAppState = {
theme: theme,
};

private onSwitchTheme = (): void => {
this.setState({ theme: themeInverse });
};

public render(): React.ReactNode {
return (
<View>
<Button title='Switch Theme' onPress={this.onSwitchTheme}/>
<Mock
mapping={mapping}
theme={this.state.theme}
/>
</View>
);
}
}

const Mock = (props?: ApplicationProviderProps): React.ReactElement<ApplicationProviderProps> => {
return (
<ApplicationProvider {...props} />
Expand Down Expand Up @@ -49,4 +83,18 @@ describe('@app: application wrapper check', () => {
expect(state.styles).toMatchSnapshot();
});


it('* theme switching checks', () => {
const application: RenderAPI = render(<TestApp/>);
fireEvent(application.getByType(Button), 'press');
const { output } = shallow(application.getByType(ApplicationProvider));

const stringify = (obj: any): string => {
return JSON.stringify(obj);
};

// @ts-ignore just for theme prop changing
expect(stringify(output.props.theme)).toBe(JSON.stringify(themeInverse));
});

});
10 changes: 4 additions & 6 deletions src/framework/theme/application/applicationProvider.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ export type ApplicationProviderProps = ComponentProps & ThemeProviderProps;

interface State {
styles: ThemeStyleType;
theme: ThemeType;
}

/**
Expand Down Expand Up @@ -85,10 +84,7 @@ export class ApplicationProvider extends React.Component<ApplicationProviderProp

const styles: ThemeStyleType = this.createStyles(mapping, customMapping);

this.state = {
styles,
theme,
};
this.state = { styles };
}

private createStyles = (mapping: SchemaType, custom: CustomSchemaType): ThemeStyleType => {
Expand All @@ -99,7 +95,9 @@ export class ApplicationProvider extends React.Component<ApplicationProviderProp

public render(): React.ReactNode {
return (
<StyleProvider {...this.state}>
<StyleProvider
theme={this.props.theme}
styles={this.state.styles}>
<ModalPanel>
{this.props.children}
</ModalPanel>
Expand Down
48 changes: 24 additions & 24 deletions src/framework/theme/modal/modalPanel.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`@modal panel checks * close modal checking inner 1`] = `
<Component
<View
style={
Object {
"flex": 1,
}
}
>
<Component>
<Component>
<View>
<Text>
Modal Panel Test
</Component>
</Component>
</Text>
</View>
<Button
onPress={[Function]}
testID="@modal/show"
Expand All @@ -23,22 +23,22 @@ exports[`@modal panel checks * close modal checking inner 1`] = `
testID="@modal/hide-outer"
title="Hide Modal"
/>
</Component>
</View>
`;

exports[`@modal panel checks * close modal checking outer 1`] = `
<Component
<View
style={
Object {
"flex": 1,
}
}
>
<Component>
<Component>
<View>
<Text>
Modal Panel Test
</Component>
</Component>
</Text>
</View>
<Button
onPress={[Function]}
testID="@modal/show"
Expand All @@ -49,22 +49,22 @@ exports[`@modal panel checks * close modal checking outer 1`] = `
testID="@modal/hide-outer"
title="Hide Modal"
/>
</Component>
</View>
`;

exports[`@modal panel checks * modal panel render with props / children checking 1`] = `
<Component
<View
style={
Object {
"flex": 1,
}
}
>
<Component>
<Component>
<View>
<Text>
Modal Panel Test
</Component>
</Component>
</Text>
</View>
<Button
onPress={[Function]}
testID="@modal/show"
Expand All @@ -75,22 +75,22 @@ exports[`@modal panel checks * modal panel render with props / children checking
testID="@modal/hide-outer"
title="Hide Modal"
/>
</Component>
</View>
`;

exports[`@modal panel checks * modal panel renders properly 1`] = `
<Component
<View
style={
Object {
"flex": 1,
}
}
>
<Component>
<Component>
<View>
<Text>
Modal Panel Test
</Component>
</Component>
</Text>
</View>
<Button
onPress={[Function]}
testID="@modal/show"
Expand All @@ -101,7 +101,7 @@ exports[`@modal panel checks * modal panel renders properly 1`] = `
testID="@modal/hide-outer"
title="Hide Modal"
/>
</Component>
</View>
`;

exports[`@modal-service: service checks * unexpected branch cover 1`] = `
Expand Down
2 changes: 1 addition & 1 deletion src/framework/theme/style/style.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ Object {
"selectBorderRadius": 12,
"selectHeight": 24,
"selectWidth": 24,
"textColor": "#000000",
"textColor": "#FFFFFF",
"textFontSize": 16,
"textFontWeight": "500",
"textMarginLeft": 12,
Expand Down
4 changes: 2 additions & 2 deletions src/framework/theme/support/tests/themeInverse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"gray-dark": "#8992A3",
"gray-highlight": "#EDF0F5",
"pink-primary": "#FF3D71",
"text-primary": "#000000",
"text-primary-inverse": "#ffffff",
"text-primary": "#FFFFFF",
"text-primary-inverse": "#000000",

"gray-100": "#f7f8fa",
"gray-200": "#edf0f5",
Expand Down
Loading