Skip to content

fix: Unify behavior of empty and undefined viewSpec.order in object form #246

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

Merged
bocembocem merged 2 commits into from
Nov 12, 2024
Merged

fix: Unify behavior of empty and undefined viewSpec.order in object form #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e19f0e
fix(dynamic-forms): change behavior viewSpec order for object forms
arteria32 Nov 10, 2024
b9e0d84
fix(dynamic-forms): fix initilization value of one of object form wit…
arteria32 Nov 10, 2024
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
9 changes: 7 additions & 2 deletions src/lib/kit/components/Inputs/MultiOneOf/MultiOneOf.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,14 @@ export const MultiOneOf: React.FC<MultiOneOfProps> = (props) => {
[spec.properties],
);

const propertiesOrder = React.useMemo(
() => (spec.viewSpec.order?.length ? spec.viewSpec.order : Object.keys(specProperties)),
[spec.viewSpec.order, specProperties],
);

const options = React.useMemo(
() =>
(spec.viewSpec.order || Object.keys(specProperties)).map((value) => {
propertiesOrder.map((value) => {
const title =
spec.description?.[value] ||
specProperties[value]?.viewSpec.layoutTitle ||
Expand All @@ -74,7 +79,7 @@ export const MultiOneOf: React.FC<MultiOneOfProps> = (props) => {
content: title,
};
}),
[spec.description, spec.viewSpec.order, specProperties],
[propertiesOrder, spec.description, specProperties],
);

const filterable = React.useMemo(() => (options.length || 0) > 9, [options.length]);
Expand Down
4 changes: 3 additions & 1 deletion src/lib/kit/components/Inputs/ObjectBase/ObjectBase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ export const ObjectBase: React.FC<ObjectBaseProps> = ({
: spec.properties;

const delimiter = spec.viewSpec.delimiter;
const orderProperties = spec.viewSpec.order || Object.keys(specProperties);
const orderProperties = spec.viewSpec.order?.length
? spec.viewSpec.order
: Object.keys(specProperties);

return (
<div className={b('content', {inline})}>
Expand Down
4 changes: 3 additions & 1 deletion src/lib/kit/components/Views/ObjectBaseView/ObjectBaseView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ export const ObjectBaseView: React.FC<ObjectBaseViewProps> = ({
: spec.properties;

const delimiter = spec.viewSpec.delimiter;
const orderProperties = spec.viewSpec.order || Object.keys(specProperties);
const orderProperties = spec.viewSpec.order?.length
? spec.viewSpec.order
: Object.keys(specProperties);

return (
<div className={b('content', {inline})}>
Expand Down
15 changes: 12 additions & 3 deletions src/lib/kit/hooks/useOneOf/useOneOf.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@ export const useOneOf = ({props, onTogglerChange}: UseOneOfParams) => {
}
}

return (valueKeys || spec.viewSpec.order || Object.keys(specProperties))[0];
if (valueKeys) return valueKeys[0];

if (spec.viewSpec.order?.length) return spec.viewSpec.order[0];

return Object.keys(specProperties)[0];
});

const onOneOfChange = React.useCallback(
Expand Down Expand Up @@ -81,9 +85,14 @@ export const useOneOf = ({props, onTogglerChange}: UseOneOfParams) => {
return undefined;
}, [oneOfValue, specBooleanMap]);

const propertiesOrder = React.useMemo(
() => (spec.viewSpec.order?.length ? spec.viewSpec.order : Object.keys(specProperties)),
[spec.viewSpec.order, specProperties],
);

const options = React.useMemo(
() =>
(spec.viewSpec.order || Object.keys(specProperties)).map((value) => {
propertiesOrder.map((value) => {
const title =
spec.description?.[value] ||
specProperties[value]?.viewSpec.layoutTitle ||
Expand All @@ -96,7 +105,7 @@ export const useOneOf = ({props, onTogglerChange}: UseOneOfParams) => {
content: title,
};
}),
[spec.description, spec.viewSpec.order, specProperties],
[propertiesOrder, spec.description, specProperties],
);

const togglerType = React.useMemo(() => {
Expand Down
Loading