Skip to content

Remove OneKeyFrom type check to reduce compile time. #7115

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
na9da merged 2 commits into from
Apr 29, 2024
Merged

Remove OneKeyFrom type check to reduce compile time. #7115

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
cf4da1e
Simplify type of Text component.
na9da Apr 29, 2024
94f5c66
Remove OneKeyFrom type for Box.
na9da Apr 29, 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
4 changes: 2 additions & 2 deletions lib/Styled/Box.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Ref } from "react";
import styled from "styled-components";
import { OneKeyFrom, Overflow, WhiteSpace, WordBreak } from "./Styled.types";
import { Overflow, WhiteSpace, WordBreak } from "./Styled.types";

interface Column {
col1?: boolean;
Expand Down Expand Up @@ -68,7 +68,7 @@ export interface IBoxPropsBase {
as?: React.ElementType | keyof JSX.IntrinsicElements;
}

export type IBoxProps = IBoxPropsBase & OneKeyFrom<Column>;
export type IBoxProps = IBoxPropsBase & Column;

export const Box = styled.div<IBoxProps>`
display: flex;
Expand Down
6 changes: 0 additions & 6 deletions lib/Styled/Styled.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@ export type WhiteSpace =
| "initial"
| "inherit";

export type OneKeyFrom<T, K extends keyof T = keyof T> = K extends any
? Pick<T, K> & Partial<Record<Exclude<keyof T, K>, never>> extends infer O
? { [P in keyof O]: O[P] }
: never
: never;

/**
* Types that can be used after upgrade to ts4.
*/
Expand Down
7 changes: 3 additions & 4 deletions lib/Styled/Text.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { ComponentProps } from "react";
import styled from "styled-components";
import { OneKeyFrom } from "./Styled.types";

interface ITextSize {
noFontSize?: boolean;
Expand Down Expand Up @@ -52,9 +51,9 @@ export interface ITextPropsBase {
}

export type ITextProps = ITextPropsBase &
OneKeyFrom<ITextSize> &
OneKeyFrom<ITextColor> &
OneKeyFrom<ITextWeight> &
ITextSize &
ITextColor &
ITextWeight &
ComponentProps<"div">;

// should it be a span or inline-block-div? - leaning to div
Expand Down