From 17a873e9f8744c8e7c0966e6588e3aba665cbfa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Moya?= <andres.moya@kaleidos.net>
Date: Fri, 13 Dec 2024 15:01:22 +0100
Subject: [PATCH] :wrench: Restore some things broken in merge

---
 frontend/src/app/main/ui/ds/controls/input.cljs  |  3 +--
 .../src/app/main/ui/workspace/tokens/common.scss | 16 ++++++++++++++++
 .../main/ui/workspace/tokens/modals/themes.cljs  |  4 ----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/frontend/src/app/main/ui/ds/controls/input.cljs b/frontend/src/app/main/ui/ds/controls/input.cljs
index 0df0c0c6d..944c4cce2 100644
--- a/frontend/src/app/main/ui/ds/controls/input.cljs
+++ b/frontend/src/app/main/ui/ds/controls/input.cljs
@@ -19,8 +19,7 @@
    [:class {:optional true} :string]
    [:icon {:optional true}
     [:and :string [:fn #(contains? icon-list %)]]]
-   [:type {:optional true} :string]
-   [:ref {:optional true} some?]])
+   [:type {:optional true} :string]])
 
 (mf/defc input*
   {::mf/props :obj
diff --git a/frontend/src/app/main/ui/workspace/tokens/common.scss b/frontend/src/app/main/ui/workspace/tokens/common.scss
index 668db73af..bb067e683 100644
--- a/frontend/src/app/main/ui/workspace/tokens/common.scss
+++ b/frontend/src/app/main/ui/workspace/tokens/common.scss
@@ -6,6 +6,22 @@
 
 @import "refactor/common-refactor.scss";
 
+.input {
+  @extend .input-element;
+}
+
+.labeled-input {
+  @extend .input-element;
+  .label {
+    width: auto;
+    text-wrap: nowrap;
+  }
+}
+
+.labeled-input-error {
+  border: 1px solid var(--status-color-error-500) !important;
+}
+
 .button {
   @extend .button-primary;
 }
diff --git a/frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs b/frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs
index a3ff1a8b1..b27371468 100644
--- a/frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs
@@ -173,8 +173,6 @@
                                                (set! (.-value (mf/ref-val group-input-ref)) value)
                                                (on-update-group value))
                                   :on-close on-close-dropdown}])
-      ;; TODO: This span should be remove when labeled-input is updated
-      [:span {:class (stl/css :labeled-input-label)}  "Theme group"]
       [:& labeled-input {:label "Group"
                          :input-props {:ref group-input-ref
                                        :default-value (:group theme)
@@ -188,8 +186,6 @@
                                                                  (on-toggle-dropdown))}
                                             [:> icon* {:id "arrow-down"}]]))}]]
      [:div {:class (stl/css :group-input-wrapper)}
-      ;; TODO: This span should be remove when labeled-input is updated
-      [:span {:class (stl/css :labeled-input-label)}  "Theme"]
       [:& labeled-input {:label "Theme"
                          :input-props {:default-value (:name theme)
                                        :on-change (comp on-update-name dom/get-target-val)}}]]]))