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

Upgrade typescript, react, jest, & enzyme #1583

Merged
merged 16 commits into from
Feb 25, 2019
Merged

Upgrade typescript, react, jest, & enzyme #1583

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d87e31b
upgrade to typescript v3, add it as a peerdep to enforce downstream p…
chandlerprall Feb 13, 2019
46374dc
upgrade to typescript v3, add it as a peerdep to enforce downstream p…
chandlerprall Feb 13, 2019
8165d58
Change popover positioning's align type to use undefined instead of null
chandlerprall Feb 20, 2019
e0ff50c
Upgrade @types/react and @types/prop-types versions
chandlerprall Feb 20, 2019
5278e23
Merge branch 'typescript-v3' of github.com:chandlerprall/eui into typ…
chandlerprall Feb 21, 2019
6a1a4ce
Update TSX files to move default prop values in function signature; u…
chandlerprall Feb 21, 2019
b5dcc38
Upgrade jest version
chandlerprall Feb 21, 2019
2981e32
Update render_to_html to latest enzyme adapter
chandlerprall Feb 21, 2019
27e8f1e
Handle relative import statements in eui.d.ts
chandlerprall Feb 21, 2019
9646962
SFC -> FunctionComponent
chandlerprall Feb 21, 2019
2c2b0bb
Don't track and pass a name value in context example's state
chandlerprall Feb 21, 2019
afc45fa
Merge branch 'master' into typescript-v3
chandlerprall Feb 22, 2019
4ca0c02
Some PR feedback
chandlerprall Feb 22, 2019
d710ef1
Merge branch 'master' into typescript-v3
chandlerprall Feb 25, 2019
ce72858
Merge branch 'master' into typescript-v3
chandlerprall Feb 25, 2019
ff76dda
changelog
chandlerprall Feb 25, 2019
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
6 changes: 3 additions & 3 deletions scripts/dtsgenerator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ const generator = dtsGenerator({
},
});

// NOTE: once EUI is all converted to typescript this madness can be deleted for ever
// NOTE: once EUI is all converted to typescript this madness can be deleted forever
// 1. strip any `/// <reference` lines from the generated eui.d.ts
// 2. replace any import("src/...") declarations to import("@elastic/src/...")
// 3. replace any import("./...") declarations to import("@elastic/src/...)
// 2. replace any import("src/...") declarations to import("@elastic/eui/src/...")
// 3. replace any import("./...") declarations to import("@elastic/eui/src/...)
generator.then(() => {
const defsFilePath = path.resolve(baseDir, 'eui.d.ts');

Expand Down
56 changes: 53 additions & 3 deletions src/components/button/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { CommonProps } from '../common';
import { IconType, IconSize } from '../icon'
import { ToggleType } from '../toggle'

import { FunctionComponent, ButtonHTMLAttributes, AnchorHTMLAttributes, MouseEventHandler, HTMLAttributes } from 'react';
import { FunctionComponent, ButtonHTMLAttributes, AnchorHTMLAttributes, ChangeEventHandler, MouseEventHandler, HTMLAttributes } from 'react';

declare module '@elastic/eui' {
type EuiButtonPropsForButtonOrLink<Props> = (
Expand Down Expand Up @@ -95,7 +95,57 @@ declare module '@elastic/eui' {
textProps?: HTMLAttributes<HTMLSpanElement>;
}>

export const EuiButtonEmpty: FunctionComponent<
EuiButtonPropsForButtonOrLink<CommonProps & EuiButtonEmptyProps>
export const EuiButtonEmpty: FunctionComponent<EuiButtonEmptyProps>;

/**
* button toggle type defs
*
* @see './button_toggle/button_toggle.js'
*/

export type EuiButtonToggleProps = EuiButtonProps & {
isEmpty?: boolean;
isIconOnly?: boolean;
isSelected?: boolean;
label: string;
toggleClassName?: string;
type?: ToggleType;
}

export const EuiButtonToggle: FunctionComponent<
EuiButtonPropsForButtonOrLink<CommonProps & EuiButtonToggleProps>
>;

/**
* button group type defs
*
* @see './button_group/button_group.js'
*/

export type EuiButtonGroupIdToSelectedMap = { [id: string]: boolean };
export type GroupButtonSize = 's' | 'm';

export interface EuiButtonGroupOption {
id: string,
label: string,
isDisabled?: boolean,
}
export interface EuiButtonGroupProps {
options: EuiButtonGroupOption[],
onChange: (id: string, value: any) => void;
buttonSize?: GroupButtonSize;
isDisabled?: boolean,
isFullWidth?: boolean;
isIconOnly?: boolean;
idSelected?: string;
idToSelectedMap?: EuiButtonGroupIdToSelectedMap;
legend?: string,
color?: ButtonColor,
type?: ToggleType,
name?: string;
}

export const EuiButtonGroup: FunctionComponent<
HTMLAttributes<HTMLDivElement> & EuiButtonGroupProps
>;
}
1 change: 0 additions & 1 deletion src/components/modal/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { CommonProps, Omit } from '../common';
/// <reference path="../button/index.d.ts" />
/// <reference path="../focus_trap/index.d.ts" />

import { FocusTarget } from 'focus-trap';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this

import { ReactNode, FunctionComponent, HTMLAttributes } from 'react';

declare module '@elastic/eui' {
Expand Down
1 change: 0 additions & 1 deletion src/components/popover/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { CommonProps, NoArgCallback } from '../common';
/// <reference path="../focus_trap/index.d.ts" />
/// <reference path="../panel/index.d.ts" />

import { FocusTarget } from 'focus-trap';
import { FunctionComponent, ReactNode, HTMLAttributes } from 'react';

declare module '@elastic/eui' {
Expand Down