Merge pull request #20024 from ant-design/merge-feature

chore: Master merge feature
ant-design · Dec 1, 2019 · a713a6a · a713a6a
2 parents d7e8102 + 1d516d7
commit a713a6a
Show file tree

Hide file tree

Showing 36 changed files with 8,266 additions and 2,621 deletions.
diff --git a/components/calendar/__tests__/index.test.js b/components/calendar/__tests__/index.test.js
@@ -316,7 +316,7 @@ describe('Calendar', () => {
 
       for (let index = start; index < end; index += 1) {
         monthOptions.push(
-          <Select.Option className="month-item" key={`${index}`}>
+          <Select.Option className="month-item" key={`${index}`} value={index}>
             {months[index]}
           </Select.Option>,
         );

diff --git a/components/calendar/locale/mk_MK.tsx b/components/calendar/locale/mk_MK.tsx
@@ -0,0 +1,3 @@
+import mk_MK from '../../date-picker/locale/mk_MK';
+
+export default mk_MK;
diff --git a/components/date-picker/interface.tsx b/components/date-picker/interface.tsx
@@ -40,7 +40,7 @@ export interface SinglePickerProps {
 }
 
 const DatePickerModes = tuple('time', 'date', 'month', 'year', 'decade');
-export type DatePickerMode = (typeof DatePickerModes)[number];
+export type DatePickerMode = typeof DatePickerModes[number];
 
 export interface DatePickerProps extends PickerProps, SinglePickerProps {
   showTime?: TimePickerProps | boolean;

diff --git a/components/date-picker/locale/mk_MK.tsx b/components/date-picker/locale/mk_MK.tsx
@@ -0,0 +1,19 @@
+import CalendarLocale from 'rc-calendar/lib/locale/mk_MK';
+import TimePickerLocale from '../../time-picker/locale/mk_MK';
+
+// Merge into a locale object
+const locale = {
+  lang: {
+    placeholder: 'Избери датум',
+    rangePlaceholder: ['Од датум', 'До датум'],
+    ...CalendarLocale,
+  },
+  timePickerLocale: {
+    ...TimePickerLocale,
+  },
+};
+
+// All settings at:
+// https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json
+
+export default locale;
diff --git a/components/drawer/index.tsx b/components/drawer/index.tsx
@@ -18,7 +18,7 @@ type EventType =
 type getContainerFunc = () => HTMLElement;
 
 const PlacementTypes = tuple('top', 'right', 'bottom', 'left');
-type placementType = (typeof PlacementTypes)[number];
+type placementType = typeof PlacementTypes[number];
 export interface DrawerProps {
   closable?: boolean;
   destroyOnClose?: boolean;

diff --git a/components/form/FormItem.tsx b/components/form/FormItem.tsx
@@ -17,7 +17,7 @@ const ValidateStatuses = tuple('success', 'warning', 'error', 'validating', '');
 
 const FormLabelAligns = tuple('left', 'right');
 
-export type FormLabelAlign = (typeof FormLabelAligns)[number];
+export type FormLabelAlign = typeof FormLabelAligns[number];
 
 export interface FormItemProps {
   prefixCls?: string;
@@ -30,7 +30,7 @@ export interface FormItemProps {
   wrapperCol?: ColProps;
   help?: React.ReactNode;
   extra?: React.ReactNode;
-  validateStatus?: (typeof ValidateStatuses)[number];
+  validateStatus?: typeof ValidateStatuses[number];
   hasFeedback?: boolean;
   required?: boolean;
   style?: React.CSSProperties;
@@ -66,7 +66,8 @@ export default class FormItem extends React.Component<FormItemProps, any> {
     const { children, help, validateStatus, id } = this.props;
     warning(
       this.getControls(children, true).length <= 1 ||
-        (help !== undefined || validateStatus !== undefined),
+        help !== undefined ||
+        validateStatus !== undefined,
       'Form.Item',
       'Cannot generate `validateStatus` and `help` automatically, ' +
         'while there are more than one `getFieldDecorator` in it.',

diff --git a/components/form/__tests__/__snapshots__/demo.test.js.snap b/components/form/__tests__/__snapshots__/demo.test.js.snap
@@ -4151,9 +4151,7 @@ exports[`renders ./components/form/demo/validate-other.md correctly 1`] = `
         <span
           class="ant-form-item-children"
         >
-          <span
-            class=""
-          >
+          <span>
             <div
               class="ant-upload ant-upload-drag"
             />