Skip to content
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

Jump to bottom

feat(popup): support background,border-radius,safe-area #1758

Merged
merged 8 commits into from
Mar 14, 2023
Merged

feat(popup): support background,border-radius,safe-area #1758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
682785a
fix(popup): resolve close can not tap
jarmywang Mar 9, 2023
ef12ae2
Merge branch 'Tencent:develop' into develop
jarmywang Mar 10, 2023
e6e60b1
feat(popup): support background,border-radius,safe-area
jarmywang Mar 10, 2023
035a05f
Merge branch 'Tencent:develop' into develop
jarmywang Mar 13, 2023
3dc5489
Merge branch 'Tencent:develop' into develop
jarmywang Mar 14, 2023
cfd2ece
Merge branch 'Tencent:develop' into develop
jarmywang Mar 14, 2023
d7acab3
Merge branch 'Tencent:develop' into develop
jarmywang Mar 14, 2023
c7cda33
fix(popup): add less variable (#1758)
jarmywang Mar 14, 2023
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
4 changes: 0 additions & 4 deletions src/action-sheet/action-sheet.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,4 @@
}
}
}
&__safe {
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
}
}
2 changes: 1 addition & 1 deletion src/action-sheet/action-sheet.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</view>
</view>
<slot />
<view wx:if="{{showCancel}}" class="{{classPrefix}}__footer {{classPrefix}}__safe">
<view wx:if="{{showCancel}}" class="{{classPrefix}}__footer">
<view class="{{classPrefix}}__gap-{{theme}}" />
<view
class="{{classPrefix}}__cancel {{prefix}}-class-cancel"
Expand Down
2 changes: 0 additions & 2 deletions src/calendar/calendar.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
z-index: 9999;
background: @calendar-bg-color;
overflow-x: hidden;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);

&--popup {
border-top-left-radius: @calendar-radius;
Expand Down
2 changes: 0 additions & 2 deletions src/drawer/drawer.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
width: @drawer-width;
display: flex;
flex-direction: column;
padding-bottom: env(safe-area-inset-bottom, 28px);
padding-bottom: constant(safe-area-inset-bottom, 28px);

&--hover {
background-color: @drawer-hover-color;
Expand Down
2 changes: 0 additions & 2 deletions src/picker/picker.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
.@{picker} {
position: relative;
background-color: @picker-bg-color;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
border-top-left-radius: @picker-border-radius;
border-top-right-radius: @picker-border-radius;

Expand Down
4 changes: 2 additions & 2 deletions src/popup/_example/base/index.wxss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.block {
background: #fff;
/*background: #fff;*/
color: #333;
display: flex;
align-items: center;
Expand All @@ -25,4 +25,4 @@

.wrapper + .wrapper {
margin-top: 32rpx;
}
}
11 changes: 11 additions & 0 deletions src/popup/popup.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@
@popup-position: ~'@{popup}--position';
@popup-transition: ~'@{popup}--transition';

@popup-bg-color: var(--td-popup-bg-color, @bg-color-container);
@popup-border-radius: var(--td-popup-border-radius, @radius-default);

.@{popup} {
position: fixed;
z-index: 11500;
max-height: 100vh;
transition: all 300ms ease;
background-color: @popup-bg-color;

&__content {
position: relative;
Expand All @@ -27,12 +31,18 @@
top: 0;
left: 0;
width: 100%;
border-bottom-left-radius: @popup-border-radius;
border-bottom-right-radius: @popup-border-radius;
}

&--bottom {
bottom: 0;
left: 0;
width: 100vw;
border-top-left-radius: @popup-border-radius;
border-top-right-radius: @popup-border-radius;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
}

&--left {
Expand All @@ -52,6 +62,7 @@
left: 50%;
transform: scale(1) translate3d(-50%, -50%, 0);
transform-origin: 0% 0%;
border-radius: @popup-border-radius;
}

&.@{prefix}-fade-enter,
Expand Down