change vRef to ref and delete _update_slot (#10)

* feat(weex): publish weex-vue-framework 2.5.16-weex.1

* feat(weex): change vRef to ref

* feat(weex): remove _update_slot event

* fix(weex): add '[[VirtualElement]]': true

Author: imyzf

flow/weex.js

@@ -124,7 +124,8 @@ declare type WeexCompiledResult = CompiledResult & {
 declare type WeexVirtalElement = {
   attrs: Object;
   type: string;
-  vRef: string;
+  ref: string;
+  '[[VirtualElement]]': true;
 }
 
 declare type WeexComponentHookInstance = {

packages/weex-vue-framework/factory.js

@@ -4121,6 +4121,55 @@ function updateComponentData (
   warn(("Failed to update component data (" + componentId + ")."));
 }
 
+function updateVirtualRef (vm, refsMap, isRemoval) {
+  if (!isObject(refsMap)) { return }
+
+  if (isRemoval) {
+    vm.$refs = {};
+  } else {
+    var vmRef = vm.$refs || {};
+    Object.keys(refsMap).forEach(function (key) {
+      var refs = refsMap[key];
+      vmRef[key] = refs.length === 1 ? refs[0] : refs;
+    });
+    vm.$refs = vmRef;
+  }
+}
+
+function registerListRef (vm, position, refsMap, isRemoval) {
+  if (!isObject(refsMap)) { return }
+
+  var vmRef = vm.$refs || {};
+  if (isRemoval) {
+    Object.keys(refsMap).forEach(function (key) {
+      var refs = refsMap[key];
+
+      if (vmRef[key]) {
+        if (refs.length === 1 && Array.isArray(vmRef[key])) {
+          delete vmRef[key][position];
+        } else {
+          delete vmRef[key];
+        }
+      }
+    });
+  } else {
+    Object.keys(refsMap).forEach(function (key) {
+      var refs = refsMap[key];
+
+      if (refs.length === 1) {
+        if (!Array.isArray(vmRef[key])) {
+          vmRef[key] = [];
+        }
+        // $flow-disable-line
+        vmRef[key][position] = refs[0];
+      } else {
+        vmRef[key] = refs;
+      }
+    });
+    vm.$refs = vmRef;
+  }
+}
+
 /*  */
 
 // https://github.com/Hanks10100/weex-native-directive/tree/master/component
@@ -4188,22 +4237,27 @@ function initVirtualComponent (options) {
   initProvide(vm); // resolve provide after data/props
   callHook(vm, 'created');
 
-  registerComponentHook(componentId, 'lifecycle', 'attach', function () {
-    callHook(vm, 'beforeMount');
+  registerComponentHook(componentId, 'lifecycle', 'attach',
+    function (instance) {
+      updateVirtualRef(vm, instance && instance.refs);
 
-    new Watcher(
-      vm,
-      function () { return getComponentState(vm); },
-      function () { return vm._update(vm._vnode, false); }
-    );
+      callHook(vm, 'beforeMount');
 
-    vm._isMounted = true;
-    callHook(vm, 'mounted');
-  });
+      new Watcher(
+        vm,
+        function () { return getComponentState(vm); },
+        function () { return vm._update(vm._vnode, false); }
+      );
 
-  registerComponentHook(componentId, 'lifecycle', 'update', function () {
-    vm._update(vm._vnode, false);
-  });
+      vm._isMounted = true;
+      callHook(vm, 'mounted');
+    });
+
+  registerComponentHook(componentId, 'lifecycle', 'update',
+    function (instance) {
+      updateVirtualRef(vm, instance && instance.refs);
+      vm._update(vm._vnode, false);
+    });
 
   registerComponentHook(
     componentId,
@@ -4219,14 +4273,16 @@ function initVirtualComponent (options) {
     }
   );
 
-  registerComponentHook(componentId, 'lifecycle', 'detach', function () {
-    vm.$destroy();
-    if (vm._vmTemplate) {
+  registerComponentHook(componentId, 'lifecycle', 'detach',
+    function (instance) {
+      updateVirtualRef(vm, instance && instance.refs, true);
+      vm.$destroy();
+      if (vm._vmTemplate) {
       // $flow-disable-line
-      vm._vmTemplate.removeVirtualComponent(vm._uid);
-      delete vm._vmTemplate;
-    }
-  });
+        vm._vmTemplate.removeVirtualComponent(vm._uid);
+        delete vm._vmTemplate;
+      }
+    });
 }
 
 // override Vue.prototype._update
@@ -7214,6 +7270,16 @@ var RecycleList = {
       });
     }
 
+    this._events['_attach_slot'] = function (instance) {
+      registerListRef(this$1.$parent || this$1, instance.position, instance.refs);
+    };
+    this._events['_update_slot'] = function (instance) {
+      registerListRef(this$1.$parent || this$1, instance.position, instance.refs);
+    };
+    this._events['_detach_slot'] = function (instance) {
+      registerListRef(this$1.$parent || this$1, instance.position, instance.refs, true);
+    };
+
     return h('weex:recycle-list', {
       on: this._events
     }, this.$slots.default)
@@ -7682,7 +7748,7 @@ var canBeLeftOpenTag = makeMap(
 );
 
 var isRuntimeComponent = makeMap(
-  'richtext,transition,transition-group',
+  'richtext,transition,transition-group,recycle-list',
   true
 );
 

packages/weex-vue-framework/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weex-vue-framework",
-  "version": "2.5.16-weex.0",
+  "version": "2.5.16-weex.1",
   "description": "Vue 2.0 Framework for Weex",
   "main": "index.js",
   "repository": {

src/platforms/weex/runtime/components/recycle-list.js

@@ -113,9 +113,6 @@ export default {
     this._events['_attach_slot'] = (instance: WeexComponentHookInstance) => {
       registerListRef(this.$parent || this, instance.position, instance.refs)
     }
-    this._events['_update_slot'] = (instance: WeexComponentHookInstance) => {
-      registerListRef(this.$parent || this, instance.position, instance.refs)
-    }
     this._events['_detach_slot'] = (instance: WeexComponentHookInstance) => {
       registerListRef(this.$parent || this, instance.position, instance.refs, true)
     }

test/weex/helpers/index.js

@@ -130,8 +130,7 @@ function omitUseless (object, parentKey) {
       }
       if (key === 'event' && Array.isArray(object[key])) {
         object.event = object.event.filter(name => {
-          return name !== '_attach_slot' && name !== '_update_slot' &&
-            name !== '_detach_slot'
+          return name !== '_attach_slot' && name !== '_detach_slot'
         })
         if (!object.event.length) {
           delete object.event
@@ -153,8 +152,7 @@ export function getEvents (instance) {
     if (!node) { return }
     if (Array.isArray(node.event)) {
       node.event.forEach(type => {
-        if (type !== '_attach_slot' && type !== '_update_slot' &&
-        type !== '_detach_slot') {
+        if (type !== '_attach_slot' && type !== '_detach_slot') {
           events.push({ ref: node.ref, type })
         }
       })