Skip to content

fix(Collapsible): CSS-driven accordion height animation (#1917) #1992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kotAPI wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(Collapsible): CSS-driven accordion height animation (#1917) #1992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions src/components/ui/Accordion/fragments/AccordionContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ const AccordionContent = React.forwardRef<React.ElementRef<'div'>, AccordionCont
'var(--radix-collapsible-content-height)',
['--radix-accordion-content-width' as string]:
'var(--radix-collapsible-content-width)',
['--rad-accordion-content-height' as string]:
'var(--radix-collapsible-content-height)',
['--rad-accordion-content-width' as string]:
'var(--radix-collapsible-content-width)',
...style
}}
{...props}
Expand Down
12 changes: 11 additions & 1 deletion src/core/primitives/Collapsible/fragments/CollapsiblePrimitiveContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const CollapsiblePrimitiveContent = React.forwardRef<

const [height, setHeight] = useState<number | undefined>(open ? undefined : 0);
const [isPresent, setIsPresent] = useState(open || forceMount);
const [, setCssVarRevision] = useState(0);
const animationTimeoutRef = useRef<NodeJS.Timeout>();
const rafRef = useRef<number>();
const ref = useRef<HTMLDivElement | null>(null);
Expand Down Expand Up @@ -87,6 +88,11 @@ const CollapsiblePrimitiveContent = React.forwardRef<
} else {
setIsPresent(true);
}

if (open) {
setCssVarRevision((revision) => revision + 1);
}

return;
}

Expand Down Expand Up @@ -147,10 +153,14 @@ const CollapsiblePrimitiveContent = React.forwardRef<
return null;
}

const omitInlineHeightForCssAnimation = transitionDuration === 0 && open;

const dynamicStyle: React.CSSProperties = {
...style,
overflow: 'hidden',
height: height !== undefined ? `${height}px` : undefined,
...(!omitInlineHeightForCssAnimation && height !== undefined
? { height: `${height}px` }
: {}),
['--radix-collapsible-content-height' as string]:
heightRef.current !== undefined ? `${heightRef.current}px` : undefined,
['--radix-collapsible-content-width' as string]:
Expand Down
90 changes: 90 additions & 0 deletions src/core/primitives/Collapsible/tests/Collapsible.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,4 +141,94 @@ describe('CollapsiblePrimitive', () => {
expect(content.style.getPropertyValue('--radix-collapsible-content-height')).toBe('120px');
expect(content.style.getPropertyValue('--radix-collapsible-content-width')).toBe('320px');
});
test('does not set inline height in steady open state when transitionDuration is 0', () => {
HTMLElement.prototype.getBoundingClientRect = jest.fn(function(this: HTMLElement) {
if (this.dataset.testid === 'content') {
return {
width: 320,
height: 120,
top: 0,
left: 0,
right: 320,
bottom: 120,
x: 0,
y: 0,
toJSON: () => ({})
} as DOMRect;
}

return {
width: 0,
height: 0,
top: 0,
left: 0,
right: 0,
bottom: 0,
x: 0,
y: 0,
toJSON: () => ({})
} as DOMRect;
});

render(
<CollapsiblePrimitive.Root transitionDuration={0} defaultOpen>
<CollapsiblePrimitive.Content data-testid="content">
<div>Measured Content</div>
</CollapsiblePrimitive.Content>
</CollapsiblePrimitive.Root>
);

const content = screen.getByTestId('content');

expect(content.style.height).toBe('');
expect(content.style.getPropertyValue('--radix-collapsible-content-height')).toBe('120px');
expect(content.style.getPropertyValue('--radix-collapsible-content-width')).toBe('320px');
});

test('clears inline height after opening with transitionDuration 0', () => {
HTMLElement.prototype.getBoundingClientRect = jest.fn(function(this: HTMLElement) {
if (this.dataset.testid === 'content') {
return {
width: 200,
height: 80,
top: 0,
left: 0,
right: 200,
bottom: 80,
x: 0,
y: 0,
toJSON: () => ({})
} as DOMRect;
}

return {
width: 0,
height: 0,
top: 0,
left: 0,
right: 0,
bottom: 0,
x: 0,
y: 0,
toJSON: () => ({})
} as DOMRect;
});

render(
<CollapsiblePrimitive.Root transitionDuration={0}>
<CollapsiblePrimitive.Trigger data-testid="trigger">Toggle</CollapsiblePrimitive.Trigger>
<CollapsiblePrimitive.Content data-testid="content">
<div>Measured Content</div>
</CollapsiblePrimitive.Content>
</CollapsiblePrimitive.Root>
);

fireEvent.click(screen.getByTestId('trigger'));

const content = screen.getByTestId('content');

expect(content).toHaveAttribute('data-state', 'open');
expect(content.style.height).toBe('');
expect(content.style.getPropertyValue('--radix-collapsible-content-height')).toBe('80px');
});
});
Loading