Skip to content

Commit 98f26d9

Browse files
authored
Merge branch 'main' into refactor-select
2 parents 669ff7f + debdbfe commit 98f26d9

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

packages/kit-headless/src/components/accordion/accordion-context.type.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ export interface AccordionRootContext {
1616

1717
export interface AccordionItemContext {
1818
isTriggerExpandedSig: Signal<boolean>;
19-
isDefaultValueOpenedSig: Signal<boolean>;
2019
defaultValue: boolean;
2120
itemId: string;
2221
}

packages/kit-headless/src/components/accordion/accordion-item.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,18 @@ export const AccordionItem = component$(
1919
({ defaultValue = false, ...props }: AccordionItemProps) => {
2020
const itemId = useId();
2121

22-
const itemRef = useSignal<HTMLElement>();
2322
const isTriggerExpandedSig = useSignal<boolean>(defaultValue);
24-
const isDefaultValueOpenedSig = useSignal<boolean>(false);
2523

2624
const itemContext: AccordionItemContext = {
2725
itemId,
2826
isTriggerExpandedSig,
29-
isDefaultValueOpenedSig,
3027
defaultValue
3128
};
3229

3330
useContextProvider(accordionItemContextId, itemContext);
3431

3532
return (
36-
<div ref={itemRef} id={itemId} data-type="item" data-item-id={itemId} {...props}>
33+
<div id={itemId} data-type="item" data-item-id={itemId} {...props}>
3734
<Slot />
3835
</div>
3936
);

packages/kit-headless/src/components/accordion/accordion-trigger.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,13 @@ export const AccordionTrigger = component$(
4848
const currSelectedTriggerIndexSig = contextService.currSelectedTriggerIndexSig;
4949

5050
const isTriggerExpandedSig = itemContext.isTriggerExpandedSig;
51-
const isDefaultValueOpenedSig = itemContext.isDefaultValueOpenedSig;
5251

5352
const setSelectedTriggerIndexSig$ = $(() => {
5453
if (behavior === 'single' && triggerElement) {
5554
currSelectedTriggerIndexSig.value = triggerStore.indexOf(triggerElement);
5655
}
5756
});
5857

59-
/* selectedTriggerIdSig is updated when getSelectedTriggerId$ runs */
6058
useTask$(function resetTriggersTask({ track }) {
6159
track(() => selectedTriggerIdSig.value);
6260

@@ -66,9 +64,8 @@ export const AccordionTrigger = component$(
6664
});
6765

6866
useTask$(function openDefaultValueTask() {
69-
if (defaultValue && !isDefaultValueOpenedSig.value) {
67+
if (defaultValue) {
7068
isTriggerExpandedSig.value = true;
71-
isDefaultValueOpenedSig.value = true;
7269
}
7370
});
7471

@@ -89,7 +86,6 @@ export const AccordionTrigger = component$(
8986
});
9087
});
9188

92-
// cleans up trigger element
9389
useVisibleTask$(
9490
function cleanupTriggersTask({ cleanup }) {
9591
cleanup(() => {

0 commit comments

Comments
 (0)