From 5d6b2d40dc893e7639e57b6e98e854ffb205260e Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Fri, 28 Sep 2018 07:03:45 -0700 Subject: [PATCH] Type Minimize --- js/actionCreators/index.ts | 7 ++++++- js/components/ClickedDiv.tsx | 7 ++++++- js/components/MainWindow/Minimize.js | 17 ----------------- js/components/MainWindow/Minimize.tsx | 22 ++++++++++++++++++++++ 4 files changed, 34 insertions(+), 19 deletions(-) delete mode 100644 js/components/MainWindow/Minimize.js create mode 100644 js/components/MainWindow/Minimize.tsx diff --git a/js/actionCreators/index.ts b/js/actionCreators/index.ts index baa08af9..9a5a1b94 100644 --- a/js/actionCreators/index.ts +++ b/js/actionCreators/index.ts @@ -2,7 +2,8 @@ import { CLOSE_WINAMP, STOP, TOGGLE_VISUALIZER_STYLE, - CLOSE_REQUESTED + CLOSE_REQUESTED, + MINIMIZE_WINAMP } from "../actionTypes"; import { Dispatchable } from "../types"; @@ -93,3 +94,7 @@ export function close(): Dispatchable { export function toggleVisualizerStyle(): Dispatchable { return { type: TOGGLE_VISUALIZER_STYLE }; } + +export function minimize(): Dispatchable { + return { type: MINIMIZE_WINAMP }; +} diff --git a/js/components/ClickedDiv.tsx b/js/components/ClickedDiv.tsx index aa5876b1..70347478 100644 --- a/js/components/ClickedDiv.tsx +++ b/js/components/ClickedDiv.tsx @@ -1,7 +1,12 @@ import React from "react"; import classnames from "classnames"; -interface Props { +type DivProps = React.DetailedHTMLProps< + React.HTMLAttributes, + HTMLDivElement +>; + +interface Props extends DivProps { className?: string; onMouseDown?: (e: React.MouseEvent) => void; } diff --git a/js/components/MainWindow/Minimize.js b/js/components/MainWindow/Minimize.js deleted file mode 100644 index 268d661d..00000000 --- a/js/components/MainWindow/Minimize.js +++ /dev/null @@ -1,17 +0,0 @@ -import React from "react"; -import { connect } from "react-redux"; -import ClickedDiv from "../ClickedDiv"; -import { MINIMIZE_WINAMP } from "../../actionTypes"; - -const Minimize = ({ minimize }) => ( - -); - -const mapDispatchToProps = { - minimize: () => ({ type: MINIMIZE_WINAMP }) -}; - -export default connect( - null, - mapDispatchToProps -)(Minimize); diff --git a/js/components/MainWindow/Minimize.tsx b/js/components/MainWindow/Minimize.tsx new file mode 100644 index 00000000..077f7c8e --- /dev/null +++ b/js/components/MainWindow/Minimize.tsx @@ -0,0 +1,22 @@ +import React from "react"; +import { connect } from "react-redux"; +import ClickedDiv from "../ClickedDiv"; +import * as Actions from "../../actionCreators"; +import { Dispatch } from "../../types"; + +interface Props { + minimize(): void; +} + +const Minimize = ({ minimize }: Props) => ( + +); + +const mapDispatchToProps = (dispatch: Dispatch) => ({ + minimize: () => dispatch(Actions.minimize()) +}); + +export default connect( + null, + mapDispatchToProps +)(Minimize);