Add missing :include-macros true on mixins ns import.

2025-05-20 16:56:11 +02:00 · 2016-09-27 09:30:43 +03:00 · 2016-09-27 09:30:43 +03:00 · 57396cf368
commit 57396cf368
parent 692f066cf4
51 changed files with 63 additions and 52 deletions
--- a/src/uxbox/main/exports.cljs
+++ b/src/uxbox/main/exports.cljs
@ -13,7 +13,7 @@
            [uxbox.main.ui.shapes.group :refer (group-shape)]
            [uxbox.main.ui.shapes.path :refer (path-shape)]
            [uxbox.main.ui.shapes.circle :refer (circle-shape)]
-            [uxbox.util.mixins :as mx]))
+            [uxbox.util.mixins :as mx :include-macros true]))

 (mx/defc background
  []
--- a/src/uxbox/main/ui.cljs
+++ b/src/uxbox/main/ui.cljs
@ -28,7 +28,7 @@
            [uxbox.util.i18n :refer (tr)]
            [uxbox.util.data :refer (parse-int uuid-str?)]
            [uxbox.util.dom :as dom]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.shapes]))

 ;; --- Constants
@ -98,7 +98,14 @@
        :auth/recovery (auth/recovery-page (:token params))
        :dashboard/projects (dashboard/projects-page)
        :dashboard/elements (dashboard/elements-page)
-        :dashboard/icons (dashboard/icons-page)
+        :dashboard/icons (let [{:keys [id type]} params
+                                type (when (str/alpha? type) (keyword type))
+                                id (cond
+                                     (str/digits? id) (parse-int id)
+                                     (uuid-str? id) (uuid id)
+                                     :else nil)]
+                            (dashboard/icons-page type id))
+
        :dashboard/images (let [{:keys [id type]} params
                                type (when (str/alpha? type) (keyword type))
                                id (cond
@ -133,7 +140,11 @@
   ["/settings/notifications" :settings/notifications]
   ["/dashboard/projects" :dashboard/projects]
   ["/dashboard/elements" :dashboard/elements]
+
+
   ["/dashboard/icons" :dashboard/icons]
+   ["/dashboard/icons/:type/:id" :dashboard/icons]
+   ["/dashboard/icons/:type" :dashboard/icons]

   ["/dashboard/images" :dashboard/images]
   ["/dashboard/images/:type/:id" :dashboard/images]
--- a/src/uxbox/main/ui/auth/login.cljs
+++ b/src/uxbox/main/ui/auth/login.cljs
@ -18,7 +18,7 @@
            [uxbox.main.ui.icons :as i]
            [uxbox.main.ui.messages :as uum]
            [uxbox.main.ui.navigation :as nav]
-            [uxbox.util.mixins :as mx]))
+            [uxbox.util.mixins :as mx :include-macros true]))

 (defn- login-submit
  [event local]
--- a/src/uxbox/main/ui/auth/recovery.cljs
+++ b/src/uxbox/main/ui/auth/recovery.cljs
@ -20,7 +20,7 @@
            [uxbox.main.ui.icons :as i]
            [uxbox.main.ui.messages :as uum]
            [uxbox.main.ui.navigation :as nav]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.util.dom :as dom]))

 ;; --- Constants
--- a/src/uxbox/main/ui/auth/recovery_request.cljs
+++ b/src/uxbox/main/ui/auth/recovery_request.cljs
@ -20,7 +20,7 @@
            [uxbox.main.ui.icons :as i]
            [uxbox.main.ui.messages :as uum]
            [uxbox.main.ui.navigation :as nav]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.util.dom :as dom]))

 ;; --- Recovery Request Constants
--- a/src/uxbox/main/ui/auth/register.cljs
+++ b/src/uxbox/main/ui/auth/register.cljs
@ -20,7 +20,7 @@
            [uxbox.main.ui.icons :as i]
            [uxbox.main.ui.messages :as uum]
            [uxbox.main.ui.navigation :as nav]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.util.dom :as dom]))

 ;; --- Constants
--- a/src/uxbox/main/ui/colorpicker.cljs
+++ b/src/uxbox/main/ui/colorpicker.cljs
@ -10,7 +10,7 @@
            [lentes.core :as l]
            [goog.events :as events]
            [uxbox.util.schema :as sc]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.util.math :as mth]
            [uxbox.util.data :as data]
            [uxbox.util.dom :as dom]
