Merge 0362733 into ac42f55

helpscout · Apr 11, 2019 · 7ffaada · 7ffaada
2 parents ac42f55 + 0362733
commit 7ffaada
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/components/Input/Input.js b/src/components/Input/Input.js
@@ -127,6 +127,7 @@ export class Input extends Component<Props, State> {
     isLast: false,
     isNotOnly: false,
     isSubtleReadOnly: false,
+    maxHeight: 320,
     moveCursorToEnd: false,
     multiline: null,
     offsetAmount: 0,

diff --git a/src/components/Input/Resizer.tsx b/src/components/Input/Resizer.tsx
@@ -129,8 +129,8 @@ export class Resizer extends React.PureComponent<Props> {
     if (!minimumLines) return
 
     return (
-      <div
-        ref={this.setMinimumLinesNode}
+      <GhostUI
+        innerRef={this.setMinimumLinesNode}
         className={this.getContentClassName()}
         dangerouslySetInnerHTML={{
           __html: this.getContentsForMinimumLines(minimumLines),

diff --git a/src/components/Input/__tests__/Input.test.js b/src/components/Input/__tests__/Input.test.js
@@ -370,11 +370,11 @@ describe('Multiline', () => {
     expect(wrapper.state()).not.toBe(null)
   })
 
-  test('Does not set maxHeight on multiline by default', () => {
+  test('Has a maxHeight by default', () => {
     const wrapper = mount(<Input multiline={3} />)
     const el = wrapper.find('textarea')
 
-    expect(el.prop('style').maxHeight).toBeFalsy()
+    expect(el.prop('style').maxHeight).toBeTruthy()
   })
 
   test('Sets maxHeight on multiline, if specified', () => {