Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-13 10:38:13 -05:00
Code Issues Activity

♻️ Remove classnames old reference

Browse source
This commit is contained in:
alonso.torres 2021-07-07 09:23:10 +02:00
parent 84cf63d1ba
commit 991e0d5e5b
7 changed files with 19 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frontend/src/app/main/ui/confirm.cljs
View file

@ -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}]]]]]))

8
frontend/src/app/main/ui/dashboard/export.cljs
View file

@ -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

10
frontend/src/app/main/ui/dashboard/import.cljs
View file

@ -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

6
frontend/src/app/main/ui/viewer/thumbnails.cljs
View file

@ -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}

6
frontend/src/app/main/ui/workspace/libraries.cljs
View file

@ -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

3
frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs
View file

@ -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

53
frontend/src/app/util/data.cljs
View file

@ -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#)))))))