ChoChoX/suwayomi-material-you-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass non "source props" to "prop source creators" in "withPropsFrom" HOC

Browse Source
This commit is contained in:
schroda
2025-01-27 22:06:21 +01:00
parent 91e8b70d35
commit d73bb31df9
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/modules/core/hoc/withPropsFrom.tsx
View File

@@ -6,9 +6,9 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/. * file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/ */
import { ComponentType, forwardRef, memo } from 'react'; import { ComponentType, memo, forwardRef } from 'react';
type PropsSourceCreator<T> = () => T; type PropsSourceCreator<T, Props extends Record<string, any>> = (props: Props) => T;
export const withPropsFrom = < export const withPropsFrom = <
ComponentProps extends Record<string, any>, ComponentProps extends Record<string, any>,
@@ -16,12 +16,17 @@ export const withPropsFrom = <
SourcePropKeys extends keyof (ComponentProps | MergeObjectsArray<SourceProps>), SourcePropKeys extends keyof (ComponentProps | MergeObjectsArray<SourceProps>),
>( >(
Component: ComponentType<ComponentProps>, Component: ComponentType<ComponentProps>,
propsSources: { [K in keyof SourceProps]: PropsSourceCreator<SourceProps[K]> }, propsSources: {
[K in keyof SourceProps]: PropsSourceCreator<SourceProps[K], Omit<ComponentProps, SourcePropKeys>>;
},
sourcePropKeys: SourcePropKeys[], sourcePropKeys: SourcePropKeys[],
) => ) =>
memo( memo(
forwardRef<HTMLElement, Omit<ComponentProps, SourcePropKeys>>((props, ref) => { forwardRef<HTMLElement, Omit<ComponentProps, SourcePropKeys>>((props, ref) => {
const sourceProps = propsSources.reduce((acc, propsSource) => ({ ...acc, ...propsSource() }), {}); const sourceProps = propsSources.reduce(
(acc, propsSource) => ({ ...acc, ...propsSource(props as Omit<ComponentProps, SourcePropKeys>) }),
{},
);
const selectedProps = Object.fromEntries( const selectedProps = Object.fromEntries(
Object.entries(sourceProps).filter(([key]) => sourcePropKeys.includes(key as SourcePropKeys)), Object.entries(sourceProps).filter(([key]) => sourcePropKeys.includes(key as SourcePropKeys)),