--- a/src/uxbox/main/ui/confirm.cljs
+++ b/src/uxbox/main/ui/confirm.cljs
@ -9,7 +9,7 @@
  (:require [sablono.core :as html :refer-macros [html]]
            [uxbox.main.data.lightbox :as udl]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.util.dom :as dom]
            [uxbox.main.ui.lightbox :as lbx]))

--- a/src/uxbox/main/ui/dashboard/elements.cljs
+++ b/src/uxbox/main/ui/dashboard/elements.cljs
@ -12,7 +12,7 @@
            [uxbox.main.data.dashboard :as dd]
            [uxbox.main.data.lightbox :as udl]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.lightbox :as lbx]
            [uxbox.main.ui.library-bar :as ui.library-bar]
            [uxbox.main.ui.dashboard.header :refer (header)]
--- a/src/uxbox/main/ui/library_bar.cljs
+++ b/src/uxbox/main/ui/library_bar.cljs
@ -1,7 +1,7 @@
 (ns uxbox.main.ui.library-bar
  (:require [sablono.core :as html :refer-macros [html]]
            [rum.core :as rum]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.icons :as i]))

 (defn library-bar-render
--- a/src/uxbox/main/ui/lightbox.cljs
+++ b/src/uxbox/main/ui/lightbox.cljs
@ -4,7 +4,7 @@
            [lentes.core :as l]
            [uxbox.main.state :as st]
            [uxbox.main.data.lightbox :as udl]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.keyboard :as k]
            [uxbox.util.dom :as dom]
            [uxbox.util.data :refer (classnames)]
--- a/src/uxbox/main/ui/loader.cljs
+++ b/src/uxbox/main/ui/loader.cljs
@ -10,7 +10,7 @@
            [uxbox.main.state :as st]
            [uxbox.util.rstore :as rs]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.shapes]))

 ;; --- Error Handling
--- a/src/uxbox/main/ui/messages.cljs
+++ b/src/uxbox/main/ui/messages.cljs
@ -6,7 +6,7 @@
            [uxbox.main.state :as st]
            [uxbox.main.data.messages :as udm]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.util.data :refer (classnames)]
            [uxbox.util.dom :as dom]))

--- a/src/uxbox/main/ui/settings.cljs
+++ b/src/uxbox/main/ui/settings.cljs
@ -12,7 +12,7 @@
            [uxbox.util.router :as r]
            [uxbox.util.rstore :as rs]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.util.dom :as dom]
            [uxbox.main.ui.settings.profile :as profile]
            [uxbox.main.ui.settings.password :as password]
--- a/src/uxbox/main/ui/settings/header.cljs
+++ b/src/uxbox/main/ui/settings/header.cljs
@ -17,7 +17,7 @@
            [uxbox.main.ui.navigation :as nav]
            [uxbox.main.ui.icons :as i]
            [uxbox.main.ui.users :refer (user)]
-            [uxbox.util.mixins :as mx]))
+            [uxbox.util.mixins :as mx :include-macros true]))

 (def ^:private section-ref
  (-> (l/in [:route :id])
--- a/src/uxbox/main/ui/settings/notifications.cljs
+++ b/src/uxbox/main/ui/settings/notifications.cljs
@ -12,7 +12,7 @@
            [uxbox.util.router :as r]
            [uxbox.util.rstore :as rs]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.util.dom :as dom]
            [uxbox.main.ui.settings.header :refer (header)]))

--- a/src/uxbox/main/ui/settings/password.cljs
+++ b/src/uxbox/main/ui/settings/password.cljs
@ -20,7 +20,7 @@
            [uxbox.main.ui.icons :as i]
            [uxbox.main.ui.forms :as forms]
            [uxbox.main.ui.messages :as uum]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.settings.header :refer (header)]
            [uxbox.util.dom :as dom]))

--- a/src/uxbox/main/ui/settings/profile.cljs
+++ b/src/uxbox/main/ui/settings/profile.cljs
@ -15,7 +15,7 @@
            [uxbox.main.state :as st]
            [uxbox.util.rstore :as rs]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.forms :as forms]
            [uxbox.main.ui.settings.header :refer (header)]
            [uxbox.main.ui.messages :as uum]
--- a/src/uxbox/main/ui/shapes/circle.cljs
+++ b/src/uxbox/main/ui/shapes/circle.cljs
@ -8,7 +8,7 @@
  (:require [sablono.core :refer-macros [html]]
            [rum.core :as rum]
            [lentes.core :as l]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.shapes.common :as common]
            [uxbox.main.ui.shapes.attrs :as attrs]
            [uxbox.main.geom :as geom]))
