vant 2.12.44 → 2.12.45

package/README.md

@@ -93,6 +93,7 @@ Vant 3 supports modern browsers and Chrome >= 51、iOS >= 10.0 (same as Vue 3).
 | [taroify](https://gitee.com/mallfoundry/taroify) | Vant Taro |
 | [vant-theme](https://github.com/Aisen60/vant-theme) | Online theme preview built on Vant UI |
 | [@antmjs/vantui](https://github.com/antmjs/vantui) | Mobile UI Components based on Vant, supporting Taro and React |
+| [@formily/vant](https://github.com/formilyjs/vant) | Form solution based on Vant and Formily |
 
 ## Links
 

package/README.zh-CN.md

@@ -102,6 +102,7 @@ Vant 3 支持现代浏览器以及 Chrome >= 51、iOS >= 10.0（与 Vue 3 一致
 | [taroify](https://gitee.com/mallfoundry/taroify) | Vant Taro 版 |
 | [vant-theme](https://github.com/Aisen60/vant-theme) | Vant 在线主题预览工具 |
 | [@antmjs/vantui](https://github.com/antmjs/vantui) | 基于 Vant Weapp 开发的多端组件库，同时支持 Taro 和 React |
+| [@formily/vant](https://github.com/formilyjs/vant) | 基于 Vant 和 Formily 开发的表单解决方案 |
 
 ## 链接
 

package/changelog.generated.md

@@ -0,0 +1,17 @@
+### [v2.12.45](https://github.com/youzan/vant/compare/v2.12.44...v2.12.45)
+
+`2022-03-18`
+
+**Bug Fixes**
+
+- Sku: 修复特殊情况下 skuTree 为空数组时导致的语法报错问题 [#10390](https://github.com/youzan/vant/issues/10390)
+
+**Document**
+
+- add @formily/vant to README.md and home.md [#10323](https://github.com/youzan/vant/issues/10323)
+- fix [167e99](https://github.com/youzan/vant/commit/167e99cef84b25fdd46929e4fc0324c37c6a135c)
+- changelog: 2.12.44 [b9035d](https://github.com/youzan/vant/commit/b9035d69f0d72aace66e5fb6890a9d0097552de9)
+
+**Feature**
+
+- Dialog: support keyboard events [#10359](https://github.com/youzan/vant/issues/10359)

package/es/dialog/Dialog.js

@@ -1,5 +1,5 @@
 import _mergeJSXProps from "@vue/babel-helper-vue-jsx-merge-props";
-import { createNamespace, addUnit } from '../utils';
+import { createNamespace, addUnit, noop } from '../utils';
 import { BORDER_TOP, BORDER_LEFT } from '../utils/constant';
 import { PopupMixin } from '../mixins/popup';
 import Button from '../button';
@@ -95,13 +95,41 @@ export default createComponent({
       }
     },
     onOpened: function onOpened() {
+      var _this2 = this;
+
       this.$emit('opened');
+      this.$nextTick(function () {
+        var _this2$$refs$dialog;
+
+        (_this2$$refs$dialog = _this2.$refs.dialog) == null ? void 0 : _this2$$refs$dialog.focus();
+      });
     },
     onClosed: function onClosed() {
       this.$emit('closed');
     },
+    onKeydown: function onKeydown(event) {
+      var _this3 = this;
+
+      if (event.key === 'Escape' || event.key === 'Enter') {
+        // skip keyboard events of child elements
+        if (event.target !== this.$refs.dialog) {
+          return;
+        }
+
+        var onEventType = {
+          Enter: this.showConfirmButton ? function () {
+            return _this3.handleAction('confirm');
+          } : noop,
+          Escape: this.showCancelButton ? function () {
+            return _this3.handleAction('cancel');
+          } : noop
+        };
+        onEventType[event.key]();
+        this.$emit('keydown', event);
+      }
+    },
     genRoundButtons: function genRoundButtons() {
-      var _this2 = this;
+      var _this4 = this;
 
       var h = this.$createElement;
       return h(GoodsAction, {
@@ -117,7 +145,7 @@ export default createComponent({
         "class": bem('cancel'),
         "on": {
           "click": function click() {
-            _this2.handleAction('cancel');
+            _this4.handleAction('cancel');
           }
         }
       }), this.showConfirmButton && h(GoodsActionButton, {
@@ -131,13 +159,13 @@ export default createComponent({
         "class": bem('confirm'),
         "on": {
           "click": function click() {
-            _this2.handleAction('confirm');
+            _this4.handleAction('confirm');
           }
         }
       })]);
     },
     genButtons: function genButtons() {
-      var _this3 = this,
+      var _this5 = this,
           _ref;
 
       var h = this.$createElement;
@@ -156,7 +184,7 @@ export default createComponent({
         },
         "on": {
           "click": function click() {
-            _this3.handleAction('cancel');
+            _this5.handleAction('cancel');
           }
         }
       }), this.showConfirmButton && h(Button, {
@@ -171,7 +199,7 @@ export default createComponent({
         },
         "on": {
           "click": function click() {
-            _this3.handleAction('confirm');
+            _this5.handleAction('confirm');
           }
         }
       })]);
@@ -235,11 +263,16 @@ export default createComponent({
       }],
       "attrs": {
         "role": "dialog",
-        "aria-labelledby": this.title || message
+        "aria-labelledby": this.title || message,
+        "tabIndex": 0
       },
       "class": [bem([this.theme]), this.className],
       "style": {
         width: addUnit(this.width)
+      },
+      "ref": "dialog",
+      "on": {
+        "keydown": this.onKeydown
       }
     }, [Title, this.genContent(title, messageSlot), this.theme === 'round-button' ? this.genRoundButtons() : this.genButtons()])]);
   }

package/es/index.js

@@ -87,7 +87,7 @@ import Tag from './tag';
 import Toast from './toast';
 import TreeSelect from './tree-select';
 import Uploader from './uploader';
-var version = '2.12.44';
+var version = '2.12.45';
 
 function install(Vue) {
   var components = [ActionSheet, AddressEdit, AddressList, Area, Badge, Button, Calendar, Card, Cascader, Cell, CellGroup, Checkbox, CheckboxGroup, Circle, Col, Collapse, CollapseItem, ContactCard, ContactEdit, ContactList, CountDown, Coupon, CouponCell, CouponList, DatetimePicker, Dialog, Divider, DropdownItem, DropdownMenu, Empty, Field, Form, GoodsAction, GoodsActionButton, GoodsActionIcon, Grid, GridItem, Icon, Image, ImagePreview, IndexAnchor, IndexBar, Info, List, Loading, Locale, NavBar, NoticeBar, Notify, NumberKeyboard, Overlay, Pagination, Panel, PasswordInput, Picker, Popover, Popup, Progress, PullRefresh, Radio, RadioGroup, Rate, Row, Search, ShareSheet, Sidebar, SidebarItem, Skeleton, Sku, Slider, Step, Stepper, Steps, Sticky, SubmitBar, Swipe, SwipeCell, SwipeItem, Switch, SwitchCell, Tab, Tabbar, TabbarItem, Tabs, Tag, Toast, TreeSelect, Uploader];

package/es/sku/utils/sku-helper.js

@@ -74,10 +74,10 @@ export var getSkuComb = function getSkuComb(skuList, selectedSku) {
 export var getSelectedSkuValues = function getSelectedSkuValues(skuTree, selectedSku) {
   var normalizedTree = normalizeSkuTree(skuTree);
   return Object.keys(selectedSku).reduce(function (selectedValues, skuKeyStr) {
-    var skuValues = normalizedTree[skuKeyStr];
+    var skuValues = normalizedTree[skuKeyStr] || [];
     var skuValueId = selectedSku[skuKeyStr];
 
-    if (skuValueId !== UNSELECTED_SKU_VALUE_ID) {
+    if (skuValueId !== UNSELECTED_SKU_VALUE_ID && skuValues.length > 0) {
       var skuValue = skuValues.filter(function (value) {
         return value.id === skuValueId;
       })[0];

package/lib/dialog/Dialog.js

@@ -108,13 +108,41 @@ var _default = createComponent({
       }
     },
     onOpened: function onOpened() {
+      var _this2 = this;
+
       this.$emit('opened');
+      this.$nextTick(function () {
+        var _this2$$refs$dialog;
+
+        (_this2$$refs$dialog = _this2.$refs.dialog) == null ? void 0 : _this2$$refs$dialog.focus();
+      });
     },
     onClosed: function onClosed() {
       this.$emit('closed');
     },
+    onKeydown: function onKeydown(event) {
+      var _this3 = this;
+
+      if (event.key === 'Escape' || event.key === 'Enter') {
+        // skip keyboard events of child elements
+        if (event.target !== this.$refs.dialog) {
+          return;
+        }
+
+        var onEventType = {
+          Enter: this.showConfirmButton ? function () {
+            return _this3.handleAction('confirm');
+          } : _utils.noop,
+          Escape: this.showCancelButton ? function () {
+            return _this3.handleAction('cancel');
+          } : _utils.noop
+        };
+        onEventType[event.key]();
+        this.$emit('keydown', event);
+      }
+    },
     genRoundButtons: function genRoundButtons() {
-      var _this2 = this;
+      var _this4 = this;
 
       var h = this.$createElement;
       return h(_goodsAction.default, {
@@ -130,7 +158,7 @@ var _default = createComponent({
         "class": bem('cancel'),
         "on": {
           "click": function click() {
-            _this2.handleAction('cancel');
+            _this4.handleAction('cancel');
           }
         }
       }), this.showConfirmButton && h(_goodsActionButton.default, {
@@ -144,13 +172,13 @@ var _default = createComponent({
         "class": bem('confirm'),
         "on": {
           "click": function click() {
-            _this2.handleAction('confirm');
+            _this4.handleAction('confirm');
           }
         }
       })]);
     },
     genButtons: function genButtons() {
-      var _this3 = this,
+      var _this5 = this,
           _ref;
 
       var h = this.$createElement;
@@ -169,7 +197,7 @@ var _default = createComponent({
         },
         "on": {
           "click": function click() {
-            _this3.handleAction('cancel');
+            _this5.handleAction('cancel');
           }
         }
       }), this.showConfirmButton && h(_button.default, {
@@ -184,7 +212,7 @@ var _default = createComponent({
         },
         "on": {
           "click": function click() {
-            _this3.handleAction('confirm');
+            _this5.handleAction('confirm');
           }
         }
       })]);
@@ -248,11 +276,16 @@ var _default = createComponent({
       }],
       "attrs": {
         "role": "dialog",
-        "aria-labelledby": this.title || message
+        "aria-labelledby": this.title || message,
+        "tabIndex": 0
       },
       "class": [bem([this.theme]), this.className],
       "style": {
         width: (0, _utils.addUnit)(this.width)
+      },
+      "ref": "dialog",
+      "on": {
+        "keydown": this.onKeydown
       }
     }, [Title, this.genContent(title, messageSlot), this.theme === 'round-button' ? this.genRoundButtons() : this.genButtons()])]);
   }

package/lib/index.js

@@ -361,7 +361,7 @@ exports.TreeSelect = _treeSelect.default;
 var _uploader = _interopRequireDefault(require("./uploader"));
 
 exports.Uploader = _uploader.default;
-var version = '2.12.44';
+var version = '2.12.45';
 exports.version = version;
 
 function install(Vue) {

package/lib/sku/utils/sku-helper.js

@@ -94,10 +94,10 @@ exports.getSkuComb = getSkuComb;
 var getSelectedSkuValues = function getSelectedSkuValues(skuTree, selectedSku) {
   var normalizedTree = normalizeSkuTree(skuTree);
   return Object.keys(selectedSku).reduce(function (selectedValues, skuKeyStr) {
-    var skuValues = normalizedTree[skuKeyStr];
+    var skuValues = normalizedTree[skuKeyStr] || [];
     var skuValueId = selectedSku[skuKeyStr];
 
-    if (skuValueId !== _constants.UNSELECTED_SKU_VALUE_ID) {
+    if (skuValueId !== _constants.UNSELECTED_SKU_VALUE_ID && skuValues.length > 0) {
       var skuValue = skuValues.filter(function (value) {
         return value.id === skuValueId;
       })[0];

package/lib/vant.js

@@ -4936,13 +4936,41 @@ var Dialog_createNamespace = Object(create["a" /* createNamespace */])('dialog')
       }
     },
     onOpened: function onOpened() {
+      var _this2 = this;
+
       this.$emit('opened');
+      this.$nextTick(function () {
+        var _this2$$refs$dialog;
+
+        (_this2$$refs$dialog = _this2.$refs.dialog) == null ? void 0 : _this2$$refs$dialog.focus();
+      });
     },
     onClosed: function onClosed() {
       this.$emit('closed');
     },
+    onKeydown: function onKeydown(event) {
+      var _this3 = this;
+
+      if (event.key === 'Escape' || event.key === 'Enter') {
+        // skip keyboard events of child elements
+        if (event.target !== this.$refs.dialog) {
+          return;
+        }
+
+        var onEventType = {
+          Enter: this.showConfirmButton ? function () {
+            return _this3.handleAction('confirm');
+          } : utils["i" /* noop */],
+          Escape: this.showCancelButton ? function () {
+            return _this3.handleAction('cancel');
+          } : utils["i" /* noop */]
+        };
+        onEventType[event.key]();
+        this.$emit('keydown', event);
+      }
+    },
     genRoundButtons: function genRoundButtons() {
-      var _this2 = this;
+      var _this4 = this;
 
       var h = this.$createElement;
       return h(goods_action, {
@@ -4958,7 +4986,7 @@ var Dialog_createNamespace = Object(create["a" /* createNamespace */])('dialog')
         "class": Dialog_bem('cancel'),
         "on": {
           "click": function click() {
-            _this2.handleAction('cancel');
+            _this4.handleAction('cancel');
           }
         }
       }), this.showConfirmButton && h(goods_action_button, {
@@ -4972,13 +5000,13 @@ var Dialog_createNamespace = Object(create["a" /* createNamespace */])('dialog')
         "class": Dialog_bem('confirm'),
         "on": {
           "click": function click() {
-            _this2.handleAction('confirm');
+            _this4.handleAction('confirm');
           }
         }
       })]);
     },
     genButtons: function genButtons() {
-      var _this3 = this,
+      var _this5 = this,
           _ref;
 
       var h = this.$createElement;
@@ -4997,7 +5025,7 @@ var Dialog_createNamespace = Object(create["a" /* createNamespace */])('dialog')
         },
         "on": {
           "click": function click() {
-            _this3.handleAction('cancel');
+            _this5.handleAction('cancel');
           }
         }
       }), this.showConfirmButton && h(es_button, {
@@ -5012,7 +5040,7 @@ var Dialog_createNamespace = Object(create["a" /* createNamespace */])('dialog')
         },
         "on": {
           "click": function click() {
-            _this3.handleAction('confirm');
+            _this5.handleAction('confirm');
           }
         }
       })]);
@@ -5076,11 +5104,16 @@ var Dialog_createNamespace = Object(create["a" /* createNamespace */])('dialog')
       }],
       "attrs": {
         "role": "dialog",
-        "aria-labelledby": this.title || message
+        "aria-labelledby": this.title || message,
+        "tabIndex": 0
       },
       "class": [Dialog_bem([this.theme]), this.className],
       "style": {
         width: Object(unit["a" /* addUnit */])(this.width)
+      },
+      "ref": "dialog",
+      "on": {
+        "keydown": this.onKeydown
       }
     }, [Title, this.genContent(title, messageSlot), this.theme === 'round-button' ? this.genRoundButtons() : this.genButtons()])]);
   }
@@ -18064,10 +18097,10 @@ var getSkuComb = function getSkuComb(skuList, selectedSku) {
 var sku_helper_getSelectedSkuValues = function getSelectedSkuValues(skuTree, selectedSku) {
   var normalizedTree = normalizeSkuTree(skuTree);
   return Object.keys(selectedSku).reduce(function (selectedValues, skuKeyStr) {
-    var skuValues = normalizedTree[skuKeyStr];
+    var skuValues = normalizedTree[skuKeyStr] || [];
     var skuValueId = selectedSku[skuKeyStr];
 
-    if (skuValueId !== UNSELECTED_SKU_VALUE_ID) {
+    if (skuValueId !== UNSELECTED_SKU_VALUE_ID && skuValues.length > 0) {
       var skuValue = skuValues.filter(function (value) {
         return value.id === skuValueId;
       })[0];
@@ -22226,7 +22259,7 @@ TreeSelect.props = {
 
 
 
-var version = '2.12.44';
+var version = '2.12.45';
 
 function install(Vue) {
   var components = [action_sheet, address_edit, address_list, es_area, badge, es_button, calendar, card, cascader, cell, cell_group, es_checkbox, checkbox_group, circle, col, collapse, collapse_item, contact_card, contact_edit, contact_list, count_down, es_coupon, coupon_cell, coupon_list, datetime_picker, dialog, divider, dropdown_item, dropdown_menu, empty, es_field, es_form, goods_action, goods_action_button, goods_action_icon, grid, grid_item, es_icon, es_image, image_preview, index_anchor, index_bar, es_info, es_list, es_loading, locale["a" /* default */], nav_bar, notice_bar, notify, number_keyboard, es_overlay, pagination, panel, password_input, es_picker, popover, popup, es_progress, pull_refresh, es_radio, radio_group, es_rate, row, search, share_sheet, sidebar, sidebar_item, skeleton, es_sku, slider, es_step, stepper, steps, es_sticky, submit_bar, swipe, swipe_cell, swipe_item, es_switch, switch_cell, tab, tabbar, tabbar_item, tabs, es_tag, es_toast, tree_select, uploader];