Merge pull request #22 from thompsongl/fix-and-ts-steps

TS fixes
cchaos · Aug 2, 2019 · 8e13356 · 8e13356
2 parents 42763f5 + fac40c1
commit 8e13356
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/src/components/steps/index.ts b/src/components/steps/index.ts
@@ -5,3 +5,5 @@ export { EuiSteps } from './steps';
 export { EuiSubSteps } from './sub_steps';
 
 export { EuiStepsHorizontal } from './steps_horizontal';
+
+export { EuiStepStatus } from './step_number';
diff --git a/src/components/steps/step.tsx b/src/components/steps/step.tsx
@@ -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 }) => {
             if (status === 'incomplete') return 'Incomplete Step';
             return 'Step';
           }}
           values={{ status }}>
-          {/* // @ts-ignore */}
           {(ariaLabel: string) => (
             <EuiStepNumber
               className="euiStep__circle"

diff --git a/src/components/steps/step_horizontal.test.tsx b/src/components/steps/step_horizontal.test.tsx
@@ -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';
@@ -63,27 +61,27 @@ describe('EuiStepHorizontal', () => {
 
     describe('onClick', () => {
       test('is called when clicked', () => {
-        const onClickHandler = sinon.stub();
+        const onClickHandler = jest.fn();
 
         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();
       });
     });
   });

diff --git a/src/components/steps/step_horizontal.tsx b/src/components/steps/step_horizontal.tsx
@@ -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';
@@ -85,7 +91,6 @@ export const EuiStepHorizontal: FunctionComponent<
         return `Step ${step}: ${title}${titleAppendix}`;
       }}
       values={{ step, title, disabled, isComplete }}>
-      {/* // @ts-ignore */}
       {(buttonTitle: string) => (
         <EuiKeyboardAccessible>
           <div
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';