@pathscale/ui 1.1.54 → 1.1.56

package/dist/components/accordion/Accordion.d.ts

@@ -1,50 +1,26 @@
-import "./Accordion.css";
-import { type Component, type JSX, type ParentComponent } from "solid-js";
+import "./collapse.css";
+import { type JSX } from "solid-js";
+import { CollapseContent, CollapseTitle } from "../collapse";
 import type { IComponentBaseProps } from "../types";
-export type AccordionSelectionMode = "single" | "multiple";
-export type AccordionVariant = "default" | "surface";
-export type AccordionValue = string | string[];
-export type AccordionRootProps = Omit<JSX.HTMLAttributes<HTMLDivElement>, "children"> & IComponentBaseProps & {
-    children?: JSX.Element;
-    selectionMode?: AccordionSelectionMode;
-    value?: AccordionValue;
-    defaultValue?: AccordionValue;
-    onValueChange?: (value: string[]) => void;
-    hideSeparator?: boolean;
-    variant?: AccordionVariant;
-    isDisabled?: boolean;
-    disabled?: boolean;
+type AccordionBaseProps = {
+    name?: string;
+    icon?: "arrow" | "plus";
+    checked?: boolean;
+    dataTheme?: string;
+    class?: string;
+    className?: string;
+    style?: JSX.CSSProperties;
+    mode?: "radio" | "checkbox" | "controlled";
+    expanded?: boolean;
+    onToggle?: () => void;
+    "aria-label"?: string;
+    "aria-describedby"?: string;
+    "aria-labelledby"?: string;
 };
-export type AccordionItemProps = Omit<JSX.HTMLAttributes<HTMLDivElement>, "children"> & IComponentBaseProps & {
-    value?: string;
-    children?: JSX.Element;
-    isDisabled?: boolean;
-    disabled?: boolean;
-};
-export type AccordionTriggerProps = Omit<JSX.ButtonHTMLAttributes<HTMLButtonElement>, "children" | "disabled"> & IComponentBaseProps & {
-    children?: JSX.Element;
-    showIndicator?: boolean;
-    indicator?: JSX.Element;
-};
-export type AccordionContentProps = Omit<JSX.HTMLAttributes<HTMLDivElement>, "children"> & IComponentBaseProps & {
-    children?: JSX.Element;
-    keepMounted?: boolean;
-};
-export type AccordionIndicatorProps = Omit<JSX.HTMLAttributes<HTMLSpanElement>, "children"> & IComponentBaseProps & {
-    children?: JSX.Element;
-};
-declare const AccordionRoot: ParentComponent<AccordionRootProps>;
-declare const AccordionItem: ParentComponent<AccordionItemProps>;
-declare const AccordionTrigger: Component<AccordionTriggerProps>;
-declare const AccordionContent: ParentComponent<AccordionContentProps>;
-declare const AccordionIndicator: Component<AccordionIndicatorProps>;
-declare const Accordion: ParentComponent<AccordionRootProps> & {
-    Root: ParentComponent<AccordionRootProps>;
-    Item: ParentComponent<AccordionItemProps>;
-    Trigger: Component<AccordionTriggerProps>;
-    Content: ParentComponent<AccordionContentProps>;
-    Indicator: Component<AccordionIndicatorProps>;
+export type AccordionProps = AccordionBaseProps & IComponentBaseProps & Omit<JSX.InputHTMLAttributes<HTMLInputElement>, keyof AccordionBaseProps>;
+declare const Accordion: {
+    (props: AccordionProps): JSX.Element;
+    Title: typeof CollapseTitle;
+    Content: typeof CollapseContent;
 };
 export default Accordion;
-export { Accordion, AccordionRoot, AccordionItem, AccordionTrigger, AccordionContent, AccordionIndicator, };
-export type { AccordionRootProps as AccordionProps };

package/dist/components/accordion/Accordion.js

@@ -1,359 +1,180 @@
 import * as __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__ from "solid-js/web";
-import "./Accordion.css";
+import "./collapse.css";
+import * as __WEBPACK_EXTERNAL_MODULE_clsx__ from "clsx";
 import * as __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__ from "solid-js";
 import * as __WEBPACK_EXTERNAL_MODULE_tailwind_merge_e05e3e95__ from "tailwind-merge";
-import * as __WEBPACK_EXTERNAL_MODULE__Accordion_classes_js_d6ff7f0b__ from "./Accordion.classes.js";
-var _tmpl$ = /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.template)("<div>"), _tmpl$2 = /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.template)("<button>"), _tmpl$3 = /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.template)("<div><div><div>"), _tmpl$4 = /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.template)("<span>"), _tmpl$5 = /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.template)('<svg fill=none role=presentation viewBox="0 0 24 24"width=100% height=100%><path d="M6 9L12 15L18 9"stroke=currentColor stroke-width=2 stroke-linecap=round stroke-linejoin=round>');
-const normalizeAccordionValue = (value, selectionMode)=>{
-    if (void 0 === value) return [];
-    const raw = Array.isArray(value) ? value : [
-        value
-    ];
-    const normalized = Array.from(new Set(raw.map((entry)=>String(entry))));
-    return "single" === selectionMode ? normalized.slice(0, 1) : normalized;
-};
-const invokeEventHandler = (handler, event)=>{
-    if ("function" == typeof handler) return void handler(event);
-    if (Array.isArray(handler) && "function" == typeof handler[0]) handler[0](handler[1], event);
-};
-const AccordionContext = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.createContext)();
-const AccordionItemContext = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.createContext)();
-const AccordionRoot = (props)=>{
+import * as __WEBPACK_EXTERNAL_MODULE__collapse_index_js_5afd01f8__ from "../collapse/index.js";
+var _tmpl$ = /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.template)("<div role=region>"), _tmpl$2 = /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.template)("<input>");
+const accordionGroups = new Map();
+const TITLE_PART = "title";
+const CONTENT_PART = "content";
+const Accordion = (props)=>{
     const [local, others] = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.splitProps)(props, [
-        "children",
-        "class",
-        "className",
+        "name",
+        "icon",
+        "checked",
         "dataTheme",
-        "style",
-        "selectionMode",
-        "value",
-        "defaultValue",
-        "onValueChange",
-        "hideSeparator",
-        "variant",
-        "isDisabled",
-        "disabled",
-        "ref"
-    ]);
-    const selectionMode = ()=>local.selectionMode ?? "single";
-    const variant = ()=>local.variant ?? "default";
-    const hideSeparator = ()=>Boolean(local.hideSeparator);
-    const isDisabled = ()=>Boolean(local.isDisabled) || Boolean(local.disabled);
-    const [internalValue, setInternalValue] = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.createSignal)(normalizeAccordionValue(local.defaultValue, selectionMode()));
-    const selectedValues = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.createMemo)(()=>void 0 !== local.value ? normalizeAccordionValue(local.value, selectionMode()) : normalizeAccordionValue(internalValue(), selectionMode()));
-    const isItemExpanded = (value)=>selectedValues().includes(value);
-    const setSelectedValues = (nextValues)=>{
-        const normalizedNextValues = normalizeAccordionValue(nextValues, selectionMode());
-        if (void 0 === local.value) setInternalValue(normalizedNextValues);
-        local.onValueChange?.(normalizedNextValues);
-    };
-    const toggleItem = (value)=>{
-        if (isDisabled()) return;
-        const currentValues = selectedValues();
-        const isExpanded = currentValues.includes(value);
-        if ("single" === selectionMode()) return void setSelectedValues(isExpanded ? [] : [
-            value
-        ]);
-        const next = new Set(currentValues);
-        if (isExpanded) next.delete(value);
-        else next.add(value);
-        setSelectedValues(Array.from(next));
-    };
-    let rootRef;
-    const handleTriggerKeyDown = (event, currentTarget)=>{
-        if ("ArrowDown" !== event.key && "ArrowUp" !== event.key && "Home" !== event.key && "End" !== event.key) return;
-        if (!rootRef) return;
-        const triggers = Array.from(rootRef.querySelectorAll('[data-slot="accordion-trigger"]')).filter((trigger)=>!trigger.disabled && "true" !== trigger.getAttribute("aria-disabled"));
-        if (!triggers.length) return;
-        const currentIndex = triggers.indexOf(currentTarget);
-        if (currentIndex < 0) return;
-        event.preventDefault();
-        if ("Home" === event.key) return void triggers[0]?.focus();
-        if ("End" === event.key) return void triggers[triggers.length - 1]?.focus();
-        const direction = "ArrowDown" === event.key ? 1 : -1;
-        const nextIndex = (currentIndex + direction + triggers.length) % triggers.length;
-        triggers[nextIndex]?.focus();
-    };
-    const contextValue = {
-        selectionMode,
-        variant,
-        hideSeparator,
-        isDisabled,
-        isItemExpanded,
-        toggleItem,
-        handleTriggerKeyDown
-    };
-    return (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.createComponent)(AccordionContext.Provider, {
-        value: contextValue,
-        get children () {
-            var _el$ = _tmpl$();
-            (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.use)((node)=>{
-                rootRef = node;
-                if ("function" == typeof local.ref) local.ref(node);
-            }, _el$);
-            (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.spread)(_el$, (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.mergeProps)(others, ()=>({
-                    class: (0, __WEBPACK_EXTERNAL_MODULE_tailwind_merge_e05e3e95__.twMerge)(__WEBPACK_EXTERNAL_MODULE__Accordion_classes_js_d6ff7f0b__.CLASSES.Root.base, __WEBPACK_EXTERNAL_MODULE__Accordion_classes_js_d6ff7f0b__.CLASSES.Root.variant[variant()], local.class, local.className)
-                }), {
-                "data-slot": "accordion",
-                get ["data-selection-mode"] () {
-                    return selectionMode();
-                },
-                get ["data-hide-separator"] () {
-                    return hideSeparator() ? "true" : void 0;
-                },
-                get ["data-variant"] () {
-                    return variant();
-                },
-                get ["data-disabled"] () {
-                    return isDisabled() ? "true" : "false";
-                },
-                get ["data-theme"] () {
-                    return local.dataTheme;
-                },
-                get style () {
-                    return local.style;
-                },
-                get ["aria-disabled"] () {
-                    return isDisabled() ? "true" : void 0;
-                }
-            }), false, true);
-            (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.insert)(_el$, ()=>local.children);
-            return _el$;
-        }
-    });
-};
-const AccordionItem = (props)=>{
-    const accordion = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.useContext)(AccordionContext);
-    const [local, others] = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.splitProps)(props, [
-        "value",
-        "children",
         "class",
         "className",
-        "dataTheme",
         "style",
-        "isDisabled",
-        "disabled"
+        "mode",
+        "expanded",
+        "onToggle",
+        "children",
+        "aria-label",
+        "aria-describedby",
+        "aria-labelledby"
     ]);
     const uniqueId = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.createUniqueId)();
