From 36094d70d6d8121fb66dd2286201b1ed0170270c Mon Sep 17 00:00:00 2001
From: Faizaan Gagan <fzngagan@gmail.com>
Date: Tue, 19 Jan 2021 12:21:37 +0530
Subject: [PATCH] fixed formatting for composer field type

---
 .../wizard/initializers/custom-wizard-field.js.es6    |  2 +-
 .../templates/components/wizard-field-composer.hbs    |  8 +++++++-
 .../wizard/templates/components/wizard-field.hbs      |  2 +-
 assets/stylesheets/wizard/custom/composer.scss        | 11 +++++++----
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/assets/javascripts/wizard/initializers/custom-wizard-field.js.es6 b/assets/javascripts/wizard/initializers/custom-wizard-field.js.es6
index a520f5dd..efeaaefd 100644
--- a/assets/javascripts/wizard/initializers/custom-wizard-field.js.es6
+++ b/assets/javascripts/wizard/initializers/custom-wizard-field.js.es6
@@ -18,7 +18,7 @@ export default {
 
       @discourseComputed("field.type")
       textType(fieldType) {
-        return ['text', 'textarea', 'composer'].includes(fieldType);
+        return ['text', 'textarea'].includes(fieldType);
       },
 
       cookedDescription: function () {
diff --git a/assets/javascripts/wizard/templates/components/wizard-field-composer.hbs b/assets/javascripts/wizard/templates/components/wizard-field-composer.hbs
index 1fe2bde6..3160d9fb 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field-composer.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field-composer.hbs
@@ -7,6 +7,12 @@
   togglePreview=(action "togglePreview")
   afterRefresh=(action "afterRefresh")}}
 
+<div class="bottom-bar">
 <button class='wizard-btn toggle-preview' {{action 'togglePreview'}}>
   <span class="d-button-label">{{wizard-i18n togglePreviewLabel}}</span>
-</button>
\ No newline at end of file
+</button>
+
+{{#if field.char_counter}}
+  {{char-counter field.value field.max_length}}
+{{/if}}
+</div>
diff --git a/assets/javascripts/wizard/templates/components/wizard-field.hbs b/assets/javascripts/wizard/templates/components/wizard-field.hbs
index 86e209c2..5f524e92 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field.hbs
@@ -18,7 +18,7 @@
 
 {{#if field.char_counter}}
   {{#if textType}}
-    {{char-counter field.value}}
+    {{char-counter field.value field.max_length}}
   {{/if}}
 {{/if}}
 
diff --git a/assets/stylesheets/wizard/custom/composer.scss b/assets/stylesheets/wizard/custom/composer.scss
index c360e76a..d747bfcb 100644
--- a/assets/stylesheets/wizard/custom/composer.scss
+++ b/assets/stylesheets/wizard/custom/composer.scss
@@ -50,10 +50,6 @@
   display: none;
 }
 
-.custom-wizard .wizard-field-composer .toggle-preview {
-  margin-top: 20px;
-}
-
 .d-editor-textarea-wrapper,
 .d-editor-preview-wrapper {
   background-color: var(--secondary);
@@ -230,3 +226,10 @@
   bottom: -40px;
   right: 0;
 }
+
+.bottom-bar {
+  display: flex;
+  justify-content:space-between;
+  margin-top: 20px;
+  align-items: center;
+}