Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/propel/src/collapsible/collapsible.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const useCollapsible = () => {

// Components
function Root({ children, className, isOpen: controlledIsOpen, onToggle, defaultOpen }: RootProps) {
const [localIsOpen, setLocalIsOpen] = useState<boolean>(controlledIsOpen || defaultOpen || false);
const [localIsOpen, setLocalIsOpen] = useState<boolean>(controlledIsOpen !== undefined ? controlledIsOpen : !!defaultOpen);

useEffect(() => {
if (controlledIsOpen !== undefined) {
Expand Down
28 changes: 9 additions & 19 deletions packages/ui/src/collapsible/collapsible.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* See the LICENSE file for details.
*/

import { Disclosure, Transition } from "@headlessui/react";
import React, { useState, useEffect, useCallback } from "react";

export type TCollapsibleProps = {
Expand All @@ -21,7 +20,7 @@ export type TCollapsibleProps = {
export function Collapsible(props: TCollapsibleProps) {
const { title, children, buttonRef, className, buttonClassName, isOpen, onToggle, defaultOpen } = props;
// state
const [localIsOpen, setLocalIsOpen] = useState<boolean>(isOpen || defaultOpen ? true : false);
const [localIsOpen, setLocalIsOpen] = useState<boolean>(isOpen !== undefined ? isOpen : !!defaultOpen);

useEffect(() => {
if (isOpen !== undefined) {
Expand All @@ -39,24 +38,15 @@ export function Collapsible(props: TCollapsibleProps) {
}, [isOpen, onToggle]);

return (
<Disclosure as="div" className={className}>
<Disclosure.Button ref={buttonRef} className={buttonClassName} onClick={handleOnClick}>
<div className={className}>
<button ref={buttonRef} type="button" className={buttonClassName} onClick={handleOnClick} aria-expanded={localIsOpen}>
{title}
</Disclosure.Button>
<Transition
show={localIsOpen}
enter="transition-all duration-300 ease-in-out"
enterFrom="grid-rows-[0fr] opacity-0"
enterTo="grid-rows-[1fr] opacity-100"
leave="transition-all duration-300 ease-in-out"
leaveFrom="grid-rows-[1fr] opacity-100"
leaveTo="grid-rows-[0fr] opacity-0"
className="grid overflow-hidden"
>
<Disclosure.Panel static className="min-h-0">
</button>
{localIsOpen && (
<div className="min-h-0">
{children}
</Disclosure.Panel>
</Transition>
</Disclosure>
</div>
)}
</div>
);
}