浏览代码

fix: can't select today in date picker

Tienson Qin 1 年之前
父节点
当前提交
42bded2c03
共有 1 个文件被更改,包括 14 次插入13 次删除
  1. 14 13
      src/main/frontend/ui.cljs

+ 14 - 13
src/main/frontend/ui.cljs

@@ -1177,20 +1177,21 @@
       (get-month-label value)])])
 
 (defn single-calendar
-  [{:keys [del-btn? on-delete on-select] :as opts}]
+  [{:keys [del-btn? on-delete on-select on-day-click] :as opts}]
   (shui/calendar
-    (merge
-      {:mode "single"
-       :caption-layout "dropdown-buttons"
-       :fromYear 1899
-       :toYear 2099
-       :components (cond-> {:Dropdown #(DateNavSelect (bean/bean %))}
-                     del-btn? (assoc :Head #(DelDateButton on-delete)))
-       :class-names {:months "" :root (when del-btn? "has-del-btn")}
-       :on-day-key-down (fn [^js d _ ^js e]
-                          (when (= "Enter" (.-key e))
-                            (on-select d)))}
-      opts)))
+   (merge
+    {:mode "single"
+     :caption-layout "dropdown-buttons"
+     :fromYear 1899
+     :toYear 2099
+     :components (cond-> {:Dropdown #(DateNavSelect (bean/bean %))}
+                   del-btn? (assoc :Head #(DelDateButton on-delete)))
+     :class-names {:months "" :root (when del-btn? "has-del-btn")}
+     :on-day-key-down (fn [^js d _ ^js e]
+                        (when (= "Enter" (.-key e))
+                          (let [on-select' (or on-select on-day-click)]
+                            (on-select' d))))}
+    opts)))
 
 (comment
   (rum/defc emoji-picker