From 3021c5d8031b645c6cc86cb96ef0ded9e491f474 Mon Sep 17 00:00:00 2001
From: Nicko Winner-Arroyo <nicko.winner-arroyo@rackspace.com>
Date: Tue, 2 Feb 2021 17:03:12 -0500
Subject: [PATCH 1/4] Make labels optional on text-like inputs

For folks who may be using helix in non-standard ways,
IE: applications with legacy field types.
---
 src/Search/index.js   |  2 +-
 src/Select/index.js   |  2 +-
 src/Text/index.js     | 20 +++++++++++---------
 src/TextArea/index.js | 20 +++++++++++---------
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/Search/index.js b/src/Search/index.js
index ad84518..6cb06c7 100644
--- a/src/Search/index.js
+++ b/src/Search/index.js
@@ -57,7 +57,7 @@ const Search = React.forwardRef(
           <Icon type="times" />
         </button>
         <hx-search></hx-search>
-        {label && (
+        {typeof label === 'undefined' && (
           <label
             className={classnames({
               hxOptional: optional,
diff --git a/src/Select/index.js b/src/Select/index.js
index a3bb0dc..833d76c 100644
--- a/src/Select/index.js
+++ b/src/Select/index.js
@@ -13,7 +13,7 @@ const Select = React.forwardRef(
           {children}
         </select>
         <hx-select></hx-select>
-        {label && (
+        {typeof label === 'undefined' && (
           <label
             className={classnames({
               hxOptional: optional,
diff --git a/src/Text/index.js b/src/Text/index.js
index 45339e5..c7a4ab0 100644
--- a/src/Text/index.js
+++ b/src/Text/index.js
@@ -14,15 +14,17 @@ const Text = React.forwardRef(
         ref={ref}
       >
         <input {...rest} id={id} required={required} type="text" />
-        <label
-          className={classnames({
-            hxOptional: optional,
-            hxRequired: required,
-          })}
-          htmlFor={id}
-        >
-          {label}
-        </label>
+        {typeof label === 'undefined' && (
+          <label
+            className={classnames({
+              hxOptional: optional,
+              hxRequired: required
+            })}
+            htmlFor={id}
+          >
+            {label}
+          </label>
+        )}
         {prefix && <span className="hxPrefix">{prefix}</span>}
         {suffix && <span className="hxSuffix">{suffix}</span>}
         {children}
diff --git a/src/TextArea/index.js b/src/TextArea/index.js
index ad6fa0b..7d9430b 100644
--- a/src/TextArea/index.js
+++ b/src/TextArea/index.js
@@ -14,15 +14,17 @@ const TextArea = React.forwardRef(
         ref={ref}
       >
         <textarea {...rest} id={id} required={required} disabled={disabled} />
-        <label
-          className={classnames({
-            hxOptional: optional,
-            hxRequired: required,
-          })}
-          htmlFor={id}
-        >
-          {label}
-        </label>
+        {typeof label === 'undefined' && (
+          <label
+            className={classnames({
+              hxOptional: optional,
+              hxRequired: required
+            })}
+            htmlFor={id}
+          >
+            {label}
+          </label>
+        )}
         {children}
       </hx-textarea-control>
     );

From 2ee122bfdfb94d7b025880c3c670ace2df9504a7 Mon Sep 17 00:00:00 2001
From: Nicko Winner-Arroyo <nicko.winner-arroyo@rackspace.com>
Date: Tue, 2 Feb 2021 17:08:03 -0500
Subject: [PATCH 2/4] make it pretty

---
 src/Text/index.js     | 2 +-
 src/TextArea/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Text/index.js b/src/Text/index.js
index c7a4ab0..5ce340f 100644
--- a/src/Text/index.js
+++ b/src/Text/index.js
@@ -18,7 +18,7 @@ const Text = React.forwardRef(
           <label
             className={classnames({
               hxOptional: optional,
-              hxRequired: required
+              hxRequired: required,
             })}
             htmlFor={id}
           >
diff --git a/src/TextArea/index.js b/src/TextArea/index.js
index 7d9430b..b13f722 100644
--- a/src/TextArea/index.js
+++ b/src/TextArea/index.js
@@ -18,7 +18,7 @@ const TextArea = React.forwardRef(
           <label
             className={classnames({
               hxOptional: optional,
-              hxRequired: required
+              hxRequired: required,
             })}
             htmlFor={id}
           >

From ff5b7a7adacd38b17084db53b5ebebcf86851739 Mon Sep 17 00:00:00 2001
From: Nicko Winner-Arroyo <nicko.winner-arroyo@rackspace.com>
Date: Mon, 15 Mar 2021 20:51:26 -0400
Subject: [PATCH 3/4] simplify code

---
 src/Search/index.js   | 2 +-
 src/Select/index.js   | 2 +-
 src/Text/index.js     | 2 +-
 src/TextArea/index.js | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Search/index.js b/src/Search/index.js
index 6cb06c7..ad84518 100644
--- a/src/Search/index.js
+++ b/src/Search/index.js
@@ -57,7 +57,7 @@ const Search = React.forwardRef(
           <Icon type="times" />
         </button>
         <hx-search></hx-search>
-        {typeof label === 'undefined' && (
+        {label && (
           <label
             className={classnames({
               hxOptional: optional,
diff --git a/src/Select/index.js b/src/Select/index.js
index 833d76c..a3bb0dc 100644
--- a/src/Select/index.js
+++ b/src/Select/index.js
@@ -13,7 +13,7 @@ const Select = React.forwardRef(
           {children}
         </select>
         <hx-select></hx-select>
-        {typeof label === 'undefined' && (
+        {label && (
           <label
             className={classnames({
               hxOptional: optional,
diff --git a/src/Text/index.js b/src/Text/index.js
index 5ce340f..70f5102 100644
--- a/src/Text/index.js
+++ b/src/Text/index.js
@@ -14,7 +14,7 @@ const Text = React.forwardRef(
         ref={ref}
       >
         <input {...rest} id={id} required={required} type="text" />
-        {typeof label === 'undefined' && (
+        {label && (
           <label
             className={classnames({
               hxOptional: optional,
diff --git a/src/TextArea/index.js b/src/TextArea/index.js
index b13f722..0bc8180 100644
--- a/src/TextArea/index.js
+++ b/src/TextArea/index.js
@@ -14,7 +14,7 @@ const TextArea = React.forwardRef(
         ref={ref}
       >
         <textarea {...rest} id={id} required={required} disabled={disabled} />
-        {typeof label === 'undefined' && (
+        {label && (
           <label
             className={classnames({
               hxOptional: optional,

From a483ca59e4ce908ce192a657b9bf48a7e3534fcd Mon Sep 17 00:00:00 2001
From: Nicko Winner-Arroyo <nicko.winner-arroyo@rackspace.com>
Date: Mon, 15 Mar 2021 20:53:56 -0400
Subject: [PATCH 4/4] only show labels if they exist

---
 src/PasswordText/index.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/PasswordText/index.js b/src/PasswordText/index.js
index ba04a3f..7a4d7c2 100644
--- a/src/PasswordText/index.js
+++ b/src/PasswordText/index.js
@@ -11,14 +11,16 @@ const Password = React.forwardRef(
         ref={ref}
       >
         <input {...rest} id={id} required={required} placeholder={placeholder} type="password" />
-        <label
-          className={classnames({
-            hxRequired: required,
-          })}
-          htmlFor={id}
-        >
-          {label}
-        </label>
+        {label && (
+          <label
+            className={classnames({
+              hxRequired: required,
+            })}
+            htmlFor={id}
+          >
+            {label}
+          </label>
+        )}
         {children}
       </hx-password-control>
     );