diff --git a/frontend/src/app/main/ui/components/select.cljs b/frontend/src/app/main/ui/components/select.cljs index d00267078d..07c2a9db86 100644 --- a/frontend/src/app/main/ui/components/select.cljs +++ b/frontend/src/app/main/ui/components/select.cljs @@ -60,6 +60,7 @@ current-id (get state :id) current-value (get state :current-value) current-label (get label-index current-value) + is-open? (get state :is-open?) node-ref (mf/use-ref nil) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/border_radius.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/border_radius.cljs index d2311f26d4..6c2e4137c9 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/border_radius.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/border_radius.cljs @@ -102,7 +102,7 @@ [:> deprecated-input/numeric-input* {:placeholder (cond (not all-equal?) - "Mixed" + (tr "settings.multiple") (= :multiple (:r1 values)) (tr "settings.multiple") :else diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs index 6498e57d10..4474cef9cb 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs @@ -264,11 +264,13 @@ (mf/deps font on-change) (fn [new-variant-id] (let [variant (d/seek #(= new-variant-id (:id %)) (:variants font))] - (on-change {:font-id (:id font) - :font-family (:family font) - :font-variant-id new-variant-id - :font-weight (:weight variant) - :font-style (:style variant)}) + (when-not (nil? variant) + (on-change {:font-id (:id font) + :font-family (:family font) + :font-variant-id new-variant-id + :font-weight (:weight variant) + :font-style (:style variant)})) + (dom/blur! (dom/get-target new-variant-id))))) on-font-select @@ -341,12 +343,13 @@ {:value (:id variant) :key (pr-str variant) :label (:name variant)}))) - variant-options (if (= font-size :multiple) + variant-options (if (= font-variant-id :multiple) (conj basic-variant-options - {:value :multiple + {:value "" :key :multiple-variants :label "--"}) basic-variant-options)] + ;; TODO Add disabled mode [:& select {:class (stl/css :font-variant-select)