Skip to content

Commit 37a0c4d

Browse files
robinclaude
andcommitted
[run] issue-1844: fix enterprise WeChat compilation by removing OpenData and correcting calc() syntax
- Add Taro.canIUse('open-data') guard before rendering <OpenData> in Avatar - Replace invalid `- calc(...)` with `calc(... / -2)` in curtain.scss and range.scss - Fix range.scss padding calc expression syntax Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 6466a1e commit 37a0c4d

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

packages/taro-ui/src/components/avatar/index.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@ export default class AtAvatar extends React.Component<
3838
if (text) letter = text[0]
3939

4040
let elem: React.ReactNode
41-
if (openData && openData.type === 'userAvatarUrl' && this.state.isWEAPP) {
41+
if (
42+
openData &&
43+
openData.type === 'userAvatarUrl' &&
44+
this.state.isWEAPP &&
45+
Taro.canIUse('open-data')
46+
) {
4247
elem = <OpenData type={openData.type}></OpenData>
4348
} else if (image) {
4449
elem = <Image className='at-avatar__img' src={image} />

packages/taro-ui/src/style/components/curtain.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ $at-curtain-btn-size: 56px;
3636
position: absolute;
3737
width: $at-curtain-btn-size;
3838
height: $at-curtain-btn-size;
39-
margin-left: - calc($at-curtain-btn-size / 2);
39+
margin-left: calc($at-curtain-btn-size / -2);
4040
left: 50%;
4141
bottom: -($at-curtain-btn-size + 24px);
4242
align-items: center;
@@ -68,7 +68,7 @@ $at-curtain-btn-size: 56px;
6868
}
6969

7070
&--top {
71-
margin-left: - calc($at-curtain-btn-size / 2);
71+
margin-left: calc($at-curtain-btn-size / -2);
7272
top: -($at-curtain-btn-size + 24px);
7373
left: 50%;
7474
bottom: auto;
@@ -88,7 +88,7 @@ $at-curtain-btn-size: 56px;
8888
}
8989

9090
&--bottom {
91-
margin-left: - calc($at-curtain-btn-size / 2);
91+
margin-left: calc($at-curtain-btn-size / -2);
9292
bottom: -($at-curtain-btn-size + 24px);
9393
left: 50%;
9494
}

packages/taro-ui/src/style/components/range.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
.at-range {
55
position: relative;
6-
padding: 0 calc($at-range-slider-size / 2) + 4PX;
6+
padding: 0 calc($at-range-slider-size / 2 + 4PX);
77
width: 100%;
88
box-sizing: border-box;
99

@@ -33,7 +33,7 @@
3333

3434
&__slider {
3535
position: absolute;
36-
margin-left: - calc($at-range-slider-size / 2);
36+
margin-left: calc($at-range-slider-size / -2);
3737
width: $at-range-slider-size;
3838
height: $at-range-slider-size;
3939
border-radius: 50%;

0 commit comments

Comments
 (0)