Skip to content

Commit 8a05832

Browse files
committed
feat: comments resolve
1 parent 78a21eb commit 8a05832

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

test/component.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Component({
2929
max: {
3030
type: Number,
3131
value: 0,
32-
observer(newVal: number, oldVal: number) {
32+
observer(newVal, oldVal) {
3333
expectType<number>(newVal)
3434
expectType<number>(oldVal)
3535
expectType<void>(this.onMyButtonTap())

types/wx/lib.wx.component.d.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ SOFTWARE.
2121
***************************************************************************** */
2222

2323
declare namespace WechatMiniprogram.Component {
24+
type FilterUnknownProperty<TProperty> = string extends keyof TProperty ? {} : TProperty
2425
type Instance<
2526
TData extends DataOption,
2627
TProperty extends PropertyOption,
@@ -33,9 +34,9 @@ declare namespace WechatMiniprogram.Component {
3334
(TIsPage extends true ? Page.ILifetime : {}) &
3435
TCustomInstanceProperty & {
3536
/** 组件数据,**包括内部数据和属性值** */
36-
data: TData & PropertyOptionToData<TProperty>
37+
data: TData & PropertyOptionToData<FilterUnknownProperty<TProperty>>
3738
/** 组件数据,**包括内部数据和属性值**(与 `data` 一致) */
38-
properties: TData & PropertyOptionToData<TProperty>
39+
properties: TData & PropertyOptionToData<FilterUnknownProperty<TProperty>>
3940
}
4041
type TrivialInstance = Instance<
4142
IAnyObject,
@@ -69,10 +70,8 @@ declare namespace WechatMiniprogram.Component {
6970
interface Constructor {
7071
<
7172
TData extends DataOption,
72-
// 给泛型默认值,避免出现当组件无 properties 选项时
73-
// 当xxx未在 data 中声明,this.data.xxx 为 any 且不报 TS2339 error 的问题。
74-
TProperty extends PropertyOption = {},
75-
TMethod extends MethodOption = {},
73+
TProperty extends PropertyOption,
74+
TMethod extends MethodOption,
7675
TCustomInstanceProperty extends IAnyObject = {},
7776
TIsPage extends boolean = false
7877
>(

0 commit comments

Comments
 (0)