Merge 324aa59 into 03886c7

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helpscout/hsds-react",
-  "version": "2.68.2",
+  "version": "2.68.3",
   "private": false,
   "main": "dist/index.js",
   "module": "dist/index.es.js",

src/components/Input/Input.tsx

@@ -114,6 +114,8 @@ export class Input extends React.PureComponent<InputProps, InputState> {
     }
   }
 
+  autoFocusTimeoutId = setTimeout(() => '', 0)
+
   componentDidMount() {
     this.maybeForceAutoFocus()
     this.props.withTypingEvent &&
@@ -143,6 +145,7 @@ export class Input extends React.PureComponent<InputProps, InputState> {
   componentWillUnmount() {
     this.inputNode = null
     this.props.withTypingEvent && this.clearTypingTimeout()
+    this.autoFocusTimeoutId && clearTimeout(this.autoFocusTimeoutId)
   }
 
   setValue = value => {
@@ -179,7 +182,7 @@ export class Input extends React.PureComponent<InputProps, InputState> {
   forceAutoFocus() {
     const { forceAutoFocusTimeout } = this.props
 
-    setTimeout(() => {
+    this.autoFocusTimeoutId = setTimeout(() => {
       /* istanbul ignore else */
       if (this.inputNode) {
         this.inputNode.focus()

src/components/Input/Input.types.ts

@@ -26,6 +26,7 @@ export type InputValue = string
 export type InputProps = {
   action?: any
   autoFocus: boolean
+  autoFocusTimeoutId: any
   charValidatorLimit: number
   className: string
   disabled: boolean

src/components/Input/__tests__/Input.test.js

@@ -716,7 +716,7 @@ describe('Typing events', () => {
     expect(spies.callStartTyping).toHaveBeenCalledTimes(1)
     expect(spies.setTypingTimeout).toHaveBeenCalledTimes(1)
     expect(spies.onStartTyping).toHaveBeenCalledTimes(1)
-    expect(setTimeout).toHaveBeenCalledTimes(1)
+    expect(setTimeout.mock.calls[1][1]).toEqual(3000)
   })
 
   test('After a delay of 3000ms and no more typing events, should call stop typing events and clear timeout', () => {
@@ -766,7 +766,6 @@ describe('Typing events', () => {
     wrapper.find('input').simulate('change')
     wrapper.unmount()
     expect(spies.clearTypingTimeout).toHaveBeenCalledTimes(2)
-    expect(clearTimeout).toHaveBeenCalledTimes(1)
   })
 
   test('Should call callStopTyping on refApplyCallStopTyping', () => {
@@ -779,6 +778,17 @@ describe('Typing events', () => {
   })
 })
 
+describe('Unmount', () => {
+  it('should call clearTimeout once when the component unmounts', () => {
+    const clearTimeout = jest.spyOn(window, 'clearTimeout')
+    const wrapper = mount(<Input />)
+    wrapper.find('input').simulate('change')
+    const id = wrapper.instance().autoFocusTimeoutId
+    wrapper.unmount()
+    expect(clearTimeout).toHaveBeenCalledWith(id)
+  })
+})
+
 describe('ErrorMessage', () => {
   test('Does not render an error Icon if suffix is defined', () => {
     const wrapper = mount(<Input suffix="Derek" />)

src/utilities/pkg.ts

@@ -1,3 +1,3 @@
 export default {
-  version: '2.68.2',
+  version: '2.68.3',
 }