Fix/event handler hook

package.json

@@ -1,6 +1,6 @@
 {
  "name": "@nodegui/react-nodegui",
- "version": "0.3.2",
+ "version": "0.4.0",
  "description": "React Native for building cross platform desktop applications",
  "main": "dist/index.js",
  "typings": "dist/index.d.ts",
@@ -27,17 +27,17 @@
  "react-reconciler": "^0.24.0"
  },
  "peerDependencies":{
- "@nodegui/nodegui": ">=0.9.0",
+ "@nodegui/nodegui": ">=0.12.0",
  "@nodegui/qode": "*",
  "react": "^16.9.0"
  },
  "devDependencies":{
- "@nodegui/nodegui": "^0.11.0",
- "@types/node": "^12.0.10",
+ "@nodegui/nodegui": "^0.12.0",
+ "@types/node": "^12.12.22",
  "prettier": "^1.18.2",
  "react": "^16.9.0",
  "typedoc": "^0.15.4",
  "typedoc-plugin-markdown": "^2.2.14",
- "typescript": "^3.7.3"
+ "typescript": "^3.7.4"
  }
 }

src/components/AbstractComponents/RNAbstractButton.ts

@@ -1,4 +1,4 @@
-import{QIcon, QSize } from "@nodegui/nodegui"
+import{QIcon, QSize, QAbstractButtonSignals } from "@nodegui/nodegui"
 import{ViewProps, setViewProps } from "../View/RNView"
 import{QAbstractButton } from "@nodegui/nodegui"
 
@@ -23,7 +23,8 @@ import{QAbstractButton } from "@nodegui/nodegui"
  *
  * ```
  */
-export interface AbstractButtonProps<Signals> extends ViewProps<Signals>{
+export interface AbstractButtonProps<Signals extends QAbstractButtonSignals>
+ extends ViewProps<Signals>{
  /**
  * Sets the given text to the button. [QPushButton: setText](https://docs.nodegui.org/docs/api/QPushButton#buttonsettexttext)
  */
@@ -38,7 +39,7 @@ export interface AbstractButtonProps<Signals> extends ViewProps<Signals>{
  iconSize?: QSize;
 }
 
-export function setAbstractButtonProps<Signals>(
+export function setAbstractButtonProps<Signals extends QAbstractButtonSignals>(
  widget: QAbstractButton<Signals>,
  newProps: AbstractButtonProps<Signals>,
  oldProps: AbstractButtonProps<Signals>

src/components/View/RNView.ts

@@ -105,20 +105,20 @@ export interface ViewProps<Signals extends{}> extends RNProps{
  /**
  * Prop to set the event listener map. See [Handlong Events](/docs/guides/handle-events)
  */
- on?: Partial<EventListeners | Signals>
+ on?: Partial<WidgetEventListeners | Signals>
  /**
  * Prop to set the ref. The ref will return the underlying nodegui widget.
  */
  ref?: any;
  /**
  * Prop to set the Widget Attributes. example:
- * <View attributes={{Qt::WA_Disabled: true}} />
+ * `<View attributes={{[WidgetAttributes.WA_Disabled]: true}} />`
  */
  attributes?: WidgetAttributesMap;
 
  /**
  * Prop to set the Widget flags. example:
- * <View windowFlags={{Qt::SplashScreen: true}} />
+ * `<View windowFlags={{[WindowType.SplashScreen]: true}} />`
  */
  windowFlags?: WindowFlagsMap;
 }
@@ -199,7 +199,7 @@ export function setViewProps<Signals extends{}>(
  set pos(position: Position){
  widget.move(position.x, position.y);
  },
- set on(listenerMap: Partial<EventListeners | Signals>){
+ set on(listenerMap: Partial<WidgetEventListeners | Signals>){
  const listenerMapLatest: any = Object.assign({}, listenerMap);
  const oldListenerMap = Object.assign({}, oldProps.on);
  Object.entries(oldListenerMap).forEach(([eventType, oldEvtListener]) =>{
@@ -293,14 +293,14 @@ type Position ={
  y: number;
 };
 
-type EventListeners ={
- [key in WidgetEventTypes]: (native?: NativeElement) => void;
-};
-
 type WidgetAttributesMap ={
  [key: number]: boolean;
 };
 
 type WindowFlagsMap ={
  [key: number]: boolean;
 };
+
+export type WidgetEventListeners ={
+ [key in WidgetEventTypes]: (native?: NativeElement) => void;
+};

src/demo.tsx

@@ -7,7 +7,8 @@ import{
  AnimatedImage,
  ComboBox
 } from "./index"
-import{QIcon, QVariant } from "@nodegui/nodegui"
+import{QIcon, QVariant, QPushButtonSignals } from "@nodegui/nodegui"
+import{useEventHandler } from "./hooks"
 
 const items = [
 {
@@ -20,12 +21,18 @@ const items = [
 {text: "world"}
 ];
 
+const handler = useEventHandler<QPushButtonSignals>(
+{
+ clicked: clicked =>{}
+ },
+ []
+);
 const App = () =>{
  return (
  <Window>
  <View style={containerStyle}>
  <View on={{}}>
- <Button on={{}} style={buttonStyle} text={"Hello"} />
+ <Button on={handler} style={buttonStyle} text={"Hello"} />
  <Button style={buttonStyle} text={"World"} />
  </View>
  <ComboBox items={items} />

src/hooks/index.ts

@@ -1,15 +1,12 @@
 import{useMemo, DependencyList } from "react"
+import{WidgetEventListeners } from "../components/View/RNView"
 
-type EventHandlerMap ={
- [key: string]: (...args: any[]) => void;
-};
-
-export const useEventHandler = (
- eventHandlerMap: EventHandlerMap,
+export function useEventHandler<Signals>(
+ eventHandlerMap: Partial<WidgetEventListeners | Signals>,
  deps: DependencyList
-) => {
+){
  const handler = useMemo(() =>{
  return eventHandlerMap;
  }, deps);
  return handler;
-};
+}