Add text event

Author: easafe

src/Flame/Native/Attribute.purs

@@ -2,4 +2,4 @@
 module Flame.Native.Attribute (module Exported) where
 
 import Flame.Native.Attribute.Internal as Exported
-import Flame.Native.Event (EventName, ToEvent, ToRawEvent, ToMaybeEvent, ToSpecialEvent, createEvent, createEventMessage, createRawEvent, onBlur, onBlur', onCheck, onClick, onClick', onChange, onChange', onContextmenu, onContextmenu', onDblclick, onDblclick', onDrag, onDrag', onDragend, onDragend', onDragenter, onDragenter', onDragleave, onDragleave', onDragover, onDragover', onDragstart, onDragstart', onDrop, onDrop', onError, onError', onFocus, onFocus', onFocusin, onFocusin', onFocusout, onFocusout', onInput, onInput', onKeydown, onKeydown', onKeypress, onKeypress', onKeyup, onKeyup', onMousedown, onMousedown', onMouseenter, onMouseenter', onMouseleave, onMouseleave', onMousemove, onMousemove', onMouseout, onMouseout', onMouseover, onMouseover', onMouseup, onMouseup', onReset, onReset', onScroll, onScroll', onSelect, onSelect', onSubmit, onSubmit', onLoad, onLoad', onUnload, onUnload', onWheel, onWheel') as Exported
+import Flame.Native.Event as Exported

src/Flame/Native/Attribute/Event.js

@@ -26,13 +26,6 @@ export function createRawEvent_(name) {
     };
 }
 