--- a/src/uxbox/main/ui/shapes/icon.cljs
+++ b/src/uxbox/main/ui/shapes/icon.cljs
@ -7,7 +7,7 @@
 (ns uxbox.main.ui.shapes.icon
  (:require [sablono.core :refer-macros [html]]
            [rum.core :as rum]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.shapes.common :as common]
            [uxbox.main.ui.shapes.attrs :as attrs]
            [uxbox.main.geom :as geom]))
--- a/src/uxbox/main/ui/users.cljs
+++ b/src/uxbox/main/ui/users.cljs
@ -16,7 +16,7 @@
            [uxbox.main.data.lightbox :as udl]
            [uxbox.main.ui.icons :as i]
            [uxbox.main.ui.navigation :as nav]
-            [uxbox.util.mixins :as mx]))
+            [uxbox.util.mixins :as mx :include-macros true]))

 ;; --- User Menu

--- a/src/uxbox/main/ui/workspace.cljs
+++ b/src/uxbox/main/ui/workspace.cljs
@ -18,7 +18,7 @@
            [uxbox.util.dom :as dom]
            [uxbox.util.geom.point :as gpt]
            [uxbox.util.data :refer (classnames)]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.messages :as uum]
            [uxbox.main.ui.confirm]
            [uxbox.main.ui.workspace.images]
--- a/src/uxbox/main/ui/workspace/clipboard.cljs
+++ b/src/uxbox/main/ui/workspace/clipboard.cljs
@ -13,7 +13,7 @@
            [uxbox.main.ui.icons :as i]
            [uxbox.main.ui.lightbox :as lbx]
            [uxbox.util.rstore :as rs]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.util.dom :as dom]
            [uxbox.util.datetime :as dt]))

--- a/src/uxbox/main/ui/workspace/colorpalette.cljs
+++ b/src/uxbox/main/ui/workspace/colorpalette.cljs
@ -22,7 +22,7 @@
            [uxbox.main.ui.icons :as i]
            [uxbox.main.ui.keyboard :as kbd]
            [uxbox.util.dom :as dom]
-            [uxbox.util.mixins :as mx]))
+            [uxbox.util.mixins :as mx :include-macros true]))

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Lenses
--- a/src/uxbox/main/ui/workspace/colorpicker.cljs
+++ b/src/uxbox/main/ui/workspace/colorpicker.cljs
@ -17,7 +17,7 @@
            [uxbox.main.data.shapes :as uds]
            [uxbox.main.ui.workspace.base :as wb]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.lightbox :as lbx]
            [uxbox.main.ui.colorpicker :as cp]
            [uxbox.main.ui.workspace.recent-colors :refer (recent-colors)]
--- a/src/uxbox/main/ui/workspace/download.cljs
+++ b/src/uxbox/main/ui/workspace/download.cljs
@ -18,7 +18,7 @@
            [uxbox.util.data :refer (read-string)]
            [uxbox.util.datetime :as dt]
            [uxbox.util.dom :as dom]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.util.rstore :as rs]
            [uxbox.util.zip :as zip]
            [lentes.core :as l]))
--- a/src/uxbox/main/ui/workspace/grid.cljs
+++ b/src/uxbox/main/ui/workspace/grid.cljs
@ -10,7 +10,7 @@
            [rum.core :as rum]
            [cuerdas.core :as str]
            [uxbox.main.constants :as c]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.workspace.base :as wb]))

 ;; --- Grid (Component)
--- a/src/uxbox/main/ui/workspace/header.cljs
+++ b/src/uxbox/main/ui/workspace/header.cljs
@ -21,7 +21,7 @@
            [uxbox.main.ui.icons :as i]
            [uxbox.main.ui.users :as ui.u]
            [uxbox.main.ui.navigation :as nav]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.util.geom.point :as gpt]
            [uxbox.util.math :as mth]))

--- a/src/uxbox/main/ui/workspace/images.cljs
+++ b/src/uxbox/main/ui/workspace/images.cljs
@ -17,7 +17,7 @@
            [uxbox.main.data.lightbox :as udl]
            [uxbox.main.data.images :as di]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.lightbox :as lbx]
            [uxbox.main.ui.keyboard :as k]
            [uxbox.main.ui.library-bar :as ui.library-bar]
