From 391354805b0442eab334cb5c02a062a59539ed89 Mon Sep 17 00:00:00 2001 From: Kimo Knowles Date: Thu, 18 Jan 2024 19:39:48 +0100 Subject: [PATCH] Upgrade to spade 5197e54 --- .clj-kondo/config.edn | 2 +- .../spade/git_sha_5197e54/container.cljc | 14 ++ .../git_sha_5197e54/container/alternate.cljc | 17 ++ .../spade/git_sha_5197e54/container/atom.cljc | 16 ++ .../container/dom.cljs | 22 +- .../core.cljc | 203 +++++++++++------- .../spade/git_sha_5197e54/core.cljs | 6 + .../react.cljs | 10 +- .../runtime.cljc | 34 ++- .../git_sha_5197e54/runtime/defaults.clj | 8 + .../git_sha_5197e54/runtime/defaults.cljs | 5 + .../util.cljc | 2 +- .../spade/git_sha_93ef290/container.cljc | 8 - .../git_sha_93ef290/container/alternate.cljc | 12 -- .../spade/git_sha_93ef290/container/atom.cljc | 9 - .../spade/git_sha_93ef290/core.cljs | 6 - .../git_sha_93ef290/runtime/defaults.clj | 7 - .../git_sha_93ef290/runtime/defaults.cljs | 5 - src/day8/re_frame_10x.cljs | 4 +- src/day8/re_frame_10x/components/buttons.cljs | 4 +- .../components/cljs_devtools.cljs | 2 +- src/day8/re_frame_10x/components/data.cljs | 4 +- .../re_frame_10x/components/hyperlinks.cljs | 2 +- src/day8/re_frame_10x/components/inputs.cljs | 2 +- src/day8/re_frame_10x/components/re_com.cljs | 2 +- .../re_frame_10x/navigation/epochs/views.cljs | 2 +- src/day8/re_frame_10x/navigation/views.cljs | 6 +- .../re_frame_10x/panels/app_db/views.cljs | 2 +- src/day8/re_frame_10x/panels/event/views.cljs | 2 +- src/day8/re_frame_10x/panels/fx/views.cljs | 2 +- src/day8/re_frame_10x/panels/subs/views.cljs | 6 +- .../re_frame_10x/panels/timing/views.cljs | 2 +- .../re_frame_10x/panels/traces/views.cljs | 2 +- src/day8/re_frame_10x/styles.cljs | 4 +- 34 files changed, 262 insertions(+), 172 deletions(-) create mode 100644 gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/container.cljc create mode 100644 gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/container/alternate.cljc create mode 100644 gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/container/atom.cljc rename gen-src/day8/re_frame_10x/inlined_deps/spade/{git_sha_93ef290 => git_sha_5197e54}/container/dom.cljs (77%) rename gen-src/day8/re_frame_10x/inlined_deps/spade/{git_sha_93ef290 => git_sha_5197e54}/core.cljc (61%) create mode 100644 gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/core.cljs rename gen-src/day8/re_frame_10x/inlined_deps/spade/{git_sha_93ef290 => git_sha_5197e54}/react.cljs (76%) rename gen-src/day8/re_frame_10x/inlined_deps/spade/{git_sha_93ef290 => git_sha_5197e54}/runtime.cljc (50%) create mode 100644 gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/runtime/defaults.clj create mode 100644 gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/runtime/defaults.cljs rename gen-src/day8/re_frame_10x/inlined_deps/spade/{git_sha_93ef290 => git_sha_5197e54}/util.cljc (95%) delete mode 100644 gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/container.cljc delete mode 100644 gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/container/alternate.cljc delete mode 100644 gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/container/atom.cljc delete mode 100644 gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/core.cljs delete mode 100644 gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/runtime/defaults.clj delete mode 100644 gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/runtime/defaults.cljs diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn index a9338a25..6d39c10b 100644 --- a/.clj-kondo/config.edn +++ b/.clj-kondo/config.edn @@ -2,4 +2,4 @@ {day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.selectors/defpseudoclass clojure.core/def day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.selectors/defpseudoelement clojure.core/def day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.units/defunit clojure.core/def - day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.core/defclass clojure.core/defn}} \ No newline at end of file + day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.core/defclass clojure.core/defn}} diff --git a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/container.cljc b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/container.cljc new file mode 100644 index 00000000..856557c5 --- /dev/null +++ b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/container.cljc @@ -0,0 +1,14 @@ +(ns day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.container) + +(defprotocol IStyleContainer + "The IStyleContainer represents anything that can be used by Spade to + 'mount' styles for access by Spade style components." + (mounted-info + [this style-name] + "Given a style-name, return the info object that was passed when style-name + was mounted, or nil if that style is not currently mounted.") + (mount-style! + [this style-name css info] + "Ensure the style with the given name and CSS is available. [info] + should be stored somewhere in-memory to be quickly retrieved + by a call to [mounted-info].")) diff --git a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/container/alternate.cljc b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/container/alternate.cljc new file mode 100644 index 00000000..0d40f60e --- /dev/null +++ b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/container/alternate.cljc @@ -0,0 +1,17 @@ +(ns day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.container.alternate + "The AlternateStyleContainer may be used when a preferred container + is not always available." + (:require [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.container :as sc :refer [IStyleContainer]])) + +(deftype AlternateStyleContainer [get-preferred fallback] + IStyleContainer + (mounted-info + [_ style-name] + (or (when-let [preferred (get-preferred)] + (sc/mounted-info preferred style-name)) + (sc/mounted-info fallback style-name))) + (mount-style! + [_ style-name css info] + (or (when-let [preferred (get-preferred)] + (sc/mount-style! preferred style-name css info)) + (sc/mount-style! fallback style-name css info)))) diff --git a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/container/atom.cljc b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/container/atom.cljc new file mode 100644 index 00000000..5c11a3aa --- /dev/null +++ b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/container/atom.cljc @@ -0,0 +1,16 @@ +(ns day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.container.atom + "The AtomStyleContainer renders styles into an atom it is provided with." + (:require [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.container :refer [IStyleContainer]])) + +(deftype AtomStyleContainer [styles-atom info-atom] + IStyleContainer + (mounted-info [_ style-name] + (get @info-atom style-name)) + (mount-style! [_ style-name css info] + (swap! styles-atom assoc style-name css) + (swap! info-atom assoc style-name info))) + +(defn create-container + ([] (create-container (atom nil))) + ([styles-atom] (create-container styles-atom (atom nil))) + ([styles-atom info-atom] (->AtomStyleContainer styles-atom info-atom))) diff --git a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/container/dom.cljs b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/container/dom.cljs similarity index 77% rename from gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/container/dom.cljs rename to gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/container/dom.cljs index 715ece1a..13cbef71 100644 --- a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/container/dom.cljs +++ b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/container/dom.cljs @@ -1,27 +1,28 @@ -(ns day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.container.dom +(ns day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.container.dom "The DomStyleContainer renders styles into DOM elements. References to those elements are stored in a `styles` atom, or `*injected-styles*` if that is not provided. Similarly, if no `target-dom` is provided, the `document.head` element is used." - (:require [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.container :refer [IStyleContainer]])) + (:require [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.container :refer [IStyleContainer]])) (defonce ^:dynamic *injected-styles* (atom nil)) (defn- perform-update! [obj css] (set! (.-innerHTML (:element obj)) css)) -(defn update! [styles-container id css] +(defn update! [styles-container id css info] (swap! styles-container update id (fn update-injected-style [obj] (when-not (= (:source obj) css) (perform-update! obj css)) - (assoc obj :source css)))) + (assoc obj :source css :info info)))) -(defn inject! [target-dom styles-container id css] +(defn inject! [target-dom styles-container id css info] (let [element (doto (js/document.createElement "style") (.setAttribute "spade-id" (str id))) obj {:element element :source css + :info info :id id}] (assert (some? target-dom) "An element or target DOM is required to inject the style.") @@ -33,17 +34,22 @@ (deftype DomStyleContainer [target-dom styles] IStyleContainer - (mount-style! [_ style-name css] + (mounted-info [_ style-name] + (let [resolved-container (or styles + *injected-styles*)] + (:info (get @resolved-container style-name)))) + + (mount-style! [_ style-name css info] (let [resolved-container (or styles *injected-styles*)] (if (contains? @resolved-container style-name) - (update! resolved-container style-name css) + (update! resolved-container style-name css info) (let [resolved-dom (or (when (ifn? target-dom) (target-dom)) target-dom (.-head js/document))] - (inject! resolved-dom resolved-container style-name css)))))) + (inject! resolved-dom resolved-container style-name css info)))))) (defn create-container "Create a DomStyleContainer. With no args, the default is created, which diff --git a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/core.cljc b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/core.cljc similarity index 61% rename from gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/core.cljc rename to gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/core.cljc index 58e545af..55ce78be 100644 --- a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/core.cljc +++ b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/core.cljc @@ -1,26 +1,33 @@ -(ns day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.core +(ns day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.core #?(:cljs (:require-macros [net.cgrand.macrovich :as macros])) (:require [clojure.string :as str] [clojure.walk :refer [postwalk prewalk]] #?@(:clj [[net.cgrand.macrovich :as macros] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.runtime]]) - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.util :refer [factory->name build-style-name]])) + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.runtime]]) + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.util :refer [factory->name build-style-name]])) (defn- extract-key [style] (:key (meta (first style)))) (defn- find-key-meta [style] - (postwalk - (fn [form] - (if (and (map? form) - (::key form)) - form + (->> style - (if-let [k (:key (meta form))] - {::key k} + (postwalk + (fn [form] + (if (and (map? form) + (::key form)) + form - form))) - style)) + (if-let [k (:key (meta form))] + {::key k} + + (if-let [k (when (sequential? form) + (some ::key form))] + {::key k} + + form))))) + + ::key)) (def ^:private auto-imported-at-form? #{'at-font-face @@ -58,7 +65,7 @@ (subs n 1 (dec (count n)))))))) (defn- varify-val [element] - `(day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.runtime/->css-var ~(varify-key element))) + `(day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.runtime/->css-var ~(varify-key element))) (defn- rename-vars [style] (prewalk @@ -92,39 +99,43 @@ [nil style])) -(defn- with-composition [composition name-var style-var] - (let [base {:css `(day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.runtime/compile-css ~style-var) - :name name-var}] +(defn- with-composition [composition name-var key-var style-var] + (let [base (cond-> + {:css `(when ~name-var + (day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.runtime/compile-css ~style-var)) + :name name-var} + + key-var (assoc ::key key-var))] (if composition (assoc base :composes composition) base))) (defn- build-style-naming-let - [style params original-style-name-var params-var] - (let [has-key-meta? (find-key-meta style) + [style params name-var] + (let [has-key-meta? (some? (find-key-meta style)) static-key (extract-key style) - name-var (gensym "name")] + key-var (gensym "key")] (cond ; easiest case: no params? no need to call build-style-name (nil? (seq params)) - [nil original-style-name-var nil] + [nil name-var nil nil] - (or static-key - (not has-key-meta?)) - ; if we can extract the key statically, that's better - [nil name-var `[~name-var (#'build-style-name - ~original-style-name-var - ~static-key - ~params-var)]] + ; typical case: no custom key + (not has-key-meta?) + [nil name-var nil nil] + ; okay case: a (nearly) static key that we can pull out and compute + ; directly, without building the rest of the style form + static-key + [nil name-var key-var + `[~key-var ~static-key]] + + ; fancy case: custom :key :else (let [base-style-var (gensym "base-style")] - [base-style-var name-var `[~base-style-var ~(vec style) - key# (:key (meta (first ~base-style-var))) - ~name-var (#'build-style-name - ~original-style-name-var - key# - ~params-var)]])))) + [base-style-var name-var key-var + `[~base-style-var ~(vec style) + ~key-var (:key (meta (first ~base-style-var)))]])))) (defn- prefix-at-media [style] (postwalk @@ -138,31 +149,32 @@ form)) style)) -(defn- transform-named-style [style params style-name-var params-var] +(defn- transform-named-style [style params style-name-var] (let [[composition style] (extract-composes style) style-var (gensym "style") style (->> style prefix-at-media rename-vars) - [base-style-var name-var name-let] (build-style-naming-let - style params style-name-var - params-var) + [base-style-var name-var key-var style-naming-let] (build-style-naming-let + style params style-name-var) style-decl (if base-style-var `(into [(str "." ~name-var)] ~base-style-var) (into [`(str "." ~name-var)] style))] - `(let ~(vec (concat name-let + `(let ~(vec (concat style-naming-let [style-var style-decl])) - ~(with-composition composition name-var style-var)))) + ~(with-composition composition name-var key-var style-var)))) -(defn- transform-keyframes-style [style params style-name-var params-var] +(defn- transform-keyframes-style [style params style-name-var] (let [style (->> style prefix-at-media rename-vars) - [style-var name-var style-naming-let] (build-style-naming-let - style params style-name-var - params-var) - info-map `{:css (day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.runtime/compile-css - (day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.stylesheet/at-keyframes - ~name-var - ~(or style-var - (vec style)))) - :name ~name-var}] + [base-style-var name-var key-var style-naming-let] (build-style-naming-let + style params style-name-var) + info-map (cond-> + `{:css (when ~name-var + (day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.runtime/compile-css + (garden.stylesheet/at-keyframes + ~name-var + ~(or base-style-var (vec style))))) + :name ~name-var} + + key-var (assoc ::key key-var))] ; this (let) might get compiled out in advanced mode anyway, but ; let's just generate simpler code instead of having a redundant @@ -171,22 +183,46 @@ `(let ~style-naming-let ~info-map) info-map))) -(defn- transform-style [mode style params style-name-var params-var] +(defn- transform-style [mode style params style-name-var] (let [style (replace-at-forms style)] (cond (#{:global} mode) - `{:css (day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.runtime/compile-css ~(vec (rename-vars style))) - :name ~style-name-var} + `{:css (day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.runtime/compile-css ~(vec (rename-vars style)))} ; keyframes are a bit of a special case (#{:keyframes} mode) - (transform-keyframes-style style params style-name-var params-var) + (transform-keyframes-style style params style-name-var) :else - (transform-named-style style params style-name-var params-var)))) + (transform-named-style style params style-name-var)))) + +(defn- generate-style-name-fn [factory-fn-name factory-name-var style params] + (cond + (empty? params) + `(clojure.core/constantly ~factory-name-var) + + ; Custom :key meta; we need to generate the form to extract that. + ; TODO: Ideally we can invoke the factory but *skip* CSS compilation, + ; but since this is memoized (and :key isn't much used anyway) this is + ; probably not a big deal for now. Would be a nice optimization, however. + (some? (find-key-meta style)) + `(clojure.core/memoize + (fn [params#] + (let [dry-run# (~factory-fn-name nil params#)] + (#'build-style-name + ~factory-name-var + (::key dry-run#) + params#)))) + + :else + `(clojure.core/memoize + (partial + #'build-style-name + ~factory-name-var + nil)))) (defmulti ^:private declare-style - (fn [mode _class-name params _factory-name-var _factory-fn-name] + (fn [mode _class-name params _name-fn-name _factory-fn-name] (case mode :global :static (cond @@ -194,22 +230,24 @@ (every? symbol? params) :default :else :destructured)))) (defmethod declare-style :static - [mode class-name _ factory-name-var factory-fn-name] - `(def ~class-name (day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.runtime/ensure-style! + [mode class-name _ name-fn-name factory-fn-name] + `(def ~class-name (day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.runtime/ensure-style! ~mode - ~factory-name-var + (meta (var ~class-name)) + ~name-fn-name ~factory-fn-name nil))) (defmethod declare-style :no-args - [mode class-name _ factory-name-var factory-fn-name] + [mode class-name _ name-fn-name factory-fn-name] `(defn ~class-name [] - (day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.runtime/ensure-style! + (day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.runtime/ensure-style! ~mode - ~factory-name-var + (meta (var ~class-name)) + ~name-fn-name ~factory-fn-name nil))) (defmethod declare-style :destructured - [mode class-name params factory-name-var factory-fn-name] + [mode class-name params name-fn-name factory-fn-name] ; good case; since there's no variadic args, we can generate an :arglists ; meta and a simplified params list that we can forward simply (let [raw-params (->> (range (count params)) @@ -219,29 +257,32 @@ `(defn ~class-name {:arglists (quote ~(list params))} ~raw-params - (day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.runtime/ensure-style! + (day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.runtime/ensure-style! ~mode - ~factory-name-var + (meta (var ~class-name)) + ~name-fn-name ~factory-fn-name ~raw-params)))) (defmethod declare-style :variadic - [mode class-name _params factory-name-var factory-fn-name] + [mode class-name _params name-fn-name factory-fn-name] ; dumb case; with a variadic params vector, any :arglists we ; provide gets ignored, so we just simply collect them all ; and pass the list as-is `(defn ~class-name [& params#] - (day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.runtime/ensure-style! + (day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.runtime/ensure-style! ~mode - ~factory-name-var + (meta (var ~class-name)) + ~name-fn-name ~factory-fn-name params#))) (defmethod declare-style :default - [mode class-name params factory-name-var factory-fn-name] + [mode class-name params name-fn-name factory-fn-name] ; best case; simple params means we can use them directly `(defn ~class-name ~params - (day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.runtime/ensure-style! + (day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.runtime/ensure-style! ~mode - ~factory-name-var + (meta (var ~class-name)) + ~name-fn-name ~factory-fn-name ~params))) @@ -250,19 +291,27 @@ (or (vector? params) (nil? params))]} (let [factory-fn-name (symbol (str (name class-name) "-factory$")) + style-name-fn-name (symbol (str (name class-name) "-name$")) + style-name-var (gensym "style-name") params-var (gensym "params") - factory-params (vec (concat [style-name-var params-var] params)) factory-name-var (gensym "factory-name")] `(do - (defn ~factory-fn-name ~factory-params - ~(transform-style mode style params style-name-var params-var)) + (defn ~factory-fn-name [~style-name-var ~params-var] + ~(if params + `(let [~params ~params-var] + ~(transform-style mode style params style-name-var)) + (transform-style mode style nil style-name-var))) (let [~factory-name-var (factory->name (macros/case :cljs ~factory-fn-name - :clj (var ~factory-fn-name)))] - ~(declare-style mode class-name params factory-name-var factory-fn-name))))) + :clj (var ~factory-fn-name))) + + ~style-name-fn-name ~(generate-style-name-fn + factory-fn-name factory-name-var style params)] + + ~(declare-style mode class-name params style-name-fn-name factory-fn-name))))) (defmacro defclass "Define a CSS module function named `class-name` and accepting a vector @@ -330,7 +379,7 @@ (defmacro with-styles-container [container & body] (macros/case - :cljs `(binding [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.runtime/*style-container* ~container] + :cljs `(binding [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.runtime/*style-container* ~container] ~@body) - :clj `(with-bindings {#'day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.runtime/*style-container* ~container} + :clj `(with-bindings {#'day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.runtime/*style-container* ~container} ~@body))) diff --git a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/core.cljs b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/core.cljs new file mode 100644 index 00000000..9f974289 --- /dev/null +++ b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/core.cljs @@ -0,0 +1,6 @@ +(ns day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.core + (:require-macros [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.core]) + (:require [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.core] + [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.stylesheet] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.runtime] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.util])) diff --git a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/react.cljs b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/react.cljs similarity index 76% rename from gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/react.cljs rename to gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/react.cljs index 49ac412a..d0172a46 100644 --- a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/react.cljs +++ b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/react.cljs @@ -1,9 +1,9 @@ -(ns day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.react +(ns day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.react (:require [react :as react] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.container :refer [IStyleContainer]] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.container.alternate :refer [->AlternateStyleContainer]] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.container.dom :as dom] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.runtime :refer [*style-container*]])) + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.container :refer [IStyleContainer]] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.container.alternate :refer [->AlternateStyleContainer]] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.container.dom :as dom] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.runtime :refer [*style-container*]])) (defonce context (react/createContext nil)) (defonce Provider (.-Provider context)) diff --git a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/runtime.cljc b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/runtime.cljc similarity index 50% rename from gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/runtime.cljc rename to gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/runtime.cljc index c1dc1f6b..26e11175 100644 --- a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/runtime.cljc +++ b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/runtime.cljc @@ -1,13 +1,15 @@ -(ns day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.runtime +(ns day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.runtime (:require [clojure.string :as str] [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.core :as garden] [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.types :refer [->CSSFunction]] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.container :as sc] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.runtime.defaults :as defaults])) + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.container :as sc] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.runtime.defaults :as defaults])) (defonce ^:dynamic *css-compile-flags* {:pretty-print? #? (:cljs goog.DEBUG - :clj false)}) + :clj false) + :always-compile-css? #? (:cljs goog.DEBUG + :clj false)}) (defonce ^:dynamic *style-container* (defaults/create-container)) @@ -21,8 +23,8 @@ (if-not composed style-name - (->> (if (seq? composed) - (into composed style-name) + (->> (if (sequential? composed) + (conj composed style-name) [composed style-name]) (map (fn [item] (cond @@ -41,10 +43,24 @@ :value item}))))) (str/join " ")))) -(defn ensure-style! [mode base-style-name factory params] - (let [{css :css style-name :name :as info} (apply factory base-style-name params params)] +(defn ensure-style! [mode metadata name-factory style-factory params] + (let [style-name (name-factory params) + always-compile? (or (:always-compile-css metadata) + (:always-compile-css? *css-compile-flags*)) - (sc/mount-style! *style-container* style-name css) + ; NOTE: If we've been instructed to always compile css, then always + ; assume it's unmounted. The container can update a mounted style + mounted-info (when-not always-compile? + (sc/mounted-info *style-container* style-name)) + + {css :css :as info} (or + mounted-info + + ; Not mounted *or* we always want to compile + (style-factory style-name params))] + + (when-not mounted-info + (sc/mount-style! *style-container* style-name css info)) (case mode :attrs {:class (compose-names info)} diff --git a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/runtime/defaults.clj b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/runtime/defaults.clj new file mode 100644 index 00000000..47830591 --- /dev/null +++ b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/runtime/defaults.clj @@ -0,0 +1,8 @@ +(ns day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.runtime.defaults + (:require [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.container.atom :as atom-container])) + +(defonce shared-styles-atom (atom nil)) +(defonce shared-styles-info-atom (atom nil)) + +(defn create-container [] + (atom-container/create-container shared-styles-atom shared-styles-info-atom)) diff --git a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/runtime/defaults.cljs b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/runtime/defaults.cljs new file mode 100644 index 00000000..f631fb3e --- /dev/null +++ b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/runtime/defaults.cljs @@ -0,0 +1,5 @@ +(ns day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.runtime.defaults + (:require [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.container.dom :as dom])) + +(defn create-container [] + (dom/create-container)) diff --git a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/util.cljc b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/util.cljc similarity index 95% rename from gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/util.cljc rename to gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/util.cljc index 3046d7a8..e500a17c 100644 --- a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/util.cljc +++ b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_5197e54/util.cljc @@ -1,4 +1,4 @@ -(ns ^:no-doc day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.util +(ns ^:no-doc day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.util (:require [clojure.string :as str])) (defn factory->name diff --git a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/container.cljc b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/container.cljc deleted file mode 100644 index 353bf737..00000000 --- a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/container.cljc +++ /dev/null @@ -1,8 +0,0 @@ -(ns day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.container) - -(defprotocol IStyleContainer - "The IStyleContainer represents anything that can be used by Spade to - 'mount' styles for access by Spade style components." - (mount-style! - [this style-name css] - "Ensure the style with the given name and CSS is available")) diff --git a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/container/alternate.cljc b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/container/alternate.cljc deleted file mode 100644 index 238fcdb2..00000000 --- a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/container/alternate.cljc +++ /dev/null @@ -1,12 +0,0 @@ -(ns day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.container.alternate - "The AlternateStyleContainer may be used when a preferred container - is not always available." - (:require [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.container :as sc :refer [IStyleContainer]])) - -(deftype AlternateStyleContainer [get-preferred fallback] - IStyleContainer - (mount-style! - [_ style-name css] - (or (when-let [preferred (get-preferred)] - (sc/mount-style! preferred style-name css)) - (sc/mount-style! fallback style-name css)))) diff --git a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/container/atom.cljc b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/container/atom.cljc deleted file mode 100644 index fd1e10a4..00000000 --- a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/container/atom.cljc +++ /dev/null @@ -1,9 +0,0 @@ -(ns day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.container.atom - "The AtomStyleContainer renders styles into an atom it is provided with." - (:require [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.container :refer [IStyleContainer]])) - -(deftype AtomStyleContainer [styles-atom] - IStyleContainer - (mount-style! [_ style-name css] - (swap! styles-atom assoc style-name css))) - diff --git a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/core.cljs b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/core.cljs deleted file mode 100644 index 8129c198..00000000 --- a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/core.cljs +++ /dev/null @@ -1,6 +0,0 @@ -(ns day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.core - (:require-macros [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.core]) - (:require [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.core] - [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.stylesheet] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.runtime] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.util])) diff --git a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/runtime/defaults.clj b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/runtime/defaults.clj deleted file mode 100644 index a11ec55f..00000000 --- a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/runtime/defaults.clj +++ /dev/null @@ -1,7 +0,0 @@ -(ns day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.runtime.defaults - (:require [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.container.atom :refer [->AtomStyleContainer]])) - -(defonce shared-styles-atom (atom nil)) - -(defn create-container [] - (->AtomStyleContainer shared-styles-atom)) diff --git a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/runtime/defaults.cljs b/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/runtime/defaults.cljs deleted file mode 100644 index be181b1b..00000000 --- a/gen-src/day8/re_frame_10x/inlined_deps/spade/git_sha_93ef290/runtime/defaults.cljs +++ /dev/null @@ -1,5 +0,0 @@ -(ns day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.runtime.defaults - (:require [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.container.dom :as dom])) - -(defn create-container [] - (dom/create-container)) diff --git a/src/day8/re_frame_10x.cljs b/src/day8/re_frame_10x.cljs index 0db40fe8..0ebb7ae9 100644 --- a/src/day8/re_frame_10x.cljs +++ b/src/day8/re_frame_10x.cljs @@ -3,8 +3,8 @@ [day8.re-frame-10x.inlined-deps.reagent.v1v2v0.reagent.core :as r] [day8.re-frame-10x.inlined-deps.re-frame.v1v3v0.re-frame.core :as rf] [day8.re-frame-10x.inlined-deps.re-frame.v1v3v0.re-frame.db :as db] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.container.dom :as spade.dom] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.react :as spade.react] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.container.dom :as spade.dom] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.react :as spade.react] [day8.reagent.impl.batching :refer [patch-next-tick]] [day8.reagent.impl.component :refer [patch-wrap-funs patch-custom-wrapper]] [day8.re-frame-10x.tools.coll :refer [sortable-uuid-map pred-map]] diff --git a/src/day8/re_frame_10x/components/buttons.cljs b/src/day8/re_frame_10x/components/buttons.cljs index c3032626..cb8ce5e2 100644 --- a/src/day8/re_frame_10x/components/buttons.cljs +++ b/src/day8/re_frame_10x/components/buttons.cljs @@ -1,6 +1,6 @@ (ns day8.re-frame-10x.components.buttons (:require - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.core :refer [defclass]] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.core :refer [defclass]] [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.units :refer [px]] [day8.re-frame-10x.components.re-com :as rc] [day8.re-frame-10x.material :as material] @@ -53,4 +53,4 @@ :class (expansion-style) :child (if open? [material/arrow-drop-down {:size size}] - [material/arrow-right {:size size}])]) \ No newline at end of file + [material/arrow-right {:size size}])]) diff --git a/src/day8/re_frame_10x/components/cljs_devtools.cljs b/src/day8/re_frame_10x/components/cljs_devtools.cljs index ef89b2de..82082c16 100644 --- a/src/day8/re_frame_10x/components/cljs_devtools.cljs +++ b/src/day8/re_frame_10x/components/cljs_devtools.cljs @@ -15,7 +15,7 @@ [day8.re-frame-10x.inlined-deps.re-frame.v1v3v0.re-frame.core :as rf] [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.core :refer [style]] [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.units :refer [px]] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.core :refer [defclass]] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.core :refer [defclass]] [day8.re-frame-10x.components.re-com :as rc] [day8.re-frame-10x.material :as material] [day8.re-frame-10x.styles :as styles] diff --git a/src/day8/re_frame_10x/components/data.cljs b/src/day8/re_frame_10x/components/data.cljs index 4f4240f4..b6f13267 100644 --- a/src/day8/re_frame_10x/components/data.cljs +++ b/src/day8/re_frame_10x/components/data.cljs @@ -1,6 +1,6 @@ (ns day8.re-frame-10x.components.data (:require - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.core :refer [defclass]] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.core :refer [defclass]] [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.units :refer [px]] [day8.re-frame-10x.components.re-com :as rc] [day8.re-frame-10x.styles :as styles])) @@ -18,4 +18,4 @@ (defn tag [class label] [rc/box :class (str (tag-style) " " class) - :child [:span label]]) \ No newline at end of file + :child [:span label]]) diff --git a/src/day8/re_frame_10x/components/hyperlinks.cljs b/src/day8/re_frame_10x/components/hyperlinks.cljs index 2c72c78b..edf57039 100644 --- a/src/day8/re_frame_10x/components/hyperlinks.cljs +++ b/src/day8/re_frame_10x/components/hyperlinks.cljs @@ -1,7 +1,7 @@ (ns day8.re-frame-10x.components.hyperlinks (:require [day8.re-frame-10x.inlined-deps.re-frame.v1v3v0.re-frame.core :as rf] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.core :refer [defclass]] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.core :refer [defclass]] [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.units :refer [percent]] [day8.re-frame-10x.components.re-com :as rc] [day8.re-frame-10x.styles :as styles] diff --git a/src/day8/re_frame_10x/components/inputs.cljs b/src/day8/re_frame_10x/components/inputs.cljs index 75992434..806acec1 100644 --- a/src/day8/re_frame_10x/components/inputs.cljs +++ b/src/day8/re_frame_10x/components/inputs.cljs @@ -3,7 +3,7 @@ [clojure.string :as string] [day8.re-frame-10x.inlined-deps.reagent.v1v2v0.reagent.core :as r] [day8.re-frame-10x.inlined-deps.re-frame.v1v3v0.re-frame.core :as rf] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.core :refer [defclass]] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.core :refer [defclass]] [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.color :as color] [day8.re-frame-10x.panels.settings.subs :as settings.subs] [day8.re-frame-10x.components.re-com :as rc :refer [deref-or-value]] diff --git a/src/day8/re_frame_10x/components/re_com.cljs b/src/day8/re_frame_10x/components/re_com.cljs index 3418223d..db75195a 100644 --- a/src/day8/re_frame_10x/components/re_com.cljs +++ b/src/day8/re_frame_10x/components/re_com.cljs @@ -6,7 +6,7 @@ [goog.object :as gobj] [clojure.string :as string] [day8.re-frame-10x.inlined-deps.reagent.v1v2v0.reagent.ratom :as reagent :refer [RAtom Reaction RCursor Track Wrapper]] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.core :refer [defclass]] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.core :refer [defclass]] [reagent.impl.component :as component] [reagent.core :as r])) diff --git a/src/day8/re_frame_10x/navigation/epochs/views.cljs b/src/day8/re_frame_10x/navigation/epochs/views.cljs index 80320800..fbe9e38f 100644 --- a/src/day8/re_frame_10x/navigation/epochs/views.cljs +++ b/src/day8/re_frame_10x/navigation/epochs/views.cljs @@ -3,7 +3,7 @@ [day8.re-frame-10x.inlined-deps.reagent.v1v2v0.reagent.core :as r] [day8.re-frame-10x.inlined-deps.reagent.v1v2v0.reagent.dom :as rdom] [day8.re-frame-10x.inlined-deps.re-frame.v1v3v0.re-frame.core :as rf] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.core :refer [defclass]] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.core :refer [defclass]] [day8.re-frame-10x.components.buttons :as buttons] [day8.re-frame-10x.components.re-com :as rc] [day8.re-frame-10x.material :as material] diff --git a/src/day8/re_frame_10x/navigation/views.cljs b/src/day8/re_frame_10x/navigation/views.cljs index c0668bfd..56d272da 100644 --- a/src/day8/re_frame_10x/navigation/views.cljs +++ b/src/day8/re_frame_10x/navigation/views.cljs @@ -9,9 +9,9 @@ [day8.re-frame-10x.inlined-deps.re-frame.v1v3v0.re-frame.core :as rf] [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.core] [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.units :refer [px]] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.core :refer [defclass]] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.container.dom :as spade.dom] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.react :as spade.react] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.core :refer [defclass]] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.container.dom :as spade.dom] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.react :as spade.react] [day8.re-frame-10x.components.buttons :as buttons] [day8.re-frame-10x.components.hyperlinks :as hyperlinks] [day8.re-frame-10x.components.inputs :as inputs] diff --git a/src/day8/re_frame_10x/panels/app_db/views.cljs b/src/day8/re_frame_10x/panels/app_db/views.cljs index b76377d0..df604ea6 100644 --- a/src/day8/re_frame_10x/panels/app_db/views.cljs +++ b/src/day8/re_frame_10x/panels/app_db/views.cljs @@ -6,7 +6,7 @@ [devtools.prefs] [devtools.formatters.core] [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.units :refer [px]] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.core :refer [defclass]] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.core :refer [defclass]] [day8.re-frame-10x.inlined-deps.re-frame.v1v3v0.re-frame.core :as rf] [day8.re-frame-10x.components.buttons :as buttons] [day8.re-frame-10x.components.cljs-devtools :as cljs-devtools] diff --git a/src/day8/re_frame_10x/panels/event/views.cljs b/src/day8/re_frame_10x/panels/event/views.cljs index c67a5319..0131dc67 100644 --- a/src/day8/re_frame_10x/panels/event/views.cljs +++ b/src/day8/re_frame_10x/panels/event/views.cljs @@ -4,7 +4,7 @@ (:require ["react" :as react] [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.units :refer [px ms]] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.core :refer [defclass]] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.core :refer [defclass]] [day8.re-frame-10x.inlined-deps.reagent.v1v2v0.reagent.core :as r] [day8.re-frame-10x.inlined-deps.re-frame.v1v3v0.re-frame.core :as rf] [day8.re-frame-10x.components.buttons :as buttons] diff --git a/src/day8/re_frame_10x/panels/fx/views.cljs b/src/day8/re_frame_10x/panels/fx/views.cljs index fb397c43..2800ee0d 100644 --- a/src/day8/re_frame_10x/panels/fx/views.cljs +++ b/src/day8/re_frame_10x/panels/fx/views.cljs @@ -2,7 +2,7 @@ (:require [day8.re-frame-10x.components.re-com :as rc] [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.units :refer [percent]] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.core :refer [defclass]] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.core :refer [defclass]] [day8.re-frame-10x.inlined-deps.re-frame.v1v3v0.re-frame.core :as rf] [day8.re-frame-10x.components.buttons :as buttons] [day8.re-frame-10x.components.cljs-devtools :as cljs-devtools] diff --git a/src/day8/re_frame_10x/panels/subs/views.cljs b/src/day8/re_frame_10x/panels/subs/views.cljs index 84f2bee4..739ce332 100644 --- a/src/day8/re_frame_10x/panels/subs/views.cljs +++ b/src/day8/re_frame_10x/panels/subs/views.cljs @@ -4,7 +4,7 @@ (:require [clojure.data] [day8.re-frame-10x.inlined-deps.re-frame.v1v3v0.re-frame.core :as rf] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.core :refer [defclass]] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.core :refer [defclass]] [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.units :refer [px percent]] [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.color :as color] [day8.re-frame-10x.components.buttons :as buttons] @@ -256,8 +256,8 @@ [pod-header-section :width styles/gs-31s :attr {:on-click #(clipboard/copy! (pr-str `(day8.re-frame-10x/traced-sub - ~epoch-id - ~id)))} + ~epoch-id + ~id)))} :last? true :children [[rc/box diff --git a/src/day8/re_frame_10x/panels/timing/views.cljs b/src/day8/re_frame_10x/panels/timing/views.cljs index 8b443e6d..7ca67697 100644 --- a/src/day8/re_frame_10x/panels/timing/views.cljs +++ b/src/day8/re_frame_10x/panels/timing/views.cljs @@ -1,7 +1,7 @@ (ns day8.re-frame-10x.panels.timing.views (:require [day8.re-frame-10x.inlined-deps.re-frame.v1v3v0.re-frame.core :as rf] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.core :refer [defclass]] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.core :refer [defclass]] [day8.re-frame-10x.components.re-com :as rc] [day8.re-frame-10x.styles :as styles] [day8.re-frame-10x.panels.settings.subs :as settings.subs] diff --git a/src/day8/re_frame_10x/panels/traces/views.cljs b/src/day8/re_frame_10x/panels/traces/views.cljs index c82033ad..85f15964 100644 --- a/src/day8/re_frame_10x/panels/traces/views.cljs +++ b/src/day8/re_frame_10x/panels/traces/views.cljs @@ -2,7 +2,7 @@ (:require [day8.re-frame-10x.inlined-deps.re-frame.v1v3v0.re-frame.core :as rf] [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.units :refer [px percent]] - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.core :refer [defclass]] + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.core :refer [defclass]] [day8.re-frame-10x.components.buttons :as buttons] [day8.re-frame-10x.components.inputs :as inputs] [day8.re-frame-10x.components.re-com :as rc] diff --git a/src/day8/re_frame_10x/styles.cljs b/src/day8/re_frame_10x/styles.cljs index bcbe48df..5191f2f8 100644 --- a/src/day8/re_frame_10x/styles.cljs +++ b/src/day8/re_frame_10x/styles.cljs @@ -8,7 +8,7 @@ [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.color :as color :refer [rgb rgba transparentize]] [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.selectors :as s] [day8.re-frame-10x.inlined-deps.garden.v1v3v10.garden.stylesheet :refer [at-keyframes]] ;;(at-import at-media at-keyframes) - [day8.re-frame-10x.inlined-deps.spade.git-sha-93ef290.core :refer [defclass]])) + [day8.re-frame-10x.inlined-deps.spade.git-sha-5197e54.core :refer [defclass]])) ;; ==== ;; https://www.nordtheme.com/docs/colors-and-palettes @@ -570,4 +570,4 @@ (defclass clj-highlighted [] {:background-color nord13}) -(defclass clj-seq [] {}) \ No newline at end of file +(defclass clj-seq [] {})