Skip to content

Omit null state and props to fix default props #5

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.

Sign up for GitHub

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

Merged
roryabraham merged 2 commits into from
Nov 17, 2020
Merged

Omit null state and props to fix default props #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4aeb471
Omit null state and props to fix default props
Nov 13, 2020
6d57e20
Merge branch 'master' into amechler-fix-default-props
Nov 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions lib/withOnyx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,17 @@ export default function (mapOnyxToState) {

// Remove any internal state properties used by withOnyx
// that should not be passed to a wrapped component
const stateToPass = _.omit(this.state, 'loading');
let stateToPass = _.omit(this.state, 'loading');
stateToPass = _.omit(stateToPass, value => _.isNull(value));

// Remove any null values so that React replaces them with default props
const propsToPass = _.omit(this.props, value => _.isNull(value));

// Spreading props and state is necessary in an HOC where the data cannot be predicted
return (
<WrappedComponent
// eslint-disable-next-line react/jsx-props-no-spreading
{...this.props}
{...propsToPass}
// eslint-disable-next-line react/jsx-props-no-spreading
{...stateToPass}
/>
Expand Down