fix: (WaterMark) when not set zIndex props, --adm-water-mark-z-index … #6330
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…and --z-index support
Codecov ReportPatch coverage has no change and project coverage change:
Additional details and impacted files@@ Coverage Diff @@
## master #6330 +/- ##
==========================================
- Coverage 91.56% 91.56% -0.01%
==========================================
Files 306 306
Lines 6592 6591 -1
Branches 1627 1626 -1
==========================================
- Hits 6036 6035 -1
Misses 521 521
Partials 35 35
☔ View full report in Codecov by Sentry. |
|
PR preview has been successfully built and deployed to https://antd-mobile-preview-pr-6330.surge.sh |
1587315093
reviewed
Aug 22, 2023
| @@ -31,7 +31,7 @@ const defaultProps = { | |||
| export const WaterMark: FC<WaterMarkProps> = p => { | |||
| const props = mergeProps(defaultProps, p) | |||
| const { | |||
| zIndex = 2000, | |||
| zIndex = 'var(--z-index)', | |||
There was a problem hiding this comment.
可以这样，css var 里改成和 zIndex prop 一样。然后 zIndex prop 默认为空
1587315093
reviewed
Aug 22, 2023
| @@ -8,7 +8,7 @@ const classPrefix = `adm-water-mark` | |||
| export type WaterMarkProps = { | |||
| gapX?: number | |||
| gapY?: number | |||
| zIndex?: number | |||
| zIndex?: number | 'var(--z-index)' | |||
|
是的，我把它去掉吧，可以不对外暴露
…------------------ Original ------------------
From: Wing ***@***.***>
Date: Tue,Aug 22,2023 11:19 PM
To: ant-design/ant-design-mobile ***@***.***>
Cc: liangsky ***@***.***>, Author ***@***.***>
Subject: Re: [ant-design/ant-design-mobile] fix: (WaterMark) when not set zIndex props, --adm-water-mark-z-index … (PR #6330)
@1587315093 commented on this pull request.
In src/components/water-mark/water-mark.tsx:
> @@ -8,7 +8,7 @@ const classPrefix = `adm-water-mark` export type WaterMarkProps = { gapX?: number gapY?: number - zIndex?: number + zIndex?: number | 'var(--z-index)'
这个类型提示也没用 就是写死的str
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you authored the thread.Message ID: ***@***.***>
|
|
这样是可以，之前没这样写，css var 里已经有默认值了，也是2000，一样的，我改了
…------------------ Original ------------------
From: 二货爱吃白萝卜 ***@***.***>
Date: Thu,Aug 24,2023 8:07 PM
To: ant-design/ant-design-mobile ***@***.***>
Cc: liangsky ***@***.***>, Author ***@***.***>
Subject: Re: [ant-design/ant-design-mobile] fix: (WaterMark) when not set zIndex props, --adm-water-mark-z-index … (PR #6330)
@zombieJ commented on this pull request.
In src/components/water-mark/water-mark.tsx:
> @@ -31,7 +31,7 @@ const defaultProps = { export const WaterMark: FC<WaterMarkProps> = p => { const props = mergeProps(defaultProps, p) const { - zIndex = 2000, + zIndex = 'var(--z-index)',
可以这样，css var 里改成和 zIndex prop 一样。然后 zIndex prop 默认为空
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you authored the thread.Message ID: ***@***.***>
|
miracles1919
approved these changes
Aug 25, 2023
cytle
pushed a commit
to cytle/ant-design-mobile
that referenced
this pull request
Sep 11, 2023
ant-design#6330) * fix: (WaterMark) when not set zIndex props, --adm-water-mark-z-index and --z-index support * refactor: (WaterMark) zIndex type remove 'var(--z-index)' * refactor(FloatingBubble): zIndex props default undefined
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix: #6329