Skip to content
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

feat(shared/system): 쓰지 않는 함수 generics 정리, type명 변경 #74

Merged
merged 2 commits into from
Mar 7, 2024
Merged

feat(shared/system): 쓰지 않는 함수 generics 정리, type명 변경 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3a96c9
style(shared/system/types.ts): PropsMergeAs를 MergeWithAsComponentProp…
sukvvon Mar 7, 2024
84224d3
feat(shared/system): createComponent, FavilinkComponent에 쓰지 않는 generi…
sukvvon Mar 7, 2024
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
21 changes: 10 additions & 11 deletions packages/shared/system/src/createComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import { type ElementType, createElement } from 'react';
import { createElement } from 'react';
import forwardRef from './forwardRef';
import { type ComponentWithAs, type DOMElements } from './types';

export type FavolinkComponent<
Element extends ElementType,
Props extends object,
> = ComponentWithAs<Element, Props>;
export type FavolinkComponent<Element extends DOMElements> = ComponentWithAs<
Element,
object
>;

export default function createComponent<
Element extends ElementType,
Props extends object,
>(element: Element) {
export default function createComponent<Element extends DOMElements>(
element: Element,
) {
const favolinkComponent = forwardRef(function favolinkComponent(props, ref) {
const { as: asComponent, ...restProps } = props;

Expand All @@ -20,9 +19,9 @@ export default function createComponent<
});
});

return favolinkComponent as FavolinkComponent<Element, Props>;
return favolinkComponent as FavolinkComponent<Element>;
}

export type HTMLFavolinkComponents = {
[Tag in DOMElements]: FavolinkComponent<Tag, object>;
[Element in DOMElements]: FavolinkComponent<Element>;
};
7 changes: 2 additions & 5 deletions packages/shared/system/src/factory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
import { type ElementType } from 'react';
import createComponent, {
type FavolinkComponent,
type HTMLFavolinkComponents,
} from './createComponent';
import { type DOMElements } from './types';

type FavolinkFactory = {
<Element extends ElementType, Props extends object>(
element: Element,
): FavolinkComponent<Element, Props>;
<Element extends DOMElements>(element: Element): FavolinkComponent<Element>;
};

function factory() {
const cache = new Map<DOMElements, FavolinkComponent<DOMElements, object>>();
const cache = new Map<DOMElements, FavolinkComponent<DOMElements>>();

return new Proxy(createComponent, {
apply: (_, __, options: [DOMElements]) => {
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/system/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export type RightJoinProps<
OverrideProps extends object,
> = Omit<OriginalProps, keyof OverrideProps> & OverrideProps;

export type PropsMergeWithAs<
export type MergeWithAsComponentProps<
ComponentProps extends object,
AsComponentProps extends object,
Props extends object,
Expand All @@ -24,7 +24,7 @@ export type ComponentWithAs<
Props extends object,
> = {
<AsComponent extends ElementType>(
props: PropsMergeWithAs<
props: MergeWithAsComponentProps<
ComponentPropsWithRef<Component>,
ComponentPropsWithRef<AsComponent>,
Props,
Expand Down
Loading