fix: put onClose onvocation before closing the dropdown for PopupBase…

… component Closes #ONEUI-164
textkernel · Feb 17, 2020 · 8d248f1 · 8d248f1
1 parent a6123d7
commit 8d248f1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/components/PopupBase/PopupBase.js b/src/components/PopupBase/PopupBase.js
@@ -79,10 +79,10 @@ export class PopupBase extends React.Component {
         const { isOpen } = this.state;
 
         if (isOpen) {
-            this.setState({ isOpen: false });
             if (onClose) {
                 onClose();
             }
+            this.setState({ isOpen: false });
         }
     }
 

diff --git a/src/components/SelectedOption/SelectedOption.tsx b/src/components/SelectedOption/SelectedOption.tsx
@@ -36,7 +36,12 @@ export const SelectedOption: React.FC<Props> = React.forwardRef((props, ref) =>
 
     return (
         <As {...rest} ref={ref} {...block(props)}>
-            <button {...elem('button', props)} onClick={onDelete} onKeyDown={handleKeyDown}>
+            <button
+                {...elem('button', props)}
+                type="button"
+                onClick={onDelete}
+                onKeyDown={handleKeyDown}
+            >
                 <IoIosClose {...elem('buttonIcon', props)} />
             </button>
             {renderChildren()}

diff --git a/src/components/SelectedOption/__tests__/__snapshots__/SelectedOption.spec.js.snap b/src/components/SelectedOption/__tests__/__snapshots__/SelectedOption.spec.js.snap
@@ -12,6 +12,7 @@ exports[`<SelectedOption> should render default props correctly with string as c
       className="SelectedOption__button"
       onClick={[MockFunction]}
       onKeyDown={[Function]}
+      type="button"
     >
       <IoIosClose
         className="SelectedOption__buttonIcon"
@@ -68,6 +69,7 @@ exports[`<SelectedOption> should render default props correctly with string as c
       className="SelectedOption__button"
       onClick={[MockFunction]}
       onKeyDown={[Function]}
+      type="button"
     >
       <IoIosClose
         className="SelectedOption__buttonIcon"