-
Notifications
You must be signed in to change notification settings - Fork 843
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Emotion] Add internal service for cloning elements with the css
property
#5835
Merged
+143
−0
Merged
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
* in compliance with, at your election, the Elastic License 2.0 or the Server | ||
* Side Public License, v 1. | ||
*/ | ||
|
||
/** @jsx jsx */ | ||
import React from 'react'; | ||
import { css, jsx } from '@emotion/react'; | ||
import { render } from 'enzyme'; | ||
|
||
import { cloneElementWithCss } from './clone_element'; | ||
|
||
describe('cloneElementWithCss', () => { | ||
const CloningParent: React.FC<any> = ({ children, ...props }) => { | ||
return cloneElementWithCss(children, props); | ||
}; | ||
|
||
it('correctly renders css on elements that do not already have a `css` property', () => { | ||
const component = render( | ||
<CloningParent css={{ color: 'red' }}> | ||
<div>hello world</div> | ||
</CloningParent> | ||
); | ||
|
||
expect(component).toMatchInlineSnapshot(` | ||
<div | ||
class="css-1h3ogp1-component" | ||
> | ||
hello world | ||
</div> | ||
`); | ||
expect(component).toHaveStyleRule('color', 'red'); | ||
}); | ||
|
||
it('combines css properties on cloned elements that already have a `css` property', () => { | ||
const component = render( | ||
<CloningParent css={{ color: 'red' }}> | ||
<div | ||
css={[ | ||
css` | ||
background-color: blue; | ||
`, | ||
]} | ||
> | ||
hello world | ||
</div> | ||
</CloningParent> | ||
); | ||
|
||
expect(component).toMatchInlineSnapshot(` | ||
<div | ||
class="css-1pj53ay-component-component-component" | ||
> | ||
hello world | ||
</div> | ||
`); | ||
expect(component).toHaveStyleRule('color', 'red'); | ||
expect(component).toHaveStyleRule('background-color', 'blue'); | ||
}); | ||
|
||
it('does nothing if no css property is set', () => { | ||
const component = render( | ||
<CloningParent className="test"> | ||
<div>hello world</div> | ||
</CloningParent> | ||
); | ||
|
||
expect(component).toMatchInlineSnapshot(` | ||
<div | ||
class="test" | ||
> | ||
hello world | ||
</div> | ||
`); | ||
expect(component).not.toHaveStyleRule('color', 'red'); | ||
}); | ||
}); |
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,32 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
* in compliance with, at your election, the Elastic License 2.0 or the Server | ||
* Side Public License, v 1. | ||
*/ | ||
|
||
import React from 'react'; | ||
import { jsx } from '@emotion/react'; | ||
|
||
/** | ||
* React.cloneElement does not work if the cloned element does not already have the | ||
* `css` prop - as a result, we need to use `jsx()` to manually clone the element | ||
* See https://github.com/emotion-js/emotion/issues/1404 | ||
* | ||
* NOTE: We're still using/testing this utility internally, so this is not yet a public API | ||
*/ | ||
export const cloneElementWithCss = ( | ||
element: any, | ||
props: any | ||
): React.ReactElement => { | ||
const elementType = | ||
element.props.__EMOTION_TYPE_PLEASE_DO_NOT_USE__ || element.type; // EMOTION_TYPE handles non-React elements (native JSX/HTML nodes) | ||
|
||
return jsx(elementType, { | ||
key: element.key, | ||
ref: element.ref, | ||
...element.props, | ||
...props, | ||
}); | ||
}; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not super in love with this name or anything, would be open to other suggestions/preferences, e.g.
emotionClone