Просмотр исходного кода

fix: clicking on today's date on deadline again

For https://github.com/logseq/db-test/issues/65#issuecomment-2393240724
Gabriel Horner 1 год назад
Родитель
Сommit
e0bce3f1a7
2 измененных файлов с 6 добавлено и 5 удалено
  1. 1 1
      src/main/frontend/components/property/value.cljs
  2. 5 4
      src/main/frontend/ui.cljs

+ 1 - 1
src/main/frontend/components/property/value.cljs

@@ -241,7 +241,7 @@
        :id @*ident
        :id @*ident
        :del-btn? del-btn?
        :del-btn? del-btn?
        :on-delete on-delete
        :on-delete on-delete
-       :on-select select-handler!}
+       :on-day-click select-handler!}
        initial-month
        initial-month
        (assoc :default-month initial-month)))))
        (assoc :default-month initial-month)))))
 
 

+ 5 - 4
src/main/frontend/ui.cljs

@@ -1216,16 +1216,17 @@
     "Use current time")])
     "Use current time")])
 
 
 (rum/defc nlp-calendar
 (rum/defc nlp-calendar
-  [{:keys [selected on-select] :as opts}]
-  (let [on-select' (if (:datetime? opts)
+  [{:keys [selected on-select on-day-click] :as opts}]
+  (let [default-on-select (or on-select on-day-click)
+        on-select' (if (:datetime? opts)
                      (fn [date value]
                      (fn [date value]
                        (let [value (or (and (string? value) value)
                        (let [value (or (and (string? value) value)
                                        (.-value (gdom/getElement "time-picker")))]
                                        (.-value (gdom/getElement "time-picker")))]
                          (let [[h m] (string/split value ":")]
                          (let [[h m] (string/split value ":")]
                            (when selected
                            (when selected
                              (.setHours date h m 0))
                              (.setHours date h m 0))
-                           (on-select date))))
-                     on-select)]
+                           (default-on-select date))))
+                     default-on-select)]
     [:div.flex.flex-col.gap-2
     [:div.flex.flex-col.gap-2
      (single-calendar (assoc opts :on-select on-select'))
      (single-calendar (assoc opts :on-select on-select'))
      (when (:datetime? opts)
      (when (:datetime? opts)