From e6c1219bd51b44077242407965f3a51af394ca1b Mon Sep 17 00:00:00 2001
From: fzaninotto <fzaninotto@gmail.com>
Date: Tue, 27 Nov 2018 18:37:28 +0100
Subject: [PATCH] Fix ReferenceArrayInput ignores default filter on search

Closes #2559
---
 examples/simple/src/posts/PostEdit.js         | 20 +++++++++----------
 .../input/ReferenceArrayInputController.js    |  3 ++-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/examples/simple/src/posts/PostEdit.js b/examples/simple/src/posts/PostEdit.js
index 1454207526b..2e4ab5e7ad4 100644
--- a/examples/simple/src/posts/PostEdit.js
+++ b/examples/simple/src/posts/PostEdit.js
@@ -41,15 +41,15 @@ const EditActions = ({
     resource,
     ...rest
 }) => (
-    <CardActions className={className} {...rest}>
-        <CloneButton
-            className="button-clone"
-            basePath={basePath}
-            record={data}
-        />
-        {hasShow && <ShowButton basePath={basePath} record={data} />}
-    </CardActions>
-);
+        <CardActions className={className} {...rest}>
+            <CloneButton
+                className="button-clone"
+                basePath={basePath}
+                record={data}
+            />
+            {hasShow && <ShowButton basePath={basePath} record={data} />}
+        </CardActions>
+    );
 
 const PostEdit = props => (
     <Edit title={<PostTitle />} actions={<EditActions />} {...props}>
@@ -83,7 +83,7 @@ const PostEdit = props => (
                 />
             </FormTab>
             <FormTab label="post.form.miscellaneous">
-                <ReferenceArrayInput reference="tags" source="tags">
+                <ReferenceArrayInput reference="tags" source="tags" filter={{ published: true }}>
                     <AutocompleteArrayInput />
                 </ReferenceArrayInput>
                 <ArrayInput source="backlinks">
diff --git a/packages/ra-core/src/controller/input/ReferenceArrayInputController.js b/packages/ra-core/src/controller/input/ReferenceArrayInputController.js
index 4625a54e4b1..23174161797 100644
--- a/packages/ra-core/src/controller/input/ReferenceArrayInputController.js
+++ b/packages/ra-core/src/controller/input/ReferenceArrayInputController.js
@@ -184,6 +184,7 @@ export class ReferenceArrayInputController extends Component {
             source,
             resource,
             referenceSource,
+            filter: defaultFilter,
         } = props;
         const { pagination, sort, filter } = this.params;
         crudGetMatching(
@@ -191,7 +192,7 @@ export class ReferenceArrayInputController extends Component {
             referenceSource(resource, source),
             pagination,
             sort,
-            filter
+            { ...filter, ...defaultFilter }
         );
     };