maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-25 22:37:18 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add textComponent prop to IntlProvider

Browse source
This commit is contained in:
Jenni Nurmi 2019-08-29 15:28:51 +03:00
parent a173e7271e
commit 3a88c0f386
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/app.js
View file

@ -12,7 +12,7 @@ import { Provider } from 'react-redux';
import difference from 'lodash/difference';
import mapValues from 'lodash/mapValues';
import moment from 'moment';
import { IntlProvider } from 'react-intl';
import { IntlProvider } from './util/reactIntl';
import configureStore from './store';
import routeConfiguration from './routeConfiguration';
import Routes from './Routes';
@ -86,7 +86,7 @@ export const ClientApp = props => {
const { store } = props;
setupLocale();
return (
<IntlProvider locale={config.locale} messages={localeMessages}>
<IntlProvider locale={config.locale} messages={localeMessages} textComponent="span">
<Provider store={store}>
<HelmetProvider>
<BrowserRouter>
@ -107,7 +107,7 @@ export const ServerApp = props => {
setupLocale();
HelmetProvider.canUseDOM = false;
return (
<IntlProvider locale={config.locale} messages={localeMessages}>
<IntlProvider locale={config.locale} messages={localeMessages} textComponent="span">
<Provider store={store}>
<HelmetProvider context={helmetContext}>
<StaticRouter location={url} context={context}>

4
src/util/test-helpers.js
View file

@ -3,10 +3,10 @@ import mapValues from 'lodash/mapValues';
import Enzyme, { shallow, mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import toJson from 'enzyme-to-json';
import { IntlProvider } from 'react-intl';
import { BrowserRouter } from 'react-router-dom';
import { Provider } from 'react-redux';
import configureStore from '../store';
import { IntlProvider } from './reactIntl';
// In case you have translated the template and have new translations that
// are missing from the en translations file, the language for the tests can
@ -24,7 +24,7 @@ const testMessages = mapValues(messages, (val, key) => key);
export const TestProvider = props => {
const store = configureStore();
return (
<IntlProvider locale="en" messages={testMessages}>
<IntlProvider locale="en" messages={testMessages} textComponent="span">
<BrowserRouter>
<Provider store={store}>{props.children}</Provider>
</BrowserRouter>