From cd38d37242bdc107535c774adafda46159e9f2a3 Mon Sep 17 00:00:00 2001
From: Elliot DeNolf <denolfe@gmail.com>
Date: Fri, 9 Oct 2020 10:04:33 -0400
Subject: [PATCH] enforce maxRows on Arrays and Blocks

---
 src/client/components/forms/field-types/Array/Array.js   | 3 ++-
 src/client/components/forms/field-types/Blocks/Blocks.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/client/components/forms/field-types/Array/Array.js b/src/client/components/forms/field-types/Array/Array.js
index 36600457f0..e7cdd72454 100644
--- a/src/client/components/forms/field-types/Array/Array.js
+++ b/src/client/components/forms/field-types/Array/Array.js
@@ -180,6 +180,7 @@ const RenderArray = React.memo((props) => {
     value,
     readOnly,
     minRows,
+    maxRows,
   } = props;
 
   return (
@@ -240,7 +241,7 @@ const RenderArray = React.memo((props) => {
             </div>
           )}
         </Droppable>
-        {!readOnly && (
+        {(!readOnly && (rows.length < maxRows || maxRows === undefined)) && (
           <div className={`${baseClass}__add-button-wrap`}>
             <Button
               onClick={() => addRow(value)}
diff --git a/src/client/components/forms/field-types/Blocks/Blocks.js b/src/client/components/forms/field-types/Blocks/Blocks.js
index 8e696a043a..97ced8a40c 100644
--- a/src/client/components/forms/field-types/Blocks/Blocks.js
+++ b/src/client/components/forms/field-types/Blocks/Blocks.js
@@ -198,6 +198,7 @@ const RenderBlocks = React.memo((props) => {
     blocks,
     readOnly,
     minRows,
+    maxRows,
   } = props;
 
   return (
@@ -282,7 +283,7 @@ const RenderBlocks = React.memo((props) => {
           )}
         </Droppable>
 
-        {!readOnly && (
+        {(!readOnly && (rows.length < maxRows || maxRows === undefined)) && (
           <div className={`${baseClass}__add-button-wrap`}>
             <Popup
               buttonType="custom"