-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1392 from Shopify/update-react
[v4] Update React - preparations
- Loading branch information
Showing
151 changed files
with
1,806 additions
and
1,841 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +0,0 @@ | ||
| // https://github.com/Microsoft/TypeScript/issues/24599 | ||
| declare module 'prop-types' { | ||
| const content: any; | ||
| export = content; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| import * as React from 'react'; | ||
| import {ClientApplication} from '@shopify/app-bridge'; | ||
| import createPolarisContext from './utilities/createPolarisContext'; | ||
| import {Intl, Link, StickyManager, ScrollLockManager} from './utilities'; | ||
|
|
||
| export interface AppProviderContextType { | ||
| intl: Intl; | ||
| link: Link; | ||
| stickyManager: StickyManager; | ||
| scrollLockManager: ScrollLockManager; | ||
| appBridge?: ClientApplication<{}>; | ||
| } | ||
|
|
||
| const AppProviderContext = React.createContext<AppProviderContextType>( | ||
| createPolarisContext(), | ||
| ); | ||
|
|
||
| export default AppProviderContext; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,81 +1,28 @@ | ||
| import * as React from 'react'; | ||
| import TestUtils from 'react-dom/test-utils'; | ||
| import {mount} from 'enzyme'; | ||
| import {createThemeContext} from '../../ThemeProvider'; | ||
| import {StickyManager, createAppProviderContext} from '../utilities'; | ||
| import {polarisAppProviderContextTypes} from '../types'; | ||
| import AppProviderContext from '../context'; | ||
| import AppProvider from '../AppProvider'; | ||
| import {mountWithAppProvider} from '../../../test-utilities'; | ||
|
|
||
| describe('<AppProvider />', () => { | ||
| it('passes i18n and withComponent properties to context', () => { | ||
| const i18n = { | ||
| Polaris: { | ||
| Common: { | ||
| undo: 'Custom Undo', | ||
| }, | ||
| }, | ||
| }; | ||
| const CustomLinkComponent = () => { | ||
| return <a href="test">Custom Link Component</a>; | ||
| }; | ||
| const stickyManager = new StickyManager(document); | ||
| const context = { | ||
| ...createAppProviderContext({ | ||
| i18n, | ||
| linkComponent: CustomLinkComponent, | ||
| stickyManager, | ||
| }), | ||
| ...createThemeContext(), | ||
| }; | ||
|
|
||
| // eslint-disable-next-line react/prefer-stateless-function | ||
| class Child extends React.Component { | ||
| static contextTypes = polarisAppProviderContextTypes; | ||
|
|
||
| render() { | ||
| return <div />; | ||
| } | ||
| } | ||
|
|
||
| const wrapper = TestUtils.renderIntoDocument( | ||
| <AppProvider i18n={i18n} linkComponent={CustomLinkComponent}> | ||
| <Child /> | ||
| </AppProvider>, | ||
| ); | ||
|
|
||
| const child = TestUtils.findRenderedComponentWithType( | ||
| wrapper as React.Component, | ||
| Child, | ||
| ); | ||
|
|
||
| // https://github.com/facebook/jest/issues/1772 | ||
| expect(JSON.stringify(child.context)).toBe(JSON.stringify(context)); | ||
| }); | ||
|
|
||
| it('updates polaris context when props change', () => { | ||
| const CustomLinkComponent = () => { | ||
| return <a href="test">Custom Link Component</a>; | ||
| }; | ||
|
|
||
| // eslint-disable-next-line react/prefer-stateless-function | ||
| class Child extends React.Component { | ||
| static contextTypes = polarisAppProviderContextTypes; | ||
|
|
||
| render() { | ||
| return <div />; | ||
| } | ||
| } | ||
| const Child: React.SFC<{}> = (_props) => ( | ||
| <AppProviderContext.Consumer> | ||
| {({link: {linkComponent}}) => | ||
| linkComponent ? <div id="child" /> : null | ||
| } | ||
| </AppProviderContext.Consumer> | ||
| ); | ||
| const LinkComponent = () => <div />; | ||
|
|
||
| const wrapper = mount( | ||
| const wrapper = mountWithAppProvider( | ||
| <AppProvider> | ||
| <Child /> | ||
| </AppProvider>, | ||
| ); | ||
|
|
||
| wrapper.setProps({linkComponent: CustomLinkComponent}); | ||
|
|
||
| expect( | ||
| wrapper.find(Child).instance().context.polaris.link.linkComponent, | ||
| ).toBe(CustomLinkComponent); | ||
| expect(wrapper.find('#child')).toHaveLength(0); | ||
| wrapper.setProps({linkComponent: LinkComponent}); | ||
| wrapper.update(); | ||
| expect(wrapper.find('#child')).toHaveLength(1); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| import StickyManager from './StickyManager'; | ||
|
|
||
| export default StickyManager; |
Oops, something went wrong.