chore: Merge master into prerelease/minor (#1826)

Co-authored-by: @NicholasBoll <[email protected]> Co-authored-by: @alanbsmith <[email protected]> Co-authored-by: manuel.carrera <[email protected]>
Workday · Oct 6, 2022 · abf3c1f · abf3c1f
2 parents 139012e + 1f975f6
commit abf3c1f
Show file tree

Hide file tree

Showing 37 changed files with 330 additions and 102 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [v7.3.15](https://github.com/Workday/canvas-kit/releases/tag/v7.3.15) (2022-10-04)
+
+### Components
+
+- fix: Update `useReturnFocus` to change focus if target is visible ([#1709](https://github.com/Workday/canvas-kit/pull/1709)) ([@NicholasBoll](https://github.com/NicholasBoll), [@alanbsmith](https://github.com/alanbsmith))
+
+
 ## [v7.3.14](https://github.com/Workday/canvas-kit/releases/tag/v7.3.14) (2022-10-04)
 
 ### Documentation

diff --git a/cypress/integration/Popup.spec.ts b/cypress/integration/Popup.spec.ts
@@ -393,6 +393,104 @@ describe('Popup', () => {
     });
   });
 
+  context('given the [Testing/React/Popups/Popup, MixedPopupTypes] story is rendered', () => {
+    beforeEach(() => {
+      h.stories.load('Testing/React/Popups/Popup', 'ReturnFocusTest');
+    });
+
+    context('when the "Open Popup" is clicked', () => {
+      beforeEach(() => {
+        cy.findByRole('button', {name: 'Open Popup'})
+          .scrollIntoView()
+          .click();
+      });
+
+      context('when the user clicks outside', () => {
+        beforeEach(() => {
+          cy.get('body').click('bottom');
+        });
+
+        it('should focus the "Open Popup" button', {scrollBehavior: false}, () => {
+          cy.findByRole('button', {name: 'Open Popup'}).should('have.focus');
+        });
+      });
+
+      context('when the user clicks the input', () => {
+        beforeEach(() => {
+          cy.findByRole('textbox', {name: 'Name'}).click();
+        });
+
+        it('should not focus the "Open Popup" button', () => {
+          cy.findByRole('button', {name: 'Open Popup'}).should('not.have.focus');
+        });
+      });
+
+      context('when the user scrolls to the top', () => {
+        beforeEach(() => {
+          cy.findByTestId('scroll-area').scrollTo('top');
+        });
+
+        context('when the user clicks outside', () => {
+          beforeEach(() => {
+            cy.get('body').click('top');
+          });
+
+          it('should not focus the "Open Popup" button', () => {
+            cy.findByRole('button', {name: 'Open Popup'}).should('not.have.focus');
+          });
+        });
+      });
+
+      context('when the user scrolls to the bottom', () => {
+        beforeEach(() => {
+          cy.findByTestId('scroll-area').scrollTo('bottom');
+        });
+
+        context('when the user clicks outside', () => {
+          beforeEach(() => {
+            cy.get('body').click('top');
+          });
+
+          it('should not focus the "Open Popup" button', () => {
+            cy.findByRole('button', {name: 'Open Popup'}).should('not.have.focus');
+          });
+        });
+      });
+
+      context('when the user scrolls to the right', () => {
+        beforeEach(() => {
+          cy.findByTestId('scroll-area').scrollTo('right');
+        });
+
+        context('when the user clicks outside', () => {
+          beforeEach(() => {
+            cy.get('body').click('top');
+          });
+
+          it('should not focus the "Open Popup" button', () => {
+            cy.findByRole('button', {name: 'Open Popup'}).should('not.have.focus');
+          });
+        });
+      });
+
+      context('when the user scrolls to the left', () => {
+        beforeEach(() => {
+          cy.findByTestId('scroll-area').scrollTo('left');
+        });
+
+        context('when the user clicks outside', () => {
+          beforeEach(() => {
+            cy.get('body').click('top');
+          });
+
+          it('should not focus the "Open Popup" button', () => {
+            cy.findByRole('button', {name: 'Open Popup'}).should('not.have.focus');
+          });
+        });
+      });
+    });
+  });
+
   context(`given the [Testing/React/Popups/Popup, TooltipReturnFocus] example is rendered`, () => {
     beforeEach(() => {
       h.stories.load('Testing/React/Popups/Popup', 'TooltipReturnFocus');

diff --git a/lerna.json b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "modules/**"
   ],
-  "version": "7.3.14",
+  "version": "7.3.15",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {

diff --git a/modules/codemod/package.json b/modules/codemod/package.json
@@ -2,7 +2,7 @@
   "name": "@workday/canvas-kit-codemod",
   "author": "Workday, Inc. (https://www.workday.com)",
   "license": "Apache-2.0",
-  "version": "7.3.14",
+  "version": "7.3.15",
   "description": "A collection of codemods for use on Workday Canvas Kit packages.",
   "main": "dist/es6/index.js",
   "sideEffects": false,

diff --git a/modules/css-fonts/package.json b/modules/css-fonts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-css-fonts",
-  "version": "7.3.14",
+  "version": "7.3.15",
   "description": "Fonts for canvas-kit-css",
   "author": "Workday, Inc. (https://www.workday.com)",
   "license": "Apache-2.0",

diff --git a/modules/css/action-bar/package.json b/modules/css/action-bar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-css-action-bar",
-  "version": "7.3.14",
+  "version": "7.3.15",
   "description": "Action bar CSS for canvas-kit-css",
   "author": "Workday, Inc. (https://www.workday.com)",
   "license": "Apache-2.0",
@@ -16,8 +16,8 @@
     "url": "http://github.com/Workday/canvas-kit/tree/master/modules/action-bar/css"
   },
   "dependencies": {
-    "@workday/canvas-kit-css-button": "^7.3.14",
-    "@workday/canvas-kit-css-core": "^7.3.14"
+    "@workday/canvas-kit-css-button": "^7.3.15",
+    "@workday/canvas-kit-css-core": "^7.3.15"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

diff --git a/modules/css/badge/package.json b/modules/css/badge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-css-badge",
-  "version": "7.3.14",
+  "version": "7.3.15",
   "description": "provides a summary indicator with dynamic values",
   "author": "Workday, Inc. (https://www.workday.com)",
   "license": "Apache-2.0",

diff --git a/modules/css/banner/package.json b/modules/css/banner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-css-banner",
-  "version": "7.3.14",
+  "version": "7.3.15",
   "description": "Errors and alerts for canvas-kit-css",
   "author": "Workday, Inc. (https://www.workday.com)",
   "license": "Apache-2.0",
@@ -16,7 +16,7 @@
     "url": "http://github.com/Workday/canvas-kit/tree/master/modules/banner/css"
   },
   "dependencies": {
-    "@workday/canvas-kit-css-core": "^7.3.14",
+    "@workday/canvas-kit-css-core": "^7.3.15",
     "@workday/canvas-system-icons-web": "^3.0.0"
   },
   "scripts": {

diff --git a/modules/css/button/package.json b/modules/css/button/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-css-button",
-  "version": "7.3.14",
+  "version": "7.3.15",
   "description": "The button css for canvas-kit-css",
   "author": "Workday, Inc. (https://www.workday.com)",
   "license": "Apache-2.0",
@@ -16,7 +16,7 @@
     "url": "http://github.com/Workday/canvas-kit/tree/master/modules/button/css"
   },
   "dependencies": {
-    "@workday/canvas-kit-css-core": "^7.3.14",
+    "@workday/canvas-kit-css-core": "^7.3.15",
     "@workday/canvas-system-icons-web": "^3.0.0"
   },
   "scripts": {

diff --git a/modules/css/card/package.json b/modules/css/card/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-css-card",
-  "version": "7.3.14",
+  "version": "7.3.15",
   "description": "Card CSS for canvas-kit-css",
   "author": "Workday, Inc. (https://www.workday.com)",
   "license": "Apache-2.0",
@@ -16,7 +16,7 @@
     "url": "http://github.com/Workday/canvas-kit/tree/master/modules/card/css"
   },
   "dependencies": {
-    "@workday/canvas-kit-css-core": "^7.3.14"
+    "@workday/canvas-kit-css-core": "^7.3.15"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

diff --git a/modules/css/checkbox/package.json b/modules/css/checkbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-css-checkbox",
-  "version": "7.3.14",
+  "version": "7.3.15",
   "description": "The checkbox css for canvas-kit-css",
   "author": "Workday, Inc. (https://www.workday.com)",
   "license": "Apache-2.0",
@@ -29,7 +29,7 @@
     "workday"
   ],
   "dependencies": {
-    "@workday/canvas-kit-css-common": "^7.3.14",
-    "@workday/canvas-kit-css-core": "^7.3.14"
+    "@workday/canvas-kit-css-common": "^7.3.15",
+    "@workday/canvas-kit-css-core": "^7.3.15"
   }
 }
diff --git a/modules/css/common/package.json b/modules/css/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-css-common",
-  "version": "7.3.14",
+  "version": "7.3.15",
   "description": "The common css for canvas-kit-css",
   "author": "Workday, Inc. (https://www.workday.com)",
   "license": "Apache-2.0",
@@ -28,6 +28,6 @@
     "workday"
   ],
   "dependencies": {
-    "@workday/canvas-kit-css-core": "^7.3.14"
+    "@workday/canvas-kit-css-core": "^7.3.15"
   }
 }
diff --git a/modules/css/core/package.json b/modules/css/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-css-core",
-  "version": "7.3.14",
+  "version": "7.3.15",
   "description": "The core css for canvas-kit-css",
   "author": "Workday, Inc. (https://www.workday.com)",
   "license": "Apache-2.0",

diff --git a/modules/css/form-field/package.json b/modules/css/form-field/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-css-form-field",
-  "version": "7.3.14",
+  "version": "7.3.15",
   "description": "The form css for canvas-kit-css",
   "author": "Workday, Inc. (https://www.workday.com)",
   "license": "Apache-2.0",
@@ -16,16 +16,16 @@
     "url": "http://github.com/Workday/canvas-kit/tree/master/modules/form-field/css"
   },
   "dependencies": {
-    "@workday/canvas-kit-css-common": "^7.3.14",
-    "@workday/canvas-kit-css-core": "^7.3.14",
+    "@workday/canvas-kit-css-common": "^7.3.15",
+    "@workday/canvas-kit-css-core": "^7.3.15",
     "@workday/canvas-system-icons-web": "^3.0.0"
   },
   "devDependencies": {
-    "@workday/canvas-kit-css-checkbox": "^7.3.14",
-    "@workday/canvas-kit-css-radio": "^7.3.14",
-    "@workday/canvas-kit-css-select": "^7.3.14",
-    "@workday/canvas-kit-css-text-area": "^7.3.14",
-    "@workday/canvas-kit-css-text-input": "^7.3.14"
+    "@workday/canvas-kit-css-checkbox": "^7.3.15",
+    "@workday/canvas-kit-css-radio": "^7.3.15",
+    "@workday/canvas-kit-css-select": "^7.3.15",
+    "@workday/canvas-kit-css-text-area": "^7.3.15",
+    "@workday/canvas-kit-css-text-input": "^7.3.15"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

diff --git a/modules/css/icon/package.json b/modules/css/icon/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-css-icon",
-  "version": "7.3.14",
+  "version": "7.3.15",
   "description": "Icon toolkit for Canvas kit",
   "author": "Workday, Inc. (https://www.workday.com)",
   "license": "Apache-2.0",
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@workday/canvas-colors-web": "^2.0.0",
-    "@workday/canvas-kit-css-core": "^7.3.14",
+    "@workday/canvas-kit-css-core": "^7.3.15",
     "svg-injector": "^1.1.3",
     "to-slug-case": "^1.0.0"
   },

diff --git a/modules/css/layout/package.json b/modules/css/layout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-css-layout",
-  "version": "7.3.14",
+  "version": "7.3.15",
   "description": "Layout css for canvas-kit-css",
   "author": "Workday, Inc. (https://www.workday.com)",
   "license": "Apache-2.0",
@@ -16,7 +16,7 @@
     "url": "http://github.com/Workday/canvas-kit/tree/master/modules/layout/css"
   },
   "dependencies": {
-    "@workday/canvas-kit-css-core": "^7.3.14"
+    "@workday/canvas-kit-css-core": "^7.3.15"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

diff --git a/modules/css/loading-animation/package.json b/modules/css/loading-animation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-css-loading-animation",
-  "version": "7.3.14",
+  "version": "7.3.15",
   "description": "Animations used while a page or component is loading.",
   "author": "Workday, Inc. (https://www.workday.com)",
   "license": "Apache-2.0",
@@ -16,7 +16,7 @@
     "url": "http://github.com/Workday/canvas-kit/tree/master/modules/loading-animation/css"
   },
   "dependencies": {
-    "@workday/canvas-kit-css-core": "^7.3.14"
+    "@workday/canvas-kit-css-core": "^7.3.15"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

diff --git a/modules/css/menu/package.json b/modules/css/menu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-css-menu",
-  "version": "7.3.14",
+  "version": "7.3.15",
   "description": "Menu CSS for Canvas kit CSS",
   "author": "Workday, Inc. (https://www.workday.com)",
   "license": "Apache-2.0",
@@ -16,7 +16,7 @@
     "url": "http://github.com/Workday/canvas-kit/tree/master/modules/menu/css"
   },
   "dependencies": {
-    "@workday/canvas-kit-css-core": "^7.3.14"
+    "@workday/canvas-kit-css-core": "^7.3.15"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

diff --git a/modules/css/modal/package.json b/modules/css/modal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-css-modal",
-  "version": "7.3.14",
+  "version": "7.3.15",
   "description": "Modal CSS for Canvas kit CSS",
   "author": "Workday, Inc. (https://www.workday.com)",
   "license": "Apache-2.0",
@@ -16,8 +16,8 @@
     "url": "http://github.com/Workday/canvas-kit/tree/master/modules/modal/css"
   },
   "dependencies": {
-    "@workday/canvas-kit-css-core": "^7.3.14",
-    "@workday/canvas-kit-css-popup": "^7.3.14"
+    "@workday/canvas-kit-css-core": "^7.3.15",
+    "@workday/canvas-kit-css-popup": "^7.3.15"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",