Skip to content

fix(popover): arrow inherits custom background colors, replace data-placement with classes #4144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 4 commits into from
Closed

fix(popover): arrow inherits custom background colors, replace data-placement with classes #4144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7d90c4
Initial plan
Copilot Dec 26, 2025
d269d65
fix(popover): arrow color now matches background theme color
Copilot Dec 26, 2025
df863c4
Update progress: tests passing
Copilot Dec 26, 2025
4c69978
fix(popover): arrow inherits background color, use class-based placem…
Copilot Dec 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions packages/components/calendar/__test__/demo.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,7 @@
import path from 'path';
import simulate from 'miniprogram-simulate';

const mapper = [
'base',
'custom-range',
'custom-text',
'local-text',
'multiple',
'range',
'switch-mode',
'without-popup',
];
const mapper = ['base', 'custom-range', 'custom-text', 'local-text', 'multiple', 'range', 'switch-mode', 'without-popup'];

describe('Calendar', () => {
mapper.forEach((demoName) => {
Expand Down
15 changes: 1 addition & 14 deletions packages/components/input/__test__/demo.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,7 @@
import path from 'path';
import simulate from 'miniprogram-simulate';

const mapper = [
'align',
'banner',
'base',
'bordered',
'custom',
'label',
'layout',
'maxlength',
'prefix',
'special',
'status',
'suffix',
];
const mapper = ['align', 'banner', 'base', 'bordered', 'custom', 'label', 'layout', 'maxlength', 'prefix', 'special', 'status', 'suffix'];

describe('Input', () => {
mapper.forEach((demoName) => {
Expand Down
68 changes: 43 additions & 25 deletions packages/components/popover/popover.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
border-style: solid;
border-color: transparent;
border-width: @popover-arrow-width;
color: inherit;
}

// 主题
Expand Down Expand Up @@ -93,7 +94,9 @@
.arrow-placement-right();

.content-placement-top {
.@{prefix}-popover[data-placement^='top'] {
.@{prefix}-popover.@{prefix}-popover--placement-top,
.@{prefix}-popover.@{prefix}-popover--placement-top-start,
.@{prefix}-popover.@{prefix}-popover--placement-top-end {
.@{prefix}-popover__content {
margin-bottom: @popover-content-margin;
}
Expand All @@ -104,7 +107,9 @@
}

.content-placement-bottom {
.@{prefix}-popover[data-placement^='bottom'] {
.@{prefix}-popover.@{prefix}-popover--placement-bottom,
.@{prefix}-popover.@{prefix}-popover--placement-bottom-start,
.@{prefix}-popover.@{prefix}-popover--placement-bottom-end {
.@{prefix}-popover__content {
margin-top: @popover-content-margin;
}
Expand All @@ -115,7 +120,9 @@
}

.content-placement-left {
.@{prefix}-popover[data-placement^='left'] {
.@{prefix}-popover.@{prefix}-popover--placement-left,
.@{prefix}-popover.@{prefix}-popover--placement-left-start,
.@{prefix}-popover.@{prefix}-popover--placement-left-end {
.@{prefix}-popover__content {
margin-right: @popover-content-margin;
}
Expand All @@ -126,7 +133,9 @@
}

.content-placement-right {
.@{prefix}-popover[data-placement^='right'] {
.@{prefix}-popover.@{prefix}-popover--placement-right,
.@{prefix}-popover.@{prefix}-popover--placement-right-start,
.@{prefix}-popover.@{prefix}-popover--placement-right-end {
.@{prefix}-popover__content {
margin-left: @popover-content-margin;
}
Expand All @@ -137,7 +146,9 @@
}

.arrow-placement-top() {
.@{prefix}-popover[data-placement^='top'] {
.@{prefix}-popover.@{prefix}-popover--placement-top,
.@{prefix}-popover.@{prefix}-popover--placement-top-start,
.@{prefix}-popover.@{prefix}-popover--placement-top-end {
.@{prefix}-popover__arrow {
bottom: 0;
border-top-color: currentColor;
Expand All @@ -146,7 +157,7 @@
}
}

.@{prefix}-popover[data-placement='top'] {
.@{prefix}-popover.@{prefix}-popover--placement-top {
transform-origin: 50% 100%;

.@{prefix}-popover__arrow {
Expand All @@ -155,15 +166,15 @@
}
}

.@{prefix}-popover[data-placement='top-start'] {
.@{prefix}-popover.@{prefix}-popover--placement-top-start {
transform-origin: 0 100%;

.@{prefix}-popover__arrow {
left: @popover-padding;
}
}

.@{prefix}-popover[data-placement='top-end'] {
.@{prefix}-popover.@{prefix}-popover--placement-top-end {
transform-origin: 100% 100%;

.@{prefix}-popover__arrow {
Expand All @@ -173,7 +184,9 @@
}

.arrow-placement-left() {
.@{prefix}-popover[data-placement^='left'] {
.@{prefix}-popover.@{prefix}-popover--placement-left,
.@{prefix}-popover.@{prefix}-popover--placement-left-start,
.@{prefix}-popover.@{prefix}-popover--placement-left-end {
.@{prefix}-popover__arrow {
right: 0;
border-right-width: 0;
Expand All @@ -182,7 +195,7 @@
}
}

.@{prefix}-popover[data-placement='left'] {
.@{prefix}-popover.@{prefix}-popover--placement-left {
transform-origin: 100% 50%;

.@{prefix}-popover__arrow {
Expand All @@ -191,15 +204,15 @@
}
}

.@{prefix}-popover[data-placement='left-start'] {
.@{prefix}-popover.@{prefix}-popover--placement-left-start {
transform-origin: 100% 0;

.@{prefix}-popover__arrow {
top: @popover-padding;
}
}

.@{prefix}-popover[data-placement='left-end'] {
.@{prefix}-popover.@{prefix}-popover--placement-left-end {
transform-origin: 100% 100%;

.@{prefix}-popover__arrow {
Expand All @@ -209,7 +222,9 @@
}

.arrow-placement-bottom() {
.@{prefix}-popover[data-placement^='bottom'] {
.@{prefix}-popover.@{prefix}-popover--placement-bottom,
.@{prefix}-popover.@{prefix}-popover--placement-bottom-start,
.@{prefix}-popover.@{prefix}-popover--placement-bottom-end {
.@{prefix}-popover__arrow {
top: 0;
border-top-width: 0;
Expand All @@ -218,7 +233,7 @@
}
}

.@{prefix}-popover[data-placement='bottom'] {
.@{prefix}-popover.@{prefix}-popover--placement-bottom {
transform-origin: 50% 0;

.@{prefix}-popover__arrow {
Expand All @@ -227,15 +242,15 @@
}
}

.@{prefix}-popover[data-placement='bottom-start'] {
.@{prefix}-popover.@{prefix}-popover--placement-bottom-start {
transform-origin: 0 0;

.@{prefix}-popover__arrow {
left: @popover-padding;
}
}

.@{prefix}-popover[data-placement='bottom-end'] {
.@{prefix}-popover.@{prefix}-popover--placement-bottom-end {
transform-origin: 100% 0;

.@{prefix}-popover__arrow {
Expand All @@ -245,7 +260,9 @@
}

.arrow-placement-right() {
.@{prefix}-popover[data-placement^='right'] {
.@{prefix}-popover.@{prefix}-popover--placement-right,
.@{prefix}-popover.@{prefix}-popover--placement-right-start,
.@{prefix}-popover.@{prefix}-popover--placement-right-end {
.@{prefix}-popover__arrow {
left: 0;
border-right-color: currentColor;
Expand All @@ -254,7 +271,7 @@
}
}

.@{prefix}-popover[data-placement='right'] {
.@{prefix}-popover.@{prefix}-popover--placement-right {
transform-origin: 0 50%;

.@{prefix}-popover__arrow {
Expand All @@ -263,15 +280,15 @@
}
}

.@{prefix}-popover[data-placement='right-start'] {
.@{prefix}-popover.@{prefix}-popover--placement-right-start {
transform-origin: 0 0;

.@{prefix}-popover__arrow {
top: @popover-padding;
}
}

.@{prefix}-popover[data-placement='right-end'] {
.@{prefix}-popover.@{prefix}-popover--placement-right-end {
transform-origin: 0 100%;

.@{prefix}-popover__arrow {
Expand All @@ -284,12 +301,13 @@
@color: 'popover-@{theme}-color';
@bgColor: 'popover-@{theme}-bg-color';

.@{prefix}-popover--@{theme} {
color: @@color;
.@{prefix}-popover__content.@{prefix}-popover--@{theme} {
background: @@bgColor;

.@{prefix}-popover__arrow {
color: @@bgColor;
color: @@bgColor; // Set color to background so arrow can inherit it via currentColor

// Reset text color for content
& > view, & > text, & > * {
color: @@color;
}
}
}
2 changes: 1 addition & 1 deletion packages/components/popover/popover.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
wx:if="{{realVisible}}"
id="{{classPrefix}}-content"
style="{{style}} {{contentStyle}} {{customStyle}}"
class="{{class}} {{classPrefix}} {{transitionClass}} {{prefix}}-class {{fixed ? classPrefix + '--fixed' : ''}}"
class="{{class}} {{classPrefix}} {{classPrefix}}--placement-{{_placement}} {{transitionClass}} {{prefix}}-class {{fixed ? classPrefix + '--fixed' : ''}}"
data-placement="{{_placement}}"
>
<view
Expand Down
Loading