Merge branch 'master' into link-to-grid-component

Sage · Apr 13, 2021 · 0dfce65 · 0dfce65
2 parents cc82ce0 + fbd7d88
commit 0dfce65
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 2 deletions.
diff --git a/cypress/features/regression/designSystem/simpleSelectEvents.feature b/cypress/features/regression/designSystem/simpleSelectEvents.feature
@@ -14,8 +14,8 @@ Feature: Design System Simple Select component
 
   @positive
   Scenario: Check the onChange event by clicking mouse on the select list option
-    Given I click on default Select input
-      And clear all actions in Actions Tab
+    Given clear all actions in Actions Tab
+      And I click on default Select input
     When I click on "first" option on Select list in iframe
     Then onChange action was called in Actions Tab
 

diff --git a/src/components/select/filterable-select/filterable-select.component.js b/src/components/select/filterable-select/filterable-select.component.js
@@ -379,6 +379,7 @@ const FilterableSelect = React.forwardRef(
       }
 
       isInputFocused.current = false;
+      setOpen(false);
 
       if (onBlur) {
         onBlur(event);

diff --git a/src/components/select/filterable-select/filterable-select.spec.js b/src/components/select/filterable-select/filterable-select.spec.js
@@ -751,6 +751,17 @@ describe("FilterableSelect", () => {
       expect(onBlurFn).toHaveBeenCalled();
     });
 
+    it("then SelectList shouldn't exist", () => {
+      const onBlurFn = jest.fn();
+      const wrapper = renderSelect({ onBlur: onBlurFn, openOnFocus: true });
+
+      wrapper.find("input").simulate("focus");
+      expect(wrapper.find(SelectList).exists()).toBe(true);
+
+      wrapper.find("input").simulate("blur");
+      expect(wrapper.find(SelectList).exists()).toBe(false);
+    });
+
     describe("and there is a mouseDown reported on open list", () => {
       it("then that prop should not be called", () => {
         const onBlurFn = jest.fn();

diff --git a/src/components/select/multi-select/multi-select.component.js b/src/components/select/multi-select/multi-select.component.js
@@ -293,6 +293,7 @@ const MultiSelect = React.forwardRef(
       }
 
       isInputFocused.current = false;
+      setOpenState(false);
 
       if (onBlur) {
         onBlur(event);

diff --git a/src/components/select/multi-select/multi-select.spec.js b/src/components/select/multi-select/multi-select.spec.js
@@ -148,6 +148,17 @@ describe("MultiSelect", () => {
       expect(onBlurFn).toHaveBeenCalled();
     });
 
+    it("then SelectList shouldn't exist", () => {
+      const onBlurFn = jest.fn();
+      const wrapper = renderSelect({ onBlur: onBlurFn, openOnFocus: true });
+
+      wrapper.find("input").simulate("focus");
+      expect(wrapper.find(SelectList).exists()).toBe(true);
+
+      wrapper.find("input").simulate("blur");
+      expect(wrapper.find(SelectList).exists()).toBe(false);
+    });
+
     describe("and there is a mouseDown reported on open list", () => {
       it("then that prop should not be called", () => {
         const onBlurFn = jest.fn();
@@ -156,6 +167,7 @@ describe("MultiSelect", () => {
         wrapper.find("input").simulate("focus");
         wrapper.find(Option).first().simulate("mousedown");
         wrapper.find("input").simulate("blur");
+
         expect(onBlurFn).not.toHaveBeenCalled();
       });
     });

diff --git a/src/components/select/simple-select/simple-select.component.js b/src/components/select/simple-select/simple-select.component.js
@@ -251,6 +251,8 @@ const SimpleSelect = React.forwardRef(
         return;
       }
 
+      setOpenState(false);
+
       if (onBlur) {
         onBlur(event);
       }

diff --git a/src/components/select/simple-select/simple-select.spec.js b/src/components/select/simple-select/simple-select.spec.js
@@ -680,6 +680,17 @@ describe("SimpleSelect", () => {
       expect(onBlurFn).toHaveBeenCalled();
     });
 
+    it("then SelectList shouldn't exist", () => {
+      const onBlurFn = jest.fn();
+      const wrapper = renderSelect({ onBlur: onBlurFn, openOnFocus: true });
+
+      wrapper.find("input").simulate("focus");
+      expect(wrapper.find(SelectList).exists()).toBe(true);
+
+      wrapper.find("input").simulate("blur");
+      expect(wrapper.find(SelectList).exists()).toBe(false);
+    });
+
     describe("and there is a mouseDown reported on open list", () => {
       it("then that prop should not be called", () => {
         const onBlurFn = jest.fn();
-Original file line number
+Diff line change
@@ Expand Up / @@ -251,6 +251,8 @@ const SimpleSelect = React.forwardRef( @@
             return;
           }
+          setOpenState(false);
           if (onBlur) {
             onBlur(event);
           }
@@ Expand Down @@