Move all FFI to Util

Author: natefaubion

src/Halogen/VDom/DOM.purs

@@ -15,14 +15,15 @@ import Control.Monad.Eff (Eff, foreachE)
 import Data.Array as Array
 import Data.Function.Uncurried as Fn
 import Data.Maybe (Maybe(..))
+import Data.Nullable (toNullable)
 import Data.Tuple (Tuple(..), fst)
 
 import DOM (DOM)
 import DOM.Node.Types (Element, Node, Document, elementToNode) as DOM
 
 import Halogen.VDom.Machine (Step(..), Machine)
 import Halogen.VDom.Machine as Machine
-import Halogen.VDom.Types (VDom(..), ElemSpec(..), ElemName(..), Namespace(..), runGraft)
+import Halogen.VDom.Types (VDom(..), ElemSpec(..), Namespace(..), runGraft)
 import Halogen.VDom.Util as Util
 
 type VDomMachine eff a b = Machine (Eff eff) a b
@@ -87,7 +88,7 @@ buildElem
 buildElem (VDomSpec spec) = render
   where
   render es1@(ElemSpec ns1 name1 as1) ch1 = do
-    el ← Fn.runFn3 createElem ns1 name1 spec.document
+    el ← Fn.runFn3 Util.createElement (toNullable ns1) name1 spec.document
     let
       node = DOM.elementToNode el
       onChild = Fn.mkFn2 \ix child → do
@@ -147,7 +148,7 @@ buildKeyed
 buildKeyed (VDomSpec spec) = render
   where
   render es1@(ElemSpec ns1 name1 as1) ch1 = do
-    el ← Fn.runFn3 createElem ns1 name1 spec.document
+    el ← Fn.runFn3 Util.createElement (toNullable ns1) name1 spec.document
     let
       node = DOM.elementToNode el
       onChild = Fn.mkFn3 \k ix (Tuple _ vdom) → do
@@ -219,14 +220,6 @@ buildWidget (VDomSpec spec) = render
       halt
       buildVDom (VDomSpec spec) vdom
 
-createElem
-  ∷ ∀ eff
-  . Fn.Fn3 (Maybe Namespace) ElemName DOM.Document (Eff (dom ∷ DOM | eff) DOM.Element)
-createElem = Fn.mkFn3 \ns (ElemName name) doc →
-  case ns of
-    Nothing → Fn.runFn2 Util.createElement name doc
-    Just (Namespace n) → Fn.runFn3 Util.createElementNS n name doc
-
 eqElemSpec
   ∷ ∀ a
   . Fn.Fn2 (ElemSpec a) (ElemSpec a) Boolean

src/Halogen/VDom/DOM/Prop.js

