FIX Applying the allowed elements fix to the other add element buttons

silverstripe · Jan 29, 2019 · 289f6f6 · 289f6f6
1 parent adc3692
commit 289f6f6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/components/ElementEditor/ElementEditor.js b/client/src/components/ElementEditor/ElementEditor.js
@@ -96,6 +96,7 @@ class ElementEditor extends PureComponent {
           onDragOver={this.handleDragOver}
         />
         <ListComponent
+          allowedElementTypes={allowedElementTypes}
           elementTypes={elementTypes}
           areaId={areaId}
           onDragOver={this.handleDragOver}

diff --git a/client/src/components/ElementEditor/ElementList.js b/client/src/components/ElementEditor/ElementList.js
@@ -33,6 +33,7 @@ class ElementList extends Component {
       HoverBarComponent,
       DragIndicatorComponent,
       blocks,
+      allowedElementTypes,
       elementTypes,
       areaId,
       onDragEnd,
@@ -64,7 +65,7 @@ class ElementList extends Component {
         {isDraggingOver || <HoverBarComponent
           areaId={areaId}
           elementId={element.ID}
-          elementTypes={elementTypes}
+          elementTypes={allowedElementTypes}
         />}
       </div>
     ));
@@ -111,6 +112,7 @@ ElementList.propTypes = {
   // @todo support either ElementList or Element children in an array (or both)
   blocks: PropTypes.arrayOf(elementType),
   elementTypes: PropTypes.arrayOf(elementTypeType).isRequired,
+  allowedElementTypes: PropTypes.arrayOf(elementTypeType).isRequired,
   loading: PropTypes.bool,
   areaId: PropTypes.number.isRequired,
   dragTargetElementId: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),

diff --git a/client/src/components/ElementEditor/tests/ElementList-test.js b/client/src/components/ElementEditor/tests/ElementList-test.js
@@ -54,6 +54,7 @@ describe('ElementList', () => {
         <ElementList
           key={'1'}
           blocks={blocks}
+          allowedElementTypes={elementTypes}
           elementTypes={elementTypes}
           ElementComponent={Element}
           LoadingComponent={Loading}
@@ -74,6 +75,7 @@ describe('ElementList', () => {
         <ElementList
           key={'2'}
           blocks={[]}
+          allowedElementTypes={elementTypes}
           elementTypes={elementTypes}
           ElementComponent={Element}
           LoadingComponent={Loading}
@@ -94,6 +96,7 @@ describe('ElementList', () => {
         <ElementList
           key={'3'}
           blocks={[]}
+          allowedElementTypes={elementTypes}
           elementTypes={elementTypes}
           ElementComponent={Element}
           LoadingComponent={Loading}