bucket picker fix
This commit is contained in:
@@ -20,6 +20,7 @@ interface LayoutProps {
|
|||||||
export const Layout: Component<LayoutProps> = (props) => {
|
export const Layout: Component<LayoutProps> = (props) => {
|
||||||
const [isSidebarLocked, setIsSidebarLocked] = createSignal(true);
|
const [isSidebarLocked, setIsSidebarLocked] = createSignal(true);
|
||||||
const [isSidebarPeeking, setIsSidebarPeeking] = createSignal(false);
|
const [isSidebarPeeking, setIsSidebarPeeking] = createSignal(false);
|
||||||
|
const [isDropdownOpen, setIsDropdownOpen] = createSignal(false);
|
||||||
|
|
||||||
// Lift selectedNoteId up to Layout so it can be passed to NotesSidebar and NotepadView
|
// Lift selectedNoteId up to Layout so it can be passed to NotesSidebar and NotepadView
|
||||||
const [selectedNoteId, setSelectedNoteId] = createSignal<string | null>(null);
|
const [selectedNoteId, setSelectedNoteId] = createSignal<string | null>(null);
|
||||||
@@ -64,7 +65,11 @@ export const Layout: Component<LayoutProps> = (props) => {
|
|||||||
!isSidebarLocked() && (isSidebarPeeking() || (store.isNotepadMode && !selectedNoteId())) && "translate-x-0 shadow-2xl ring-1 ring-border"
|
!isSidebarLocked() && (isSidebarPeeking() || (store.isNotepadMode && !selectedNoteId())) && "translate-x-0 shadow-2xl ring-1 ring-border"
|
||||||
)}
|
)}
|
||||||
onMouseEnter={() => !isSidebarLocked() && setIsSidebarPeeking(true)}
|
onMouseEnter={() => !isSidebarLocked() && setIsSidebarPeeking(true)}
|
||||||
onMouseLeave={() => !isSidebarLocked() && setIsSidebarPeeking(false)}>
|
onMouseLeave={() => {
|
||||||
|
if (!isSidebarLocked() && !isDropdownOpen()) {
|
||||||
|
setIsSidebarPeeking(false);
|
||||||
|
}
|
||||||
|
}}>
|
||||||
|
|
||||||
<div class="relative flex-1 flex flex-col min-h-0">
|
<div class="relative flex-1 flex flex-col min-h-0">
|
||||||
{/* Task Sidebar Wrapper */}
|
{/* Task Sidebar Wrapper */}
|
||||||
@@ -82,6 +87,7 @@ export const Layout: Component<LayoutProps> = (props) => {
|
|||||||
isPeeking={isSidebarPeeking()}
|
isPeeking={isSidebarPeeking()}
|
||||||
setIsPeeking={setIsSidebarPeeking}
|
setIsPeeking={setIsSidebarPeeking}
|
||||||
isEmbed={true}
|
isEmbed={true}
|
||||||
|
onDropdownOpenChange={setIsDropdownOpen}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -300,6 +300,7 @@ export const Sidebar: Component<{
|
|||||||
isPeeking: boolean;
|
isPeeking: boolean;
|
||||||
setIsPeeking: (v: boolean) => void;
|
setIsPeeking: (v: boolean) => void;
|
||||||
isEmbed?: boolean;
|
isEmbed?: boolean;
|
||||||
|
onDropdownOpenChange?: (open: boolean) => void;
|
||||||
}> = (props) => {
|
}> = (props) => {
|
||||||
const [switcherOpen, setSwitcherOpen] = createSignal(false);
|
const [switcherOpen, setSwitcherOpen] = createSignal(false);
|
||||||
|
|
||||||
@@ -374,7 +375,10 @@ export const Sidebar: Component<{
|
|||||||
isLocked={props.isLocked}
|
isLocked={props.isLocked}
|
||||||
isPeeking={props.isPeeking}
|
isPeeking={props.isPeeking}
|
||||||
setIsPeeking={props.setIsPeeking}
|
setIsPeeking={props.setIsPeeking}
|
||||||
onOpenChange={setSwitcherOpen}
|
onOpenChange={(open) => {
|
||||||
|
setSwitcherOpen(open);
|
||||||
|
props.onDropdownOpenChange?.(open);
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user