Merge branch 'feat/db' into refactor/db-properties-schema

pull/11196/head
Tienson Qin 2024-04-01 22:42:31 +08:00
commit 419104abf3
2 changed files with 20 additions and 23 deletions

View File

@ -602,27 +602,17 @@
user-select: none;
.resizer {
@apply absolute top-0 bottom-0;
touch-action: none;
left: 1px;
width: 3px;
user-select: none;
cursor: col-resize !important;
transition: background-color 300ms;
transition-delay: 300ms;
z-index: 1000;
&:hover,
&:focus,
&:active {
@apply bg-primary/90;
}
@apply absolute top-0 bottom-0 touch-none left-[1px] w-[3px] select-none !bg-primary;
@apply !cursor-col-resize hover:bg-primary/90 focus:bg-primary/90 active:bg-primary/90;
@apply z-[1000] delay-300 transition-[background-color] duration-300;
}
&.closed {
width: 0 !important;
@apply !w-0;
.resizer {
@apply hidden;
}
}
&.open {

View File

@ -72,15 +72,21 @@
(rum/defc date-picker
[value {:keys [on-change editing? multiple-values?]}]
(let [;; FIXME: Remove ignore when editing bug is fixed
#_:clj-kondo/ignore
[open? set-open!] (rum/use-state editing?)
title (when value (:block/original-name value))
(let [*trigger-ref (rum/use-ref nil)
page value
value' (when title (js/Date. (date/journal-title->long title)))
title (when page (:block/original-name page))
value' (when title
(js/Date. (date/journal-title->long title)))
initial-day (some-> value' (.getTime) (js/Date.))
initial-month (when value'
(js/Date. (.getFullYear value') (.getMonth value')))]
(rum/use-effect!
(fn []
(when editing?
(some-> (rum/deref *trigger-ref)
(.focus))))
[])
[:div.flex.flex-row.gap-1.items-center
(when page
(when-let [page-cp (state/get-component :block/page-cp)]
@ -118,6 +124,7 @@
(shui/button
{:class "jtrigger !p-1"
:ref *trigger-ref
:variant :text
:size :sm
:on-click (fn [e]