gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: object validation collapsed (#416)

Browse Source
This commit is contained in:
Daniel Lautzenheiser
2023-01-23 14:36:52 -05:00
committed by GitHub
parent dad93b42fc
commit d17378d557
3 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/core/src/widgets/object/ObjectControl.tsx
View File

@ -6,6 +6,7 @@ import ObjectWidgetTopBar from '@staticcms/core/components/UI/ObjectWidgetTopBar
import Outline from '@staticcms/core/components/UI/Outline';
import { transientOptions } from '@staticcms/core/lib';
import { compileStringTemplate } from '@staticcms/core/lib/widgets/stringTemplate';
import { getEntryDataPath } from '@staticcms/core/reducers/selectors/entryDraft';
import type { ObjectField, ObjectValue, WidgetControlProps } from '@staticcms/core/interface';
import type { FC } from 'react';
@ -61,7 +62,7 @@ const ObjectControl: FC<WidgetControlProps<ObjectValue, ObjectField>> = ({
hasErrors,
value = {},
}) => {
const [collapsed, setCollapsed] = useState(false);
const [collapsed, setCollapsed] = useState(field.collapsed ?? false);
const handleCollapseToggle = useCallback(() => {
setCollapsed(!collapsed);
@ -75,6 +76,13 @@ const ObjectControl: FC<WidgetControlProps<ObjectValue, ObjectField>> = ({
const multiFields = useMemo(() => field.fields, [field.fields]);
const childHasError = useMemo(() => {
const dataPath = getEntryDataPath(i18n);
const fullPath = `${dataPath}.${path}`;
return Boolean(Object.keys(fieldsErrors).find(key => key.startsWith(fullPath)));
}, [fieldsErrors, i18n, path]);
const renderedField = useMemo(() => {
return (
multiFields?.map((field, index) => {
@ -132,7 +140,7 @@ const ObjectControl: FC<WidgetControlProps<ObjectValue, ObjectField>> = ({
collapsed={collapsed}
onCollapseToggle={handleCollapseToggle}
heading={objectLabel}
hasError={hasErrors}
hasError={hasErrors || childHasError}
t={t}
testId="object-title"
/>
@ -140,7 +148,9 @@ const ObjectControl: FC<WidgetControlProps<ObjectValue, ObjectField>> = ({
<StyledFieldsBox $collapsed={collapsed} key="object-control-fields">
{renderedField}
</StyledFieldsBox>
{forList ? null : <Outline key="object-control-outline" hasError={hasErrors} />}
{forList ? null : (
<Outline key="object-control-outline" hasError={hasErrors || childHasError} />
)}
</StyledObjectControlWrapper>
);
}