Skip to content

Commit fdc0ea3

Browse files
committed
Merge branch 'master' into release
2 parents 38b01fe + 1e4a689 commit fdc0ea3

File tree

47 files changed

+3453
-587
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+3453
-587
lines changed

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
*Enter description to help the reviewer understand what's the change about...*
33

44
## Changelog
5-
*Add a quick message for our users about this change (include Compoennt name, relevant props and general purpose of the PR)*
5+
*Add a quick message for our users about this change (include Component name, relevant props and general purpose of the PR)*

.npmignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
example/
22
docs/
3+
docuilib/
4+
eslint-rules/
35
extensions/
46
node_modules/
57
.npmignore
68
.watchmanconfig
7-
9+
src/**/__tests__/*.*
810

911
#################
1012
# from .gitignore:

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ When contributing to this repository, please first discuss the change you wish t
88
## Pull Request Process
99

1010
1. First make sure the environment is working and synced with master. For installation details go [here](https://github.com/wix/react-native-ui-lib/blob/master/markdowns/getting-started/setup.md#demo-app)
11-
2. Before submitting a PR we suggest running `npm run prepush` command that verifies our lint, TS and tests were not broken.
11+
2. Before submitting a PR we suggest running `npm run pre-push` command that verifies our lint, TS and tests were not broken.
1212
3. Please use our PR prefixes accordingly. `fix` for bugfix, `feat` for feature, `infra` for infrastructure changes and `docs` for documentation related changes (e.g `fix/ButtonStyle`, `feat/Avatar_colorProp`)
1313
4. Please don't change our PR template.
1414
- In the Description section add everything that can help the reviewer and the reviewing process, like a description of the issue and the way you decided to go about it, screenshots or gifs, etc.

demo/src/demoApp.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,3 +128,30 @@ Navigation.events().registerAppLaunchedListener(() => {
128128
registerScreens(Navigation.registerComponent.bind(Navigation));
129129
getDefaultScreenAndStartApp();
130130
});
131+
132+
133+
/* Setting Intl Polyfills
134+
This is due to lack of Intl support in Hermes engine
135+
*/
136+
137+
if (global.HermesInternal) {
138+
if (Constants.isIOS) {
139+
140+
// Polyfills required to use Intl with Hermes engine
141+
require('@formatjs/intl-getcanonicallocales/polyfill').default;
142+
require('@formatjs/intl-locale/polyfill').default;
143+
require('@formatjs/intl-pluralrules/polyfill').default;
144+
require('@formatjs/intl-pluralrules/locale-data/en').default;
145+
require('@formatjs/intl-numberformat/polyfill').default;
146+
require('@formatjs/intl-numberformat/locale-data/en').default;
147+
require('@formatjs/intl-datetimeformat/polyfill').default;
148+
require('@formatjs/intl-datetimeformat/locale-data/en').default;
149+
require('@formatjs/intl-datetimeformat/add-all-tz').default;
150+
} else {
151+
require('@formatjs/intl-getcanonicallocales/polyfill');
152+
require('@formatjs/intl-locale/polyfill');
153+
require('@formatjs/intl-datetimeformat/polyfill');
154+
require('@formatjs/intl-datetimeformat/locale-data/en');
155+
require('@formatjs/intl-datetimeformat/add-all-tz');
156+
}
157+
}

demo/src/screens/MainScreen.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import _ from 'lodash';
22
import React, {Component} from 'react';
33
import AsyncStorage from '@react-native-community/async-storage';
44
import PropTypes from 'prop-types';
5-
import {StyleSheet, FlatList, ViewPropTypes} from 'react-native';
5+
import {StyleSheet, FlatList} from 'react-native';
6+
import {ViewPropTypes} from 'deprecated-react-native-prop-types';
67
import {Navigation} from 'react-native-navigation';
78
import {gestureHandlerRootHOC} from 'react-native-gesture-handler';
89
import {
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import React from 'react';
2+
import renderer from 'react-test-renderer';
3+
4+
describe('AvatarScreen', () => {
5+
let AvatarScreen;
6+
7+
beforeEach(() => {
8+
AvatarScreen = require('../componentScreens/AvatarsScreen').default;
9+
});
10+
11+
it('renders screen', () => {
12+
const tree = renderer.create(<AvatarScreen/>).toJSON();
13+
expect(tree).toMatchSnapshot();
14+
});
15+
});

0 commit comments

Comments
 (0)