diff --git a/spec/text-editor-component-spec.js b/spec/text-editor-component-spec.js index de2b68bb5..bfbb8b8be 100644 --- a/spec/text-editor-component-spec.js +++ b/spec/text-editor-component-spec.js @@ -1368,40 +1368,6 @@ describe('TextEditorComponent', () => { } }) - it('always scrolls by a minimum of 1, even when the delta is small or the scroll sensitivity is low', () => { - const scrollSensitivity = 10 - const {component, editor} = buildComponent({height: 50, width: 50, scrollSensitivity}) - - { - component.didMouseWheel({wheelDeltaX: 0, wheelDeltaY: -3}) - expect(component.getScrollTop()).toBe(1) - expect(component.getScrollLeft()).toBe(0) - expect(component.refs.content.style.transform).toBe(`translate(0px, -1px)`) - } - - { - component.didMouseWheel({wheelDeltaX: -4, wheelDeltaY: 0}) - expect(component.getScrollTop()).toBe(1) - expect(component.getScrollLeft()).toBe(1) - expect(component.refs.content.style.transform).toBe(`translate(-1px, -1px)`) - } - - editor.update({scrollSensitivity: 100}) - { - component.didMouseWheel({wheelDeltaX: 0, wheelDeltaY: 0.3}) - expect(component.getScrollTop()).toBe(0) - expect(component.getScrollLeft()).toBe(1) - expect(component.refs.content.style.transform).toBe(`translate(-1px, 0px)`) - } - - { - component.didMouseWheel({wheelDeltaX: 0.1, wheelDeltaY: 0}) - expect(component.getScrollTop()).toBe(0) - expect(component.getScrollLeft()).toBe(0) - expect(component.refs.content.style.transform).toBe(`translate(0px, 0px)`) - } - }) - it('inverts deltaX and deltaY when holding shift on Windows and Linux', async () => { const scrollSensitivity = 50 const {component, editor} = buildComponent({height: 50, width: 50, scrollSensitivity}) diff --git a/src/text-editor-component.js b/src/text-editor-component.js index 5d09ff50f..8f8bd3937 100644 --- a/src/text-editor-component.js +++ b/src/text-editor-component.js @@ -1520,15 +1520,11 @@ class TextEditorComponent { let {wheelDeltaX, wheelDeltaY} = event if (Math.abs(wheelDeltaX) > Math.abs(wheelDeltaY)) { - wheelDeltaX = (Math.sign(wheelDeltaX) === 1) - ? Math.max(1, wheelDeltaX * scrollSensitivity) - : Math.min(-1, wheelDeltaX * scrollSensitivity) + wheelDeltaX = wheelDeltaX * scrollSensitivity wheelDeltaY = 0 } else { wheelDeltaX = 0 - wheelDeltaY = (Math.sign(wheelDeltaY) === 1) - ? Math.max(1, wheelDeltaY * scrollSensitivity) - : Math.min(-1, wheelDeltaY * scrollSensitivity) + wheelDeltaY = wheelDeltaY * scrollSensitivity } if (this.getPlatform() !== 'darwin' && event.shiftKey) {