diff --git a/frontend/src/app/main/ui/confirm.cljs b/frontend/src/app/main/ui/confirm.cljs index 030aafd20..a39f47b1d 100644 --- a/frontend/src/app/main/ui/confirm.cljs +++ b/frontend/src/app/main/ui/confirm.cljs @@ -9,7 +9,6 @@ [app.main.data.modal :as modal] [app.main.store :as st] [app.main.ui.icons :as i] - [app.util.data :refer [classnames]] [app.util.dom :as dom] [app.util.i18n :as i18n :refer [tr t]] [app.util.keyboard :as k] @@ -86,9 +85,9 @@ :on-click cancel-fn}]) [:input.accept-button - {:class (classnames :danger (= accept-style :danger) - :primary (= accept-style :primary)) + {:class (dom/classnames + :danger (= accept-style :danger) + :primary (= accept-style :primary)) :type "button" :value accept-label :on-click accept-fn}]]]]])) - diff --git a/frontend/src/app/main/ui/dashboard/export.cljs b/frontend/src/app/main/ui/dashboard/export.cljs index 81fdd7335..e89405d3e 100644 --- a/frontend/src/app/main/ui/dashboard/export.cljs +++ b/frontend/src/app/main/ui/dashboard/export.cljs @@ -11,7 +11,6 @@ [app.main.store :as st] [app.main.ui.icons :as i] [app.main.worker :as uw] - [app.util.data :refer [classnames]] [app.util.dom :as dom] [app.util.i18n :as i18n :refer [tr]] [beicon.core :as rx] @@ -23,9 +22,10 @@ [{:keys [file]}] [:div.file-entry - {:class (classnames :loading (:loading? file) - :success (:export-success? file) - :error (:export-error? file))} + {:class (dom/classnames + :loading (:loading? file) + :success (:export-success? file) + :error (:export-error? file))} [:div.file-name [:div.file-icon (cond (:export-success? file) i/tick diff --git a/frontend/src/app/main/ui/dashboard/import.cljs b/frontend/src/app/main/ui/dashboard/import.cljs index cd9a97620..b8b083e04 100644 --- a/frontend/src/app/main/ui/dashboard/import.cljs +++ b/frontend/src/app/main/ui/dashboard/import.cljs @@ -12,7 +12,6 @@ [app.main.ui.components.file-uploader :refer [file-uploader]] [app.main.ui.icons :as i] [app.main.worker :as uw] - [app.util.data :refer [classnames]] [app.util.dom :as dom] [app.util.i18n :as i18n :refer [tr]] [app.util.keyboard :as kbd] @@ -144,10 +143,11 @@ (swap! state update :files remove-file (:file-id file))))] [:div.file-entry - {:class (classnames :loading loading? - :success load-success? - :error (or import-error? analyze-error?) - :editable (and ready? (not editing?)))} + {:class (dom/classnames + :loading loading? + :success load-success? + :error (or import-error? analyze-error?) + :editable (and ready? (not editing?)))} [:div.file-name [:div.file-icon diff --git a/frontend/src/app/main/ui/viewer/thumbnails.cljs b/frontend/src/app/main/ui/viewer/thumbnails.cljs index 9c1d09e7c..26397302e 100644 --- a/frontend/src/app/main/ui/viewer/thumbnails.cljs +++ b/frontend/src/app/main/ui/viewer/thumbnails.cljs @@ -12,7 +12,7 @@ [app.main.store :as st] [app.main.ui.components.dropdown :refer [dropdown']] [app.main.ui.icons :as i] - [app.util.data :refer [classnames]] + [app.util.dom :as dom] [app.util.i18n :as i18n :refer [tr]] [goog.object :as gobj] [rumext.alpha :as mf])) @@ -75,7 +75,7 @@ [{:keys [selected? frame on-click index objects] :as props}] [:div.thumbnail-item {:on-click #(on-click % index)} [:div.thumbnail-preview - {:class (classnames :selected selected?)} + {:class (dom/classnames :selected selected?)} [:& exports/frame-svg {:frame frame :objects objects}]] [:div.thumbnail-info [:span.name {:title (:name frame)} (:name frame)]]]) @@ -104,7 +104,7 @@ :container container :show true} [:section.viewer-thumbnails - {:class (classnames :expanded @expanded?) + {:class (dom/classnames :expanded @expanded?) :ref container :on-mouse-leave on-mouse-leave} diff --git a/frontend/src/app/main/ui/workspace/libraries.cljs b/frontend/src/app/main/ui/workspace/libraries.cljs index c0766515d..f48d73b45 100644 --- a/frontend/src/app/main/ui/workspace/libraries.cljs +++ b/frontend/src/app/main/ui/workspace/libraries.cljs @@ -13,7 +13,7 @@ [app.main.refs :as refs] [app.main.store :as st] [app.main.ui.icons :as i] - [app.util.data :refer [classnames matches-search]] + [app.util.data :refer [matches-search]] [app.util.dom :as dom] [app.util.i18n :as i18n :refer [t tr]] [cuerdas.core :as str] @@ -170,11 +170,11 @@ [:div.modal-content [:div.libraries-header [:div.header-item - {:class (classnames :active (= @selected-tab :libraries)) + {:class (dom/classnames :active (= @selected-tab :libraries)) :on-click #(change-tab :libraries)} (t locale "workspace.libraries.libraries")] [:div.header-item - {:class (classnames :active (= @selected-tab :updates)) + {:class (dom/classnames :active (= @selected-tab :updates)) :on-click #(change-tab :updates)} (t locale "workspace.libraries.updates")]] [:div.libraries-content diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs index f7f050e22..af5a3e81a 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs @@ -18,7 +18,6 @@ [app.main.ui.hooks :as h] [app.main.ui.icons :as i] [app.util.color :as uc] - [app.util.data :refer [classnames]] [app.util.dom :as dom] [app.util.i18n :as i18n :refer [tr]] [rumext.alpha :as mf])) @@ -162,7 +161,7 @@ (when (and (not disable-opacity) (not (:gradient color))) [:div.input-element - {:class (classnames :percentail (not= (:opacity color) :multiple))} + {:class (dom/classnames :percentail (not= (:opacity color) :multiple))} [:> numeric-input {:value (-> color :opacity opacity->string) :placeholder (tr "settings.multiple") :on-click select-all diff --git a/frontend/src/app/util/data.cljs b/frontend/src/app/util/data.cljs index fb0007bb3..7447359fb 100644 --- a/frontend/src/app/util/data.cljs +++ b/frontend/src/app/util/data.cljs @@ -153,34 +153,6 @@ ;; Other ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defn classnames - [& params] - {:pre [(even? (count params))]} - (str/join " " (reduce (fn [acc [k v]] - (if (and k (true? v)) - (conj acc (name k)) - acc)) - [] - (partition 2 params)))) - -;; (defn normalize-attrs -;; [m] -;; (letfn [(transform [[k v]] -;; (cond -;; (or (= k :class) (= k :class-name)) -;; ["className" v] - -;; (or (keyword? k) (string? k)) -;; [(str/camel (name k)) v] - -;; :else -;; [k v])) -;; (walker [x] -;; (if (map? x) -;; (into {} (map tf) x) -;; x))] -;; (walk/postwalk walker m))) - (defn normalize-props [props] (clj->js props :keyword-fn (fn [key] @@ -196,28 +168,3 @@ nm (str/trim (str/lower name))] (str/includes? nm st)))) -;; (defn coalesce -;; [^number v ^number n] -;; (if (.-toFixed v) -;; (js/parseFloat (.toFixed v n)) -;; 0)) - - - -;; (defmacro mirror-map [& fields] -;; (let [keys# (map #(keyword (name %)) fields) -;; vals# fields] -;; (apply hash-map (interleave keys# vals#)))) - -;; (defmacro some->' -;; [x & forms] -;; `(let [x# (p/then' ~x (fn [v#] -;; (when (nil? v#) -;; (throw (ex-info "internal" {::some-interrupt true}))) -;; v#))] -;; (-> (-> x# ~@forms) -;; (p/catch' (fn [e#] -;; (if (::some-interrupt (ex-data e#)) -;; nil -;; (throw e#))))))) -