From 58053505204a782eaa89dfcfa971f4d8ba320858 Mon Sep 17 00:00:00 2001
From: zombiej <smith3816@gmail.com>
Date: Sat, 2 May 2020 20:13:38 +0800
Subject: [PATCH 1/2] feat: support picker id

---
 src/Picker.tsx        | 3 +++
 tests/picker.spec.tsx | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/src/Picker.tsx b/src/Picker.tsx
index 6b1ecc670..1854d6c27 100644
--- a/src/Picker.tsx
+++ b/src/Picker.tsx
@@ -49,6 +49,7 @@ export interface PickerSharedProps<DateType> extends React.AriaAttributes {
   defaultOpen?: boolean;
   /** Make input readOnly to avoid popup keyboard in mobile */
   inputReadOnly?: boolean;
+  id?: string;
 
   // Value
   format?: string | string[];
@@ -127,6 +128,7 @@ interface MergedPickerProps<DateType>
 function InnerPicker<DateType>(props: PickerProps<DateType>) {
   const {
     prefixCls = 'rc-picker',
+    id,
     style,
     className,
     dropdownClassName,
@@ -477,6 +479,7 @@ function InnerPicker<DateType>(props: PickerProps<DateType>) {
               size={getInputSize(picker, formatList[0])}
               {...getDataOrAriaProps(props)}
               autoComplete={autoComplete}
+              id={id}
             />
             {suffixNode}
             {clearNode}
diff --git a/tests/picker.spec.tsx b/tests/picker.spec.tsx
index aa2e7d2b5..1d97c30d2 100644
--- a/tests/picker.spec.tsx
+++ b/tests/picker.spec.tsx
@@ -612,4 +612,9 @@ describe('Picker.Basic', () => {
       expect(wrapper.find('input').props().value).toEqual(text);
     });
   });
+
+  it('id', () => {
+    const wrapper = mount(<MomentPicker id="light" />);
+    expect(wrapper.find('input').props().id).toEqual('light');
+  });
 });

From 2d1d0319491705b1c9a0fc5d9002a9448a5271ae Mon Sep 17 00:00:00 2001
From: zombiej <smith3816@gmail.com>
Date: Sat, 2 May 2020 20:18:08 +0800
Subject: [PATCH 2/2] rangepicker

---
 src/Picker.tsx       |  2 +-
 src/RangePicker.tsx  |  3 +++
 tests/range.spec.tsx | 10 ++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/Picker.tsx b/src/Picker.tsx
index 1854d6c27..e9124224e 100644
--- a/src/Picker.tsx
+++ b/src/Picker.tsx
@@ -465,6 +465,7 @@ function InnerPicker<DateType>(props: PickerProps<DateType>) {
         >
           <div className={`${prefixCls}-input`} ref={inputDivRef}>
             <input
+              id={id}
               disabled={disabled}
               readOnly={inputReadOnly || !typing}
               value={text}
@@ -479,7 +480,6 @@ function InnerPicker<DateType>(props: PickerProps<DateType>) {
               size={getInputSize(picker, formatList[0])}
               {...getDataOrAriaProps(props)}
               autoComplete={autoComplete}
-              id={id}
             />
             {suffixNode}
             {clearNode}
diff --git a/src/RangePicker.tsx b/src/RangePicker.tsx
index 804c89f21..820c9d727 100644
--- a/src/RangePicker.tsx
+++ b/src/RangePicker.tsx
@@ -55,6 +55,7 @@ function canValueTrigger<DateType>(
 }
 
 export interface RangePickerSharedProps<DateType> {
+  id?: string;
   value?: RangeValue<DateType>;
   defaultValue?: RangeValue<DateType>;
   defaultPickerValue?: [DateType, DateType];
@@ -136,6 +137,7 @@ interface MergedRangePickerProps<DateType>
 function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
   const {
     prefixCls = 'rc-picker',
+    id,
     style,
     className,
     popupStyle,
@@ -887,6 +889,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
             ref={startInputDivRef}
           >
             <input
+              id={id}
               disabled={mergedDisabled[0]}
               readOnly={inputReadOnly || !startTyping}
               value={startText}
diff --git a/tests/range.spec.tsx b/tests/range.spec.tsx
index 0c625b261..34f8d560c 100644
--- a/tests/range.spec.tsx
+++ b/tests/range.spec.tsx
@@ -1036,4 +1036,14 @@ describe('Picker.Range', () => {
     testOrderOnTime(false, '23:00:00', '02:00:00');
     testOrderOnTime(true, '02:00:00', '23:00:00');
   });
+
+  it('id', () => {
+    const wrapper = mount(<MomentRangePicker id="bamboo" />);
+    expect(
+      wrapper
+        .find('input')
+        .first()
+        .props().id,
+    ).toEqual('bamboo');
+  });
 });