Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-25 19:13:54 +00:00
Code Issues Projects Releases Wiki Activity

Don't capture scroll events in gen window

Browse source 
This was breaking scrolling in the library window
This commit is contained in:
Jordan Eldredge 2018-10-15 18:51:46 -07:00
parent d7ac403770
commit b10bff288d
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/components/GenWindow/index.tsx
View file

@ -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<HTMLDivElement>) => 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 = ({
<div
className={classnames("gen-window", "window", { selected })}
onMouseDown={() => setFocus(windowId)}
onWheel={handleWheel}
style={{ width, height }}
>
<div className="gen-top draggable">
@ -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))
};
};