decap-cms-core 3.4.2 → 3.5.0

package/dist/esm/components/UI/ErrorBoundary.js

@@ -54,8 +54,8 @@ function buildIssueTemplate({
   let version = '';
   if (typeof DECAP_CMS_VERSION === 'string') {
     version = `decap-cms@${DECAP_CMS_VERSION}`;
-  } else if (typeof "3.3.2" === 'string') {
-    version = `decap-cms-app@${"3.3.2"}`;
+  } else if (typeof "3.4.0" === 'string') {
+    version = `decap-cms-app@${"3.4.0"}`;
   }
   const template = getIssueTemplate({
     version,

package/dist/esm/reducers/editorComponent.js

@@ -0,0 +1 @@
+"use strict";

package/dist/esm/reducers/editorControl.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _editorControl = require("../actions/editorControl");
+const initialState = null;
+function editorControl(state = initialState, action) {
+  switch (action.type) {
+    case _editorControl.SET_EDITOR_CONTROL:
+      return action.payload;
+    default:
+      return state;
+  }
+}
+var _default = exports.default = editorControl;

package/dist/esm/reducers/entryDraft.js

@@ -113,7 +113,10 @@ function entryDraftReducer(state = (0, _immutable.Map)(), action) {
       }
     case _entries.DRAFT_CLEAR_ERRORS:
       {
-        return state.set('fieldsErrors', (0, _immutable.Map)());
+        const {
+          uniqueFieldId
+        } = action.payload;
+        return state.deleteIn(['fieldsErrors', uniqueFieldId]);
       }
     case _entries.ENTRY_PERSIST_REQUEST:
     case _editorialWorkflow.UNPUBLISHED_ENTRY_PERSIST_REQUEST:

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-core",
   "description": "Decap CMS core application, see decap-cms package for the main distribution.",
-  "version": "3.4.2",
+  "version": "3.5.0",
   "repository": "https://github.com/decaporg/decap-cms/tree/main/packages/decap-cms-core",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
   "module": "dist/esm/index.js",
@@ -96,5 +96,5 @@
     "@types/url-join": "^4.0.0",
     "redux-mock-store": "^1.5.3"
   },
-  "gitHead": "64d91b8bb3d0a93dd36c53800cdac4ba2e435000"
+  "gitHead": "022dbe523d07bb8bc74970460cc82b259fde4041"
 }

package/src/actions/entries.ts

@@ -431,8 +431,11 @@ export function changeDraftFieldValidation(
   };
 }
 
-export function clearFieldErrors() {
-  return { type: DRAFT_CLEAR_ERRORS };
+export function clearFieldErrors(uniqueFieldId: string) {
+  return {
+    type: DRAFT_CLEAR_ERRORS,
+    payload: { uniqueFieldId },
+  };
 }
 
 export function localBackupRetrieved(entry: EntryValue) {

package/src/components/Editor/EditorControlPane/EditorControl.js

@@ -62,7 +62,6 @@ const styleStrings = {
   disabled: `
     pointer-events: none;
     opacity: 0.5;
-    background: #ccc;
   `,
   hidden: `
     visibility: hidden;
@@ -77,18 +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: 8px;
   text-align: right;
+  text-transform: uppercase;
   font-weight: 600;
+  margin: 0;
+  padding: 2px 0 3px;
 `;
 
 export const ControlHint = styled.p`
   margin-bottom: 0;
-  padding: 3px 0;
+  padding: 6px 0 0;
   font-size: 12px;
   color: ${props =>
     props.error ? colors.errorText : props.active ? colors.active : colors.controlLabel};
@@ -238,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`
@@ -302,7 +311,10 @@ class EditorControl extends React.Component {
               value={value}
               mediaPaths={mediaPaths}
               metadata={metadata}
-              onChange={(newValue, newMetadata) => onChange(field, newValue, newMetadata)}
+              onChange={(newValue, newMetadata) => {
+                onChange(field, newValue, newMetadata);
+                clearFieldErrors(this.uniqueFieldId); // Видаляємо помилки лише для цього поля
+              }}
               onValidate={onValidate && partial(onValidate, this.uniqueFieldId)}
               onOpenMediaLibrary={openMediaLibrary}
               onClearMediaControl={clearMediaControl}

package/src/components/Editor/EditorToolbar.js

@@ -594,11 +594,20 @@ export class EditorToolbar extends React.Component {
       </SaveButton>,
       currentStatus
         ? [
-            this.renderWorkflowStatusControls(),
-            this.renderNewEntryWorkflowPublishControls({ canCreate, canPublish }),
+            <React.Fragment key="workflow-status-controls">
+              {this.renderWorkflowStatusControls()}
+              {!hasChanged && this.renderNewEntryWorkflowPublishControls({ canCreate, canPublish })}
+            </React.Fragment>,
           ]
-        : !isNewEntry &&
-          this.renderExistingEntryWorkflowPublishControls({ canCreate, canPublish, canDelete }),
+        : !isNewEntry && (
+            <React.Fragment key="existing-entry-workflow-publish-controls">
+              {this.renderExistingEntryWorkflowPublishControls({
+                canCreate,
+                canPublish,
+                canDelete,
+              })}
+            </React.Fragment>
+          ),
       (!showDelete || useOpenAuthoring) && !hasUnpublishedChanges && !isModification ? null : (
         <DeleteButton
           key="delete-button"

package/src/reducers/entryDraft.js

@@ -129,7 +129,8 @@ function entryDraftReducer(state = Map(), action) {
       }
 
     case DRAFT_CLEAR_ERRORS: {
-      return state.set('fieldsErrors', Map());
+      const { uniqueFieldId } = action.payload;
+      return state.deleteIn(['fieldsErrors', uniqueFieldId]);
     }
 
     case ENTRY_PERSIST_REQUEST: