payload 1.1.19 → 1.1.21

package/README.md

@@ -16,7 +16,7 @@
   </a>
 
   <a href="https://discord.com/invite/r6sCXqVk3v">
-    <img alt="Discord" src="https://img.shields.io/discord/967097582721572934?label=Discord" />
+    <img alt="Discord" src="https://img.shields.io/discord/967097582721572934?label=Discord&color=7289da" />
   </a>
 </p>
 
@@ -68,6 +68,7 @@ Alternatively, it only takes about five minutes to [create an app from scratch](
 ### Documentation
 
 Check out the [Payload website](https://payloadcms.com/docs/getting-started/what-is-payload) to find in-depth documentation for everything that Payload offers.
+
 ### Contributing
 
 If you want to add contributions to this repository, please follow the instructions in [contributing.md](./contributing.md).

package/dist/admin/components/forms/Form/fieldReducer.js

@@ -62,6 +62,10 @@ function fieldReducer(state, action) {
             const flattenedRowState = unflattenedRows.length > 0 ? flatten({ [path]: unflattenedRows }, { filters: flattenFilters }) : {};
             return {
                 ...remainingFlattenedState,
+                [path]: {
+                    ...(state[path] || {}),
+                    disableFormData: unflattenedRows.length > 0,
+                },
                 ...flattenedRowState,
             };
         }
@@ -82,6 +86,11 @@ function fieldReducer(state, action) {
             }
             const newState = {
                 ...remainingFlattenedState,
+                [path]: {
+                    ...(state[path] || {}),
+                    value: unflattenedRows.length,
+                    disableFormData: true,
+                },
                 ...(flatten({ [path]: unflattenedRows }, { filters: flattenFilters })),
             };
             return newState;
@@ -99,6 +108,11 @@ function fieldReducer(state, action) {
             }
             const newState = {
                 ...remainingFlattenedState,
+                [path]: {
+                    ...(state[path] || {}),
+                    value: unflattenedRows.length,
+                    disableFormData: true,
+                },
                 ...(flatten({ [path]: unflattenedRows }, { filters: flattenFilters })),
             };
             return newState;

package/dist/admin/components/forms/field-types/Array/index.js

@@ -51,33 +51,34 @@ const ArrayFieldType = (props) => {
     const memoizedValidate = useCallback((value, options) => {
         return validate(value, { ...options, minRows, maxRows, required });
     }, [maxRows, minRows, required, validate]);
-    const { showError, errorMessage, value, setValue, } = useField({
+    const { showError, errorMessage, value, } = useField({
         path,
         validate: memoizedValidate,
         condition,
+        disableFormData: (rows === null || rows === void 0 ? void 0 : rows.length) > 0,
     });
     const addRow = useCallback(async (rowIndex) => {
         const subFieldState = await buildStateFromSchema({ fieldSchema: fields, operation, id, user, locale });
         dispatchFields({ type: 'ADD_ROW', rowIndex, subFieldState, path });
         dispatchRows({ type: 'ADD', rowIndex });
-        setValue(value + 1);
+        setModified(true);
         setTimeout(() => {
             scrollToID(`${path}-row-${rowIndex + 1}`);
         }, 0);
-    }, [dispatchRows, dispatchFields, fields, path, setValue, value, operation, id, user, locale]);
+    }, [dispatchRows, dispatchFields, fields, path, operation, id, user, locale, setModified]);
     const duplicateRow = useCallback(async (rowIndex) => {
         dispatchFields({ type: 'DUPLICATE_ROW', rowIndex, path });
         dispatchRows({ type: 'ADD', rowIndex });
-        setValue(value + 1);
+        setModified(true);
         setTimeout(() => {
             scrollToID(`${path}-row-${rowIndex + 1}`);
         }, 0);
-    }, [dispatchRows, dispatchFields, path, setValue, value]);
+    }, [dispatchRows, dispatchFields, path, setModified]);
     const removeRow = useCallback((rowIndex) => {
         dispatchRows({ type: 'REMOVE', rowIndex });
         dispatchFields({ type: 'REMOVE_ROW', rowIndex, path });
-        setValue(value - 1);
-    }, [dispatchRows, dispatchFields, path, value, setValue]);
+        setModified(true);
+    }, [dispatchRows, dispatchFields, path, setModified]);
     const moveRow = useCallback((moveFromIndex, moveToIndex) => {
         dispatchRows({ type: 'MOVE', moveFromIndex, moveToIndex });
         dispatchFields({ type: 'MOVE_ROW', moveFromIndex, moveToIndex, path });
@@ -146,17 +147,6 @@ const ArrayFieldType = (props) => {
         };
         initializeRowState();
     }, [formContext, path, getPreference, preferencesKey, initCollapsed]);