-    const itemValue = ()=>local.value ?? uniqueId;
-    const triggerId = ()=>`accordion-trigger-${uniqueId}`;
-    const contentId = ()=>`accordion-content-${uniqueId}`;
-    const isExpanded = ()=>accordion?.isItemExpanded(itemValue()) ?? false;
-    const isDisabled = ()=>Boolean(local.isDisabled) || Boolean(local.disabled) || Boolean(accordion?.isDisabled());
-    const toggle = ()=>{
-        if (isDisabled()) return;
-        accordion?.toggleItem(itemValue());
-    };
-    const itemContextValue = {
-        value: itemValue,
-        triggerId,
-        contentId,
-        isExpanded,
-        isDisabled,
-        toggle
+    const contentId = `accordion-content-${uniqueId}`;
+    const titleId = `accordion-title-${uniqueId}`;
+    const isControlled = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.createMemo)(()=>"controlled" === local.mode);
+    const [isExpanded, setIsExpanded] = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.createSignal)(local.checked || local.expanded || false);
+    const expanded = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.createMemo)(()=>{
+        if (isControlled()) return local.expanded ?? false;
+        return isExpanded();
+    });
+    const groupName = ()=>local.name ?? "accordion";
+    const isRadioMode = ()=>"checkbox" !== local.mode && "controlled" !== local.mode;
+    const closeAccordion = ()=>{
+        if (!isControlled()) setIsExpanded(false);
     };
