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.

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

Jump to bottom

fix: clear field error in Editor after the field value is changed #7216

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

fix: clear field error in Editor after the field value is changed #7216

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0047c9d
fix: remove field error in Editor after the field is changed
olegfedak May 28, 2024
90e6be3
fix: add px to control hint
olegfedak May 28, 2024
06062a4
fix: add ControlTopbar for correct error display at widget
olegfedak May 28, 2024
9ecef01
Merge branch 'decaporg:main' into main
olegfedak Jul 3, 2024
c962ed3
chore: update after tests
olegfedak Jul 4, 2024
e6a118d
Merge branch 'decaporg:main' into main
olegfedak Aug 1, 2024
e9f60cc
chore: update caniuse-lite
olegfedak Aug 4, 2024
db47712
fix: child list element should have key prop
olegfedak Aug 4, 2024
52c1244
Merge branch 'main' into main
olegfedak Aug 4, 2024
48fa423
chore: update formatting
olegfedak Aug 4, 2024
d673512
Merge branch 'main' into main
martinjagodic Aug 5, 2024
72389c4
Merge branch 'decaporg:main' into main
olegfedak Aug 10, 2024
91864c6
Merge branch 'decaporg:main' into main
olegfedak Aug 13, 2024
b45dc66
fix: add ControlTopbar margin and padding
olegfedak Aug 14, 2024
0a31216
fix: add changes to the tests
olegfedak Aug 15, 2024
4cfaf9f
fix: remove the comments
olegfedak Aug 22, 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
Prev Previous commit
Next Next commit
fix: add ControlTopbar for correct error display at widget
  • Loading branch information
@olegfedak
olegfedak committed May 28, 2024
commit 06062a4c19a031c6bc1aaf3c39433af9a16e1cce
59 changes: 33 additions & 26 deletions packages/decap-cms-core/src/components/Editor/EditorControlPane/EditorControl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,21 +76,26 @@ const ControlContainer = styled.div`
}
`;

const ControlTopbar = styled.div`
display: flex;
justify-content: space-between;
gap: 20px;
align-items: end;
`;
const ControlErrorsList = styled.ul`
list-style-type: none;
font-size: 12px;
color: ${colors.errorText};
margin-bottom: 5px;
text-align: right;
text-transform: uppercase;
position: relative;
font-weight: 600;
top: 20px;
margin: 0;
padding: 2px 0 3px;
`;

export const ControlHint = styled.p`
margin-bottom: 0;
padding: 6px 6px 0;
padding: 6px 0 0;
font-size: 12px;
color: ${props =>
props.error ? colors.errorText : props.active ? colors.active : colors.controlLabel};
Expand Down Expand Up @@ -240,28 +245,30 @@ class EditorControl extends React.Component {
${isHidden && styleStrings.hidden};
`}
>
{widget.globalStyles && <Global styles={coreCss`${widget.globalStyles}`} />}
{errors && (
<ControlErrorsList>
{errors.map(
error =>
error.message &&
typeof error.message === 'string' && (
<li key={error.message.trim().replace(/[^a-z0-9]+/gi, '-')}>
{error.message}
</li>
),
)}
</ControlErrorsList>
)}
<LabelComponent
field={field}
isActive={isSelected || this.state.styleActive}
hasErrors={hasErrors}
uniqueFieldId={this.uniqueFieldId}
isFieldOptional={isFieldOptional}
t={t}
/>
<ControlTopbar>
{widget.globalStyles && <Global styles={coreCss`${widget.globalStyles}`} />}
<LabelComponent
field={field}
isActive={isSelected || this.state.styleActive}
hasErrors={hasErrors}
uniqueFieldId={this.uniqueFieldId}
isFieldOptional={isFieldOptional}
t={t}
/>
{errors && (
<ControlErrorsList>
{errors.map(
error =>
error.message &&
typeof error.message === 'string' && (
<li key={error.message.trim().replace(/[^a-z0-9]+/gi, '-')}>
{error.message}
</li>
),
)}
</ControlErrorsList>
)}
</ControlTopbar>
<Widget
classNameWrapper={cx(
css`
Expand Down
Loading