Merge branch 'dev' into next

src/nav-bar/index.tsx

@@ -68,21 +68,28 @@ export default createComponent({
         zIndex: zIndex !== undefined ? +zIndex : undefined,
       };
 
+      const hasLeft = props.leftArrow || props.leftText || slots.left;
+      const hasRight = props.rightText || slots.right;
+
       return (
         <div
           ref={navBarRef}
           style={style}
           class={[bem({ fixed }), { [BORDER_BOTTOM]: border }]}
         >
-          <div class={bem('left')} onClick={onClickLeft}>
-            {renderLeft()}
-          </div>
+          {hasLeft && (
+            <div class={bem('left')} onClick={onClickLeft}>
+              {renderLeft()}
+            </div>
+          )}
           <div class={[bem('title'), 'van-ellipsis']}>
             {slots.title ? slots.title() : title}
           </div>
-          <div class={bem('right')} onClick={onClickRight}>
-            {renderRight()}
-          </div>
+          {hasRight && (
+            <div class={bem('right')} onClick={onClickRight}>
+              {renderRight()}
+            </div>
+          )}
         </div>
       );
     };

src/nav-bar/test/__snapshots__/index.legacy.js.snap

@@ -3,9 +3,7 @@
 exports[`placeholder prop 1`] = `
 <div class="van-nav-bar__placeholder" style="height: 50px;">
   <div class="van-nav-bar van-nav-bar--fixed van-hairline--bottom">
-    <div class="van-nav-bar__left"></div>
     <div class="van-nav-bar__title van-ellipsis"></div>
-    <div class="van-nav-bar__right"></div>
   </div>
 </div>
 `;
@@ -20,8 +18,6 @@ exports[`render left & right slot 1`] = `
 
 exports[`render title slot 1`] = `
 <div class="van-nav-bar van-hairline--bottom">
-  <div class="van-nav-bar__left"></div>
   <div class="van-nav-bar__title van-ellipsis">Custom Title</div>
-  <div class="van-nav-bar__right"></div>
 </div>
 `;