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

TS fixes #22

Merged
merged 1 commit into from
Aug 2, 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
2 changes: 2 additions & 0 deletions src/components/steps/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ export { EuiSteps } from './steps';
export { EuiSubSteps } from './sub_steps';

export { EuiStepsHorizontal } from './steps_horizontal';

export { EuiStepStatus } from './step_number';
Copy link
Author

Choose a reason for hiding this comment

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

Kibana imports and uses this type directly

5 changes: 1 addition & 4 deletions src/components/steps/step.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,13 @@ export const EuiStep: FunctionComponent<StandaloneEuiStepProps> = ({
return (
<div className={classes} {...rest}>
<div className="euiStep__titleWrapper">
{/* // EuiI18n has trouble with the string setting
// @ts-ignore */}
<EuiI18n
token="euiStep.ariaLabel"
default={({ status }) => {
default={({ status }: { status?: EuiStepStatus }) => {
Copy link
Author

Choose a reason for hiding this comment

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

If I'm honest, I have no idea why this resolves the errors

if (status === 'incomplete') return 'Incomplete Step';
return 'Step';
}}
values={{ status }}>
{/* // @ts-ignore */}
{(ariaLabel: string) => (
<EuiStepNumber
className="euiStep__circle"
Expand Down
10 changes: 4 additions & 6 deletions src/components/steps/step_horizontal.test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import React from 'react';
import { render, mount } from 'enzyme';
// @ts-ignore
import sinon from 'sinon';
import { requiredProps } from '../../test/required_props';

import { STATUS } from './step_number';
Expand Down Expand Up @@ -63,27 +61,27 @@ describe('EuiStepHorizontal', () => {

describe('onClick', () => {
test('is called when clicked', () => {
const onClickHandler = sinon.stub();
const onClickHandler = jest.fn();
Copy link
Author

Choose a reason for hiding this comment

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

Just bypassing the need to import and @ts-ignore sinon


const component = mount(
<EuiStepHorizontal step={1} onClick={onClickHandler} />
);

component.simulate('click');

sinon.assert.calledOnce(onClickHandler);
expect(onClickHandler).toBeCalledTimes(1);
});

test("isn't called when clicked if it's disabled", () => {
const onClickHandler = sinon.stub();
const onClickHandler = jest.fn();

const component = mount(
<EuiStepHorizontal disabled step={1} onClick={onClickHandler} />
);

component.simulate('click');

sinon.assert.notCalled(onClickHandler);
expect(onClickHandler).not.toBeCalled();
});
});
});
Expand Down
13 changes: 9 additions & 4 deletions src/components/steps/step_horizontal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,17 @@ export const EuiStepHorizontal: FunctionComponent<
};

return (
// EuiI18n has trouble with the string setting
// @ts-ignore
<EuiI18n
token="euiStepHorizontal.buttonTitle"
default={({ step, title, disabled, isComplete }) => {
default={({
step,
title,
disabled,
isComplete,
}: Pick<
EuiStepHorizontalProps,
'step' | 'title' | 'disabled' | 'isComplete'
>) => {
let titleAppendix = '';
if (disabled) {
titleAppendix = ' is disabled';
Expand All @@ -85,7 +91,6 @@ export const EuiStepHorizontal: FunctionComponent<
return `Step ${step}: ${title}${titleAppendix}`;
}}
values={{ step, title, disabled, isComplete }}>
{/* // @ts-ignore */}
{(buttonTitle: string) => (
<EuiKeyboardAccessible>
<div
Expand Down