diff --git a/frontend/src/app/main/ui/components/select.cljs b/frontend/src/app/main/ui/components/select.cljs index c3c117341..cdb88fd03 100644 --- a/frontend/src/app/main/ui/components/select.cljs +++ b/frontend/src/app/main/ui/components/select.cljs @@ -43,7 +43,6 @@ (mf/use-fn (mf/deps on-change) (fn [event] - (js/console.log event) (let [value (-> (dom/get-current-target event) (dom/get-data "value") (d/read-string))] diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layer.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layer.cljs index 8b9d9667b..2c057eb5b 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layer.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layer.cljs @@ -40,7 +40,7 @@ type (unchecked-get props "type") values (unchecked-get props "values") - current-blend-mode (d/name (or (:blend-mode values) :normal)) + current-blend-mode (or (:blend-mode values) :normal) current-opacity (:opacity values) state* (mf/use-state @@ -119,24 +119,24 @@ options (mf/with-memo [current-blend-mode] (d/concat-vec - (when (= "multiple" current-blend-mode) - [{:value "multiple" :label "--"}]) - [{:value "normal" :label (tr "workspace.options.layer-options.blend-mode.normal")} - {:value "darken" :label (tr "workspace.options.layer-options.blend-mode.darken")} - {:value "multiply" :label (tr "workspace.options.layer-options.blend-mode.multiply")} - {:value "color-burn" :label (tr "workspace.options.layer-options.blend-mode.color-burn")} - {:value "lighten" :label (tr "workspace.options.layer-options.blend-mode.lighten")} - {:value "screen" :label (tr "workspace.options.layer-options.blend-mode.screen")} - {:value "color-dodge" :label (tr "workspace.options.layer-options.blend-mode.color-dodge")} - {:value "overlay" :label (tr "workspace.options.layer-options.blend-mode.overlay")} - {:value "soft-light" :label (tr "workspace.options.layer-options.blend-mode.soft-light")} - {:value "hard-light" :label (tr "workspace.options.layer-options.blend-mode.hard-light")} - {:value "difference" :label (tr "workspace.options.layer-options.blend-mode.difference")} - {:value "exclusion" :label (tr "workspace.options.layer-options.blend-mode.exclusion")} - {:value "hue" :label (tr "workspace.options.layer-options.blend-mode.hue")} - {:value "saturation" :label (tr "workspace.options.layer-options.blend-mode.saturation")} - {:value "color" :label (tr "workspace.options.layer-options.blend-mode.color")} - {:value "luminosity" :label (tr "workspace.options.layer-options.blend-mode.luminosity")}]))] + (when (= :multiple current-blend-mode) + [{:value :multiple :label "--"}]) + [{:value :normal :label (tr "workspace.options.layer-options.blend-mode.normal")} + {:value :darken :label (tr "workspace.options.layer-options.blend-mode.darken")} + {:value :multiply :label (tr "workspace.options.layer-options.blend-mode.multiply")} + {:value :color-burn :label (tr "workspace.options.layer-options.blend-mode.color-burn")} + {:value :lighten :label (tr "workspace.options.layer-options.blend-mode.lighten")} + {:value :screen :label (tr "workspace.options.layer-options.blend-mode.screen")} + {:value :color-dodge :label (tr "workspace.options.layer-options.blend-mode.color-dodge")} + {:value :overlay :label (tr "workspace.options.layer-options.blend-mode.overlay")} + {:value :soft-light :label (tr "workspace.options.layer-options.blend-mode.soft-light")} + {:value :hard-light :label (tr "workspace.options.layer-options.blend-mode.hard-light")} + {:value :difference :label (tr "workspace.options.layer-options.blend-mode.difference")} + {:value :exclusion :label (tr "workspace.options.layer-options.blend-mode.exclusion")} + {:value :hue :label (tr "workspace.options.layer-options.blend-mode.hue")} + {:value :saturation :label (tr "workspace.options.layer-options.blend-mode.saturation")} + {:value :color :label (tr "workspace.options.layer-options.blend-mode.color")} + {:value :luminosity :label (tr "workspace.options.layer-options.blend-mode.luminosity")}]))] (mf/with-effect [current-blend-mode option-highlighted?