-    return (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.createComponent)(AccordionItemContext.Provider, {
-        value: itemContextValue,
-        get children () {
-            var _el$2 = _tmpl$();
-            (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.spread)(_el$2, (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.mergeProps)(others, ()=>({
-                    class: (0, __WEBPACK_EXTERNAL_MODULE_tailwind_merge_e05e3e95__.twMerge)(__WEBPACK_EXTERNAL_MODULE__Accordion_classes_js_d6ff7f0b__.CLASSES.Item.base, isExpanded() && __WEBPACK_EXTERNAL_MODULE__Accordion_classes_js_d6ff7f0b__.CLASSES.Item.flag.expanded, isDisabled() && __WEBPACK_EXTERNAL_MODULE__Accordion_classes_js_d6ff7f0b__.CLASSES.Item.flag.disabled, accordion?.hideSeparator() && __WEBPACK_EXTERNAL_MODULE__Accordion_classes_js_d6ff7f0b__.CLASSES.Item.flag.hideSeparator, local.class, local.className)
-                }), {
-                "data-slot": "accordion-item",
-                get ["data-expanded"] () {
-                    return isExpanded() ? "true" : "false";
-                },
-                get ["data-disabled"] () {
-                    return isDisabled() ? "true" : "false";
-                },
-                get ["data-theme"] () {
-                    return local.dataTheme;
-                },
-                get style () {
-                    return local.style;
-                }
-            }), false, true);
-            (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.insert)(_el$2, ()=>local.children);
-            return _el$2;
+    (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.createEffect)(()=>{
+        if (isRadioMode()) {
+            const name = groupName();
+            if (!accordionGroups.has(name)) accordionGroups.set(name, new Set());
+            const group = accordionGroups.get(name);
+            group.add(closeAccordion);
+            return ()=>{
+                group.delete(closeAccordion);
+                if (0 === group.size) accordionGroups.delete(name);
+            };
         }
     });
-};
-const AccordionTrigger = (props)=>{
-    const accordion = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.useContext)(AccordionContext);
-    const item = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.useContext)(AccordionItemContext);
-    const [local, others] = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.splitProps)(props, [
-        "children",
-        "class",
-        "className",
-        "dataTheme",
-        "style",
-        "onClick",
-        "onKeyDown",
-        "type",
-        "showIndicator",
-        "indicator"
-    ]);
-    const isDisabled = ()=>Boolean(item?.isDisabled());
-    const handleClick = (event)=>{
-        invokeEventHandler(local.onClick, event);
-        if (event.defaultPrevented || isDisabled()) return;
-        item?.toggle();
-    };
-    const handleKeyDown = (event)=>{
-        invokeEventHandler(local.onKeyDown, event);
-        if (event.defaultPrevented || isDisabled()) return;
-        if ("Enter" === event.key || " " === event.key) {
-            event.preventDefault();
-            item?.toggle();
-            return;
+    const handleToggle = ()=>{
+        const wasExpanded = expanded();
+        if (!isControlled()) {
+            if (isRadioMode() && !wasExpanded) {
+                const group = accordionGroups.get(groupName());
+                if (group) group.forEach((closeFunc)=>{
+                    if (closeFunc !== closeAccordion) closeFunc();
+                });
+                setIsExpanded(true);
+            } else if ("checkbox" === local.mode) setIsExpanded(!wasExpanded);
+            else if (isRadioMode() && wasExpanded) setIsExpanded(false);
         }
-        accordion?.handleTriggerKeyDown(event, event.currentTarget);
+        local.onToggle?.();
     };
-    return (()=>{
-        var _el$3 = _tmpl$2();
-        (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.spread)(_el$3, (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.mergeProps)(others, {
-            get id () {
-                return item?.triggerId();
-            },
-            get type () {
-                return local.type ?? "button";
-            }
-        }, ()=>({
-                class: (0, __WEBPACK_EXTERNAL_MODULE_tailwind_merge_e05e3e95__.twMerge)(__WEBPACK_EXTERNAL_MODULE__Accordion_classes_js_d6ff7f0b__.CLASSES.Trigger.base, local.class, local.className)
-            }), {
-            "data-slot": "accordion-trigger",
-            get ["data-expanded"] () {
-                return item?.isExpanded() ? "true" : "false";
-            },
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            get style () {
-                return local.style;
-            },
-            get ["aria-expanded"] () {
-                return item?.isExpanded() ? "true" : "false";
-            },
-            get ["aria-controls"] () {
-                return item?.contentId();
-            },
-            get ["aria-disabled"] () {
-                return isDisabled() ? "true" : void 0;
-            },
-            get disabled () {
-                return isDisabled();
-            },
-            onClick: handleClick,
-            onKeyDown: handleKeyDown
-        }), false, true);
-        (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.insert)(_el$3, ()=>local.children, null);
-        (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.insert)(_el$3, (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.createComponent)(__WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.Show, {
-            get when () {
-                return false !== local.showIndicator;
-            },
-            get children () {
-                return (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.createComponent)(AccordionIndicator, {
-                    get children () {
-                        return local.indicator;
+    const classes = ()=>(0, __WEBPACK_EXTERNAL_MODULE_tailwind_merge_e05e3e95__.twMerge)("collapse", (0, __WEBPACK_EXTERNAL_MODULE_clsx__.clsx)({
+            "collapse-arrow": "arrow" === local.icon,
+            "collapse-plus": "plus" === local.icon,
+            "collapse-open": expanded(),
+            "collapse-close": !expanded()
+        }), local.class, local.className);
+    const resolvedChildren = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.children)(()=>local.children);
+    const childrenWithAria = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.createMemo)(()=>{
+        const children = resolvedChildren();
+        const arr = Array.isArray(children) ? children : [
+            children
+        ];
+        const getChildProps = (child)=>{
+            if (null == child || "object" != typeof child || !("props" in child)) return null;
+            const candidate = child.props;
+            return candidate && "object" == typeof candidate ? candidate : null;
+        };
+        return arr.map((child)=>{
+            const childProps = getChildProps(child);
+            if (!childProps) return child;
+            const childElement = child;
+            const collapsePart = childProps["data-collapse-part"] === TITLE_PART || childProps["data-collapse-part"] === CONTENT_PART ? childProps["data-collapse-part"] : null;
+            if (collapsePart === TITLE_PART) {
+                const originalOnClick = childProps.onClick && "function" == typeof childProps.onClick ? childProps.onClick : void 0;
+                const originalOnKeyDown = childProps.onKeyDown && "function" == typeof childProps.onKeyDown ? childProps.onKeyDown : void 0;
+                return {
+                    ...childElement,
+                    props: {
+                        ...childProps,
+                        id: titleId,
+                        role: "button",
+                        tabIndex: 0,
+                        "aria-expanded": expanded(),
+                        "aria-controls": contentId,
+                        onClick: (e)=>{
+                            handleToggle();
+                            if (originalOnClick) originalOnClick(e);
+                        },
+                        onKeyDown: (e)=>{
+                            if ("Enter" === e.key || " " === e.key) {
+                                e.preventDefault();
+                                handleToggle();
+                            }
+                            if (originalOnKeyDown) originalOnKeyDown(e);
+                        }
                     }
-                });
-            }
-        }), null);
-        return _el$3;
-    })();
-};
-const AccordionContent = (props)=>{
-    const item = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.useContext)(AccordionItemContext);
-    const [local, others] = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.splitProps)(props, [
-        "children",
-        "class",
-        "className",
-        "dataTheme",
-        "style",
-        "keepMounted"
-    ]);
-    const expanded = ()=>Boolean(item?.isExpanded());
-    const keepMounted = ()=>local.keepMounted ?? true;
-    if (!keepMounted() && !expanded()) return null;
-    return (()=>{
-        var _el$4 = _tmpl$3(), _el$5 = _el$4.firstChild, _el$6 = _el$5.firstChild;
-        (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.spread)(_el$4, (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.mergeProps)(others, {
-            get id () {
-                return item?.contentId();
-            },
-            role: "region"
-        }, ()=>({
-                class: (0, __WEBPACK_EXTERNAL_MODULE_tailwind_merge_e05e3e95__.twMerge)(__WEBPACK_EXTERNAL_MODULE__Accordion_classes_js_d6ff7f0b__.CLASSES.Content.base, expanded() && __WEBPACK_EXTERNAL_MODULE__Accordion_classes_js_d6ff7f0b__.CLASSES.Content.flag.expanded, local.class, local.className)
-            }), {
-            "data-slot": "accordion-content",
-            get ["data-expanded"] () {
-                return expanded() ? "true" : "false";
-            },
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            get style () {
-                return local.style;
-            },
-            get ["aria-hidden"] () {
-                return expanded() ? "false" : "true";
-            },
-            get ["aria-labelledby"] () {
-                return item?.triggerId();
+                };
             }
-        }), false, true);
-        (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.spread)(_el$5, (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.mergeProps)(()=>({
-                class: __WEBPACK_EXTERNAL_MODULE__Accordion_classes_js_d6ff7f0b__.CLASSES.Body.base
-            }), {
-            "data-slot": "accordion-body"
-        }), false, true);
-        (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.spread)(_el$6, (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.mergeProps)(()=>({
-                class: __WEBPACK_EXTERNAL_MODULE__Accordion_classes_js_d6ff7f0b__.CLASSES.BodyInner.base
-            }), {
-            "data-slot": "accordion-body-inner"
-        }), false, true);
-        (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.insert)(_el$6, ()=>local.children);
-        return _el$4;
-    })();
-};
-const AccordionIndicator = (props)=>{
-    const item = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.useContext)(AccordionItemContext);
-    const [local, others] = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_aeefcc6d__.splitProps)(props, [
-        "children",
-        "class",
-        "className",
-        "dataTheme",
-        "style"
-    ]);
-    const expanded = ()=>Boolean(item?.isExpanded());
+            if (collapsePart === CONTENT_PART) return {
+                ...childElement,
+                props: {
+                    ...childProps,
+                    id: contentId
+                }
+            };
+            return child;
+        });
+    });
     return (()=>{
-        var _el$7 = _tmpl$4();
-        (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.spread)(_el$7, (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.mergeProps)(others, {
-            "aria-hidden": "true"
-        }, ()=>({
-                class: (0, __WEBPACK_EXTERNAL_MODULE_tailwind_merge_e05e3e95__.twMerge)(__WEBPACK_EXTERNAL_MODULE__Accordion_classes_js_d6ff7f0b__.CLASSES.Indicator.base, expanded() && __WEBPACK_EXTERNAL_MODULE__Accordion_classes_js_d6ff7f0b__.CLASSES.Indicator.flag.expanded, local.class, local.className)
-            }), {
-            "data-slot": "accordion-indicator",
-            get ["data-expanded"] () {
-                return expanded() ? "true" : "false";
-            },
-            get ["data-theme"] () {
-                return local.dataTheme;
-            },
-            get style () {
-                return local.style;
-            }
-        }), false, true);
-        (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.insert)(_el$7, ()=>local.children ?? _tmpl$5());
-        return _el$7;
+        var _el$ = _tmpl$();
+        (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.insert)(_el$, (()=>{
+            var _c$ = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.memo)(()=>"controlled" !== local.mode);
+            return ()=>_c$() && (()=>{
+                    var _el$2 = _tmpl$2();
+                    _el$2.addEventListener("change", handleToggle);
+                    (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.setAttribute)(_el$2, "aria-controls", contentId);
+                    (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.spread)(_el$2, (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.mergeProps)({
+                        get type () {
+                            return "checkbox" === local.mode ? "checkbox" : "radio";
+                        },
+                        get name () {
+                            return groupName();
+                        },
+                        get checked () {
+                            return expanded();
+                        },
+                        get ["aria-expanded"] () {
+                            return expanded();
+                        },
+                        get ["aria-checked"] () {
+                            return (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.memo)(()=>!!("checkbox" === local.mode || "radio" === local.mode))() ? expanded() : void 0;
+                        }
+                    }, others), false, false);
+                    return _el$2;
+                })();
+        })(), null);
+        (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.insert)(_el$, ()=>childrenWithAria(), null);
+        (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.effect)((_p$)=>{
+            var _v$ = classes(), _v$2 = local.dataTheme, _v$3 = local.style, _v$4 = local["aria-label"], _v$5 = local["aria-describedby"], _v$6 = local["aria-labelledby"] || titleId;
+            _v$ !== _p$.e && (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.className)(_el$, _p$.e = _v$);
+            _v$2 !== _p$.t && (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.setAttribute)(_el$, "data-theme", _p$.t = _v$2);
+            _p$.a = (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.style)(_el$, _v$3, _p$.a);
+            _v$4 !== _p$.o && (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.setAttribute)(_el$, "aria-label", _p$.o = _v$4);
+            _v$5 !== _p$.i && (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.setAttribute)(_el$, "aria-describedby", _p$.i = _v$5);
+            _v$6 !== _p$.n && (0, __WEBPACK_EXTERNAL_MODULE_solid_js_web_35d951b7__.setAttribute)(_el$, "aria-labelledby", _p$.n = _v$6);
+            return _p$;
+        }, {
+            e: void 0,
+            t: void 0,
+            a: void 0,
+            o: void 0,
+            i: void 0,
+            n: void 0
+        });
+        return _el$;
     })();
 };
-const Accordion = Object.assign(AccordionRoot, {
-    Root: AccordionRoot,
-    Item: AccordionItem,
-    Trigger: AccordionTrigger,
-    Content: AccordionContent,
-    Indicator: AccordionIndicator
-});
+const AccordionTitle = __WEBPACK_EXTERNAL_MODULE__collapse_index_js_5afd01f8__.CollapseTitle;
+const AccordionContent = __WEBPACK_EXTERNAL_MODULE__collapse_index_js_5afd01f8__.CollapseContent;
+Accordion.Title = AccordionTitle;
+Accordion.Content = AccordionContent;
 const accordion_Accordion = Accordion;
-export { Accordion, AccordionContent, AccordionIndicator, AccordionItem, AccordionRoot, AccordionTrigger, accordion_Accordion as default };
+export { accordion_Accordion as default };