fix(DropdownMenu): support set props dynamic & improve performance (#2454)

fix #2446

packages/dropdown-item/index.ts

@@ -9,6 +9,7 @@ VantComponent({
     type: 'ancestor',
     linked(target) {
       this.parent = target;
+      this.updateDataFromParent();
     },
     unlinked() {
       this.parent = null;
@@ -16,13 +17,23 @@ VantComponent({
   },
 
   props: {
-    value: null,
+    value: {
-    title: String,
+      type: null,
+      observer: 'rerender'
+    },
+    title: {
+      type: String,
+      observer: 'rerender'
+    },
     disabled: Boolean,
-    titleClass: String,
+    titleClass: {
+      type: String,
+      observer: 'rerender'
+    },
     options: {
       type: Array,
-      value: []
+      value: [],
+      observer: 'rerender'
     }
   },
 
@@ -33,21 +44,30 @@ VantComponent({
     displayTitle: ''
   },
 
-  created() {
-    this.setData({ displayTitle: this.computedDisplayTitle(this.data.value) });
-  },
-
   methods: {
-    computedDisplayTitle(curValue) {
+    rerender() {
-      const { title, options } = this.data;
+      wx.nextTick(() => {
+        this.parent && this.parent.updateItemListData();
+      });
+    },
 
-      if (title) {
+    updateDataFromParent() {
-        return title;
+      if (this.parent) {
+        const {
+          overlay,
+          duration,
+          activeColor,
+          closeOnClickOverlay,
+          direction
+        } = this.parent.data;
+        this.setData({
+          overlay,
+          duration,
+          activeColor,
+          closeOnClickOverlay,
+          direction
+        });
       }
-
-      const match = options.filter(option => option.value === curValue);
-      const displayTitle = match.length ? match[0].text : '';
-      return displayTitle;
     },
 
     onClickOverlay() {
@@ -56,30 +76,55 @@ VantComponent({
     },
 
     onOptionTap(event: Weapp.Event) {
-      let { value, displayTitle } = this.data;
       const { option } = event.currentTarget.dataset;
-      const { value: optionValue } = option;
+      const { value } = option;
 
-      if (optionValue !== value) {
+      const shouldEmitChange = this.data.value !== value;
-        value = optionValue;
+      this.setData({ showPopup: false, value });
-        displayTitle = this.computedDisplayTitle(optionValue);
-        this.$emit('change', optionValue);
-      }
-      this.setData({ showPopup: false, value, displayTitle });
 
-      const time = this.data.duration || 0;
       setTimeout(() => {
         this.setData({ showWrapper: false });
-      }, time);
+      }, this.data.duration || 0);
 
-      // parent 中的 itemListData 是 children 上的数据的集合
+      this.rerender();
-      // 数据的更新由 children 各自维护，但是模板的更新需要额外触发 parent 的 setData
+
-      this.parent.setData({ itemListData: this.parent.data.itemListData });
+      if (shouldEmitChange) {
+        this.$emit('change', value);
+      }
     },
 
-    toggle() {
+    toggle(show, options = {}) {
-      const { childIndex } = this.data;
+      const { showPopup, duration } = this.data;
-      this.parent.toggleItem(childIndex);
+
+      if (show == null) {
+        show = !showPopup;
+      }
+
+      if (show === showPopup) {
+        return;
+      }
+
+      if (!show) {
+        const time = options.immediate ? 0 : duration;
+        this.setData({ transition: !options.immediate, showPopup: show });
+
+        setTimeout(() => {
+          this.setData({ showWrapper: false });
+        }, time);
+
+        this.rerender();
+        return;
+      }
+
+      this.parent.getChildWrapperStyle().then((wrapperStyle: String = '') => {
+        this.setData({
+          transition: !options.immediate,
+          showPopup: show,
+          wrapperStyle,
+          showWrapper: true
+        });
+        this.rerender();
+      });
     }
   }
 });

packages/dropdown-menu/index.ts

@@ -2,11 +2,8 @@ import { VantComponent } from '../common/component';
 import { Weapp } from 'definitions/weapp';
 import { addUnit } from '../common/utils';
 
-interface ToggleOptions {
+type TrivialInstance = WechatMiniprogram.Component.TrivialInstance;
-  immediate?: Boolean;
+let ARRAY: TrivialInstance[] = [];
-}
-
-let ARRAY: WechatMiniprogram.Component.TrivialInstance[] = [];
 
 VantComponent({
   field: true,
@@ -15,35 +12,26 @@ VantComponent({
     name: 'dropdown-item',
     type: 'descendant',
     linked(target) {
-      this.children = this.children || [];
-      // 透传 props 给 dropdown-item
-      const { overlay, duration, activeColor, closeOnClickOverlay, direction } = this.data;
-      this.updateChildData(target, {
-        overlay,
-        duration,
-        activeColor,
-        closeOnClickOverlay,
-        direction,
-        childIndex: this.children.length
-      });
-
       this.children.push(target);
-      // 收集 dorpdown-item 的 data 挂在 data 上
+      this.updateItemListData();
-      target &&
-        this.setData({
-          itemListData: this.data.itemListData.concat([target.data])
-        });
     },
     unlinked(target) {
-      this.children = this.children.filter((child: WechatMiniprogram.Component.TrivialInstance) => child !== target);
+      this.children = this.children.filter(
+        (child: TrivialInstance) => child !== target
+      );
+      this.updateItemListData();
     }
   },
 
   props: {
-    activeColor: String,
+    activeColor: {
+      type: String,
+      observer: 'updateChildrenData'
+    },
     overlay: {
       type: Boolean,
-      value: true
+      value: true,
+      observer: 'updateChildrenData'
     },
     zIndex: {
       type: Number,
@@ -51,15 +39,18 @@ VantComponent({
     },
     duration: {
       type: Number,
-      value: 200
+      value: 200,
+      observer: 'updateChildrenData'
     },
     direction: {
       type: String,
-      value: 'down'
+      value: 'down',
+      observer: 'updateChildrenData'
     },
     closeOnClickOverlay: {
       type: Boolean,
-      value: true
+      value: true,
+      observer: 'updateChildrenData'
     },
     closeOnClickOutside: {
       type: Boolean,
@@ -71,7 +62,10 @@ VantComponent({
     itemListData: []
   },
 
-  created() {
+  beforeCreate() {
+    const { windowHeight } = wx.getSystemInfoSync();
+    this.windowHeight = windowHeight;
+    this.children = [];
     ARRAY.push(this);
   },
 
@@ -80,99 +74,67 @@ VantComponent({
   },
 
   methods: {
-    updateChildData(childItem: WechatMiniprogram.Component.TrivialInstance, newData, needRefreshList: Boolean = false) {
+    updateItemListData() {
-      childItem.setData(newData);
+      this.setData({
-
+        itemListData: this.children.map((child: TrivialInstance) => child.data)
-      if (needRefreshList) {
-        // dropdown-item data 更新，涉及到 title 的展示，触发模板更新
-        this.setData({ itemListData: this.data.itemListData });
-      }
-    },
-
-    toggleItem(active: Number) {
-      this.children.forEach((item: WechatMiniprogram.Component.TrivialInstance, index: Number) => {
-        const { showPopup } = item.data;
-        if (index === active) {
-          this.toggleChildItem(item);
-        } else if (showPopup) {
-          this.toggleChildItem(item, false, { immediate: true });
-        }
       });
     },
 
-    toggleChildItem(childItem: WechatMiniprogram.Component.TrivialInstance, show: boolean, options: ToggleOptions = {}) {
+    updateChildrenData() {
-      const { showPopup, duration } = childItem.data;
+      this.children.forEach((child: TrivialInstance) => {
+        child.updateDataFromParent();
+      });
+    },
 
-      if (show === undefined) show = !showPopup;
+    toggleItem(active: number) {
-
+      this.children.forEach((item: TrivialInstance, index: number) => {
-      if (show === showPopup) {
+        const { showPopup } = item.data;
-        return;
+        if (index === active) {
-      }
+          item.toggle();
-
+        } else if (showPopup) {
-      const newChildData = { transition: !options.immediate, showPopup: show };
+          item.toggle(false, { immediate: true });
-
+        }
-      if (!show) {
-        const time = options.immediate ? 0 : duration;
-        this.updateChildData(childItem, { ...newChildData }, true);
-
-        setTimeout(() => {
-          this.updateChildData(childItem, { showWrapper: false }, true);
-        }, time);
-        return;
-      }
-
-      this.getChildWrapperStyle().then((wrapperStyle: String = '') => {
-        this.updateChildData(
-          childItem,
-          {
-            ...newChildData,
-            wrapperStyle,
-            showWrapper: true
-          },
-          true
-        );
       });
     },
 
     close() {
-      this.children.forEach((item: WechatMiniprogram.Component.TrivialInstance) => {
+      this.children.forEach((child: TrivialInstance) => {
-        this.toggleChildItem(item, false, { immediate: true });
+        child.toggle(false, { immediate: true });
       });
     },
 
     getChildWrapperStyle() {
-      const { windowHeight } = wx.getSystemInfoSync();
       const { zIndex, direction } = this.data;
-      let offset = 0;
 
-      return this.getRect('.van-dropdown-menu').then(rect => {
+      return this.getRect('.van-dropdown-menu').then(
-        const { top = 0, bottom = 0 } = rect;
+        (rect: WechatMiniprogram.BoundingClientRectCallbackResult) => {
-        if (direction === 'down') {
+          const { top = 0, bottom = 0 } = rect;
-          offset = bottom;
+          const offset = direction === 'down' ? bottom : this.windowHeight - top;
-        } else {
+
-          offset = windowHeight - top;
+          let wrapperStyle = `z-index: ${zIndex};`;
+
+          if (direction === 'down') {
+            wrapperStyle += `top: ${addUnit(offset)};`;
+          } else {
+            wrapperStyle += `bottom: ${addUnit(offset)};`;
+          }
+
+          return wrapperStyle;
         }
-
+      );
-        let wrapperStyle = `z-index: ${zIndex};`;
-
-        if (direction === 'down') {
-          wrapperStyle += `top: ${addUnit(offset)};`;
-        } else {
-          wrapperStyle += `bottom: ${addUnit(offset)};`;
-        }
-
-        return Promise.resolve(wrapperStyle);
-      });
     },
 
     onTitleTap(event: Weapp.Event) {
-      // item ---> dropdown-item
+      const { index } = event.currentTarget.dataset;
-      const { item, index } = event.currentTarget.dataset;
+      const child = this.children[index];
 
-      if (!item.disabled) {
+      if (!child.data.disabled) {
-        // menuItem ---> dropdown-menu
         ARRAY.forEach(menuItem => {
-          if (menuItem && menuItem.data.closeOnClickOutside && menuItem !== this) {
+          if (
+            menuItem &&
+            menuItem.data.closeOnClickOutside &&
+            menuItem !== this
+          ) {
             menuItem.close();
           }
         });

packages/dropdown-menu/index.wxml

@@ -1,10 +1,10 @@
 <wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./index.wxs" module="computed" />
 
 <view class="van-dropdown-menu van-dropdown-menu--top-bottom">
   <view
     wx:for="{{ itemListData }}"
     wx:key="index"
-    data-item="{{ item }}"
     data-index="{{ index }}"
     class="{{ utils.bem('dropdown-menu__item', { disabled: item.disabled }) }}"
     bind:tap="onTitleTap"
@@ -14,7 +14,7 @@
       style="{{ item.showPopup ? 'color:' + activeColor : '' }}"
     >
       <view class="van-ellipsis">
-        {{item.displayTitle}}
+        {{ computed.displayTitle(item) }}
       </view>
     </view>
   </view>

packages/dropdown-menu/index.wxs

@@ -0,0 +1,16 @@
+/* eslint-disable */
+function displayTitle(item) {
+  if (item.title) {
+    return item.title;
+  }
+
+  var match = item.options.filter(function(option) {
+    return option.value === item.value;
+  });
+  var displayTitle = match.length ? match[0].text : '';
+  return displayTitle;
+}
+
+module.exports = {
+  displayTitle: displayTitle
+};