Skip to content

fix ArrayField to handle values type array correctly #76

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix ArrayField to handle values type array correctly #76

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fd8cba
fix ArrayField to handle values type array correctly
Apr 3, 2025
61e0b7b
fix: biome check
Apr 24, 2025
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
12 changes: 9 additions & 3 deletions packages/trpc-ui/src/react-app/components/form/fields/ArrayField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ export function ArrayField({
// the form state changes.
const watch = useWatch({ control });

const arrayValue = "json" in field.value ? field.value.json : field.value;

function getValueFromWatch() {
let r = watch;
for (const p of [ROOT_VALS_PROPERTY_NAME].concat(
Expand All @@ -48,13 +50,17 @@ export function ArrayField({

function onAddClick() {
setTextFieldKeys((old) => old.concat([`${currentKeyCount++}`]));
const watchValue = getValueFromWatch();
const arrayValue = "json" in watchValue ? watchValue.json : watchValue;
field.onChange(
getValueFromWatch().concat([defaultFormValuesForNode(node.childType)]),
arrayValue.concat([defaultFormValuesForNode(node.childType)]),
);
}

function onDeleteClick(index: number) {
const newArr = [...getValueFromWatch()];
const watchValue = getValueFromWatch();
const arrayValue = "json" in watchValue ? watchValue.json : watchValue;
const newArr = [...arrayValue];
const newKeysArr = [...textFieldKeys];
newArr.splice(index, 1);
newKeysArr.splice(index, 1);
Expand All @@ -66,7 +72,7 @@ export function ArrayField({
iconElement={<DataArray className="mr-1" />}
title={label}
>
{field.value.map((parsedNode: ParsedInputNode, i: number) => (
{arrayValue.map((parsedNode: ParsedInputNode, i: number) => (
<span
key={`${JSON.stringify(parsedNode)} ${i}`}
className="flex flex-row items-start"
Expand Down