Skip to content
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.

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

fix: improvements to component structure #270

Merged
merged 1 commit into from
Jan 20, 2025
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
13 changes: 2 additions & 11 deletions pdl-live-react/src/view/transcript/Transcript.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
type MouseEvent,
} from "react"

import { Accordion, AccordionItem } from "@patternfly/react-core"
import { Accordion } from "@patternfly/react-core"

import Context from "../../Context"
import DrawerContext from "../../DrawerContentContext"
Expand Down Expand Up @@ -61,16 +61,7 @@ export default function Transcript({ data }: Props) {
.concat(hasResult(data) ? [<FinalResult block={data} ctx={ctx} />] : [])
.map((block, idx) =>
isValidElement(block) && "data-id" in block.props ? (
<AccordionItem
key={idx}
className={isValidElement(block) && block.props.className}
isExpanded={
!isValidElement(block) ||
expanded.includes(block.props["data-id"])
}
>
{block}
</AccordionItem>
block
) : (
<div key={idx} className="pdl-interstitial-text">
{block}
Expand Down
10 changes: 8 additions & 2 deletions pdl-live-react/src/view/transcript/TranscriptItem.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { type PropsWithChildren } from "react"
import {
AccordionItem,
AccordionContent,
AccordionToggle,
DescriptionList,
Expand Down Expand Up @@ -82,7 +83,12 @@ export default function TranscriptItem(props: Props) {
)

return (
<div className={props.className} data-id={props.ctx.id}>
<AccordionItem
key={props.ctx.id}
className={props.className}
data-id={props.ctx.id}
isExpanded={props.ctx.isAccordionExpanded.includes(props.ctx.id)}
>
<AccordionToggle id={props.ctx.id} onClick={props.ctx.toggleAccordion}>
{toggleContent}
</AccordionToggle>
Expand All @@ -99,6 +105,6 @@ export default function TranscriptItem(props: Props) {
</DescriptionListGroup>
</DescriptionList>
</AccordionContent>
</div>
</AccordionItem>
)
}
Loading