Stop separately tracking focus for Input

src/UI/Focus.re

@@ -10,6 +10,8 @@ let focused = ref(None);
 
 module Log = (val Log.withNamespace("Revery.UI.Focus"));
 
+let getFocused = () => focused^;
+
 /* Should happen when user clicks anywhere where no focusable node exists */
 let loseFocus = () => {
   Log.trace("loseFocus()");
@@ -23,21 +25,18 @@ let loseFocus = () => {
   // If there is an active window, with text input active, turn off text input
 };
 
-let focus = (node: Node.node) => {
-  Log.trace("focus()");
-  node#handleEvent(Focus);
-  focused := Some({handler: node#handleEvent, id: node#getInternalId()});
-};
+let isFocused = (node: Node.node) =>
+  switch (focused^) {
+  | Some({id, _}) => node#getInternalId() == id
+  | None => false
+  };
 
 /* TODO perform checks if a node can be focused ? */
-let dispatch = (node: Node.node) =>
-  switch (focused^) {
-  | Some({id, _}) =>
-    if (node#getInternalId() === id) {
-      ();
-    } else {
-      loseFocus();
-      focus(node);
-    }
-  | None => focus(node)
+let focus = (node: Node.node) =>
+  if (!isFocused(node)) {
+    loseFocus();
+
+    Log.trace("focus()");
+    node#handleEvent(Focus);
+    focused := Some({handler: node#handleEvent, id: node#getInternalId()});
   };

src/UI/Focus.rei

@@ -0,0 +1,15 @@
+open NodeEvents;
+
+type active = {
+  handler: event => unit,
+  id: int,
+};
+type focused = ref(option(active));
+
+let getFocused: unit => option(active);
+
+let loseFocus: unit => unit;
+
+let isFocused: Node.node => bool;
+
+let focus: Node.node => unit;

src/UI/Keyboard.re

@@ -2,7 +2,7 @@ open Revery_Core;
 open NodeEvents;
 
 let dispatch = (event: Revery_Core.Events.internalKeyboardEvent) => {
-  let focused = Focus.focused^;
+  let focused = Focus.getFocused();
 
   switch (focused) {
   | None => ()

src/UI/Mouse.re

@@ -287,7 +287,7 @@ let dispatch =
 
     if (isMouseDownEv(eventToSend)) {
       switch (getFirstFocusable(node, mouseX, mouseY)) {
-      | Some(node) => Focus.dispatch(node)
+      | Some(node) => Focus.focus(node)
       | None => Focus.loseFocus()
       };
     };

src/UI_Components/Input.re

@@ -48,16 +48,10 @@ module Cursor = {
 };
 
 type state = {
-  isFocused: bool, // TODO: Violates single source of truth
   value: string,
   cursorPosition: int,
 };
 
-type action =
-  | Focus
-  | Blur
-  | TextInput(string, int);
-
 let getStringParts = (index, str) => {
   switch (index) {
   | 0 => ("", str)
@@ -106,13 +100,6 @@ let addCharacter = (word, char, index) => {
   (startStr ++ char ++ endStr, String.length(startStr) + 1);
 };
 
-let reducer = (action, state) =>
-  switch (action) {
-  | Focus => {...state, isFocused: true}
-  | Blur => {...state, isFocused: false}
-  | TextInput(value, cursorPosition) => {...state, value, cursorPosition}
-  };
-
 module Constants = {
   let defaultHeight = 50;
   let defaultWidth = 200;
@@ -209,15 +196,11 @@ let%component make =
                 ~isPassword=false,
                 (),
               ) => {
-  let%hook (state, dispatch) =
-    Hooks.reducer(
-      ~initialState={
-        isFocused: false,
-        value: Option.value(value, ~default=""),
-        cursorPosition: Option.value(cursorPosition, ~default=0),
-      },
-      reducer,
-    );
+  let%hook (state, setState) =
+    Hooks.state({
+      value: Option.value(value, ~default=""),
+      cursorPosition: Option.value(cursorPosition, ~default=0),
+    });
   let%hook textRef = Hooks.ref(None);
   let%hook scrollOffset = Hooks.ref(0);
 
@@ -248,8 +231,16 @@ let%component make =
     dimensions.width |> int_of_float;
   };
 
+  let%hook clickableRef = Hooks.ref(None);
+  let isFocused = () => {
+    switch (clickableRef^) {
+    | Some(node) => Focus.isFocused(node)
+    | None => false
+    };
+  };
+
   let%hook (cursorOpacity, resetCursor) =
-    Cursor.use(~interval=Time.ms(500), ~isFocused=state.isFocused);
+    Cursor.use(~interval=Time.ms(500), ~isFocused=isFocused());
 
   let () = {
     let cursorOffset =
@@ -275,14 +266,12 @@ let%component make =
     resetCursor();
     onFocus();
     Sdl2.TextInput.start();
-    dispatch(Focus);
   };
 
   let handleBlur = () => {
     resetCursor();
     onBlur();
     Sdl2.TextInput.stop();
-    dispatch(Blur);
   };
 
   // TODO:This ought to be in the reducer, but since reducer calls are deferred
@@ -291,7 +280,7 @@ let%component make =
   // Refactor when https://github.com/briskml/brisk-reconciler/issues/54 has been fixed
   let update = (value, cursorPosition) => {
     onChange(value, cursorPosition);
-    dispatch(TextInput(value, cursorPosition));
+    setState(_ => {value, cursorPosition});
   };
 
   let handleTextInput = (event: NodeEvents.textInputEventParams) => {
@@ -350,6 +339,13 @@ let%component make =
     };
   };
 
+  let handleRef = node => {
+    clickableRef := Some(node);
+    if (autofocus) {
+      Focus.focus(node);
+    };
+  };
+
   let cursor = () => {
     let (startStr, _) = getStringParts(cursorPosition, value);
     let textWidth = measureTextWidth(startStr);
@@ -392,7 +388,7 @@ let%component make =
   <Clickable
     onFocus=handleFocus
     onBlur=handleBlur
-    componentRef={autofocus ? Focus.focus : ignore}
+    componentRef=handleRef
     onAnyClick=handleClick
     onKeyDown=handleKeyDown
     onTextInput=handleTextInput>