From dff2bebfefcff354c4dfb14f6e1330c1e8a23930 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Sun, 22 Nov 2020 19:35:28 +0800 Subject: [PATCH 1/5] docs(Popover): add vertion tip --- src/popover/README.zh-CN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/popover/README.zh-CN.md b/src/popover/README.zh-CN.md index 84c901f65..8e35eacf8 100644 --- a/src/popover/README.zh-CN.md +++ b/src/popover/README.zh-CN.md @@ -2,7 +2,7 @@ ### 介绍 -弹出式的气泡菜单。 +弹出式的气泡菜单,2.11 版本开始支持此组件。 ### 引入 From 39b0a4282ddb98e6f9fadfc0caaa7c29c39a12c9 Mon Sep 17 00:00:00 2001 From: neverland Date: Mon, 23 Nov 2020 21:12:00 +0800 Subject: [PATCH 2/5] docs(Slider): hide range usage in weapp (#7611) --- src/slider/demo/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/slider/demo/index.vue b/src/slider/demo/index.vue index 3a33fa83a..63e331ea7 100644 --- a/src/slider/demo/index.vue +++ b/src/slider/demo/index.vue @@ -4,7 +4,7 @@ - + From 40062ad21b8a1e34189239db64b814148b657f12 Mon Sep 17 00:00:00 2001 From: neverland Date: Mon, 23 Nov 2020 21:19:25 +0800 Subject: [PATCH 3/5] style(NavBar): z-index not work when border is hidden (#7612) --- src/nav-bar/index.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/nav-bar/index.less b/src/nav-bar/index.less index 1fed3ee1f..f86b4af9a 100644 --- a/src/nav-bar/index.less +++ b/src/nav-bar/index.less @@ -1,6 +1,7 @@ @import '../style/var'; .van-nav-bar { + position: relative; z-index: @nav-bar-z-index; line-height: @line-height-lg; text-align: center; From 1f5f078aec6539b32647139802b9baee7c6d0aa3 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 24 Nov 2020 17:09:53 +0800 Subject: [PATCH 4/5] style(Popover): improve cursor (#7623) --- src/popover/index.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/popover/index.less b/src/popover/index.less index c718d41a6..de5ce500c 100644 --- a/src/popover/index.less +++ b/src/popover/index.less @@ -34,6 +34,7 @@ padding: 0 @padding-md; font-size: @popover-action-font-size; line-height: @line-height-md; + cursor: pointer; &:last-child { .van-popover__action-text::after { @@ -212,6 +213,7 @@ &--disabled { color: @popover-light-action-disabled-text-color; + cursor: not-allowed; &:active { background-color: transparent; From 89ce8345b4e8c30420e2fcc15a0ddba54d5d0403 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 24 Nov 2020 17:25:27 +0800 Subject: [PATCH 5/5] feat(Popover): improve a11y (#7624) --- src/popover/index.js | 5 +++-- src/popover/index.less | 2 ++ src/popover/test/__snapshots__/index.spec.js.snap | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/popover/index.js b/src/popover/index.js index ed1024152..c66c52bab 100644 --- a/src/popover/index.js +++ b/src/popover/index.js @@ -114,13 +114,14 @@ export default createComponent({ renderAction(action, index) { const { icon, text, disabled, className } = action; return ( -
this.onClickAction(action, index)} > {icon && }
{text}
-
+ ); }, diff --git a/src/popover/index.less b/src/popover/index.less index de5ce500c..a717183c0 100644 --- a/src/popover/index.less +++ b/src/popover/index.less @@ -34,6 +34,8 @@ 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 index 5cb3f0706..54423dcbc 100644 --- a/src/popover/test/__snapshots__/index.spec.js.snap +++ b/src/popover/test/__snapshots__/index.spec.js.snap @@ -1,9 +1,9 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`should allow to custom the className of action 1`] = ` -
+
+ `; exports[`should locate to reference element when showed 1`] = ``;