cr pxxx to sxxx and tree

Author: tangjinzhou

components/_util/props-util.js

@@ -133,6 +133,7 @@ const getComponentFromProp = (instance, prop, options = instance, execute = true
     const componentOptions = instance.componentOptions || {};
     (componentOptions.children || []).forEach(child => {
       if (child.data && child.data.slot === prop) {
+        delete child.data.slot;
         if (child.tag === 'template') {
           slotsProp.push(child.children);
         } else {

components/progress/circle.jsx

@@ -1,6 +1,5 @@
 import { Circle as VCCircle } from '../vc-progress';
 import { validProgress } from './utils';
-import { ProgressProps } from './progress';
 
 const statusColorMap = {
   normal: '#108ee9',

components/progress/line.jsx

@@ -1,5 +1,4 @@
 import { validProgress } from './utils';
-import { ProgressProps } from './progress';
 
 const Line = {
   functional: true,

components/radio/Group.jsx

@@ -11,9 +11,7 @@ export default {
     prop: 'value',
   },
   props: {
-    prefixCls: {
-      type: String,
-    },
+    prefixCls: PropTypes.string,
     defaultValue: PropTypes.any,
     value: PropTypes.any,
     size: {
@@ -103,7 +101,6 @@ export default {
               prefixCls={prefixCls}
               disabled={props.disabled}
               value={option}
-              onChange={this.onRadioChange}
               checked={this.stateValue === option}
             >
               {option}
@@ -116,7 +113,6 @@ export default {
               prefixCls={prefixCls}
               disabled={option.disabled || props.disabled}
               value={option.value}
-              onChange={this.onRadioChange}
               checked={this.stateValue === option.value}
             >
               {option.label}

components/radio/Radio.jsx

@@ -12,9 +12,7 @@ export default {
     prop: 'checked',
   },
   props: {
-    prefixCls: {
-      type: String,
-    },
+    prefixCls: PropTypes.string,
     defaultChecked: Boolean,
     checked: { type: Boolean, default: undefined },
     disabled: Boolean,
@@ -41,6 +39,12 @@ export default {
     blur() {
       this.$refs.vcCheckbox.blur();
     },
+    onChange(e) {
+      this.$emit('change', e);
+      if (this.radioGroupContext && this.radioGroupContext.onRadioChange) {
+        this.radioGroupContext.onRadioChange(e);
+      }
+    },
   },
 
   render() {
@@ -60,7 +64,7 @@ export default {
 
     if (radioGroup) {
       radioProps.props.name = radioGroup.name;
-      radioProps.on.change = radioGroup.onRadioChange;
+      radioProps.on.change = this.onChange;
       radioProps.props.checked = props.value === radioGroup.stateValue;
       radioProps.props.disabled = props.disabled || radioGroup.disabled;
     } else {

components/radio/RadioButton.jsx

@@ -1,14 +1,12 @@
 import Radio from './Radio';
+import PropTypes from '../_util/vue-types';
 import { getOptionProps } from '../_util/props-util';
 import { ConfigConsumerProps } from '../config-provider';
 
 export default {
   name: 'ARadioButton',
   props: {
     ...Radio.props,
-    prefixCls: {
-      type: String,
-    },
   },
   inject: {
     radioGroupContext: { default: undefined },

components/radio/__tests__/group.test.js

@@ -2,6 +2,7 @@ import { mount } from '@vue/test-utils';
 import { asyncExpect } from '@/tests/utils';
 import Radio from '../Radio';
 import RadioGroup from '../Group';
+import RadioButton from '../radioButton';
 
 describe('Radio', () => {
   function createRadioGroup(props, listeners = {}) {
@@ -50,10 +51,16 @@ describe('Radio', () => {
       },
     });
 
-    wrapper.trigger('mouseenter');
+    wrapper
+      .findAll('div')
+      .at(0)
+      .trigger('mouseenter');
     expect(onMouseEnter).toHaveBeenCalled();
 
-    wrapper.trigger('mouseleave');
+    wrapper
+      .findAll('div')
+      .at(0)
+      .trigger('mouseleave');
     expect(onMouseLeave).toHaveBeenCalled();
   });
 
@@ -89,6 +96,80 @@ describe('Radio', () => {
     });
   });
 
+  it('both of radio and radioGroup will trigger onchange event when they exists', async () => {
+    const onChange = jest.fn();
+    const onChangeRadioGroup = jest.fn();
+
+    const wrapper = mount(
+      {
+        props: ['value'],
+        render() {
+          const groupProps = {};
+          if (this.value !== undefined) {
+            groupProps.value = this.value;
+          }
+          return (
+            <RadioGroup ref="radioGroup" {...groupProps} onChange={onChangeRadioGroup}>
+              <Radio value="A" onChange={onChange}>
+                A
+              </Radio>
+              <Radio value="B" onChange={onChange}>
+                B
+              </Radio>
+              <Radio value="C" onChange={onChange}>
+                C
+              </Radio>
+            </RadioGroup>
+          );
+        },
+      },
+      { sync: false },
+    );
+    const radios = wrapper.findAll('input');
+
+    // uncontrolled component
+    wrapper.vm.$refs.radioGroup.stateValue = 'B';
+    radios.at(0).trigger('change');
+    expect(onChange.mock.calls.length).toBe(1);
+    expect(onChangeRadioGroup.mock.calls.length).toBe(1);
+
+    // controlled component
+    wrapper.setProps({ value: 'A' });
+    radios.at(1).trigger('change');
+    expect(onChange.mock.calls.length).toBe(2);
+  });
+
+  it('Trigger onChange when both of radioButton and radioGroup exists', () => {
+    const onChange = jest.fn();
+    const props = {};
+    const wrapper = mount(
+      createRadioGroup(props, {
+        change: onChange,
+      }),
+      { sync: false },
+    );
+    const radios = wrapper.findAll('input');
+
+    // uncontrolled component
+    wrapper.vm.$refs.radioGroup.stateValue = 'B';
+    radios.at(0).trigger('change');
+    expect(onChange.mock.calls.length).toBe(1);
+
+    // controlled component
+    wrapper.setProps({ value: 'A' });
+    radios.at(1).trigger('change');
+    expect(onChange.mock.calls.length).toBe(2);
+  });
+
+  // it('should only trigger once when in group with options', () => {
+  //   const onChange = jest.fn();
+  //   const options = [{ label: 'Bamboo', value: 'Bamboo' }];
+  //   const wrapper = mount(<RadioGroup options={options} onChange={onChange} />);
+
+  //   wrapper.find('input').trigger('change');
+  //   expect(onChange).toHaveBeenCalledTimes(1);
+  // });
+
   // it('won\'t fire change events when value not changes', async () => {
   //   const onChange = jest.fn()
 

components/radio/__tests__/radio.test.js

@@ -28,12 +28,12 @@ describe('Radio', () => {
       { sync: false },
     );
     await asyncExpect(() => {
-      wrapper.trigger('mouseenter');
+      wrapper.find('label').trigger('mouseenter');
     });
     await asyncExpect(() => {
       expect(onMouseEnter).toHaveBeenCalled();
     });
-    wrapper.trigger('mouseleave');
+    wrapper.find('label').trigger('mouseleave');
     await asyncExpect(() => {
       expect(onMouseLeave).toHaveBeenCalled();
     });

components/rate/index.jsx

@@ -40,12 +40,7 @@ const Rate = {
     characterRender(node, { index }) {
       const { tooltips } = this.$props;
       if (!tooltips) return node;
-      const tooltipsProps = {
-        props: {
-          title: tooltips[index],
-        },
-      };
-      return <Tooltip {...tooltipsProps}>{node}</Tooltip>;
+      return <Tooltip title={tooltips[index]}>{node}</Tooltip>;
     },
   },
   render() {

components/select/index.jsx

@@ -1,4 +1,4 @@
-import warning from 'warning';
+import warning from '../_util/warning';
 import omit from 'omit.js';
 import PropTypes from '../_util/vue-types';
 import { Select as VcSelect, Option, OptGroup } from '../vc-select';
@@ -96,7 +96,6 @@ const Select = {
   name: 'ASelect',
   props: {
     ...SelectProps,
-    prefixCls: PropTypes.string,
     showSearch: PropTypes.bool.def(false),
     transitionName: PropTypes.string.def('slide-up'),
     choiceTransitionName: PropTypes.string.def('zoom'),