Skip to content

Commit

Permalink
fix: react components throwing key erorrs (#9)
Browse files Browse the repository at this point in the history
  • Loading branch information
Benehiko authored Sep 27, 2022
1 parent eb6099b commit ade37ad
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
18 changes: 8 additions & 10 deletions src/react-components/ory/helpers/error-messages.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const nodeMessage = ({
}: {
text: string
id: number
key: number
key: string
}) => (
<Message key={key} data-testid={`ui/message/${id}`} severity={"error"}>
{text}
Expand All @@ -29,24 +29,22 @@ export const NodeMessages = ({
const $groupMessages = nodes?.reduce<JSX.Element[]>(
(groups, { messages }) => {
groups = groups.concat(
messages.map(({ text, id }) => nodeMessage({ text, id, key: id })),
messages.map(({ text, id }, key) =>
nodeMessage({ text, id, key: `node-group-message-${id}-${key}` }),
),
)
return groups
},
[],
)

const $messages = uiMessages?.map(({ text, id }, key) =>
nodeMessage({ text, id, key }),
nodeMessage({ text, id, key: `ui-messsage-${id}-${key}` }),
)

console.dir({ $groupMessages, $messages })
const $allMessages = [...($groupMessages || []), ...($messages || [])]

return ($messages && $messages.length > 0) ||
($groupMessages && $groupMessages.length > 0) ? (
<div className={gridStyle({ gap: 16 })}>
{$messages}
{$groupMessages}
</div>
return $allMessages.length > 0 ? (
<div className={gridStyle({ gap: 16 })}>{$allMessages}</div>
) : null
}
2 changes: 1 addition & 1 deletion src/react-components/ory/helpers/node.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ export const Node = ({
required={attrs.required}
defaultValue={attrs.value}
disabled={attrs.disabled}
checked={Boolean(attrs.value)}
defaultChecked={Boolean(attrs.value)}
/>
)
default:
Expand Down
20 changes: 11 additions & 9 deletions src/react-components/ory/user-auth-card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,17 @@ export const UserAuthCard = ({
),
]
.filter(Boolean) // remove nulls
.map((flow, index) =>
index > 0 ? (
<>
<Divider /> {flow}
</>
) : (
flow
),
) // only map the divider if the index is greater than 0 - more than one flow
.map((flow, index) => (
<div key={index}>
{index > 0 ? (
<>
<Divider /> {flow}
</>
) : (
flow
)}
</div>
)) // only map the divider if the index is greater than 0 - more than one flow

switch (flowType) {
case "login":
Expand Down

0 comments on commit ade37ad

Please sign in to comment.