Skip to content
Merged
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
5 changes: 5 additions & 0 deletions .changeset/real-suns-repair.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@ultraviolet/ui": patch
---

`ExpandableCard`: new prop "open" (uncontrolled version of prop "expanded)
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { Template } from './Template.stories'

export const Open = Template.bind({})

Open.args = { ...Template.args, header: 'I am open', open: true }

Open.parameters = {
docs: {
description: {
story:
'For an unconctrolled ExpandableCard open by default, use prop `open`. Otherwise use prop `expanded`.',
},
},
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export { Playground } from './Playground.stories'
export { Size } from './Size.stories'
export { Header } from './Header.stories'
export { Disabled } from './Disabled.stories'
export { Open } from './Open.stories'
export { Controlled } from './Controlled.stories'
export { Name } from './Name.stories'
export { Draggable } from './Draggable.stories'
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,19 @@ describe('ExpandableCard', () => {
expect(onToggleExpand).toHaveBeenCalled()
})
})

test('works properly when uncontrolled and open', async () => {
renderWithTheme(
<ExpandableCard data-testid="expandablecard" header="Title" open>
Content
</ExpandableCard>,
)

const title = screen.getByText('Title')
const content = screen.getByText('Content')
expect(content).toBeVisible()

await userEvent.click(title)
expect(content).not.toBeVisible()
})
})
13 changes: 11 additions & 2 deletions packages/ui/src/components/ExpandableCard/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@
import { useTheme } from '@emotion/react'
import styled from '@emotion/styled'
import { ArrowDownIcon, DragIcon } from '@ultraviolet/icons'
import type { DragEvent, ForwardedRef, KeyboardEvent, ReactNode } from 'react'
import type {
DetailsHTMLAttributes,
DragEvent,
ForwardedRef,
KeyboardEvent,
ReactNode,
} from 'react'
import { forwardRef, useCallback, useRef, useState } from 'react'
import type { XOR } from '../../types'
import { Stack } from '../Stack'
Expand Down Expand Up @@ -150,6 +156,8 @@ type CommonProps = {
disabled?: boolean
'data-testid'?: string
className?: string
/** Uncontrolled but open by default */
open?: DetailsHTMLAttributes<HTMLDetailsElement>['open']
} & DraggableProps

type ExpandableCardProps = XOR<
Expand All @@ -173,6 +181,7 @@ const BaseExpandableCard = forwardRef(
index,
onKeyDown,
'data-testid': dataTestId,
open,
}: ExpandableCardProps,
ref: ForwardedRef<HTMLDetailsElement>,
) => {
Expand Down Expand Up @@ -291,7 +300,7 @@ const BaseExpandableCard = forwardRef(
data-testid={dataTestId}
key={clicking ? 'closed' : 'open'}
name={name}
open={expanded}
open={open ?? expanded}
ref={ref}
tabIndex={disabled ? -1 : undefined}
>
Expand Down
Loading