Input tags

Author: easafe

src/Flame/Native/Attribute/Internal.purs

@@ -120,6 +120,9 @@ placeholder = createProperty "placeholder"
 src ∷ ToStringAttribute
 src = createProperty "source"
 
+type' ∷ ToStringAttribute
+type' = createProperty "type"
+
 title ∷ ToStringAttribute
 title = createProperty "title"
 

src/Flame/Native/Element.js

@@ -1,5 +1,5 @@
 import React, {createElement } from 'react';
-import { View, Text, Button, txtInput, StyleSheet, Image } from 'react-native';
+import { View, Text, Button, TextInput, StyleSheet, Image } from 'react-native';
 
 let textNode = 1,
     elementNode = 2,
@@ -46,6 +46,22 @@ export function createHrNode(nodeData) {
     return createViewNode(nodeData)(undefined);
 }
 
+export function createLabelNode(nodeData) {
+    return function(children) {
+        let props = fromNodeData(nodeData),
+            propedChildren = [];
+
+        for (let c of children) {
+            let txt = text(c);
+            txt.props = props;
+
+            propedChildren.push(txt);
+        }
+
+        return createViewNode(undefined)(propedChildren);
+    }
+}
+
 export function createBrNode(nodeData) {
     let txt = text('\n');
     txt.props = fromNodeData(nodeData);
@@ -54,7 +70,13 @@ export function createBrNode(nodeData) {
 }
 
 export function createInputNode(nodeData) {
-    return createElement(txtInput, fromNodeData(nodeData));
+    let props = fromNodeData(nodeData);
+
+    if (props.type === 'button' || props.type === 'submit') {
+        return createElement(Button, { title: props.value || "", ...props })
+    }
+
+    return createElement(TextInput, props);
 }
 
 export function createANode(nodeData) {
@@ -110,93 +132,6 @@ export function text(value) {
     return createElement(Text, undefined, value);
 }
 
-export function createLazyNode(nodeData) {
-    return function (render) {
-        return function (arg) {
-            let key = nodeData[0];
-
-            return {
-                nodeType: lazyNode,
-                node: undefined,
-                nodeData: key === undefined ? undefined : { key: key },
-                render: render,
-                arg: arg,
-                rendered: undefined
-            };
-        };
-    };
-}
-
-export function createManagedNode(render) {
-    return function (nodeData) {
-        return function (arg) {
-            return {
-                nodeType: managedNode,
-                node: undefined,
-                nodeData: fromNodeData(nodeData),
-                createNode: render.createNode,
-                updateNode: render.updateNode,
-                arg: arg
-            };
-        };
-    };
-}
-
-export function createDatalessManagedNode(render) {
-    return function (arg) {
-        return {
-            nodeType: managedNode,
-            node: undefined,
-            nodeData: {},
-            createNode: render.createNode,
-            updateNode: render.updateNode,
-            arg: arg
-        };
-    };
-}
-
-export function createSvgNode(nodeData) {
-    return function (children) {
-        return {
-            nodeType: svgNode,
-            node: undefined,
-            tag: 'svg',
-            nodeData: fromNodeData(nodeData),
-            children: asSvg(children)
-        };
-    };
-}
-
-export function createDatalessSvgNode(children) {
-    return {
-        nodeType: svgNode,
-        node: undefined,
-        tag: 'svg',
-        nodeData: {},
-        children: asSvg(children)
-    };
-}
-
-export function createSingleSvgNode(nodeData) {
-    return {
-        nodeType: svgNode,
-        node: undefined,
-        tag: 'svg',
-        nodeData: fromNodeData(nodeData)
-    };
-}
-
-function asSvg(elements) {
-    for (let e of elements) {
-        if (e.nodeType === elementNode)
-            e.nodeType = svgNode;
-        if (e.children !== null && typeof e.children !== 'undefined')
-            e.children = asSvg(e.children);
-    }
-
-    return elements;
-}
-
 function fromNodeData(allData) {
     let nodeData;
 

src/Flame/Native/Element.purs

@@ -48,10 +48,12 @@ foreign import createHrNode :: forall message. Array (NodeData message) -> Html
 
 foreign import createANode :: forall message. Array (NodeData message) -> Array (Html message) -> Html message
 
-foreign import createInputNode :: forall message. Array (NodeData message) -> Array (Html message) -> Html message
+foreign import createInputNode :: forall message. Array (NodeData message) -> Html message
 
 foreign import createBNode :: forall message. Array (NodeData message) -> Array (Html message) -> Html message
 
+foreign import createLabelNode :: forall message. Array (NodeData message) -> Array (Html message) -> Html message
+
 -- | Creates a text node
 foreign import text ∷ ∀ message. String → Html message
 
@@ -65,10 +67,7 @@ br' :: forall a h. ToHtml' a h
 br' nodeData = createBrNode (toNode nodeData)
 
 input :: forall a h. ToHtml' a h
-input nodeData = createInputNode (toNode nodeData) []
-
-input_ :: forall b h. ToHtml_ b h
-input_ children = createInputNode [] $ toNode children
+input nodeData = createInputNode (toNode nodeData)
 
 a :: forall a b h. ToHtml a b h
 a nodeData children = createANode (toNode nodeData) $ toNode children
@@ -118,7 +117,6 @@ div' nodeData = createViewNode (toNode nodeData) []
 img ∷ ∀ a h. ToHtml' a h
 img nodeData = createImageNode (toNode nodeData)
 
-
 -- h1 ∷ ∀ a b h. ToHtml a b h
 -- h1 = createElement "h1"
 
@@ -201,15 +199,14 @@ img nodeData = createImageNode (toNode nodeData)
 -- i' = createElement' "i"
 
 
--- label ∷ ∀ a b h. ToHtml a b h
--- label = createElement "label"
-
--- label_ ∷ ∀ b h. ToHtml_ b h
--- label_ = createElement_ "label"
+label ∷ ∀ a b h. ToHtml a b h
+label nodeData children = createLabelNode (toNode nodeData) $ toNode children
 
--- label' ∷ ∀ a h. ToHtml' a h
--- label' = createElement' "label"
+label_ ∷ ∀ b h. ToHtml_ b h
+label_ children = createLabelNode [] $ toNode children
 
+label' ∷ ∀ a h. ToHtml' a h
+label' nodeData = createLabelNode (toNode nodeData) []
 
 -- li ∷ ∀ a b h. ToHtml a b h
 -- li = createElement "li"