Skip to content

Commit

Permalink
Merge pull request #31428 from software-mansion-labs/ts/withPolicyAnd…
Browse files Browse the repository at this point in the history
…FullscreenLoading

[TS migration] Migrate 'withPolicyAndFullscreenLoading.js' HOC to TypeScript
  • Loading branch information
Hayata Suenaga authored Nov 24, 2023
2 parents a279886 + 3949504 commit f5194e1
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 67 deletions.
1 change: 1 addition & 0 deletions src/pages/workspace/withPolicy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,4 @@ export default function <TProps extends WithPolicyProps, TRef>(WrappedComponent:
}

export {policyPropTypes, policyDefaultProps};
export type {WithPolicyOnyxProps, WithPolicyProps};
67 changes: 0 additions & 67 deletions src/pages/workspace/withPolicyAndFullscreenLoading.js

This file was deleted.

62 changes: 62 additions & 0 deletions src/pages/workspace/withPolicyAndFullscreenLoading.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import isEmpty from 'lodash/isEmpty';
import React, {ComponentType, ForwardedRef, forwardRef, RefAttributes} from 'react';
import {OnyxEntry, withOnyx} from 'react-native-onyx';
import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
import compose from '@libs/compose';
import ONYXKEYS from '@src/ONYXKEYS';
import withPolicy, {policyDefaultProps, WithPolicyOnyxProps, WithPolicyProps} from './withPolicy';

type WithPolicyAndFullscreenLoadingOnyxProps = {
/** Indicated whether the report data is loading */
isLoadingReportData: OnyxEntry<boolean>;
};

type WithPolicyAndFullscreenLoadingProps = WithPolicyProps & WithPolicyAndFullscreenLoadingOnyxProps;

type ComponentWithPolicyAndFullscreenLoading<TProps extends WithPolicyAndFullscreenLoadingProps, TRef> = ComponentType<
Omit<Omit<TProps & RefAttributes<TRef>, keyof WithPolicyAndFullscreenLoadingOnyxProps>, keyof WithPolicyOnyxProps>
>;

export default function withPolicyAndFullscreenLoading<TProps extends WithPolicyAndFullscreenLoadingProps, TRef>(
WrappedComponent: ComponentType<TProps & RefAttributes<TRef>>,
): ComponentWithPolicyAndFullscreenLoading<TProps, TRef> {
function WithPolicyAndFullscreenLoading(
{
isLoadingReportData = true,
policy = policyDefaultProps.policy,
policyDraft = policyDefaultProps.policyDraft,
policyMembers = policyDefaultProps.policyMembers,
policyMembersDraft = policyDefaultProps.policyMembersDraft,
...rest
}: TProps,
ref: ForwardedRef<TRef>,
) {
if (isLoadingReportData && isEmpty(policy) && isEmpty(policyDraft)) {
return <FullscreenLoadingIndicator />;
}

return (
<WrappedComponent
// eslint-disable-next-line react/jsx-props-no-spreading
{...(rest as TProps)}
isLoadingReportData={isLoadingReportData}
policy={policy}
policyDraft={policyDraft}
policyMembers={policyMembers}
policyMembersDraft={policyMembersDraft}
ref={ref}
/>
);
}

WithPolicyAndFullscreenLoading.displayName = `WithPolicyAndFullscreenLoading`;

return compose(
withOnyx<TProps & RefAttributes<TRef>, WithPolicyAndFullscreenLoadingOnyxProps>({
isLoadingReportData: {
key: ONYXKEYS.IS_LOADING_REPORT_DATA,
},
}),
withPolicy,
)(forwardRef(WithPolicyAndFullscreenLoading));
}

0 comments on commit f5194e1

Please sign in to comment.