fix(layout): if src=null, un render avatar

close #7520
ant-design · Aug 13, 2023 · c721e07 · c721e07
1 parent b5d9eff
commit c721e07
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 10 deletions.
diff --git a/packages/layout/src/components/SiderMenu/SiderMenu.tsx b/packages/layout/src/components/SiderMenu/SiderMenu.tsx
@@ -279,7 +279,7 @@ const SiderMenu: React.FC<SiderMenuProps & PrivateSiderMenuProps> = (props) => {
     const { title, render, ...rest } = avatarProps;
     const dom = (
       <div className={`${baseClassName}-actions-avatar`}>
-        <Avatar size={28} {...rest} />
+        {rest?.src || rest?.srcSet ? <Avatar size={28} {...rest} /> : null}
         {avatarProps.title && !collapsed && <span>{title}</span>}
       </div>
     );

diff --git a/tests/field/__snapshots__/demo.test.ts.snap b/tests/field/__snapshots__/demo.test.ts.snap
@@ -4340,7 +4340,12 @@ exports[`field demos 📸 renders ./packages/field/src/demos/base_test.tsx corre
                   <textarea
                     class="ant-input"
                     rows="5"
-                  />
+                  >
+                    yarn run v1.22.0            
+$ eslint --format=pretty ./packages
+Done in 9.70s.
+          
+                  </textarea>
                 </span>
               </div>
             </td>
@@ -4366,7 +4371,30 @@ exports[`field demos 📸 renders ./packages/field/src/demos/base_test.tsx corre
                   <textarea
                     class="ant-input"
                     rows="5"
-                  />
+                  >
+                    {
+  "compilerOptions": {
+    "target": "esnext",
+    "moduleResolution": "node",
+    "jsx": "preserve",
+    "esModuleInterop": true,
+    "experimentalDecorators": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "noImplicitReturns": true,
+    "suppressImplicitAnyIndexErrors": true,
+    "declaration": true,
+    "skipLibCheck": true
+  },
+  "include": [
+    "**/src",
+    "**/docs",
+    "scripts",
+    "**/demo",
+    ".eslintrc.js"
+  ]
+}
+                  </textarea>
                 </span>
               </div>
             </td>

diff --git a/tests/field/__snapshots__/field.test.tsx.snap b/tests/field/__snapshots__/field.test.tsx.snap
@@ -1233,7 +1233,12 @@ exports[`Field 🐴 edit and no plain 1`] = `
                   <textarea
                     class="ant-input"
                     rows="5"
-                  />
+                  >
+                    yarn run v1.22.0
+$ eslint --format=pretty ./packages
+Done in 9.70s.
+          
+                  </textarea>
                 </span>
               </div>
             </td>
@@ -1255,7 +1260,30 @@ exports[`Field 🐴 edit and no plain 1`] = `
                   <textarea
                     class="ant-input"
                     rows="5"
-                  />
+                  >
+                    {
+  "compilerOptions": {
+    "target": "esnext",
+    "moduleResolution": "node",
+    "jsx": "preserve",
+    "esModuleInterop": true,
+    "experimentalDecorators": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "noImplicitReturns": true,
+    "suppressImplicitAnyIndexErrors": true,
+    "declaration": true,
+    "skipLibCheck": true
+  },
+  "include": [
+    "**/src",
+    "**/docs",
+    "scripts",
+    "**/demo",
+    ".eslintrc.js"
+  ]
+}
+                  </textarea>
                 </span>
               </div>
             </td>
@@ -2421,7 +2449,11 @@ exports[`Field 🐴 edit and plain=true 1`] = `
                   <input
                     class="ant-input"
                     type="text"
-                    value=""
+                    value="
+yarn run v1.22.0
+$ eslint --format=pretty ./packages
+Done in 9.70s.
+          "
                   />
                 </span>
               </div>
@@ -2444,7 +2476,28 @@ exports[`Field 🐴 edit and plain=true 1`] = `
                   <input
                     class="ant-input"
                     type="text"
-                    value=""
+                    value="{
+  "compilerOptions": {
+    "target": "esnext",
+    "moduleResolution": "node",
+    "jsx": "preserve",
+    "esModuleInterop": true,
+    "experimentalDecorators": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "noImplicitReturns": true,
+    "suppressImplicitAnyIndexErrors": true,
+    "declaration": true,
+    "skipLibCheck": true
+  },
+  "include": [
+    "**/src",
+    "**/docs",
+    "scripts",
+    "**/demo",
+    ".eslintrc.js"
+  ]
+}"
                   />
                 </span>
               </div>

diff --git a/tests/layout/__snapshots__/index.test.tsx.snap b/tests/layout/__snapshots__/index.test.tsx.snap
@@ -173,7 +173,9 @@ exports[`BasicLayout 🥩 BasicLayout menu support menu.true 1`] = `
                   <ul
                     class="ant-skeleton-paragraph"
                   >
-                    <li />
+                    <li
+                      style=""
+                    />
                     <li />
                     <li />
                     <li />
@@ -444,7 +446,9 @@ exports[`BasicLayout 🥩 BasicLayout menu support menu.true 1`] = `
                   <ul
                     class="ant-skeleton-paragraph"
                   >
-                    <li />
+                    <li
+                      style=""
+                    />
                     <li />
                     <li />
                     <li />
@@ -1562,7 +1566,9 @@ exports[`BasicLayout 🥩 support loading 1`] = `
     <ul
       class="ant-skeleton-paragraph"
     >
-      <li />
+      <li
+        style=""
+      />
       <li />
       <li />
       <li />