Merge branch '2.x' into dev

src/popover/index.js

@@ -126,14 +126,14 @@ export default createComponent({
     const renderAction = (action, index) => {
       const { icon, text, disabled, className } = action;
       return (
-        <button
-          type="button"
+        <div
+          role="menuitem"
           class={[bem('action', { disabled, 'with-icon': icon }), className]}
           onClick={() => onClickAction(action, index)}
         >
           {icon && <Icon name={icon} class={bem('action-icon')} />}
           <div class={[bem('action-text'), BORDER_BOTTOM]}>{text}</div>
-        </button>
+        </div>
       );
     };
 
@@ -167,7 +167,7 @@ export default createComponent({
           {...{ ...attrs, 'onUpdate:show': toggle }}
         >
           <div class={bem('arrow')} />
-          <div class={bem('content')}>
+          <div role="menu" class={bem('content')}>
             {slots.default ? slots.default() : props.actions.map(renderAction)}
           </div>
         </Popup>

src/popover/index.less

@@ -34,8 +34,6 @@
     padding: 0 @padding-md;
     font-size: @popover-action-font-size;
     line-height: @line-height-md;
-    background-color: transparent;
-    border: none;
     cursor: pointer;
 
     &:last-child {

src/popover/test/__snapshots__/index.spec.js.snap

@@ -1,13 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`should allow to custom the className of action 1`] = `
-<button type="button"
-        class="van-popover__action foo"
+<div role="menuitem"
+     class="van-popover__action foo"
 >
   <div class="van-popover__action-text van-hairline--bottom">
     Option
   </div>
-</button>
+</div>
 `;
 
 exports[`should locate to reference element when showed 1`] = `
@@ -23,7 +23,9 @@ exports[`should locate to reference element when showed 2`] = `
   >
     <div class="van-popover__arrow">
     </div>
-    <div class="van-popover__content">
+    <div role="menu"
+         class="van-popover__content"
+    >
     </div>
   </div>
 </transition-stub>
@@ -36,7 +38,9 @@ exports[`should locate to reference element when showed 3`] = `
   >
     <div class="van-popover__arrow">
     </div>
-    <div class="van-popover__content">
+    <div role="menu"
+         class="van-popover__content"
+    >
     </div>
   </div>
 </transition-stub>
@@ -50,7 +54,9 @@ exports[`should watch placement prop and update location 1`] = `
   >
     <div class="van-popover__arrow">
     </div>
-    <div class="van-popover__content">
+    <div role="menu"
+         class="van-popover__content"
+    >
     </div>
   </div>
 </transition-stub>