support element as menu item

Respo · Sep 12, 2018 · 1ec0997 · 1ec0997
1 parent a80a4fc
commit 1ec0997
Show file tree

Hide file tree

Showing 3 changed files with 180 additions and 82 deletions.
diff --git a/calcit.edn b/calcit.edn
diff --git a/src/inflow_popup/comp/container.cljs b/src/inflow_popup/comp/container.cljs
@@ -51,7 +51,12 @@
        (comp-menu-dialog
         (fn [result d! m!] (println "result" result))
         (fn [mutate!] (mutate! %cursor (update state :show-menu? not)))
-        {:haskell "Haskell", :clojure "Clojure"})))
+        {:haskell "Haskell",
+         :clojure "Clojure",
+         :elixir (div
+                  {:style {}}
+                  (div {} (<> "Elixir"))
+                  (div {} (<> "...with an extra line")))})))
     (comp-inspect "state" state nil)
     (cursor-> :reel comp-reel states reel {}))))
 

diff --git a/src/inflow_popup/comp/dialog.cljs b/src/inflow_popup/comp/dialog.cljs
@@ -17,6 +17,15 @@
    :on-click (fn [e d! m!] (on-close! m!))}
   (div {:on-click on-focus, :style widget/card} element-inside)))
 
+(def style-menu-item
+  {:border-bottom (str "1px solid " (hsl 0 0 90)),
+   :padding "0 16px",
+   :line-height "40px",
+   :min-width 240,
+   :max-width 400,
+   :cursor :pointer,
+   :white-space :nowrap})
+
 (defcomp
  comp-menu-dialog
  (on-choose! on-close! candidates)
@@ -46,11 +55,5 @@
             [idx
              (div
               {:on-click (fn [e d! m!] (on-choose! k d! m!) (on-close! m!)),
-               :style {:border-bottom (str "1px solid " (hsl 0 0 90)),
-                       :padding "0 16px",
-                       :line-height "40px",
-                       :min-width 240,
-                       :max-width 400,
-                       :cursor :pointer,
-                       :white-space :nowrap}}
-              (<> v))])))))))
+               :style style-menu-item}
+              (if (string? v) (<> v) v))])))))))