--- a/src/uxbox/main/ui/workspace/recent_colors.cljs
+++ b/src/uxbox/main/ui/workspace/recent_colors.cljs
@ -14,7 +14,7 @@
            [uxbox.main.state :as st]
            [uxbox.main.data.workspace :as dw]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.util.dom :as dom]
            [uxbox.main.ui.workspace.base :as wb]))

--- a/src/uxbox/main/ui/workspace/ruler.cljs
+++ b/src/uxbox/main/ui/workspace/ruler.cljs
@ -13,7 +13,7 @@
            [uxbox.util.rstore :as rs]
            [uxbox.util.math :as mth]
            [uxbox.main.ui.workspace.base :as wb]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.util.geom.point :as gpt]
            [uxbox.util.dom :as dom]))

--- a/src/uxbox/main/ui/workspace/rules.cljs
+++ b/src/uxbox/main/ui/workspace/rules.cljs
@ -14,7 +14,7 @@
            [uxbox.main.state :as s]
            [uxbox.util.dom :as dom]
            [uxbox.main.ui.workspace.base :as wb]
-            [uxbox.util.mixins :as mx]))
+            [uxbox.util.mixins :as mx :include-macros true]))

 ;; --- Constants & Helpers

--- a/src/uxbox/main/ui/workspace/scroll.cljs
+++ b/src/uxbox/main/ui/workspace/scroll.cljs
@ -8,7 +8,7 @@
 (ns uxbox.main.ui.workspace.scroll
  "Workspace scroll events handling."
  (:require [beicon.core :as rx]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.workspace.base :as wb]
            [uxbox.util.rlocks :as rlocks]
            [uxbox.util.geom.point :as gpt]))
--- a/src/uxbox/main/ui/workspace/settings.cljs
+++ b/src/uxbox/main/ui/workspace/settings.cljs
@ -17,7 +17,7 @@
            [uxbox.main.data.workspace :as udw]
            [uxbox.main.data.lightbox :as udl]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.forms :as forms]
            [uxbox.main.ui.lightbox :as lbx]
            [uxbox.main.ui.colorpicker :as uucp]
--- a/src/uxbox/main/ui/workspace/sidebar.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar.cljs
@ -10,7 +10,7 @@
            [uxbox.main.state :as st]
            [uxbox.util.router :as r]
            [uxbox.util.rstore :as rs]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.workspace.base :as wb]
            [uxbox.main.ui.workspace.sidebar.options :refer (options-toolbox)]
            [uxbox.main.ui.workspace.sidebar.layers :refer (layers-toolbox)]
--- a/src/uxbox/main/ui/workspace/sidebar/history.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar/history.cljs
@ -20,7 +20,7 @@
            [uxbox.main.data.messages :as udm]
            [uxbox.main.ui.workspace.base :as wb]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.util.datetime :as dt]
            [uxbox.util.data :refer (read-string)]
            [uxbox.util.dom :as dom]))
--- a/src/uxbox/main/ui/workspace/sidebar/icons.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar/icons.cljs
@ -17,7 +17,7 @@
            [uxbox.main.ui.shapes.icon :as icon]
            [uxbox.main.ui.workspace.base :as wb]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.util.dom :as dom]
            [uxbox.util.data :refer (read-string)]))

--- a/src/uxbox/main/ui/workspace/sidebar/layers.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar/layers.cljs
@ -20,7 +20,7 @@
            [uxbox.main.ui.workspace.base :as wb]
            [uxbox.main.ui.icons :as i]
            [uxbox.main.ui.keyboard :as kbd]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.util.dom.dnd :as dnd]
            [uxbox.util.dom :as dom])
  (:import goog.events.EventType))
--- a/src/uxbox/main/ui/workspace/sidebar/options.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar/options.cljs
@ -18,7 +18,7 @@
            [uxbox.main.data.shapes :as uds]
            [uxbox.main.ui.workspace.base :as wb]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.workspace.colorpicker :refer (colorpicker)]
            [uxbox.main.ui.workspace.recent-colors :refer (recent-colors)]
            [uxbox.main.ui.workspace.sidebar.options.icon-measures :as options-iconm]
--- a/src/uxbox/main/ui/workspace/sidebar/options/circle_measures.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar/options/circle_measures.cljs
@ -17,7 +17,7 @@
            [uxbox.main.data.workspace :as udw]
            [uxbox.main.data.shapes :as uds]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.workspace.colorpicker :refer (colorpicker)]
            [uxbox.main.ui.workspace.recent-colors :refer (recent-colors)]
            [uxbox.main.geom :as geom]
