diff --git a/.jest.js b/.jest.js
index 9806ba7732..f2b15bb87f 100644
--- a/.jest.js
+++ b/.jest.js
@@ -43,7 +43,6 @@ module.exports = {
snapshotSerializers: [
'enzyme-to-json/serializer',
],
- mapCoverage: true,
globals: {
'ts-jest': {
tsConfigFile: './tsconfig.test.json',
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index 228bdd4d4b..e84efa0e80 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -15,6 +15,18 @@ timeline: true
---
+## 3.2.3
+
+`2018-03-02`
+
+- 🐞 Fix props `onPopupScroll` ts define in `Select`. [#9475](https://github.com/ant-design/ant-design/pull/9475) [@twobin](https://github.com/twobin)
+- 🐞 Fix `Table` filter dropdown menu popup container. [#9209](https://github.com/ant-design/ant-design/issues/9209)
+- 🐞 Fix `Timeline` head custom style error in chrome. [#9429](https://github.com/ant-design/ant-design/pull/9429) [@vthinkxie](https://github.com/vthinkxie)
+- 🐞 Fix `Select` dropdown border. [82092c1](https://github.com/ant-design/ant-design/commit/82092c154ac1fa7ff2f89e1adbdf0aaf22e3ff53)
+- 🐞 Fix compatibility with less 3. [#7850](https://github.com/ant-design/ant-design/issues/7850)
+- 🐞 Fix `DatePicker.WeekPicker` year. [#9463](https://github.com/ant-design/ant-design/issues/9463)
+- 🐞 Fix `Button.Group` align issue in chrome. [#9457](https://github.com/ant-design/ant-design/issues/9457)
+
## 3.2.2
`2018-02-24`
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 82a8ea9bca..63615ab903 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -15,6 +15,18 @@ timeline: true
---
+## 3.2.3
+
+`2018-03-02`
+
+- 🐞 修复组件 `Select` 中的 `onPopupScroll` 属性的 ts 定义。 [#9475](https://github.com/ant-design/ant-design/pull/9475) [@twobin](https://github.com/twobin)
+- 🐞 修复 `Table` 过滤条件下拉选择框的问题。 [#9209](https://github.com/ant-design/ant-design/issues/9209)
+- 🐞 修复 `Timeline` 自定义头部样式在 Chrome 下的显示问题。 [#9429](https://github.com/ant-design/ant-design/pull/9429) [@vthinkxie](https://github.com/vthinkxie)
+- 🐞 修复 `Select` 下拉窗口的边框显示问题。 [82092c1](https://github.com/ant-design/ant-design/commit/82092c154ac1fa7ff2f89e1adbdf0aaf22e3ff53)
+- 🐞 修复对 less 3 的兼容性问题。 [#7850](https://github.com/ant-design/ant-design/issues/7850)
+- 🐞 修复 `DatePicker.WeekPicker` 年份问题。 [#9463](https://github.com/ant-design/ant-design/issues/9463)
+- 🐞 修复 `Button.Group` 在 Chrome 下的定位对齐问题。 [#9457](https://github.com/ant-design/ant-design/issues/9457)
+
## 3.2.2
`2018-02-24`
diff --git a/README.md b/README.md
index 76d612e871..96d57afb81 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
[](https://gemnasium.com/ant-design/ant-design)
[](https://www.npmjs.org/package/antd)
-[](https://npmjs.org/package/antd)
+[](https://npmcharts.com/compare/antd?minimal=true)
[](http://isitmaintained.com/project/ant-design/ant-design "Percentage of issues still open")
[](https://gitter.im/ant-design/ant-design-english?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) (English)
[](https://gitter.im/ant-design/ant-design?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)（中文）
@@ -26,10 +26,10 @@ An enterprise-class UI design language and React-based implementation.
## Features
-- An enterprise-class UI design language for web applications.
+- An enterprise-class UI design system for desktop applications.
- A set of high-quality React components out of the box.
-- Written in TypeScript with complete define types.
-- A npm + webpack + [dva](https://github.com/dvajs/dva) front-end development workflow.
+- Written in TypeScript with predictable static types.
+- Work with great development and design resources and tools.
## Environment Support
diff --git a/components/_util/throttleByAnimationFrame.tsx b/components/_util/throttleByAnimationFrame.tsx
index 213b213d5d..a1c9279ca1 100644
--- a/components/_util/throttleByAnimationFrame.tsx
+++ b/components/_util/throttleByAnimationFrame.tsx
@@ -2,7 +2,7 @@ import getRequestAnimationFrame, { cancelRequestAnimationFrame } from '../_util/
const reqAnimFrame = getRequestAnimationFrame();
-export default function throttleByAnimationFrame(fn: () => void) {
+export default function throttleByAnimationFrame(fn: (...args: any[]) => void) {
let requestId: number | null;
const later = (args: any[]) => () => {
diff --git a/components/back-top/__tests__/index.test.js b/components/back-top/__tests__/index.test.js
index 614fe8c8d8..305147cb81 100644
--- a/components/back-top/__tests__/index.test.js
+++ b/components/back-top/__tests__/index.test.js
@@ -19,6 +19,6 @@ describe('BackTop', () => {
jest.runAllTimers();
wrapper.find('.ant-back-top').simulate('click');
jest.runAllTimers();
- expect(Math.round(document.documentElement.scrollTop)).toBe(0);
+ expect(Math.abs(Math.round(document.documentElement.scrollTop))).toBe(0);
});
});
diff --git a/components/button/style/mixin.less b/components/button/style/mixin.less
index b90615b4bd..3e1f2dee97 100644
--- a/components/button/style/mixin.less
+++ b/components/button/style/mixin.less
@@ -108,6 +108,7 @@
display: inline-block;
> .@{btnClassName} {
position: relative;
+ line-height: @btn-height-base - 2px;
&:hover,
&:focus,
@@ -124,10 +125,12 @@
// size
&-lg > .@{btnClassName} {
.button-size(@btn-height-lg; @btn-padding-lg; @btn-font-size-lg; @btn-border-radius-base);
+ line-height: @btn-height-lg - 2px;
}
&-sm > .@{btnClassName} {
.button-size(@btn-height-sm; @btn-padding-sm; @font-size-base; @btn-border-radius-sm);
+ line-height: @btn-height-sm - 2px;
> .@{iconfont-css-prefix} {
font-size: @font-size-base;
}
diff --git a/components/carousel/__tests__/__snapshots__/demo.test.js.snap b/components/carousel/__tests__/__snapshots__/demo.test.js.snap
index 645229bc33..56dde97843 100644
--- a/components/carousel/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/carousel/__tests__/__snapshots__/demo.test.js.snap
@@ -16,13 +16,14 @@ exports[`renders ./components/carousel/demo/autoplay.md correctly 1`] = `
4
1
@@ -72,6 +74,7 @@ exports[`renders ./components/carousel/demo/autoplay.md correctly 1`] = `
2
@@ -80,6 +83,7 @@ exports[`renders ./components/carousel/demo/autoplay.md correctly 1`] = `
3
@@ -88,6 +92,7 @@ exports[`renders ./components/carousel/demo/autoplay.md correctly 1`] = `
4
@@ -115,13 +120,14 @@ exports[`renders ./components/carousel/demo/basic.md correctly 1`] = `
4
1
@@ -171,6 +178,7 @@ exports[`renders ./components/carousel/demo/basic.md correctly 1`] = `
2
@@ -179,6 +187,7 @@ exports[`renders ./components/carousel/demo/basic.md correctly 1`] = `
3
@@ -187,6 +196,7 @@ exports[`renders ./components/carousel/demo/basic.md correctly 1`] = `
4
@@ -212,9 +222,9 @@ exports[`renders ./components/carousel/demo/fade.md correctly 1`] = `
class="slick-track"
>
@@ -224,7 +234,7 @@ exports[`renders ./components/carousel/demo/fade.md correctly 1`] = `
@@ -234,7 +244,7 @@ exports[`renders ./components/carousel/demo/fade.md correctly 1`] = `
@@ -244,7 +254,7 @@ exports[`renders ./components/carousel/demo/fade.md correctly 1`] = `
@@ -273,13 +283,14 @@ exports[`renders ./components/carousel/demo/vertical.md correctly 1`] = `
4
1
@@ -329,6 +341,7 @@ exports[`renders ./components/carousel/demo/vertical.md correctly 1`] = `
2
@@ -337,6 +350,7 @@ exports[`renders ./components/carousel/demo/vertical.md correctly 1`] = `
3
@@ -345,6 +359,7 @@ exports[`renders ./components/carousel/demo/vertical.md correctly 1`] = `
4
diff --git a/components/date-picker/WeekPicker.tsx b/components/date-picker/WeekPicker.tsx
index c6b97fe48d..6a127ef229 100644
--- a/components/date-picker/WeekPicker.tsx
+++ b/components/date-picker/WeekPicker.tsx
@@ -11,7 +11,7 @@ function formatValue(value: moment.Moment | null, format: string): string {
export default class WeekPicker extends React.Component {
static defaultProps = {
- format: 'YYYY-wo',
+ format: 'gggg-wo',
allowClear: true,
};
diff --git a/components/date-picker/index.tsx b/components/date-picker/index.tsx
index 7c8e6d2b44..9d3e6de58d 100755
--- a/components/date-picker/index.tsx
+++ b/components/date-picker/index.tsx
@@ -14,7 +14,7 @@ const MonthPicker = wrapPicker(createPicker(MonthCalendar), 'YYYY-MM');
Object.assign(DatePicker, {
RangePicker: wrapPicker(RangePicker),
MonthPicker,
- WeekPicker: wrapPicker(WeekPicker, 'YYYY-wo'),
+ WeekPicker: wrapPicker(WeekPicker, 'gggg-wo'),
});
export default DatePicker as DatePickerDecorator;
diff --git a/components/divider/index.en-US.md b/components/divider/index.en-US.md
index 4bc77bf9ce..38c4102fe5 100644
--- a/components/divider/index.en-US.md
+++ b/components/divider/index.en-US.md
@@ -18,6 +18,6 @@ A divider line separates different content.
| Property | Description | Type | Default |
| -------- | ----------- | ---- | ------- |
-| dashed | whether line is dasded | Boolean | false |
+| dashed | whether line is dashed | Boolean | false |
| type | direction type of divider | enum: `horizontal` `vertical` | `horizontal` |
| orientation | this is optional, if not set it will have the text in the center | enum: `left` `right` | `center` |
diff --git a/components/form/demo/register.md b/components/form/demo/register.md
index 586475001e..16f7633d91 100644
--- a/components/form/demo/register.md
+++ b/components/form/demo/register.md
@@ -60,7 +60,7 @@ class RegistrationForm extends React.Component {
const value = e.target.value;
this.setState({ confirmDirty: this.state.confirmDirty || !!value });
}
- checkPassword = (rule, value, callback) => {
+ compareToFirstPassword = (rule, value, callback) => {
const form = this.props.form;
if (value && value !== form.getFieldValue('password')) {
callback('Two passwords that you enter is inconsistent!');
@@ -68,14 +68,13 @@ class RegistrationForm extends React.Component {
callback();
}
}
- checkConfirm = (rule, value, callback) => {
+ validateToNextPassword = (rule, value, callback) => {
const form = this.props.form;
if (value && this.state.confirmDirty) {
form.validateFields(['confirm'], { force: true });
}
callback();
}
-
handleWebsiteChange = (value) => {
let autoCompleteResult;
if (!value) {
@@ -85,7 +84,6 @@ class RegistrationForm extends React.Component {
}
this.setState({ autoCompleteResult });
}
-
render() {
const { getFieldDecorator } = this.props.form;
const { autoCompleteResult } = this.state;
@@ -149,7 +147,7 @@ class RegistrationForm extends React.Component {
rules: [{
required: true, message: 'Please input your password!',
}, {
- validator: this.checkConfirm,
+ validator: this.validateToNextPassword,
}],
})(
@@ -163,7 +161,7 @@ class RegistrationForm extends React.Component {
rules: [{
required: true, message: 'Please confirm your password!',
}, {
- validator: this.checkPassword,
+ validator: this.compareToFirstPassword,
}],
})(
diff --git a/components/grid/col.tsx b/components/grid/col.tsx
index 3cb60341d7..3faf9bfcf0 100644
--- a/components/grid/col.tsx
+++ b/components/grid/col.tsx
@@ -13,8 +13,7 @@ export interface ColSize {
pull?: number;
}
-export interface ColProps {
- className?: string;
+export interface ColProps extends React.HTMLAttributes {
span?: number;
order?: number;
offset?: number;
@@ -27,7 +26,6 @@ export interface ColProps {
xl?: number | ColSize;
xxl?: number | ColSize;
prefixCls?: string;
- style?: React.CSSProperties;
}
export default class Col extends React.Component {
diff --git a/components/grid/row.tsx b/components/grid/row.tsx
index a58c3fa698..1cd599c11e 100644
--- a/components/grid/row.tsx
+++ b/components/grid/row.tsx
@@ -31,13 +31,11 @@ export type BreakpointMap = {
xxl?: string
};
-export interface RowProps {
- className?: string;
+export interface RowProps extends React.HTMLAttributes {
gutter?: number | BreakpointMap;
type?: 'flex';
align?: 'top' | 'middle' | 'bottom';
justify?: 'start' | 'end' | 'center' | 'space-around' | 'space-between';
- style?: React.CSSProperties;
prefixCls?: string;
}
diff --git a/components/input/__tests__/__snapshots__/demo.test.js.snap b/components/input/__tests__/__snapshots__/demo.test.js.snap
index 8886819ce3..22573ef73d 100644
--- a/components/input/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/input/__tests__/__snapshots__/demo.test.js.snap
@@ -177,7 +177,7 @@ exports[`renders ./components/input/demo/group.md correctly 1`] = `
class="ant-input-group ant-input-group-lg"
>
-
+
diff --git a/components/layout/Sider.tsx b/components/layout/Sider.tsx
index d7765a8f31..e8cbf777fa 100644
--- a/components/layout/Sider.tsx
+++ b/components/layout/Sider.tsx
@@ -31,10 +31,8 @@ const dimensionMap = {
export type CollapseType = 'clickTrigger' | 'responsive';
-export interface SiderProps {
- style?: React.CSSProperties;
+export interface SiderProps extends React.HTMLAttributes {
prefixCls?: string;
- className?: string;
collapsible?: boolean;
collapsed?: boolean;
defaultCollapsed?: boolean;
diff --git a/components/layout/index.en-US.md b/components/layout/index.en-US.md
index 9270dbb142..a3e61857b5 100644
--- a/components/layout/index.en-US.md
+++ b/components/layout/index.en-US.md
@@ -43,7 +43,7 @@ The first level navigation is inclined left near a logo, and the secondary menu
- **Enlarge the size of the font**
- `12px`、`14px` is a standard font size of navigations，`14px` is used for the first and the second level of the navigation. You can choose a approprigate font size in terms of the level of your navigation.
+ `12px`、`14px` is a standard font size of navigations，`14px` is used for the first and the second level of the navigation. You can choose a appropriate font size in terms of the level of your navigation.
## Component Overview
diff --git a/components/layout/layout.tsx b/components/layout/layout.tsx
index c7fb224c19..39f7e73d50 100644
--- a/components/layout/layout.tsx
+++ b/components/layout/layout.tsx
@@ -3,10 +3,8 @@ import PropTypes from 'prop-types';
import classNames from 'classnames';
import { SiderProps } from './Sider';
-export interface BasicProps {
- style?: React.CSSProperties;
+export interface BasicProps extends React.HTMLAttributes {
prefixCls?: string;
- className?: string;
hasSider?: boolean;
}
diff --git a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap
index 071938912a..f7f93a6669 100644
--- a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap
+++ b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap
@@ -5703,6 +5703,7 @@ exports[`Locale Provider should display the text as ar 1`] = `
{
return this.popover.getPopupDomNode();
}
+ visibleChange = (visible) => {
+ if (visible && this.mention) {
+ this.mention.focus();
+ }
+ }
render() {
const mention = (
this.mention = ele}
style={{ width: '100%' }}
onChange={onChange}
defaultValue={toContentState('@afc163')}
@@ -41,7 +47,13 @@ class PopoverContainer extends React.Component {
/>
);
return (
- this.popover = popover}>
+ this.popover = popover}
+ onVisibleChange={this.visibleChange}
+ >
);
diff --git a/components/mention/index.en-US.md b/components/mention/index.en-US.md
index 3895a8c338..fbe9029721 100644
--- a/components/mention/index.en-US.md
+++ b/components/mention/index.en-US.md
@@ -4,7 +4,7 @@ type: Data Entry
title: Mention
---
-Mention component。
+Mention component.
## When To Use
diff --git a/components/mention/index.tsx b/components/mention/index.tsx
index 64d4c6fb29..f1114c1524 100644
--- a/components/mention/index.tsx
+++ b/components/mention/index.tsx
@@ -111,7 +111,7 @@ export default class Mention extends React.Component
}
}
focus = () => {
- this.mentionEle._editor.focus();
+ this.mentionEle._editor.focusEditor();
}
mentionRef = (ele: any) => {
this.mentionEle = ele;
diff --git a/components/select/index.tsx b/components/select/index.tsx
index 378ee5ef01..4d36a7cf7b 100755
--- a/components/select/index.tsx
+++ b/components/select/index.tsx
@@ -43,6 +43,7 @@ export interface SelectProps extends AbstractSelectProps {
onDeselect?: (value: SelectValue) => any;
onBlur?: () => any;
onFocus?: () => any;
+ onPopupScroll?: () => any;
onInputKeyDown?: (e: React.KeyboardEvent) => void;
maxTagCount?: number;
maxTagPlaceholder?: React.ReactNode | ((omittedValues: SelectValue[]) => React.ReactNode);
diff --git a/components/style/color/bezierEasing.less b/components/style/color/bezierEasing.less
index 78d94d5509..cf1fc066c4 100644
--- a/components/style/color/bezierEasing.less
+++ b/components/style/color/bezierEasing.less
@@ -100,6 +100,8 @@
};
this.colorEasing = BezierEasing(0.26, 0.09, 0.37, 0.18);
+ // less 3 requires a return
+ return '';
})()`;
}
// It is hacky way to make this function will be compiled preferentially by less
diff --git a/components/style/themes/default.less b/components/style/themes/default.less
index 343e374e31..447929183e 100644
--- a/components/style/themes/default.less
+++ b/components/style/themes/default.less
@@ -387,6 +387,8 @@
@tabs-card-height: 40px;
@tabs-card-active-color: @primary-color;
@tabs-title-font-size: @font-size-base;
+@tabs-title-font-size-lg: @font-size-lg;
+@tabs-title-font-size-sm: @font-size-base;
@tabs-ink-bar-bg-color: @primary-color;
@tab-bar-margin: 0 0 16px 0;
@tab-horizontal-margin: 0 32px 0 0;
diff --git a/components/table/style/index.less b/components/table/style/index.less
index 2759c42408..0c57061b45 100644
--- a/components/table/style/index.less
+++ b/components/table/style/index.less
@@ -34,6 +34,14 @@
font-weight: 500;
border-bottom: @border-width-base @border-style-base @border-color-split;
+ &:first-child {
+ border-top-left-radius: @border-radius-base;
+ }
+
+ &:last-child {
+ border-top-right-radius: @border-radius-base;
+ }
+
&[colspan] {
text-align: center;
border-bottom: 0;
@@ -540,6 +548,9 @@
table {
border-radius: @border-radius-base 0 0 0;
}
+ .ant-table-thead > tr > th:last-child {
+ border-top-right-radius: 0;
+ }
}
&-fixed-right {
@@ -555,6 +566,9 @@
color: transparent;
pointer-events: none;
}
+ .ant-table-thead > tr > th:first-child {
+ border-top-left-radius: 0;
+ }
}
&&-scroll-position-left &-fixed-left {
diff --git a/components/tabs/style/index.less b/components/tabs/style/index.less
index 93f23936e8..b2f71b26cd 100644
--- a/components/tabs/style/index.less
+++ b/components/tabs/style/index.less
@@ -207,7 +207,7 @@
}
&-large &-nav-container {
- font-size: @font-size-lg;
+ font-size: @tabs-title-font-size-lg;
}
&-large &-tab {
@@ -215,7 +215,7 @@
}
&-small &-nav-container {
- font-size: @font-size-base;
+ font-size: @tabs-title-font-size-sm;
}
&-small &-tab {
diff --git a/components/tooltip/index.en-US.md b/components/tooltip/index.en-US.md
index 83536672dc..cae0b70291 100644
--- a/components/tooltip/index.en-US.md
+++ b/components/tooltip/index.en-US.md
@@ -32,7 +32,7 @@ The following APIs are shared by Tooltip, Popconfirm, Popover.
| overlayClassName | Class name of the tooltip card | string | - |
| overlayStyle | Style of the tooltip card | object | - |
| placement | The position of the tooltip relative to the target, which can be one of `top` `left` `right` `bottom` `topLeft` `topRight` `bottomLeft` `bottomRight` `leftTop` `leftBottom` `rightTop` `rightBottom` | string | `top` |
-| trigger | Tooltip trigger mode | `hover` \| `focus` \| `click` | `hover` |
+| trigger | Tooltip trigger mode | `hover` \| `focus` \| `click` \| `contextMenu` | `hover` |
| visible | Whether the floating tooltip card is visible or not | boolean | `false` |
| onVisibleChange | Callback executed when visibility of the tooltip card is changed | (visible) => void | - |
diff --git a/components/tooltip/index.tsx b/components/tooltip/index.tsx
index 954d155fcc..69fc57f26e 100644
--- a/components/tooltip/index.tsx
+++ b/components/tooltip/index.tsx
@@ -25,7 +25,7 @@ export interface AbstractTooltipProps {
mouseEnterDelay?: number;
mouseLeaveDelay?: number;
transitionName?: string;
- trigger?: 'hover' | 'focus' | 'click';
+ trigger?: 'hover' | 'focus' | 'click' | 'contextMenu';
openClassName?: string;
arrowPointAtCenter?: boolean;
autoAdjustOverflow?: boolean | AdjustOverflow;
diff --git a/components/tooltip/index.zh-CN.md b/components/tooltip/index.zh-CN.md
index 6c6422e60a..4c38daf556 100644
--- a/components/tooltip/index.zh-CN.md
+++ b/components/tooltip/index.zh-CN.md
@@ -34,7 +34,7 @@ title: Tooltip
| overlayClassName | 卡片类名 | string | 无 |
| overlayStyle | 卡片样式 | object | 无 |
| placement | 气泡框位置，可选 `top` `left` `right` `bottom` `topLeft` `topRight` `bottomLeft` `bottomRight` `leftTop` `leftBottom` `rightTop` `rightBottom` | string | top |
-| trigger | 触发行为，可选 `hover/focus/click` | string | hover |
+| trigger | 触发行为，可选 `hover/focus/click/contextMenu` | string | hover |
| visible | 用于手动控制浮层显隐 | boolean | false |
| onVisibleChange | 显示隐藏的回调 | (visible) => void | 无 |
diff --git a/components/tree-select/index.en-US.md b/components/tree-select/index.en-US.md
index d0efbdaeb3..74654b5520 100644
--- a/components/tree-select/index.en-US.md
+++ b/components/tree-select/index.en-US.md
@@ -20,6 +20,7 @@ Any data whose entries are defined in a hierarchical manner is fit to use this c
| allowClear | Whether allow clear | boolean | false |
| defaultValue | To set the initial selected treeNode(s). | string\|string\[] | - |
| disabled | Disabled or not | boolean | false |
+| dropdownClassName | className of dropdown menu | string | - |
| dropdownMatchSelectWidth | Determine whether the dropdown menu and the select input are the same width | boolean | true |
| dropdownStyle | To set the style of the dropdown menu | object | - |
| filterTreeNode | Whether to filter treeNodes by input value. The value of `treeNodeFilterProp` is used for filtering by default. | boolean\|Function(inputValue: string, treeNode: TreeNode) (should return boolean) | Function |
diff --git a/components/tree-select/index.tsx b/components/tree-select/index.tsx
index 26d5011272..d98d9d2d0c 100644
--- a/components/tree-select/index.tsx
+++ b/components/tree-select/index.tsx
@@ -19,7 +19,6 @@ export default class TreeSelect extends React.Component {
transitionName: 'slide-up',
choiceTransitionName: 'zoom',
showSearch: false,
- dropdownClassName: 'ant-select-tree-dropdown',
};
private rcTreeSelect: any;
@@ -52,6 +51,7 @@ export default class TreeSelect extends React.Component {
size,
notFoundContent,
dropdownStyle,
+ dropdownClassName,
...restProps,
} = this.props;
@@ -67,6 +67,7 @@ export default class TreeSelect extends React.Component {
return (
{
);
wrapper.setState({});
- await delay(0);
+ await delay(20);
expect(wrapper.state().fileList[2].thumbUrl).not.toBeFalsy();
});
});
diff --git a/package.json b/package.json
old mode 100755
new mode 100644
index 702c82a0f1..5259762b42
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "antd",
- "version": "3.2.2",
+ "version": "3.2.3",
"title": "Ant Design",
"description": "An enterprise-class UI design language and React-based implementation",
"homepage": "http://ant.design/",
@@ -79,7 +79,7 @@
"rc-upload": "~2.4.0",
"rc-util": "^4.0.4",
"react-lazy-load": "^3.0.12",
- "react-slick": "~0.17.0",
+ "react-slick": "~0.20.0",
"shallowequal": "^1.0.1",
"warning": "~3.0.0"
},
@@ -88,7 +88,7 @@
"@types/react": "^16.0.0",
"@types/react-dom": "^16.0.0",
"ansi-styles": "^3.2.0",
- "antd-tools": "^5.1.0",
+ "antd-tools": "^5.1.2",
"babel-cli": "^6.18.0",
"babel-eslint": "^8.1.1",
"babel-plugin-import": "^1.0.0",
@@ -120,14 +120,14 @@
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^6.0.2",
"eslint-plugin-markdown": "~1.0.0-beta.4",
- "eslint-plugin-react": "7.5.1",
+ "eslint-plugin-react": "7.7.0",
"eslint-tinker": "^0.4.0",
"fetch-jsonp": "^1.0.3",
"glob": "^7.1.1",
"immutability-helper": "^2.5.0",
- "jest": "^21.1.0",
+ "jest": "^22.4.2",
"jsonml.js": "^0.1.0",
- "lint-staged": "^6.0.0",
+ "lint-staged": "^7.0.0",
"lz-string": "^1.4.4",
"majo": "^0.4.1",
"mockdate": "^2.0.1",
@@ -153,15 +153,15 @@
"react-sublime-video": "^0.2.0",
"react-virtualized": "~9.13.0",
"remark-frontmatter": "^1.1.0",
- "remark-parse": "^4.0.0",
- "remark-stringify": "^4.0.0",
+ "remark-parse": "^5.0.0",
+ "remark-stringify": "^5.0.0",
"remark-yaml-config": "^4.0.1",
"reqwest": "^2.0.5",
"rimraf": "^2.5.4",
- "scrollama": "^0.6.1",
- "stylelint": "^8.0.0",
+ "scrollama": "^1.4.1",
+ "stylelint": "^9.1.1",
"stylelint-config-standard": "^18.0.0",
- "typescript": "~2.6.1",
+ "typescript": "~2.7.2",
"unified": "^6.1.5",
"values.js": "^1.0.3",
"xhr2": "^0.1.3"
@@ -199,14 +199,14 @@
},
"lint-staged": {
"components/**/*.tsx": [
- "lint-staged:ts"
+ "npm run lint-staged:ts"
],
"{tests,site,scripts,components}/**/*.{js,jsx}": [
- "lint-staged:es"
+ "npm run lint-staged:es"
],
"{site,components}/**/*.less": "stylelint --syntax less",
"components/*/demo/*.md": [
- "lint-staged:demo"
+ "npm run lint-staged:demo"
]
},
"pre-commit": [
diff --git a/site/theme/static/template.html b/site/theme/static/template.html
index e5b2ad5d31..db6c5f2483 100644
--- a/site/theme/static/template.html
+++ b/site/theme/static/template.html
@@ -6,6 +6,10 @@
Ant Design - A UI Design Language
+
+