@@ -1,6 +1,5 @@
 module Halogen.VDom.DOM.Prop
   ( Prop(..)
-  , Namespace(..)
   , ElemRef(..)
   , PropValue
   , propFromString
@@ -16,16 +15,16 @@ import Control.Monad.Eff.Ref (REF)
 import Control.Monad.Eff.Ref as Ref
 import Data.Maybe (Maybe(..), maybe)
 import Data.StrMap as StrMap
-import Data.Nullable (Nullable, toNullable)
+import Data.Nullable (toNullable)
 import Data.Function.Uncurried as Fn
-import Data.Newtype (class Newtype)
 import Data.Tuple (Tuple(..), fst, snd)
 import DOM (DOM)
-import DOM.Event.EventTarget (EventListener, eventListener) as DOM
+import DOM.Event.EventTarget (eventListener) as DOM
 import DOM.Event.Types (EventType(..), Event) as DOM
 import DOM.HTML.Types (HTMLElement) as DOM
 import DOM.Node.Types (Element) as DOM
 import Halogen.VDom as V
+import Halogen.VDom.Types (Namespace(..))
 import Halogen.VDom.Util as Util
 import Unsafe.Coerce (unsafeCoerce)
 
@@ -40,10 +39,6 @@ instance functorProp ∷ Functor Prop where
   map f (Ref g) = Ref (map f <$> g)
   map f p = unsafeCoerce p
 
-newtype Namespace = Namespace String
-
-derive instance newtypeNamespace ∷ Newtype Namespace _
-
 data ElemRef a
   = Created a
   | Removed a
@@ -106,7 +101,7 @@ buildProp emit el = render
   applyProp events = Fn.mkFn3 \_ _ v →
     case v of
       Attribute ns attr val → do
-        Fn.runFn4 setAttribute (toNullable ns) attr val el
+        Fn.runFn4 Util.setAttribute (toNullable ns) attr val el
         pure v
       Property prop val → do
         Fn.runFn3 setProperty prop val el
@@ -118,7 +113,7 @@ buildProp emit el = render
             f' ← Ref.readRef ref
             mbEmit (f' ev)
         Fn.runFn3 Util.pokeMutMap ty (Tuple listener ref) events
-        Fn.runFn3 addEventListener ty listener el
+        Fn.runFn3 Util.addEventListener ty listener el
         pure v
       Ref f → do
         mbEmit (f (Created (unsafeElementToHTMLElement el)))
@@ -129,7 +124,7 @@ buildProp emit el = render
       Attribute _ _ val1, Attribute ns2 attr2 val2 →
         case val1 /= val2 of
           true → do
-            Fn.runFn4 setAttribute (toNullable ns2) attr2 val2 el
+            Fn.runFn4 Util.setAttribute (toNullable ns2) attr2 val2 el
             pure v2
           _ →
             Util.effPure v2
@@ -160,13 +155,13 @@ buildProp emit el = render
   removeProp prevEvents = Fn.mkFn2 \_ v →
     case v of
       Attribute ns attr _ →
-        Fn.runFn3 removeAttribute (toNullable ns) attr el
+        Fn.runFn3 Util.removeAttribute (toNullable ns) attr el
       Property prop _ →
         Fn.runFn2 removeProperty prop el
       Handler (DOM.EventType ty) _ → do
         let
           handler = Fn.runFn2 Util.unsafeLookup ty prevEvents
-        Fn.runFn3 removeEventListener ty (fst handler) el
+        Fn.runFn3 Util.removeEventListener ty (fst handler) el
       Ref _ →
         Util.effUnit
 
@@ -189,15 +184,3 @@ unsafeGetProperty = Util.unsafeGetAny
 
 removeProperty ∷ ∀ eff. Fn.Fn2 String DOM.Element (Eff (dom ∷ DOM | eff) Unit)
 removeProperty = Util.unsafeDeleteAny
-
-foreign import setAttribute
-  ∷ ∀ eff. Fn.Fn4 (Nullable Namespace) String String DOM.Element (Eff (dom ∷ DOM | eff) Unit)
-
-foreign import removeAttribute
-  ∷ ∀ eff. Fn.Fn3 (Nullable Namespace) String DOM.Element (Eff (dom ∷ DOM | eff) Unit)
-
-foreign import addEventListener
-  ∷ ∀ eff. Fn.Fn3 String (DOM.EventListener (dom ∷ DOM | eff)) DOM.Element (Eff (dom ∷ DOM | eff) Unit)
-
-foreign import removeEventListener
-  ∷ ∀ eff. Fn.Fn3 String (DOM.EventListener (dom ∷ DOM | eff)) DOM.Element (Eff (dom ∷ DOM | eff) Unit)

src/Halogen/VDom/DOM/Prop.purs

@@ -122,15 +122,13 @@ exports.setTextContent = function (s, n) {
   };
 };
 
-exports.createElement = function (name, doc) {
+exports.createElement = function (ns, name, doc) {
   return function () {
-    return doc.createElement(name)
-  };
-};
-
-exports.createElementNS = function (ns, name, doc) {
-  return function () {
-    return doc.createElementNS(ns, name);
+    if (ns != null) {
+      return doc.createElementNS(ns, name);
+    } else {
+      return doc.createElement(name)
+    }
   };
 };
 
@@ -153,4 +151,36 @@ exports.removeChild = function (a, b) {
 
 exports.unsafeParent = function (a) {
   return a.parentNode;
-};
+};
+
+exports.setAttribute = function (ns, attr, val, el) {
+  return function () {
+    if (ns != null) {
+      el.setAttributeNS(ns, attr, val);
+    } else {
+      el.setAttribute(attr, val);
+    }
+  };
+};
+
+exports.removeAttribute = function (ns, attr, el) {
+  return function () {
+    if (ns != null) {
+      el.removeAttributeNS(ns, attr);
+    } else {
+      el.removeAttribute(attr);
+    }
+  };
+};
+
+exports.addEventListener = function (ev, listener, el) {
+  return function () {
+    el.addEventListener(ev, listener, false);
+  };
+};
+
+exports.removeEventListener = function (ev, listener, el) {
+  return function () {
+    el.removeEventListener(ev, listener, false);
+  };
+};

src/Halogen/VDom/Util.js

@@ -21,22 +21,28 @@ module Halogen.VDom.Util
   , createTextNode
   , setTextContent
   , createElement
-  , createElementNS
   , insertChildIx
   , removeChild
   , unsafeParent
+  , setAttribute
+  , removeAttribute
+  , addEventListener
+  , removeEventListener
   ) where
 
 import Prelude
 import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Ref (REF)
 import Data.Function.Uncurried as Fn
+import Data.Nullable (Nullable)
 import Data.StrMap (StrMap)
 import Data.StrMap as StrMap
 import Data.StrMap.ST (STStrMap)
 import Data.StrMap.ST as STStrMap
 import DOM (DOM)
+import DOM.Event.EventTarget (EventListener) as DOM
 import DOM.Node.Types (Document, Element, Node) as DOM
+import Halogen.VDom.Types (Namespace, ElemName)
 import Unsafe.Coerce (unsafeCoerce)
 
 effPure ∷ ∀ eff a. a → Eff eff a
@@ -137,11 +143,7 @@ foreign import setTextContent
 
 foreign import createElement
   ∷ ∀ eff
-  . Fn.Fn2 String DOM.Document (Eff (dom ∷ DOM | eff) DOM.Element)
-
-foreign import createElementNS
-  ∷ ∀ eff
-  . Fn.Fn3 String String DOM.Document (Eff (dom ∷ DOM | eff) DOM.Element)
+  . Fn.Fn3 (Nullable Namespace) ElemName DOM.Document (Eff (dom ∷ DOM | eff) DOM.Element)
 
 foreign import insertChildIx
   ∷ ∀ eff
@@ -152,4 +154,16 @@ foreign import removeChild
   . Fn.Fn2 DOM.Node DOM.Node (Eff (dom ∷ DOM | eff) Unit)
 
 foreign import unsafeParent
-  ∷ DOM.Node → DOM.Node
+  ∷ DOM.Node → DOM.Node
+
+foreign import setAttribute
+  ∷ ∀ eff. Fn.Fn4 (Nullable Namespace) String String DOM.Element (Eff (dom ∷ DOM | eff) Unit)
+
+foreign import removeAttribute
+  ∷ ∀ eff. Fn.Fn3 (Nullable Namespace) String DOM.Element (Eff (dom ∷ DOM | eff) Unit)
+
+foreign import addEventListener
+  ∷ ∀ eff. Fn.Fn3 String (DOM.EventListener (dom ∷ DOM | eff)) DOM.Element (Eff (dom ∷ DOM | eff) Unit)
+
+foreign import removeEventListener
+  ∷ ∀ eff. Fn.Fn3 String (DOM.EventListener (dom ∷ DOM | eff)) DOM.Element (Eff (dom ∷ DOM | eff) Unit)