-export function nodeValue_(event) {
-    if (event.target.contentEditable === true || event.target.contentEditable === "true" || event.target.contentEditable === "")
-        return event.target.innerText;
-
-    return event.target.value;
-}
-
 export function checkedValue_(event) {
     if (event.target.tagName === "INPUT" && (event.target.type === "checkbox" || event.target.type === "radio"))
         return event.target.checked;

src/Flame/Native/Attribute/Event.purs

@@ -1,5 +1,5 @@
 -- | Definition of react native events that can be fired from views
-module Flame.Native.Event (EventName, ToEvent, ToRawEvent, ToMaybeEvent, ToSpecialEvent, createEvent, createEventMessage, createRawEvent, onBlur, onBlur', onCheck, onClick, onClick', onChange, onChange', onContextmenu, onContextmenu', onDblclick, onDblclick', onDrag, onDrag', onDragend, onDragend', onDragenter, onDragenter', onDragleave, onDragleave', onDragover, onDragover', onDragstart, onDragstart', onDrop, onDrop', onError, onError', onFocus, onFocus', onFocusin, onFocusin', onFocusout, onFocusout', onInput, onInput', onKeydown, onKeydown', onKeypress, onKeypress', onKeyup, onKeyup', onMousedown, onMousedown', onMouseenter, onMouseenter', onMouseleave, onMouseleave', onMousemove, onMousemove', onMouseout, onMouseout', onLoad, onLoad', onUnload, onUnload', onMouseover, onMouseover', onMouseup, onMouseup', onReset, onReset', onScroll, onScroll', onSelect, onSelect', onSubmit, onSubmit', onWheel, onWheel') where
+module Flame.Native.Event where
 
 import Prelude
 
@@ -10,6 +10,7 @@ import Effect.Uncurried (EffectFn1)
 import Effect.Uncurried as FU
 import Flame.Types (NodeData, Key)
 import Web.Event.Event (Event)
+import Unsafe.Coerce as UC
 
 type EventName = String
 
@@ -22,17 +23,13 @@ type ToMaybeEvent message = (Event → Maybe message) → NodeData message
 type ToSpecialEvent message t = (t → message) → NodeData message
 
 --this way we dont need to worry about every possible element type
-foreign import nodeValue_ ∷ EffectFn1 Event String
 foreign import checkedValue_ ∷ EffectFn1 Event Boolean
 foreign import preventDefault_ ∷ EffectFn1 Event Unit
 foreign import key_ ∷ EffectFn1 Event Key
 foreign import selection_ ∷ EffectFn1 Event String
 foreign import createEvent_ ∷ ∀ message. EventName → message → (NodeData message)
 foreign import createRawEvent_ ∷ ∀ message. EventName → (Event → Effect (Maybe message)) → (NodeData message)
 
-nodeValue ∷ Event → Effect String
-nodeValue = FU.runEffectFn1 nodeValue_
-
 checkedValue ∷ Event → Effect Boolean
 checkedValue = FU.runEffectFn1 checkedValue_
 
@@ -89,12 +86,9 @@ onChange' = createEventMessage "change"
 
 -- | This event fires when the value of an input, select, textarea, contenteditable or designMode on elements changes
 onInput ∷ ∀ message. ToSpecialEvent message String
-onInput constructor = createRawEvent "input" handler
+onInput constructor = createEventMessage "onChangeText" handler
       where
-      handler event = Just <<< constructor <$> nodeValue event
-
-onInput' ∷ ∀ message. ToRawEvent message
-onInput' = createEventMessage "input"
+      handler = constructor <<< UC.unsafeCoerce
 
 -- | Helper for `input` event of checkboxes and radios
 onCheck ∷ ∀ message. ToSpecialEvent message Boolean
@@ -146,30 +140,9 @@ onReset = createEvent "reset"
 onReset' ∷ ∀ message. ToRawEvent message
 onReset' = createEventMessage "reset"
 
-onKeydown ∷ ∀ message. ToSpecialEvent message (Tuple Key String)
-onKeydown constructor = createRawEvent "keydown" (keyInput constructor)
-
-onKeydown' ∷ ∀ message. ToRawEvent message
-onKeydown' = createEventMessage "keydown"
-
-onKeypress ∷ ∀ message. ToSpecialEvent message (Tuple Key String)
-onKeypress constructor = createRawEvent "keypress" (keyInput constructor)
-
-onKeypress' ∷ ∀ message. ToRawEvent message
-onKeypress' = createEventMessage "keypress"
-
-onKeyup ∷ ∀ message. ToSpecialEvent message (Tuple Key String)
-onKeyup constructor = createRawEvent "keyup" (keyInput constructor)
-
 onKeyup' ∷ ∀ message. ToRawEvent message
 onKeyup' = createEventMessage "keyup"
 
-keyInput ∷ ∀ message. (Tuple Key String → message) → Event → Effect (Maybe message)
-keyInput constructor event = do
-      down ← key event
-      value ← nodeValue event
-      pure <<< Just <<< constructor $ Tuple down value
-
 onContextmenu ∷ ∀ message. ToEvent message
 onContextmenu = createEvent "contextmenu"
 

src/Flame/Native/Attribute/Internal.purs

@@ -53,18 +53,12 @@ else instance DF.Foldable f ⇒ ToStyleList (f (Tuple String String)) where
       toStyleList = FO.fromFoldable
 
 -- | Sets a react native property
-foreign import createProperty ∷ ∀ message. String → String → NodeData message
+foreign import createProperty ∷ ∀ message v. String → v → NodeData message
 
 foreign import createClass ∷ ∀ message. Array String → NodeData message
 
 foreign import createStyle ∷ ∀ message. Object String → NodeData message
 
-booleanToFalsyString ∷ Boolean → String
-booleanToFalsyString =
-      case _ of
-            true → "true"
-            false → ""
-
 class' ∷ ∀ a b. ToClassList b ⇒ b → NodeData a
 class' = createClass <<< map caseify <<< to
 
@@ -139,11 +133,13 @@ autocomplete ∷ ToStringAttribute
 autocomplete = createProperty "autocomplete"
 
 checked ∷ ToBooleanAttribute
-checked = createProperty "checked" <<< booleanToFalsyString
-
+checked = createProperty "checked"
 
 disabled ∷ ToBooleanAttribute
-disabled = createProperty "disabled" <<< booleanToFalsyString
+disabled = createProperty "disabled"
 
 selected ∷ ToBooleanAttribute
-selected = createProperty "selected" <<< booleanToFalsyString
+selected = createProperty "selected"
+
+keyboardType :: ToStringAttribute
+keyboardType = createProperty "keyboardType"