From 4424abe44984db26ee5987d2b14ab8eba057b481 Mon Sep 17 00:00:00 2001
From: James Parker <jp@jamesparker.me>
Date: Mon, 10 Jun 2019 09:58:05 -0400
Subject: [PATCH] Hide bootstrap labels when empty

---
 yesod-form/ChangeLog.md             | 4 ++++
 yesod-form/Yesod/Form/Bootstrap3.hs | 5 +++--
 yesod-form/yesod-form.cabal         | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/yesod-form/ChangeLog.md b/yesod-form/ChangeLog.md
index f6d07e92..bf18c778 100644
--- a/yesod-form/ChangeLog.md
+++ b/yesod-form/ChangeLog.md
@@ -1,5 +1,9 @@
 # ChangeLog for yesod-form
 
+## 1.6.5
+
+* Omit labels in `renderBootstrap3` when they are null.
+
 ## 1.6.4
 
 * Make FormResult an instance of Eq
diff --git a/yesod-form/Yesod/Form/Bootstrap3.hs b/yesod-form/Yesod/Form/Bootstrap3.hs
index e99f82ba..50553314 100644
--- a/yesod-form/Yesod/Form/Bootstrap3.hs
+++ b/yesod-form/Yesod/Form/Bootstrap3.hs
@@ -32,6 +32,7 @@ import Control.Arrow (second)
 import Control.Monad (liftM)
 import Data.Text (Text)
 import Data.String (IsString(..))
+import qualified Text.Blaze.Internal as Blaze
 import Yesod.Core
 import Yesod.Form.Types
 import Yesod.Form.Functions
@@ -154,7 +155,7 @@ renderBootstrap3 formLayout aform fragment = do
                 $case formLayout
                   $of BootstrapBasicForm
                     $if fvId view /= bootstrapSubmitId
-                      <label for=#{fvId view}>#{fvLabel view}
+                      <label :Blaze.null (fvLabel view):.sr-only for=#{fvId view}>#{fvLabel view}
                     ^{fvInput view}
                     ^{helpWidget view}
                   $of BootstrapInlineForm
@@ -164,7 +165,7 @@ renderBootstrap3 formLayout aform fragment = do
                     ^{helpWidget view}
                   $of BootstrapHorizontalForm labelOffset labelSize inputOffset inputSize
                     $if fvId view /= bootstrapSubmitId
-                      <label .control-label .#{toOffset labelOffset} .#{toColumn labelSize} for=#{fvId view}>#{fvLabel view}
+                      <label :Blaze.null (fvLabel view):.sr-only .control-label .#{toOffset labelOffset} .#{toColumn labelSize} for=#{fvId view}>#{fvLabel view}
                       <div .#{toOffset inputOffset} .#{toColumn inputSize}>
                         ^{fvInput view}
                         ^{helpWidget view}
diff --git a/yesod-form/yesod-form.cabal b/yesod-form/yesod-form.cabal
index 817ef8db..4237dd26 100644
--- a/yesod-form/yesod-form.cabal
+++ b/yesod-form/yesod-form.cabal
@@ -1,5 +1,5 @@
 name:            yesod-form
-version:         1.6.4
+version:         1.6.5
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>