option-path can be a vector

pink-gorilla · Mar 7, 2024 · 1c644e9 · 1c644e9
1 parent 80ad8a7
commit 1c644e9
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 22 deletions.
diff --git a/demo/src/demo/page/options.cljs b/demo/src/demo/page/options.cljs
@@ -13,7 +13,7 @@
              :pet :hamster
              ; bool
              :run-parallel true
-             :debug? false
+             :environment {:enabled true}
              ; string
              :search ""
              ; view
@@ -38,8 +38,8 @@
               :name "RunParallel?"
               :spec :bool
               :class "pt-0 px-2 py-1 placeholder-gray-400 text-gray-700 relative bg-white rounded text-sm border border-gray-400 outline-none focus:outline-none focus:shadow-outline"}
-             {:path :debug?
-              :name "DebugMode"
+             {:path [:environment :enabled] 
+              :name "EnvEnabled?"
               :spec :bool}
              {:path :search
               :name "SearchBox"

diff --git a/resources/ext/options.edn b/resources/ext/options.edn
@@ -1,19 +1,15 @@
 {:name "options"
  ; build
  :lazy false
-
  :cljs-namespace [options.core
                   options.edit]
-
  :cljs-ns-bindings {'options.core {'options-ui options.core/options-ui}
-                    'options.editr {'bool options.edit/bool
-                                     'button options.edit/button
-                                     'select options.edit/select
-                                     'string options.edit/string
-                                     'view options.edit/view}}
-
+                    'options.edit {'bool options.edit/bool
+                                   'button options.edit/button
+                                   'select options.edit/select
+                                   'string options.edit/string
+                                   'view options.edit/view}}
  ; runtime
-
  :theme {:available  {:options {true ["options/options.css"]}}
          :current {:options true}}
  ;

diff --git a/src/options/core.cljs b/src/options/core.cljs
@@ -33,17 +33,33 @@
      [:span name] ; <label for= "pet-select" >Choose a pet:</label>
      (get-editor-fn config current-val)]))
 
+(defn get-value [state path]
+  (cond
+    (keyword? path)
+    (path @state)
+
+    (vector? path)
+    (get-in @state path)
+
+    :else
+    nil))
+
+(defn set-value [state path v]
+  (println "set-value path: " path " value: " v)
+  (cond
+    (keyword? path)
+    (swap! state assoc path v)
+
+    (vector? path)
+    (swap! state assoc-in path v)
+
+    :else
+    nil))
+
 (defn create-edit-element [state options]
-  (let [kw (:path options)
-        set-fn (fn [v]
-                 (when kw
-                   (println "setting state for kw: " kw " to val: " v)
-                   (swap! state assoc kw v)))]
-    [edit-element {:set-fn set-fn
-                   :options options}
-     (if kw
-       (kw @state)
-       nil)]))
+  [edit-element {:set-fn #(set-value state (:path options) %)
+                 :options options}
+   (get-value state (:path options))])
 
 (defn options-ui [{:keys [class style] :as styling}  ; styling
                   {:keys [current state options]