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.

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

Fix TS: padding types of flip and preventOverflow #518 #750

Merged
merged 3 commits into from
Jan 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions packages/popper/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ declare namespace Popper {
'x-placement': Placement;
}

export interface Padding {
top?: number,
bottom?: number,
left?: number,
right?: number,
}

export interface BaseModifier {
order?: number;
enabled?: boolean;
Expand All @@ -53,7 +60,7 @@ declare namespace Popper {
};
preventOverflow?: BaseModifier & {
priority?: Position[],
padding?: number,
padding?: number | Padding,
boundariesElement?: Boundary | Element,
escapeWithReference?: boolean
};
Expand All @@ -63,7 +70,7 @@ declare namespace Popper {
};
flip?: BaseModifier & {
behavior?: Behavior | Position[],
padding?: number,
padding?: number | Padding,
boundariesElement?: Boundary | Element,
};
inner?: BaseModifier;
Expand Down
11 changes: 9 additions & 2 deletions packages/popper/index.js.flow
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@ declare module 'popper.js' {

declare type ModifierFn = (data: Data, options: Object) => Data;

declare type Padding = {
top?: number,
bottom?: number,
left?: number,
right?: number,
}

declare type BaseModifier = {
order?: number,
enabled?: boolean,
Expand All @@ -64,7 +71,7 @@ declare module 'popper.js' {
},
preventOverflow?: BaseModifier & {
priority?: Position[],
padding?: number,
padding?: number | Padding,
boundariesElement?: Boundary | Element,
escapeWithReference?: boolean,
},
Expand All @@ -74,7 +81,7 @@ declare module 'popper.js' {
},
flip?: BaseModifier & {
behavior?: Behavior | Position[],
padding?: number,
padding?: number | Padding,
boundariesElement?: Boundary | Element,
},
inner?: BaseModifier,
Expand Down