From 718a837f591e375429980257e3a64aa873166999 Mon Sep 17 00:00:00 2001
From: wesleyZeng <as54376520@gmail.com>
Date: Wed, 27 May 2020 04:30:46 +0800
Subject: [PATCH] [Autocomplete] Fix dynamic changes of multiple={boolean}
 (#21194)

---
 packages/material-ui/src/utils/useControlled.js      |  2 +-
 packages/material-ui/src/utils/useControlled.test.js | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/material-ui/src/utils/useControlled.js b/packages/material-ui/src/utils/useControlled.js
index dab0f90397ccd2..7b3c37f1cbb12c 100644
--- a/packages/material-ui/src/utils/useControlled.js
+++ b/packages/material-ui/src/utils/useControlled.js
@@ -27,7 +27,7 @@ export default function useControlled({ controlled, default: defaultProp, name,
     const { current: defaultValue } = React.useRef(defaultProp);
 
     React.useEffect(() => {
-      if (defaultValue !== defaultProp) {
+      if (!isControlled && defaultValue !== defaultProp) {
         console.error(
           [
             `Material-UI: A component is changing the default ${state} state of an uncontrolled ${name} after being initialized. ` +
diff --git a/packages/material-ui/src/utils/useControlled.test.js b/packages/material-ui/src/utils/useControlled.test.js
index 67ba138274d45d..31155debec145c 100644
--- a/packages/material-ui/src/utils/useControlled.test.js
+++ b/packages/material-ui/src/utils/useControlled.test.js
@@ -83,4 +83,15 @@ describe('useControlled', () => {
       'Material-UI: A component is changing the default value state of an uncontrolled TestComponent after being initialized.',
     );
   });
+
+  it('should not raise a warning if changing the defaultValue when controlled', () => {
+    const { setProps } = render(
+      <TestComponent value={1} defaultValue={0}>
+        {() => null}
+      </TestComponent>,
+    );
+    expect(consoleErrorMock.callCount()).to.equal(0);
+    setProps({ defaultValue: 1 });
+    expect(consoleErrorMock.callCount()).to.equal(0);
+  });
 });