@workday/canvas-kit-react 7.4.0-next.1 → 7.4.0-next.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commonjs/popup/lib/hooks/useReturnFocus.d.ts.map +1 -1
- package/dist/commonjs/popup/lib/hooks/useReturnFocus.js +3 -0
- package/dist/es6/popup/lib/hooks/useReturnFocus.d.ts.map +1 -1
- package/dist/es6/popup/lib/hooks/useReturnFocus.js +3 -0
- package/package.json +3 -3
- package/popup/lib/hooks/useReturnFocus.tsx +4 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useReturnFocus.d.ts","sourceRoot":"","sources":["../../../../../popup/lib/hooks/useReturnFocus.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAgC1B;;;;;;GAMG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"useReturnFocus.d.ts","sourceRoot":"","sources":["../../../../../popup/lib/hooks/useReturnFocus.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAgC1B;;;;;;GAMG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;OAyGzB,CAAC"}
|
|
@@ -90,6 +90,9 @@ exports.useReturnFocus = common_1.createElemPropsHook(usePopupModel_1.usePopupMo
|
|
|
90
90
|
document.removeEventListener('mouseup', onMouseUp, true);
|
|
91
91
|
document.removeEventListener('keydown', onKeyDown, true);
|
|
92
92
|
document.removeEventListener('keyup', onKeyUp, true);
|
|
93
|
+
if (!element) {
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
93
96
|
var scrollParent = getScrollParent(element);
|
|
94
97
|
var scrollParentRect = scrollParent.getBoundingClientRect();
|
|
95
98
|
var elementRect = element.getBoundingClientRect();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useReturnFocus.d.ts","sourceRoot":"","sources":["../../../../../popup/lib/hooks/useReturnFocus.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAgC1B;;;;;;GAMG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"useReturnFocus.d.ts","sourceRoot":"","sources":["../../../../../popup/lib/hooks/useReturnFocus.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAgC1B;;;;;;GAMG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;OAyGzB,CAAC"}
|
|
@@ -84,6 +84,9 @@ export var useReturnFocus = createElemPropsHook(usePopupModel)(function (model)
|
|
|
84
84
|
document.removeEventListener('mouseup', onMouseUp, true);
|
|
85
85
|
document.removeEventListener('keydown', onKeyDown, true);
|
|
86
86
|
document.removeEventListener('keyup', onKeyUp, true);
|
|
87
|
+
if (!element) {
|
|
88
|
+
return;
|
|
89
|
+
}
|
|
87
90
|
var scrollParent = getScrollParent(element);
|
|
88
91
|
var scrollParentRect = scrollParent.getBoundingClientRect();
|
|
89
92
|
var elementRect = element.getBoundingClientRect();
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@workday/canvas-kit-react",
|
|
3
|
-
"version": "7.4.0-next.
|
|
3
|
+
"version": "7.4.0-next.2+8fa218c6",
|
|
4
4
|
"description": "The parent module that contains all Workday Canvas Kit React components",
|
|
5
5
|
"author": "Workday, Inc. (https://www.workday.com)",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"@emotion/styled": "^11.6.0",
|
|
50
50
|
"@popperjs/core": "^2.5.4",
|
|
51
51
|
"@workday/canvas-colors-web": "^2.0.0",
|
|
52
|
-
"@workday/canvas-kit-popup-stack": "^7.4.0-next.
|
|
52
|
+
"@workday/canvas-kit-popup-stack": "^7.4.0-next.2+8fa218c6",
|
|
53
53
|
"@workday/canvas-system-icons-web": "^3.0.0",
|
|
54
54
|
"@workday/design-assets-types": "^0.2.8",
|
|
55
55
|
"chroma-js": "^2.1.0",
|
|
@@ -68,5 +68,5 @@
|
|
|
68
68
|
"@workday/canvas-accent-icons-web": "^3.0.0",
|
|
69
69
|
"@workday/canvas-applet-icons-web": "^2.0.0"
|
|
70
70
|
},
|
|
71
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "8fa218c6bce7dce3e7a4723802cac972f7d928cc"
|
|
72
72
|
}
|
|
@@ -87,7 +87,7 @@ export const useReturnFocus = createElemPropsHook(usePopupModel)(model => {
|
|
|
87
87
|
return;
|
|
88
88
|
}
|
|
89
89
|
// capture the element here. The refs will be null by the time the cleanup function is called
|
|
90
|
-
const element = (model.state.returnFocusRef || model.state.targetRef).current as HTMLElement;
|
|
90
|
+
const element = (model.state.returnFocusRef || model.state.targetRef).current as HTMLElement | null;
|
|
91
91
|
document.addEventListener('mousedown', onMouseDown, true);
|
|
92
92
|
document.addEventListener('mouseup', onMouseUp, true);
|
|
93
93
|
document.addEventListener('keydown', onKeyDown, true);
|
|
@@ -98,6 +98,9 @@ export const useReturnFocus = createElemPropsHook(usePopupModel)(model => {
|
|
|
98
98
|
document.removeEventListener('mouseup', onMouseUp, true);
|
|
99
99
|
document.removeEventListener('keydown', onKeyDown, true);
|
|
100
100
|
document.removeEventListener('keyup', onKeyUp, true);
|
|
101
|
+
if (!element) {
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
101
104
|
const scrollParent = getScrollParent(element);
|
|
102
105
|
const scrollParentRect = scrollParent.getBoundingClientRect();
|
|
103
106
|
const elementRect = element.getBoundingClientRect();
|