[breaking change] Actionsheet: rename to ActionSheet (#514)

dist/action-sheet/index.wxml

@@ -0,0 +1,38 @@
+<van-popup
+  show="{{ show }}"
+  overlay="{{ overlay }}"
+  close-on-click-overlay="{{ closeOnClickOverlay }}"
+  custom-class="van-action-sheet {{ title ? 'van-action-sheet--withtitle' : '' }}"
+  position="bottom"
+  bind:close="onClose"
+>
+  <view wx:if="{{ title }}" class="van-hairline--top-bottom van-action-sheet__header">
+    <view>{{ title }}</view>
+    <van-icon custom-class="van-action-sheet__close" name="close" bind:click="onClose" />
+  </view>
+  <view wx:else class="van-hairline--bottom">
+    <view
+      wx:for="{{ actions }}"
+      wx:key="index"
+      class="van-action-sheet__item van-hairline--top {{ item.disabled || item.loading ? 'van-action-sheet__item--disabled' : '' }} {{ item.className || '' }}"
+      data-index="{{ index }}"
+      bind:tap="onSelect"
+    >
+      <block wx:if="{{ !item.loading }}">
+        <view class="van-action-sheet__name">{{ item.name }}</view>
+        <view class="van-action-sheet__subname" wx:if="{{ item.subname }}">{{ item.subname }}</view>
+      </block>
+      <van-loading wx:else custom-class="van-action-sheet__loading" size="20px" />
+    </view>
+  </view>
+  <view
+    wx:if="{{ cancelText }}"
+    class="van-action-sheet__cancel van-hairline--top"
+    bind:tap="onCancel"
+  >
+    {{ cancelText }}
+  </view>
+  <view wx:else class="van-action-sheet__content">
+    <slot />
+  </view>
+</van-popup>

dist/action-sheet/index.wxss

@@ -1 +1 @@
-.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom::after,.van-hairline--left::after,.van-hairline--right::after,.van-hairline--surround::after,.van-hairline--top-bottom::after,.van-hairline--top::after,.van-hairline::after{content:'';position:absolute;top:0;left:0;width:200%;height:200%;-webkit-transform:scale(.5);transform:scale(.5);-webkit-transform-origin:0 0;transform-origin:0 0;pointer-events:none;box-sizing:border-box;border:0 solid #e5e5e5}.van-hairline--top::after{border-top-width:1px}.van-hairline--left::after{border-left-width:1px}.van-hairline--right::after{border-right-width:1px}.van-hairline--bottom::after{border-bottom-width:1px}.van-hairline--top-bottom::after{border-width:1px 0}.van-hairline--surround::after{border-width:1px}.van-actionsheet{color:#333;max-height:90%;overflow-y:auto;-webkit-overflow-scrolling:touch;background-color:#f8f8f8}.van-actionsheet--withtitle{background-color:#fff}.van-actionsheet__cancel,.van-actionsheet__item{height:50px;line-height:50px;font-size:16px;text-align:center;background-color:#fff}.van-actionsheet__cancel:active,.van-actionsheet__item:active{background-color:#e8e8e8}.van-actionsheet__item--disabled{color:#c9c9c9}.van-actionsheet__item--disabled:active{background-color:#fff}.van-actionsheet__subname{font-size:12px;color:#666;margin-left:5px}.van-actionsheet__loading{display:inline-block}.van-actionsheet__cancel{margin-top:10px}.van-actionsheet__header{font-size:16px;line-height:44px;text-align:center}.van-actionsheet__close{top:0;right:0;padding:0 15px;font-size:18px!important;color:#999;position:absolute!important;line-height:inherit!important}
+.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom::after,.van-hairline--left::after,.van-hairline--right::after,.van-hairline--surround::after,.van-hairline--top-bottom::after,.van-hairline--top::after,.van-hairline::after{content:'';position:absolute;top:0;left:0;width:200%;height:200%;-webkit-transform:scale(.5);transform:scale(.5);-webkit-transform-origin:0 0;transform-origin:0 0;pointer-events:none;box-sizing:border-box;border:0 solid #e5e5e5}.van-hairline--top::after{border-top-width:1px}.van-hairline--left::after{border-left-width:1px}.van-hairline--right::after{border-right-width:1px}.van-hairline--bottom::after{border-bottom-width:1px}.van-hairline--top-bottom::after{border-width:1px 0}.van-hairline--surround::after{border-width:1px}.van-action-sheet{color:#333;max-height:90%;overflow-y:auto;-webkit-overflow-scrolling:touch;background-color:#f8f8f8}.van-action-sheet--withtitle{background-color:#fff}.van-action-sheet__cancel,.van-action-sheet__item{height:50px;line-height:50px;font-size:16px;text-align:center;background-color:#fff}.van-action-sheet__cancel:active,.van-action-sheet__item:active{background-color:#e8e8e8}.van-action-sheet__item--disabled{color:#c9c9c9}.van-action-sheet__item--disabled:active{background-color:#fff}.van-action-sheet__subname{font-size:12px;color:#666;margin-left:5px}.van-action-sheet__loading{display:inline-block}.van-action-sheet__cancel{margin-top:10px}.van-action-sheet__header{font-size:16px;line-height:44px;text-align:center}.van-action-sheet__close{top:0;right:0;padding:0 15px;font-size:18px!important;color:#999;position:absolute!important;line-height:inherit!important}

dist/actionsheet/index.wxml

@@ -1,38 +0,0 @@
-<van-popup
-  show="{{ show }}"
-  overlay="{{ overlay }}"
-  close-on-click-overlay="{{ closeOnClickOverlay }}"
-  custom-class="van-actionsheet {{ title ? 'van-actionsheet--withtitle' : '' }}"
-  position="bottom"
-  bind:close="onClose"
->
-  <view wx:if="{{ title }}" class="van-hairline--top-bottom van-actionsheet__header">
-    <view>{{ title }}</view>
-    <van-icon custom-class="van-actionsheet__close" name="close" bind:click="onClose" />
-  </view>
-  <view wx:else class="van-hairline--bottom">
-    <view
-      wx:for="{{ actions }}"
-      wx:key="index"
-      class="van-actionsheet__item van-hairline--top {{ item.disabled || item.loading ? 'van-actionsheet__item--disabled' : '' }} {{ item.className || '' }}"
-      data-index="{{ index }}"
-      bind:tap="onSelect"
-    >
-      <block wx:if="{{ !item.loading }}">
-        <view class="van-actionsheet__name">{{ item.name }}</view>
-        <view class="van-actionsheet__subname" wx:if="{{ item.subname }}">{{ item.subname }}</view>
-      </block>
-      <van-loading wx:else custom-class="van-actionsheet__loading" size="20px" />
-    </view>
-  </view>
-  <view
-    wx:if="{{ cancelText }}"
-    class="van-actionsheet__cancel van-hairline--top"
-    bind:tap="onCancel"
-  >
-    {{ cancelText }}
-  </view>
-  <view wx:else class="van-actionsheet__content">
-    <slot />
-  </view>
-</van-popup>

docs/markdown/changelog.md

@@ -78,7 +78,7 @@
 
 **Improvements**
 
-- 新增 Actionsheet 组件
+- 新增 ActionSheet 组件
 - 新增 Badge 组件
 - 新增 BadgeGroup 组件
 - 新增 Button 组件

docs/src/Preview.vue

@@ -14,7 +14,7 @@
 const PREFIX = 'https://img.yzcdn.cn/vant-weapp/';
 const MAP = {
   index: 'index-201808121630.png',
-  actionsheet: 'actionsheet-201808092138.jpeg',
+  'action-sheet': 'actionsheet-201808092138.jpeg',
   badge: 'badge-201808092138.png',
   button: 'button-201808092138.png',
   card: 'card-201808092138.png',

example/app.json

@@ -1,7 +1,7 @@
 {
   "pages": [
     "pages/dashboard/index",
-    "pages/actionsheet/index",
+    "pages/action-sheet/index",
     "pages/badge/index",
     "pages/button/index",
     "pages/card/index",

example/config.js

@@ -97,8 +97,8 @@ export default [
     groupName: '操作反馈',
     list: [
       {
-        path: '/actionsheet',
-        title: 'Actionsheet 上拉菜单'
+        path: '/action-sheet',
+        title: 'ActionSheet 上拉菜单'
       },
       {
         path: '/dialog',

example/pages/action-sheet/index.js

@@ -25,15 +25,15 @@ Page({
     });
   },
 
-  toggleActionsheet1() {
+  toggleActionSheet1() {
     this.toggle('show1');
   },
 
-  toggleActionsheet2() {
+  toggleActionSheet2() {
     this.toggle('show2');
   },
 
-  toggleActionsheet3() {
+  toggleActionSheet3() {
     this.toggle('show3');
   }
 });

example/pages/action-sheet/index.json

@@ -1,8 +1,8 @@
 {
-  "navigationBarTitleText": "Actionsheet 上拉菜单",
+  "navigationBarTitleText": "ActionSheet 上拉菜单",
   "usingComponents": {
     "demo-block": "../../components/demo-block/index",
-    "van-actionsheet": "../../dist/actionsheet/index",
+    "van-action-sheet": "../../dist/action-sheet/index",
     "van-button": "../../dist/button/index"
   }
 }

example/pages/action-sheet/index.wxml

@@ -0,0 +1,32 @@
+<demo-block title="基础用法" padding>
+  <van-button bind:click="toggleActionSheet1">弹出 ActionSheet</van-button>
+  <van-action-sheet
+    show="{{ show1 }}"
+    actions="{{ actions }}"
+    bind:close="toggleActionSheet1"
+    bind:select="toggleActionSheet1"
+  />
+</demo-block>
+
+<demo-block title="带取消按钮的 ActionSheet" padding>
+  <van-button bind:click="toggleActionSheet2">弹出带取消按钮的 ActionSheet</van-button>
+  <van-action-sheet
+    show="{{ show2 }}"
+    actions="{{ actions }}"
+    cancel-text="取消"
+    bind:close="toggleActionSheet2"
+    bind:cancel="toggleActionSheet2"
+    bind:select="toggleActionSheet2"
+  />
+</demo-block>
+
+<demo-block title="带标题的 ActionSheet" padding>
+  <van-button bind:click="toggleActionSheet3">弹出带标题的 ActionSheet</van-button>
+  <van-action-sheet
+    show="{{ show3 }}"
+    title="标题"
+    bind:close="toggleActionSheet3"
+  >
+    <view class="content">内容</view>
+  </van-action-sheet>
+</demo-block>

example/pages/actionsheet/index.wxml

@@ -1,32 +0,0 @@
-<demo-block title="基础用法" padding>
-  <van-button bind:click="toggleActionsheet1">弹出 Actionsheet</van-button>
-  <van-actionsheet
-    show="{{ show1 }}"
-    actions="{{ actions }}"
-    bind:close="toggleActionsheet1"
-    bind:select="toggleActionsheet1"
-  />
-</demo-block>
-
-<demo-block title="带取消按钮的 Actionsheet" padding>
-  <van-button bind:click="toggleActionsheet2">弹出带取消按钮的 Actionsheet</van-button>
-  <van-actionsheet
-    show="{{ show2 }}"
-    actions="{{ actions }}"
-    cancel-text="取消"
-    bind:close="toggleActionsheet2"
-    bind:cancel="toggleActionsheet2"
-    bind:select="toggleActionsheet2"
-  />
-</demo-block>
-
-<demo-block title="带标题的 Actionsheet" padding>
-  <van-button bind:click="toggleActionsheet3">弹出带标题的 Actionsheet</van-button>
-  <van-actionsheet
-    show="{{ show3 }}"
-    title="标题"
-    bind:close="toggleActionsheet3"
-  >
-    <view class="content">内容</view>
-  </van-actionsheet>
-</demo-block>

packages/action-sheet/README.md

@@ -1,10 +1,10 @@
-## Actionsheet 上拉菜单
+## ActionSheet 上拉菜单
 
 ### 使用指南
 在 index.json 中引入组件
 ```json
 "usingComponents": {
-  "van-actionsheet": "path/to/vant-weapp/dist/actionsheet/index"
+  "van-action-sheet": "path/to/vant-weapp/dist/action-sheet/index"
 }
 ```
 
@@ -14,7 +14,7 @@
 需要传入一个`actions`的数组，数组的每一项是一个对象，对象属性见文档下方表格。
 
 ```html
-<van-actionsheet
+<van-action-sheet
   show="{{ show }}"
   actions="{{ actions }}"
   bind:close="onClose"
@@ -59,12 +59,12 @@ Page({
 });
 ```
 
-#### 带取消按钮的 Actionsheet
+#### 带取消按钮的 ActionSheet
 
-如果传入了`cancelText`属性，且不为空，则会在下方显示一个取消按钮，点击会将当前`Actionsheet`关闭。
+如果传入了`cancelText`属性，且不为空，则会在下方显示一个取消按钮，点击会将当前`ActionSheet`关闭。
 
 ```html
-<van-actionsheet
+<van-action-sheet
   show="{{ show }}"
   actions="{{ actions }}"
   cancel-text="取消"
@@ -72,14 +72,14 @@ Page({
 />
 ```
 
-#### 带标题的 Actionsheet
+#### 带标题的 ActionSheet
 
-如果传入了`title`属性，且不为空，则另外一种样式的`Actionsheet`，里面内容需要自定义。
+如果传入了`title`属性，且不为空，则另外一种样式的`ActionSheet`，里面内容需要自定义。
 
 ```html
-<van-actionsheet show="{{ show }}" title="支持以下配送方式">
+<van-action-sheet show="{{ show }}" title="支持以下配送方式">
   <view>一些内容</view>
-</van-actionsheet>
+</van-action-sheet>
 ```
 
 ### API

packages/action-sheet/index.pcss

@@ -1,7 +1,7 @@
 @import '../common/style/var.pcss';
 @import '../common/style/hairline.pcss';
 
-.van-actionsheet {
+.van-action-sheet {
   color: $text-color;
   max-height: 90%;
   overflow-y: auto;

packages/action-sheet/index.wxml

@@ -0,0 +1,38 @@
+<van-popup
+  show="{{ show }}"
+  overlay="{{ overlay }}"
+  close-on-click-overlay="{{ closeOnClickOverlay }}"
+  custom-class="van-action-sheet {{ title ? 'van-action-sheet--withtitle' : '' }}"
+  position="bottom"
+  bind:close="onClose"
+>
+  <view wx:if="{{ title }}" class="van-hairline--top-bottom van-action-sheet__header">
+    <view>{{ title }}</view>
+    <van-icon custom-class="van-action-sheet__close" name="close" bind:click="onClose" />
+  </view>
+  <view wx:else class="van-hairline--bottom">
+    <view
+      wx:for="{{ actions }}"
+      wx:key="index"
+      class="van-action-sheet__item van-hairline--top {{ item.disabled || item.loading ? 'van-action-sheet__item--disabled' : '' }} {{ item.className || '' }}"
+      data-index="{{ index }}"
+      bind:tap="onSelect"
+    >
+      <block wx:if="{{ !item.loading }}">
+        <view class="van-action-sheet__name">{{ item.name }}</view>
+        <view class="van-action-sheet__subname" wx:if="{{ item.subname }}">{{ item.subname }}</view>
+      </block>
+      <van-loading wx:else custom-class="van-action-sheet__loading" size="20px" />
+    </view>
+  </view>
+  <view
+    wx:if="{{ cancelText }}"
+    class="van-action-sheet__cancel van-hairline--top"
+    bind:tap="onCancel"
+  >
+    {{ cancelText }}
+  </view>
+  <view wx:else class="van-action-sheet__content">
+    <slot />
+  </view>
+</van-popup>

packages/actionsheet/index.wxml

@@ -1,38 +0,0 @@
-<van-popup
-  show="{{ show }}"
-  overlay="{{ overlay }}"
-  close-on-click-overlay="{{ closeOnClickOverlay }}"
-  custom-class="van-actionsheet {{ title ? 'van-actionsheet--withtitle' : '' }}"
-  position="bottom"
-  bind:close="onClose"
->
-  <view wx:if="{{ title }}" class="van-hairline--top-bottom van-actionsheet__header">
-    <view>{{ title }}</view>
-    <van-icon custom-class="van-actionsheet__close" name="close" bind:click="onClose" />
-  </view>
-  <view wx:else class="van-hairline--bottom">
-    <view
-      wx:for="{{ actions }}"
-      wx:key="index"
-      class="van-actionsheet__item van-hairline--top {{ item.disabled || item.loading ? 'van-actionsheet__item--disabled' : '' }} {{ item.className || '' }}"
-      data-index="{{ index }}"
-      bind:tap="onSelect"
-    >
-      <block wx:if="{{ !item.loading }}">
-        <view class="van-actionsheet__name">{{ item.name }}</view>
-        <view class="van-actionsheet__subname" wx:if="{{ item.subname }}">{{ item.subname }}</view>
-      </block>
-      <van-loading wx:else custom-class="van-actionsheet__loading" size="20px" />
-    </view>
-  </view>
-  <view
-    wx:if="{{ cancelText }}"
-    class="van-actionsheet__cancel van-hairline--top"
-    bind:tap="onCancel"
-  >
-    {{ cancelText }}
-  </view>
-  <view wx:else class="van-actionsheet__content">
-    <slot />
-  </view>
-</van-popup>