Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite7a2510

Browse files
committed
Revert "[WIP] Support for ref callback (vuejs#4807)"
This reverts commitacec8db.
1 parentabfb458 commite7a2510

File tree

5 files changed

+32
-102
lines changed

5 files changed

+32
-102
lines changed

‎flow/component.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ import type { Config } from '../src/core/config'
22
importtypeVNodefrom'../src/core/vdom/vnode'
33
importtypeWatcherfrom'../src/core/observer/watcher'
44

5-
declaretypeRefs={
6-
[key:string]:Component|Element|Array<Component|Element>|void;
7-
};
8-
95
declareinterfaceComponent{
106
// constructor information
117
staticcid:number;
@@ -28,7 +24,7 @@ declare interface Component {
2824
$parent:Component|void;
2925
$root:Component;
3026
$children:Array<Component>;
31-
$refs:Refs;
27+
$refs:{[key:string]:Component|Element|Array<Component|Element>|void};
3228
$slots:{[key:string]:Array<VNode>};
3329
$scopedSlots:{[key:string]:()=>VNodeChildren};
3430
$vnode:VNode;

‎src/core/instance/lifecycle.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
importconfigfrom'../config'
44
import{perf}from'../util/perf'
55
importWatcherfrom'../observer/watcher'
6-
import{resetRefs}from'../vdom/modules/ref'
76
import{createEmptyVNode}from'../vdom/vnode'
87
import{observerState}from'../observer/index'
98
import{updateComponentListeners}from'./events'
@@ -56,7 +55,6 @@ export function lifecycleMixin (Vue: Class<Component>) {
5655
constprevVnode=vm._vnode
5756
constprevActiveInstance=activeInstance
5857
activeInstance=vm
59-
vm.$refs=resetRefs(vm.$refs)
6058
vm._vnode=vnode
6159
// Vue.prototype.__patch__ is injected in entry points
6260
// based on the rendering backend used.

‎src/core/vdom/modules/ref.js‎

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,44 @@
11
/*@flow */
22

3+
import{remove}from'shared/util'
4+
35
exportdefault{
4-
create:registerRef,
5-
update:registerRef
6+
create(_:any,vnode:VNodeWithData){
7+
registerRef(vnode)
8+
},
9+
update(oldVnode:VNodeWithData,vnode:VNodeWithData){
10+
if(oldVnode.data.ref!==vnode.data.ref){
11+
registerRef(oldVnode,true)
12+
registerRef(vnode)
13+
}
14+
},
15+
destroy(vnode:VNodeWithData){
16+
registerRef(vnode,true)
17+
}
618
}
719

8-
exportfunctionregisterRef(_:any,vnode:VNodeWithData){
20+
exportfunctionregisterRef(vnode:VNodeWithData,isRemoval: ?boolean){
921
constkey=vnode.data.ref
1022
if(!key)return
1123

24+
constvm=vnode.context
1225
constref=vnode.componentInstance||vnode.elm
13-
constrefs=vnode.context.$refs
14-
15-
if(typeofkey==='function'){
16-
key(ref)
17-
}elseif(vnode.data.refInFor){
18-
constrefArray=refs[key]
19-
if(Array.isArray(refArray)){
20-
if(refArray.indexOf(ref)<0){
21-
refArray.push(ref)
22-
}
23-
}else{
24-
refs[key]=[ref]
26+
constrefs=vm.$refs
27+
if(isRemoval){
28+
if(Array.isArray(refs[key])){
29+
remove(refs[key],ref)
30+
}elseif(refs[key]===ref){
31+
refs[key]=undefined
2532
}
2633
}else{
27-
refs[key]=ref
28-
}
29-
}
30-
31-
exportfunctionresetRefs(refs:Refs):Refs{
32-
constres={}
33-
// keep existing v-for ref arrays even if empty
34-
for(constkeyinrefs){
35-
if(Array.isArray(refs[key])){
36-
res[key]=[]
34+
if(vnode.data.refInFor){
35+
if(Array.isArray(refs[key])&&refs[key].indexOf(ref)<0){
36+
refs[key].push(ref)
37+
}else{
38+
refs[key]=[ref]
39+
}
40+
}else{
41+
refs[key]=ref
3742
}
3843
}
39-
returnres
4044
}

‎src/core/vdom/patch.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ export function createPatchFunction (backend) {
189189
}else{
190190
// empty component root.
191191
// skip all element-related modules except for ref (#3455)
192-
registerRef(null,vnode)
192+
registerRef(vnode)
193193
// make sure to invoke the insert hook
194194
insertedVnodeQueue.push(vnode)
195195
}

‎test/unit/features/ref.spec.js‎

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -157,72 +157,4 @@ describe('ref', () => {
157157
}).$mount()
158158
expect(vm.$refs.test).toBe(vm.$children[0])
159159
})
160-
161-
it('should should call callback method (v-for)',done=>{
162-
constvm=newVue({
163-
data:{
164-
items:[1,2,3]
165-
},
166-
template:`
167-
<div>
168-
<test v-for="n in items" :key="n" :ref="onRef" :n="n"></test>
169-
</div>
170-
`,
171-
components:{
172-
test:{
173-
props:['n'],
174-
template:'<div>{{ n }}</div>'
175-
}
176-
},
177-
methods:{
178-
onRef(ref){
179-
(this.$refs.list||(this.$refs.list=[])).push(ref)
180-
}
181-
}
182-
}).$mount()
183-
assertRefs()
184-
// updating
185-
vm.items.push(4)
186-
waitForUpdate(assertRefs)
187-
.then(()=>{vm.items=[]})
188-
.then(assertRefs)
189-
.then(done)
190-
191-
functionassertRefs(){
192-
expect(Array.isArray(vm.$refs.list)).toBe(true)
193-
expect(vm.$refs.list.length).toBe(vm.items.length)
194-
expect(vm.$refs.list.every((comp,i)=>comp.$el.textContent===String(i+1))).toBe(true)
195-
}
196-
})
197-
198-
it('should should call inline callback (v-for)',done=>{
199-
constvm=newVue({
200-
data:{
201-
items:[1,2,3]
202-
},
203-
template:`
204-
<div>
205-
<test v-for="n in items" :key="n" :ref="function (ref) { $refs[n] = ref }" :n="n"></test>
206-
</div>
207-
`,
208-
components:{
209-
test:{
210-
props:['n'],
211-
template:'<div>{{ n }}</div>'
212-
}
213-
}
214-
}).$mount()
215-
assertRefs()
216-
// updating
217-
vm.items.push(4)
218-
waitForUpdate(assertRefs)
219-
.then(()=>{vm.items=[]})
220-
.then(assertRefs)
221-
.then(done)
222-
223-
functionassertRefs(){
224-
expect(Object.keys(vm.$refs).length).toBe(vm.items.length)
225-
expect(Object.keys(vm.$refs).every(i=>vm.$refs[i].$el.textContent===String(i))).toBe(true)
226-
}
227-
})
228160
})

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp