Merge ff66481 into d5ec884

HISTORY.md

@@ -1,3 +1,7 @@
+# 0.4.6
+
+* `FIXED` fix issue #10 add missing onSubmit handler
+
 # 0.4.5
 
 * `IMPROVE` fix issue #8 keep selection order.

package.json

@@ -1,6 +1,6 @@
 {
  "name": "uxcore-multi-select",
- "version": "0.4.5",
+ "version": "0.4.6",
  "description": "uxcore-multi-select component for uxcore.",
  "repository": "https://github.com/uxcore/uxcore-multi-select.git",
  "author": "peijie.dpj",
@@ -53,4 +53,4 @@
  },
  "contributors": [],
  "license": "MIT"
-}
+}

src/MultiSelect.jsx

@@ -100,9 +100,20 @@ export default class MultiSelect extends Component {
   };
 
   handleOk = () => {
+    const { props, state } = this;
     this.setState({
       visible: false,
     });
+
+    const lastLabels = [];
+    state.lastValues.forEach((value) => {
+      React.Children.forEach(props.children, (item) => {
+        if (value === item.props.value) {
+          lastLabels.push(item.props.text || item.props.value);
+        }
+      });
+    })
+    props.onSubmit(state.lastValues, lastLabels);
   }
 
   processLabel = (type) => {

tests/MultiSelect.spec.jsx

@@ -80,11 +80,11 @@ describe('MultiSelect', () => {
     expect(instance.state().visible).to.be(false);
   });
 
-  it('triggers handleChange correctly', () => {
+  it('triggers handleChange and handleOk correctly', () => {
     const spy = sinon.spy();
     instance = mount(
-      <MultiSelect onChange={spy} maxSelect={2}>
-        <Item value="1" />
+      <MultiSelect onChange={spy} maxSelect={2} onSubmit={spy}>
+        <Item value="1" text="text1" />
         <Item value="2" />
         <Item value="3" />
       </MultiSelect>
@@ -114,6 +114,11 @@ describe('MultiSelect', () => {
     checkBox3.simulate('change');
     expect(spy.callCount).to.be(3);
     expect(spy.args[2][0]).to.eql(['1', '2']);
+    spy.reset();
+    instance.instance().handleOk();
+    expect(spy.callCount).to.be(1);
+    expect(spy.args[0][0]).to.eql(['1', '2']);
+    expect(spy.args[0][1]).to.eql(['text1', '2']);
   });
 
   it('triggers handleSelectAll and handleClear correctly', () => {