--- a/src/uxbox/main/ui/workspace/sidebar/options/fill.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar/options/fill.cljs
@ -17,7 +17,7 @@
            [uxbox.main.data.shapes :as uds]
            [uxbox.main.data.lightbox :as udl]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.util.dom :as dom]
            [uxbox.util.data :refer (parse-int parse-float read-string)]))

--- a/src/uxbox/main/ui/workspace/sidebar/options/icon_measures.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar/options/icon_measures.cljs
@ -17,7 +17,7 @@
            [uxbox.main.data.workspace :as udw]
            [uxbox.main.data.shapes :as uds]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.workspace.colorpicker :refer (colorpicker)]
            [uxbox.main.ui.workspace.recent-colors :refer (recent-colors)]
            [uxbox.main.geom :as geom]
--- a/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs
@ -12,7 +12,7 @@
            [uxbox.util.i18n :refer (tr)]
            [uxbox.util.router :as r]
            [uxbox.util.rstore :as rs]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.state :as st]
            [uxbox.main.library :as library]
            [uxbox.main.data.shapes :as uds]
--- a/src/uxbox/main/ui/workspace/sidebar/options/line_measures.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar/options/line_measures.cljs
@ -17,7 +17,7 @@
            [uxbox.main.data.workspace :as udw]
            [uxbox.main.data.shapes :as uds]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.workspace.colorpicker :refer (colorpicker)]
            [uxbox.main.ui.workspace.recent-colors :refer (recent-colors)]
            [uxbox.main.geom :as geom]
--- a/src/uxbox/main/ui/workspace/sidebar/options/rect_measures.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar/options/rect_measures.cljs
@ -17,7 +17,7 @@
            [uxbox.main.data.workspace :as udw]
            [uxbox.main.data.shapes :as uds]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.workspace.colorpicker :refer (colorpicker)]
            [uxbox.main.ui.workspace.recent-colors :refer (recent-colors)]
            [uxbox.main.geom :as geom]
--- a/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs
@ -17,7 +17,7 @@
            [uxbox.main.data.shapes :as uds]
            [uxbox.main.data.lightbox :as udl]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.util.dom :as dom]
            [uxbox.util.data :refer (parse-int parse-float read-string)]))

--- a/src/uxbox/main/ui/workspace/sidebar/options/text.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar/options/text.cljs
@ -18,7 +18,7 @@
            [uxbox.main.data.shapes :as uds]
            [uxbox.main.ui.workspace.base :as wb]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.workspace.colorpicker :refer (colorpicker)]
            [uxbox.main.ui.workspace.recent-colors :refer (recent-colors)]
            [uxbox.main.ui.workspace.base :as wb]
--- a/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs
+++ b/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs
@ -22,7 +22,7 @@
            [uxbox.main.ui.dashboard.projects :refer (+layouts+)]
            [uxbox.main.ui.workspace.base :as wb]
            [uxbox.main.ui.icons :as i]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.lightbox :as lbx]
            [uxbox.util.data :refer (read-string parse-int)]
            [uxbox.util.dom :as dom]))
--- a/src/uxbox/view/ui.cljs
+++ b/src/uxbox/view/ui.cljs
@ -9,7 +9,7 @@
            [uxbox.util.i18n :refer (tr)]
            [uxbox.util.rstore :as rs]
            [uxbox.util.router :as rt]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.util.dom :as dom]
            [uxbox.main.ui.loader :refer (loader)]
            [uxbox.main.ui.lightbox :refer (lightbox)]
--- a/src/uxbox/view/ui/notfound.cljs
+++ b/src/uxbox/view/ui/notfound.cljs
@ -7,7 +7,7 @@

 (ns uxbox.view.ui.notfound
  (:require [sablono.core :refer-macros [html]]
-            [uxbox.util.mixins :as mx]))
+            [uxbox.util.mixins :as mx :include-macros true]))

 (defn notfound-page-render
  [own]
--- a/src/uxbox/view/ui/viewer.cljs
+++ b/src/uxbox/view/ui/viewer.cljs
@ -11,7 +11,7 @@
            [uxbox.util.i18n :refer (tr)]
            [uxbox.util.rstore :as rs]
            [uxbox.util.router :as rt]
-            [uxbox.util.mixins :as mx]
+            [uxbox.util.mixins :as mx :include-macros true]
            [uxbox.main.ui.icons :as i]
            [uxbox.main.state :as st]
            [uxbox.view.data.viewer :as dv]