-    useEffect(() => {
-        if (typeof rows !== 'undefined') {
-            const disableFormData = rows.length > 0;
-            dispatchFields({
-                type: 'UPDATE',
-                path,
-                disableFormData,
-                value: rows.length,
-            });
-        }
-    }, [rows, dispatchFields, path]);
     const hasMaxRows = maxRows && (rows === null || rows === void 0 ? void 0 : rows.length) >= maxRows;
     const classes = [
         'field-type',

package/dist/admin/components/forms/field-types/Blocks/index.js

@@ -44,14 +44,15 @@ const BlocksField = (props) => {
     const locale = useLocale();
     const operation = useOperation();
     const { dispatchFields, setModified } = formContext;
+    const [selectorIndexOpen, setSelectorIndexOpen] = useState();
     const memoizedValidate = useCallback((value, options) => {
         return validate(value, { ...options, minRows, maxRows, required });
     }, [maxRows, minRows, required, validate]);
-    const [selectorIndexOpen, setSelectorIndexOpen] = useState();
-    const { showError, errorMessage, value, setValue, } = useField({
+    const { showError, errorMessage, value, } = useField({
         path,
         validate: memoizedValidate,
         condition,
+        disableFormData: (rows === null || rows === void 0 ? void 0 : rows.length) > 0,
     });
     const onAddPopupToggle = useCallback((open) => {
         if (!open) {
@@ -63,24 +64,24 @@ const BlocksField = (props) => {
         const subFieldState = await buildStateFromSchema({ fieldSchema: block.fields, operation, id, user, locale });
         dispatchFields({ type: 'ADD_ROW', rowIndex, subFieldState, path, blockType });
         dispatchRows({ type: 'ADD', rowIndex, blockType });
-        setValue(value + 1);
+        setModified(true);
         setTimeout(() => {
             scrollToID(`${path}-row-${rowIndex + 1}`);
         }, 0);
-    }, [path, setValue, value, blocks, dispatchFields, operation, id, user, locale]);
+    }, [path, blocks, dispatchFields, operation, id, user, locale, setModified]);
     const duplicateRow = useCallback(async (rowIndex, blockType) => {
         dispatchFields({ type: 'DUPLICATE_ROW', rowIndex, path });
         dispatchRows({ type: 'ADD', rowIndex, blockType });
-        setValue(value + 1);
+        setModified(true);
         setTimeout(() => {
             scrollToID(`${path}-row-${rowIndex + 1}`);
         }, 0);
-    }, [dispatchRows, dispatchFields, path, setValue, value]);
+    }, [dispatchRows, dispatchFields, path, setModified]);
     const removeRow = useCallback((rowIndex) => {
         dispatchRows({ type: 'REMOVE', rowIndex });
         dispatchFields({ type: 'REMOVE_ROW', rowIndex, path });
-        setValue(value - 1);
-    }, [path, setValue, value, dispatchFields]);
+        setModified(true);
+    }, [path, dispatchFields, setModified]);
     const moveRow = useCallback((moveFromIndex, moveToIndex) => {
         dispatchRows({ type: 'MOVE', moveFromIndex, moveToIndex });
         dispatchFields({ type: 'MOVE_ROW', moveFromIndex, moveToIndex, path });
@@ -150,17 +151,6 @@ const BlocksField = (props) => {
         };
         initializeRowState();
     }, [formContext, path, getPreference, preferencesKey, initCollapsed]);
-    useEffect(() => {
-        if (typeof rows !== 'undefined') {
-            const disableFormData = rows.length > 0;
-            dispatchFields({
-                type: 'UPDATE',
-                path,
-                disableFormData,
-                value: rows.length,
-            });
-        }
-    }, [rows, dispatchFields, path]);
     const hasMaxRows = maxRows && (rows === null || rows === void 0 ? void 0 : rows.length) >= maxRows;
     const classes = [
         'field-type',

package/docs/configuration/overview.mdx

@@ -8,7 +8,7 @@ keywords: overview, config, configuration, documentation, Content Management Sys
 
 Payload is a *config-based*, code-first CMS and application framework. The Payload config is central to everything that Payload does. It scaffolds the data that Payload stores as well as maintains custom React components, hook logic, custom validations, and much more. The config itself and all of its dependencies are run through Babel, so you can take full advantage of newer JavaScript features and even directly import React components containing JSX.
 
-<strong>Also, because the Payload source code is fully written in TypeScript, its configs are strongly typed—meaning that even if you aren't using TypeScript to build your project, your IDE (such as VSCode) may still provide helpful information like type-ahead suggestions while you write your config.</strong>
+**Also, because the Payload source code is fully written in TypeScript, its configs are strongly typed—meaning that even if you aren't using TypeScript to build your project, your IDE (such as VSCode) may still provide helpful information like type-ahead suggestions while you write your config.**
 
 <Banner type="warning">
 	<strong>Important:</strong><br />This file is included in the Payload admin bundle, so make sure you do not embed any sensitive information.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload",
-  "version": "1.1.19",
+  "version": "1.1.21",
   "description": "Node, React and MongoDB Headless CMS and Application Framework",
   "license": "MIT",
   "engines": {