elevate scrollEnabled prop to BlockList (#21505)

WordPress · Apr 16, 2020 · 13f244b · 13f244b
1 parent 2f33495
commit 13f244b
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 9 deletions.
diff --git a/packages/block-editor/src/components/block-list/index.native.js b/packages/block-editor/src/components/block-list/index.native.js
@@ -99,7 +99,6 @@ export class BlockList extends Component {
 			isReadOnly,
 			isRootList,
 			horizontal,
-			scrollEnabled,
 			shouldShowInsertionPointBefore,
 			shouldShowInsertionPointAfter,
 			marginVertical = styles.defaultBlock.marginTop,
@@ -140,7 +139,7 @@ export class BlockList extends Component {
 						! isRootList && styles.overflowVisible,
 					] }
 					horizontal={ horizontal }
-					scrollEnabled={ scrollEnabled }
+					scrollEnabled={ isRootList }
 					contentContainerStyle={
 						horizontal && styles.horizontalContentContainer
 					}

diff --git a/packages/block-editor/src/components/inner-blocks/index.native.js b/packages/block-editor/src/components/inner-blocks/index.native.js
@@ -114,7 +114,6 @@ class InnerBlocks extends Component {
 			renderAppender,
 			__experimentalMoverDirection,
 			horizontal,
-			scrollEnabled,
 			contentResizeMode,
 			contentStyle,
 			onAddBlock,
@@ -137,7 +136,6 @@ class InnerBlocks extends Component {
 							__experimentalMoverDirection
 						}
 						horizontal={ horizontal }
-						scrollEnabled={ scrollEnabled }
 						contentResizeMode={ contentResizeMode }
 						contentStyle={ contentStyle }
 						onAddBlock={ onAddBlock }

diff --git a/packages/block-library/src/column/edit.native.js b/packages/block-library/src/column/edit.native.js
@@ -64,7 +64,6 @@ function ColumnEdit( {
 				] }
 			>
 				<InnerBlocks
-					scrollEnabled={ false }
 					renderAppender={
 						isSelected && InnerBlocks.ButtonBlockAppender
 					}

diff --git a/packages/block-library/src/columns/edit.native.js b/packages/block-library/src/columns/edit.native.js
@@ -144,7 +144,6 @@ function ColumnsEditContainer( {
 						columnsInRow > 1 ? 'horizontal' : undefined
 					}
 					horizontal={ true }
-					scrollEnabled={ false }
 					allowedBlocks={ ALLOWED_BLOCKS }
 					contentResizeMode="stretch"
 					onAddBlock={ onAddNextColumn }

diff --git a/packages/block-library/src/group/edit.native.js b/packages/block-library/src/group/edit.native.js
@@ -36,9 +36,6 @@ function GroupEdit( { hasInnerBlocks, isSelected, getStylesFromColorScheme } ) {
 		<View style={ isSelected && hasInnerBlocks && styles.innerBlocks }>
 			<InnerBlocks
 				renderAppender={ isSelected && InnerBlocks.ButtonBlockAppender }
-				flatListProps={ {
-					scrollEnabled: false,
-				} }
 			/>
 		</View>
 	);