MM-12301 Add padding for error text on edit profile screen (#2214)

This commit is contained in:
Sudheer 2018-10-03 23:36:42 +05:30 committed by Elias Nahum
parent 1c093f70a4
commit 783dc66b2a
No known key found for this signature in database
GPG key ID: E038DB71E0B61702
5 changed files with 72 additions and 13 deletions

View file

@ -0,0 +1,26 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`ErrorText should match snapshot 1`] = `
<Component
style={
Array [
Object {
"color": "red",
"fontSize": 12,
"marginBottom": 15,
"marginTop": 15,
"textAlign": "left",
},
Object {
"color": "#fd5960",
},
Object {
"fontSize": 14,
"marginHorizontal": 15,
},
]
}
>
Username must begin with a letter and contain between 3 and 22 characters including numbers, lowercase letters, and the symbols
</Component>
`;

View file

@ -1,18 +1,16 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
import {connect} from 'react-redux';
import React, {PureComponent} from 'react';
import PropTypes from 'prop-types';
import {Text} from 'react-native';
import CustomPropTypes from 'app/constants/custom_prop_types';
import FormattedText from 'app/components/formatted_text';
import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
import {GlobalStyles} from 'app/styles';
import {makeStyleSheetFromTheme} from 'app/utils/theme';
class ErrorText extends PureComponent {
export default class ErrorText extends PureComponent {
static propTypes = {
error: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
textStyle: CustomPropTypes.Style,
@ -54,12 +52,3 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
},
};
});
function mapStateToProps(state, ownProps) {
return {
...ownProps,
theme: getTheme(state),
};
}
export default connect(mapStateToProps)(ErrorText);

View file

@ -0,0 +1,29 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
import React from 'react';
import {shallow} from 'enzyme';
import Preferences from 'mattermost-redux/constants/preferences';
import ErrorText from './error_text.js';
describe('ErrorText', () => {
const baseProps = {
textStyle: {
fontSize: 14,
marginHorizontal: 15,
},
theme: Preferences.THEMES.default,
error: {
message: 'Username must begin with a letter and contain between 3 and 22 characters including numbers, lowercase letters, and the symbols',
},
};
test('should match snapshot', () => {
const wrapper = shallow(
<ErrorText {...baseProps}/>,
);
expect(wrapper.getElement()).toMatchSnapshot();
});
});

View file

@ -0,0 +1,15 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
import {connect} from 'react-redux';
import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
import ErrorText from './error_text.js';
function mapStateToProps(state) {
return {
theme: getTheme(state),
};
}
export default connect(mapStateToProps)(ErrorText);

View file

@ -550,6 +550,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
},
errorText: {
fontSize: 14,
marginHorizontal: 15,
},
separator: {
height: 15,
@ -560,4 +561,3 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
},
};
});