From e5344eb3a578cdb2ccae25383cb4d99b572bf9d6 Mon Sep 17 00:00:00 2001
From: Joe Gaudet <joe.gaudet@food.ee>
Date: Fri, 17 Jul 2020 10:29:16 -0700
Subject: [PATCH] Fix tagName to use args

---
 addon/components/field-for.hbs |  4 ++--
 addon/components/field-for.js  | 10 ++++++++++
 addon/components/form-for.hbs  |  8 ++++----
 addon/components/form-for.js   | 20 ++++++++++++++++++++
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/addon/components/field-for.hbs b/addon/components/field-for.hbs
index 584d5aee..7bd14334 100644
--- a/addon/components/field-for.hbs
+++ b/addon/components/field-for.hbs
@@ -1,6 +1,6 @@
-{{#let (-element (or @tagName "div")) as |Tag|}}
+{{#let (-element this.tagName) as |Tag|}}
   <Tag
-    @tagName={{or @tagName "div"}}
+    @tagName={{this.tagName}}
     class={{
       concat
       "field-for "
diff --git a/addon/components/field-for.js b/addon/components/field-for.js
index 339d1330..558d37a9 100644
--- a/addon/components/field-for.js
+++ b/addon/components/field-for.js
@@ -329,6 +329,16 @@ export default class FieldForComponent extends Component {
   @arg()
   form = null;
 
+  /**
+   * The tag name that we use for this field
+   * @property tagName
+   * @type String
+   * @default form
+   * @public
+   */
+  @arg(string)
+  tagName = 'div';
+
   /**
    * The label for this field
    * @property field
diff --git a/addon/components/form-for.hbs b/addon/components/form-for.hbs
index 15a855d9..1dcb5982 100644
--- a/addon/components/form-for.hbs
+++ b/addon/components/form-for.hbs
@@ -1,6 +1,6 @@
-{{#let (-element (or @tagName "form")) as |Tag|}}
+{{#let (-element this.tagName) as |Tag|}}
   <Tag
-    @tagName={{or @tagName "form"}}
+    @tagName={{this.tagName}}
     class="
     form-for
     {{if this.formClasses this.formClasses}}
@@ -17,7 +17,7 @@
         field=(component
           "field-for"
           form=this
-          tagName=@fieldTagName
+          tagName=this.fieldTagName
           disabled=this.disabled
           readonly=this.readonly
           inlineEditing=this.inlineEditing
@@ -31,7 +31,7 @@
         fieldFor=(component
           "field-for"
           form=this
-          tagName=@fieldTagName
+          tagName=this.fieldTagName
           disabled=this.disabled
           readonly=this.readonly
           inlineEditing=this.inlineEditing
diff --git a/addon/components/form-for.js b/addon/components/form-for.js
index 62090904..5116ed5e 100644
--- a/addon/components/form-for.js
+++ b/addon/components/form-for.js
@@ -173,6 +173,26 @@ export default class FormForComponent extends Component {
   @arg(object)
   model = {};
 
+  /**
+   * The tag name that we use for this form
+   * @property tagName
+   * @type String
+   * @default form
+   * @public
+   */
+  @arg(string)
+  tagName = 'form';
+
+  /**
+   * The tag name that we use for this form's fields
+   * @property fieldTagName
+   * @type String
+   * @default form
+   * @public
+   */
+  @arg(string)
+  fieldTagName = 'div';
+
   /**
    * Whether or not this form is disabled
    * @property disabled