-
Notifications
You must be signed in to change notification settings - Fork 959
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
feat: implement falsyNode realisation & update card body component #1386
Open
whitestranger7
wants to merge
10
commits into
master
Choose a base branch
from
feat/falsyNode
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
ca8982f
feat: implement falsyNode realisation
da8033a
fix: typofix
e442300
fix: type fix
8066fc3
fix: extend source props
cdfbf91
fix: type fix
957c091
fix: dont miss source props
bd3f78e
feat(falsyNode): add tests, update falsyNode logic, create merge method
4f6b8dd
update: rename propsService method to standalone method
518396d
Delete launch.json
whitestranger7 fbf4fdf
update: update types
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
63 changes: 63 additions & 0 deletions
63
src/components/devsupport/components/falsyNode/falsyNode.component.tsx
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,63 @@ | ||
import React from "react"; | ||
import { PropsService } from '../../services/props/props.service'; | ||
import { StyleType } from '../../../theme'; | ||
|
||
export type RenderComponent = React.ReactElement | React.ReactElement[]; | ||
|
||
export type FalsyNodeProps<Props = {}> = Props & { | ||
component?: RenderComponent; | ||
style?: StyleType; | ||
}; | ||
|
||
/** | ||
* Helper component for optional properties that should render cloned component. | ||
* | ||
* Accepts props of a component that is expected to be rendered, | ||
* and `component` which may be React Element only. | ||
* | ||
* If it is a React Element, will call it with props passed to this component. | ||
* | ||
* @property {RenderComponent} component - React jsx component to be rendered. | ||
* | ||
* @example Will render nothing. | ||
* ``` | ||
* <FalsyNode /> | ||
* ``` | ||
* | ||
* @example Will render red title. | ||
* ``` | ||
* const Title = () => ( | ||
* <FalsyNode | ||
* style={{ color: 'red' }} | ||
* component={<Text>Title</Text>} | ||
* /> | ||
* ); | ||
* ``` | ||
*/ | ||
|
||
type ChildElement = React.ReactElement; | ||
type ChildrenProp = ChildElement | ChildElement[]; | ||
|
||
export class FalsyNode<Props = {}> extends React.Component<FalsyNodeProps<Props>> { | ||
private renderChildElement = (source: ChildElement, props: any): ChildElement => { | ||
return React.cloneElement(source, { | ||
...props, | ||
...source.props, | ||
style: PropsService.mergeObjectsWithArrays([this.props?.style, source.props?.style]), | ||
}); | ||
}; | ||
|
||
private renderComponentChildren = (source: ChildrenProp, props: any): ChildElement[] => { | ||
return React.Children.map(source, child => this.renderChildElement(child, props)); | ||
}; | ||
|
||
public render(): React.ReactElement { | ||
const { component, ...props } = this.props; | ||
|
||
if (!component) { | ||
return null; | ||
} | ||
|
||
return <>{this.renderComponentChildren(component, props)}</>; | ||
} | ||
} |
71 changes: 71 additions & 0 deletions
71
src/components/devsupport/components/falsyNode/falsyNode.spec.tsx
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,71 @@ | ||
import React from "react"; | ||
import { Text } from "react-native"; | ||
import { fireEvent, render } from "react-native-testing-library"; | ||
import { FalsyNode } from "./falsyNode.component"; | ||
|
||
it("should render nothing", function () { | ||
const component = render(<FalsyNode />); | ||
expect(component.toJSON()).toEqual(null); | ||
}); | ||
|
||
it("should render provided React Element", () => { | ||
const component = render( | ||
<FalsyNode style={{ color: "red" }} component={<Text>I love Babel</Text>} /> | ||
); | ||
|
||
const textComponent = component.getByText("I love Babel"); | ||
|
||
expect(textComponent).toBeTruthy(); | ||
expect(textComponent.props.style).toEqual({ | ||
color: "red", | ||
}); | ||
}); | ||
|
||
it("should render provided React Element with overwritten styles", () => { | ||
const renderComponent = <Text style={{ color: "blue" }}>I love Babel</Text>; | ||
|
||
const component = render( | ||
<FalsyNode | ||
style={{ color: "red", backgroundColor: "black" }} | ||
component={renderComponent} | ||
/> | ||
); | ||
|
||
const textComponent = component.getByText("I love Babel"); | ||
|
||
expect(textComponent).toBeTruthy(); | ||
expect(textComponent.props.style).toEqual({ | ||
color: "blue", | ||
backgroundColor: "black", | ||
}); | ||
}); | ||
|
||
it('should keep props passed in FalsyNode component', function () { | ||
const onPress = jest.fn(); | ||
|
||
const component = render( | ||
<FalsyNode | ||
onPress={onPress} | ||
component={<Text>I love Babel</Text>} | ||
/>, | ||
); | ||
|
||
fireEvent.press(component.queryByText('I love Babel')); | ||
expect(onPress).toBeCalledTimes(1); | ||
}); | ||
|
||
it('should override props passed in FalsyNode component', function () { | ||
const onPress = jest.fn(); | ||
const onInnerPress = jest.fn(); | ||
|
||
const component = render( | ||
<FalsyNode | ||
onPress={onPress} | ||
component={<Text onPress={onInnerPress}>I love Babel</Text>} | ||
/>, | ||
); | ||
|
||
fireEvent.press(component.queryByText('I love Babel')); | ||
expect(onPress).toBeCalledTimes(0); | ||
expect(onInnerPress).toBeCalledTimes(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
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
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.
I don't think we have to apply props to each child.