Cleaning up uses of StaticQuery

This commit is contained in:
Jeff Avallone
2019-01-06 16:39:29 -05:00
parent 8426eaa433
commit 02f6f2d252
6 changed files with 19 additions and 45 deletions
@@ -4,13 +4,7 @@ exports[`Footer rendering 1`] = `
ShallowWrapper {
Symbol(enzyme.__root__): [Circular],
Symbol(enzyme.__unrendered__): <Footer
site={
Object {
"siteMetadata": Object {
"buildId": "abc-123",
},
}
}
buildId="abc-123"
t={[Function]}
/>,
Symbol(enzyme.__renderer__): Object {
+5 -9
View File
@@ -15,7 +15,7 @@ const query = graphql`
}
`;
export const Footer = ({ t, site: { siteMetadata } }) => (
export const Footer = ({ t, buildId }) => (
<footer className={ style.footer }>
<ul className={ style.list }>
<li>
@@ -33,22 +33,18 @@ export const Footer = ({ t, site: { siteMetadata } }) => (
</li>
</ul>
<div className={ style.buildId }>
{ siteMetadata.buildId }
{ buildId }
</div>
</footer>
);
Footer.propTypes = {
t: PropTypes.func.isRequired,
site: PropTypes.shape({
siteMetadata: PropTypes.shape({
buildId: PropTypes.string.isRequired
}).isRequired
}).isRequired
buildId: PropTypes.string.isRequired
};
export default withNamespaces()(props => (
<StaticQuery query={ query } render={ data => (
<Footer { ...props } { ...data } />
<StaticQuery query={ query } render={ ({ site: { siteMetadata } }) => (
<Footer { ...props } { ...siteMetadata } />
) } />
));
+1 -1
View File
@@ -7,7 +7,7 @@ import { Footer } from 'components/Footer';
describe('Footer', () => {
test('rendering', () => {
const component = shallow(
<Footer site={{ siteMetadata: { buildId: 'abc-123' } }} t={ mockT } />
<Footer buildId="abc-123" t={ mockT } />
);
expect(component).toMatchSnapshot();
});