Skip to content

[@types/grid-styled] unstrict typings for grid-styled #25024

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
RyanCavanaugh merged 1 commit into from
Apr 16, 2018
Merged

[@types/grid-styled] unstrict typings for grid-styled #25024

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 33 additions & 32 deletions types/grid-styled/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Type definitions for grid-styled 3.2
// Project: https://github.com/jxnblk/grid-styled
// Definitions by: Anton Vasin <https://github.com/antonvasin>
// Victor Orlov <https://github.com/vittorio>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
// TypeScript Version: 2.6

Expand All @@ -15,44 +16,44 @@ import { StyledComponentClass } from "styled-components";
export type ResponsiveProp = number | string | Array<string | number>;

export interface CommonProps {
width: ResponsiveProp;
fontSize: ResponsiveProp;
color: ResponsiveProp;
bg: ResponsiveProp;
m: ResponsiveProp;
mt: ResponsiveProp;
mr: ResponsiveProp;
mb: ResponsiveProp;
ml: ResponsiveProp;
mx: ResponsiveProp;
my: ResponsiveProp;
p: ResponsiveProp;
pt: ResponsiveProp;
pr: ResponsiveProp;
pb: ResponsiveProp;
pl: ResponsiveProp;
px: ResponsiveProp;
py: ResponsiveProp;
theme: any;
width?: ResponsiveProp;
fontSize?: ResponsiveProp;
color?: ResponsiveProp;
bg?: ResponsiveProp;
m?: ResponsiveProp;
mt?: ResponsiveProp;
mr?: ResponsiveProp;
mb?: ResponsiveProp;
ml?: ResponsiveProp;
mx?: ResponsiveProp;
my?: ResponsiveProp;
p?: ResponsiveProp;
pt?: ResponsiveProp;
pr?: ResponsiveProp;
pb?: ResponsiveProp;
pl?: ResponsiveProp;
px?: ResponsiveProp;
py?: ResponsiveProp;
theme?: any;
}

export interface BoxProps
extends Omit<React.HTMLProps<HTMLDivElement>, "width" | "wrap" | "is"> {
flex: ResponsiveProp;
order: ResponsiveProp;
is: string | ComponentClass<any>;
flex?: ResponsiveProp;
order?: ResponsiveProp;
is?: string | ComponentClass<any>;
}

export interface FlexProps extends BoxProps {
alignItems: ResponsiveProp;
justifyContent: ResponsiveProp;
flexDirection: ResponsiveProp;
flexWrap: ResponsiveProp;
alignItems?: ResponsiveProp;
justifyContent?: ResponsiveProp;
flexDirection?: ResponsiveProp;
flexWrap?: ResponsiveProp;

// legacy aliases https://github.com/jxnblk/styled-system/releases/tag/v2.0.0
justify: ResponsiveProp;
align: ResponsiveProp;
wrap: ResponsiveProp | boolean;
justify?: ResponsiveProp;
align?: ResponsiveProp;
wrap?: ResponsiveProp | boolean;
}

export type BoxComponent = StyledComponentClass<
Expand All @@ -67,14 +68,14 @@ export type FlexComponent = StyledComponentClass<

export interface Theme {
breakpoints: string[];
space: number[];
fontSizes: number[];
space?: number[];
fontSizes?: number[];
}

export const Box: BoxComponent;
export const Flex: FlexComponent;
export const theme: Theme;
export type DivProps = Omit<React.HTMLProps<HTMLDivElement>, "ref"> & {
innerRef: (el: HTMLDivElement) => any;
innerRef?: (el: HTMLDivElement) => any;
};
export const div: ComponentClass<DivProps>;