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

fix: 补全 cover-view 在配合 map 组件使用时的特殊属性 #9184

Merged
merged 6 commits into from
Apr 25, 2021
Merged

fix: 补全 cover-view 在配合 map 组件使用时的特殊属性 #9184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6208de6
fix: 补全 cover-view 在配合 map 组件使用时的特殊属性
jay4q Mar 23, 2021
96f578f
fix: 调整微信小程序 CoverView 的特殊属性
jay4q Mar 26, 2021
f225dcf
Merge branch 'next' into next
luckyadam Mar 28, 2021
45c36f6
fix: type error
jay4q Apr 2, 2021
11179c1
fix: ci
Chen-jj Apr 25, 2021
83698db
Merge branch 'next' into jay/next
Chen-jj Apr 25, 2021
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: 11 additions & 0 deletions packages/taro-components/types/CoverView.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,17 @@ interface CoverViewProps extends ViewProps {
* @supported weapp
*/
scrollTop?: number

/**
* 适用于地图组件 map 的自定义气泡 customCallout
* @supported weapp
*/
markerId?: string

/**
* @supported weapp
*/
slot?: string
}

/** 覆盖在原生组件之上的文本视图。可覆盖的原生组件包括 map、video、canvas、camera、live-player、live-pusher 只支持嵌套 cover-view、cover-image，可在 cover-view 中使用 button。
Expand Down
4 changes: 4 additions & 0 deletions packages/taro-mini-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1480,6 +1480,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down
4 changes: 4 additions & 0 deletions packages/taro-mini-runner/src/__tests__/__snapshots__/common-style.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1480,6 +1480,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down
12 changes: 12 additions & 0 deletions packages/taro-mini-runner/src/__tests__/__snapshots__/config.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1480,6 +1480,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down Expand Up @@ -4520,6 +4524,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down Expand Up @@ -7384,6 +7392,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down
8 changes: 8 additions & 0 deletions packages/taro-mini-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1480,6 +1480,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down Expand Up @@ -4362,6 +4366,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down
4 changes: 4 additions & 0 deletions packages/taro-mini-runner/src/__tests__/__snapshots__/custom-tabbar.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1480,6 +1480,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down
4 changes: 4 additions & 0 deletions packages/taro-mini-runner/src/__tests__/__snapshots__/nerv.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1480,6 +1480,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down
4 changes: 4 additions & 0 deletions packages/taro-mini-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1480,6 +1480,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down
12 changes: 12 additions & 0 deletions packages/taro-mini-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1654,6 +1654,10 @@ require(\\"./taro\\");
\\"ad-type\\": Object(_tarojs_shared__WEBPACK_IMPORTED_MODULE_0__[\\"d\\"])(\\"banner\\"),
\\"ad-theme\\": Object(_tarojs_shared__WEBPACK_IMPORTED_MODULE_0__[\\"d\\"])(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down Expand Up @@ -5980,6 +5984,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down Expand Up @@ -10272,6 +10280,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down
8 changes: 8 additions & 0 deletions packages/taro-mini-runner/src/__tests__/__snapshots__/qq.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1480,6 +1480,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down Expand Up @@ -4964,6 +4968,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down
4 changes: 4 additions & 0 deletions packages/taro-mini-runner/src/__tests__/__snapshots__/react.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1480,6 +1480,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down
16 changes: 16 additions & 0 deletions packages/taro-mini-runner/src/__tests__/__snapshots__/sass.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1480,6 +1480,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down Expand Up @@ -4345,6 +4349,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down Expand Up @@ -7210,6 +7218,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down Expand Up @@ -10075,6 +10087,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down
4 changes: 4 additions & 0 deletions packages/taro-mini-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1480,6 +1480,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down
4 changes: 4 additions & 0 deletions packages/taro-mini-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3846,6 +3846,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down
4 changes: 4 additions & 0 deletions packages/taro-mini-runner/src/__tests__/__snapshots__/ts.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1480,6 +1480,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down
4 changes: 4 additions & 0 deletions packages/taro-mini-runner/src/__tests__/__snapshots__/vue.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1476,6 +1476,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down
4 changes: 4 additions & 0 deletions packages/taro-mini-runner/src/__tests__/__snapshots__/vue3.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1478,6 +1478,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down
4 changes: 4 additions & 0 deletions packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1261,6 +1261,10 @@ require(\\"./taro\\");
\\"ad-type\\": singleQuote(\\"banner\\"),
\\"ad-theme\\": singleQuote(\\"white\\")
},
CoverView: {
\\"marker-id\\": \\"\\",
slot: \\"\\"
},
Editor: {
\\"read-only\\": \\"false\\",
placeholder: \\"\\",
Expand Down
4 changes: 4 additions & 0 deletions packages/taro-weapp/src/components.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,10 @@ export const components = {
'ad-type': singleQuote('banner'),
'ad-theme': singleQuote('white')
},
CoverView: {
'marker-id': '',
slot: ''
},
// ======== 额外组件 ========
Editor: {
'read-only': 'false',
Expand Down
4 changes: 4 additions & 0 deletions packages/taro-weapp/types/components.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,10 @@ export declare const components: {
'ad-type': string;
'ad-theme': string;
};
CoverView: {
'marker-id': string;
slot: string;
};
Editor: {
'read-only': string;
placeholder: string;
Expand Down