fix(Popover): incorrect border position in wework (youzan#7702)

* fix(Popover): incorrect border position in wework * test(Popover): update snapshot
Fire-Dragons · Jan 18, 2021 · ab45ef9 · ab45ef9
1 parent d5ac316
commit ab45ef9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/popover/index.js b/src/popover/index.js
@@ -106,14 +106,14 @@ export default createComponent({
     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={() => this.onClickAction(action, index)}
         >
           {icon && <Icon name={icon} class={bem('action-icon')} />}
           <div class={[bem('action-text'), BORDER_BOTTOM]}>{text}</div>
-        </button>
+        </div>
       );
     },
 
@@ -187,7 +187,7 @@ export default createComponent({
           nativeOnTouchstart={this.onTouchstart}
         >
           <div class={bem('arrow')} />
-          <div class={bem('content')}>
+          <div class={bem('content')} role="menu">
             {this.slots('default') || this.actions.map(this.renderAction)}
           </div>
         </Popup>

diff --git a/src/popover/index.less b/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 {

diff --git a/src/popover/test/__snapshots__/index.spec.js.snap b/src/popover/test/__snapshots__/index.spec.js.snap
@@ -1,30 +1,30 @@
 // 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`] = `<!---->`;
 
 exports[`should locate to reference element when showed 2`] = `
 <div class="van-popup van-popover van-popover--light" name="van-popover-zoom" style="position: absolute; left: 0px; top: 8px; margin: 0px; z-index: 2007;" data-popper-placement="bottom">
   <div class="van-popover__arrow"></div>
-  <div class="van-popover__content"></div>
+  <div role="menu" class="van-popover__content"></div>
 </div>
 `;
 
 exports[`should locate to reference element when showed 3`] = `
 <div class="van-popup van-popover van-popover--light" name="van-popover-zoom" style="position: absolute; left: 0px; top: 8px; margin: 0px; z-index: 2007; display: none;" data-popper-placement="bottom">
   <div class="van-popover__arrow"></div>
-  <div class="van-popover__content"></div>
+  <div role="menu" class="van-popover__content"></div>
 </div>
 `;
 
 exports[`should watch placement prop and update location 1`] = `
 <div class="van-popup van-popover van-popover--light" name="van-popover-zoom" style="z-index: 2008; position: absolute; left: 0px; top: -8px; margin: 0px;" data-popper-placement="top">
   <div class="van-popover__arrow"></div>
-  <div class="van-popover__content"></div>
+  <div role="menu" class="van-popover__content"></div>
 </div>
 `;