From b10bff288df407c0925d498356ffdeb4d725b65e Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Mon, 15 Oct 2018 18:51:46 -0700 Subject: [PATCH] Don't capture scroll events in gen window This was breaking scrolling in the library window --- js/components/GenWindow/index.tsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/js/components/GenWindow/index.tsx b/js/components/GenWindow/index.tsx index 206227af..6a289558 100644 --- a/js/components/GenWindow/index.tsx +++ b/js/components/GenWindow/index.tsx @@ -5,7 +5,7 @@ import classnames from "classnames"; import "../../../css/gen-window.css"; import { SET_FOCUSED_WINDOW } from "../../actionTypes"; -import { scrollVolume, setWindowSize, closeWindow } from "../../actionCreators"; +import { setWindowSize, closeWindow } from "../../actionCreators"; import { getWindowPixelSize } from "../../selectors"; import ResizeTarget from "../ResizeTarget"; import { AppState, WindowId, Dispatch } from "../../types"; @@ -47,7 +47,6 @@ interface OwnProps { interface DispatchProps { setFocus: (windowId: WindowId) => void; close: (windowId: WindowId) => void; - scrollVolume: (event: React.WheelEvent) => void; setGenWindowSize: (windowId: WindowId, size: [number, number]) => void; } @@ -70,7 +69,6 @@ export const GenWindow = ({ windowId, windowSize, setGenWindowSize, - scrollVolume: handleWheel, width, height }: Props) => { @@ -78,7 +76,6 @@ export const GenWindow = ({
setFocus(windowId)} - onWheel={handleWheel} style={{ width, height }} >
@@ -138,8 +135,7 @@ const mapDispatchToProps = (dispatch: Dispatch): DispatchProps => { dispatch({ type: SET_FOCUSED_WINDOW, window: windowId }), close: (windowId: WindowId) => dispatch(closeWindow(windowId)), setGenWindowSize: (windowId: WindowId, size: [number, number]) => - dispatch(setWindowSize(windowId, size)), - scrollVolume: e => dispatch(scrollVolume(e)) + dispatch(setWindowSize(windowId, size)) }; };