@doyourjob/gravity-ui-page-constructor-addons 2.1.52 → 2.1.54
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/build/cjs/components/NewHeader/components/NHLoginButton/NHLoginButton.js +10 -1
- package/build/cjs/components/NewHeader/components/NHNavigationItem/NHNavigationItem.js +9 -3
- package/build/cjs/components/NewHeader/components/NHPopupItem/NHPopupItem.css +1 -1
- package/build/esm/components/NewHeader/components/NHLoginButton/NHLoginButton.js +10 -1
- package/build/esm/components/NewHeader/components/NHNavigationItem/NHNavigationItem.js +9 -3
- package/build/esm/components/NewHeader/components/NHPopupItem/NHPopupItem.css +1 -1
- package/package.json +1 -1
|
@@ -29,6 +29,9 @@ const NHLoginButton = ({ data, headerRef, setupRouteChangeHandler }) => {
|
|
|
29
29
|
}, [isActive, previouslyFocusedElement]);
|
|
30
30
|
const handleMouseEnter = (0, react_1.useCallback)(() => handleActiveTab(true), [handleActiveTab]);
|
|
31
31
|
const handleMouseLeave = (0, react_1.useCallback)(() => handleActiveTab(false), [handleActiveTab]);
|
|
32
|
+
const handleMouseDown = (0, react_1.useCallback)((event) => {
|
|
33
|
+
event.preventDefault();
|
|
34
|
+
}, []);
|
|
32
35
|
const handleToggle = (0, react_1.useCallback)(() => {
|
|
33
36
|
const focusedElement = document.activeElement;
|
|
34
37
|
const nextIsActive = !isActive;
|
|
@@ -39,6 +42,12 @@ const NHLoginButton = ({ data, headerRef, setupRouteChangeHandler }) => {
|
|
|
39
42
|
focusedElement === null || focusedElement === void 0 ? void 0 : focusedElement.focus({ preventScroll: true });
|
|
40
43
|
}
|
|
41
44
|
}, [isActive]);
|
|
45
|
+
const handleKeyDown = (0, react_1.useCallback)((event) => {
|
|
46
|
+
if (event.key === 'Enter' || event.key === ' ') {
|
|
47
|
+
event.preventDefault();
|
|
48
|
+
handleToggle();
|
|
49
|
+
}
|
|
50
|
+
}, [handleToggle]);
|
|
42
51
|
(0, react_1.useEffect)(() => {
|
|
43
52
|
const timerId = setTimeout(() => {
|
|
44
53
|
setIsActive(pretendentActiveTab);
|
|
@@ -55,7 +64,7 @@ const NHLoginButton = ({ data, headerRef, setupRouteChangeHandler }) => {
|
|
|
55
64
|
handleMouseLeave();
|
|
56
65
|
}), [handleMouseLeave, setupRouteChangeHandler]);
|
|
57
66
|
return (react_1.default.createElement("div", { className: b('wrapper'), onMouseEnter: handleMouseEnter, onMouseLeave: handleMouseLeave },
|
|
58
|
-
react_1.default.createElement("button", { className: b(), type: "button",
|
|
67
|
+
react_1.default.createElement("button", { className: b(), type: "button", onMouseDown: handleMouseDown, onKeyDown: handleKeyDown, "aria-expanded": isActive, "aria-controls": popupId },
|
|
59
68
|
data.text,
|
|
60
69
|
react_1.default.createElement(uikit_1.Icon, { data: isActive ? ChevronUp_1.ChevronUp : ChevronDown_1.ChevronDown, size: 16 })),
|
|
61
70
|
isActive && (react_1.default.createElement(NHNavigationPopup_1.NHNavigationPopup, { headerRef: headerRef, id: popupId },
|
|
@@ -17,7 +17,9 @@ const NHNavigationItem = ({ item, isActive, handleActiveTab, handleFocusTab, han
|
|
|
17
17
|
const setupRouteChangeHandler = (0, react_1.useContext)(route_change_1.RouteChangeHandlerContext);
|
|
18
18
|
const handleMouseEnter = (0, react_1.useCallback)(() => handleActiveTab(index), [handleActiveTab, index]);
|
|
19
19
|
const handleMouseLeave = (0, react_1.useCallback)(() => handleActiveTab(constants_1.NO_MENU_TAB_SELECTED), [handleActiveTab]);
|
|
20
|
-
const
|
|
20
|
+
const handleMouseDown = (0, react_1.useCallback)((event) => {
|
|
21
|
+
event.preventDefault();
|
|
22
|
+
}, []);
|
|
21
23
|
const handlePopupFocus = (0, react_1.useCallback)(() => handleFocusTab(index), [handleFocusTab, index]);
|
|
22
24
|
const handleLinkFocus = (0, react_1.useCallback)(() => handleFocusTab(constants_1.NO_MENU_TAB_SELECTED), [handleFocusTab]);
|
|
23
25
|
const handleKeyDown = (0, react_1.useCallback)((event) => {
|
|
@@ -25,7 +27,11 @@ const NHNavigationItem = ({ item, isActive, handleActiveTab, handleFocusTab, han
|
|
|
25
27
|
event.preventDefault();
|
|
26
28
|
handleFocusTabPopup(index);
|
|
27
29
|
}
|
|
28
|
-
|
|
30
|
+
else if (event.key === 'Enter' || event.key === ' ') {
|
|
31
|
+
event.preventDefault();
|
|
32
|
+
handleToggleTab(index);
|
|
33
|
+
}
|
|
34
|
+
}, [handleFocusTabPopup, handleToggleTab, index]);
|
|
29
35
|
(0, react_1.useEffect)(() => setupRouteChangeHandler === null || setupRouteChangeHandler === void 0 ? void 0 : setupRouteChangeHandler(() => {
|
|
30
36
|
handleMouseLeave();
|
|
31
37
|
}), [handleMouseLeave, setupRouteChangeHandler]);
|
|
@@ -35,7 +41,7 @@ const NHNavigationItem = ({ item, isActive, handleActiveTab, handleFocusTab, han
|
|
|
35
41
|
children));
|
|
36
42
|
}
|
|
37
43
|
return (react_1.default.createElement("li", { className: b({}), onMouseEnter: handleMouseEnter, onMouseLeave: handleMouseLeave },
|
|
38
|
-
react_1.default.createElement("button", { className: b('text', { active: isActive, cursor: 'default' }), type: "button",
|
|
44
|
+
react_1.default.createElement("button", { className: b('text', { active: isActive, cursor: 'default' }), type: "button", onMouseDown: handleMouseDown, onFocus: handlePopupFocus, onKeyDown: handleKeyDown, "aria-expanded": isActive, "aria-controls": tooltipId },
|
|
39
45
|
item.title,
|
|
40
46
|
react_1.default.createElement(uikit_1.Icon, { className: b('icon'), data: isActive ? ChevronUp_1.ChevronUp : ChevronDown_1.ChevronDown, size: 16 })),
|
|
41
47
|
children));
|
|
@@ -57,7 +57,7 @@ unpredictable css rules order in build */
|
|
|
57
57
|
opacity: 1;
|
|
58
58
|
}
|
|
59
59
|
|
|
60
|
-
.pc-addons-nh-navigation-popup-item:focus
|
|
60
|
+
.pc-addons-nh-navigation-popup-item:focus-visible, .pc-addons-nh-navigation-popup-item[data-keyboard-focus=true] {
|
|
61
61
|
outline: 2px solid var(--g-color-line-focus);
|
|
62
62
|
outline-offset: 4px;
|
|
63
63
|
}
|
|
@@ -26,6 +26,9 @@ export const NHLoginButton = ({ data, headerRef, setupRouteChangeHandler }) => {
|
|
|
26
26
|
}, [isActive, previouslyFocusedElement]);
|
|
27
27
|
const handleMouseEnter = useCallback(() => handleActiveTab(true), [handleActiveTab]);
|
|
28
28
|
const handleMouseLeave = useCallback(() => handleActiveTab(false), [handleActiveTab]);
|
|
29
|
+
const handleMouseDown = useCallback((event) => {
|
|
30
|
+
event.preventDefault();
|
|
31
|
+
}, []);
|
|
29
32
|
const handleToggle = useCallback(() => {
|
|
30
33
|
const focusedElement = document.activeElement;
|
|
31
34
|
const nextIsActive = !isActive;
|
|
@@ -36,6 +39,12 @@ export const NHLoginButton = ({ data, headerRef, setupRouteChangeHandler }) => {
|
|
|
36
39
|
focusedElement === null || focusedElement === void 0 ? void 0 : focusedElement.focus({ preventScroll: true });
|
|
37
40
|
}
|
|
38
41
|
}, [isActive]);
|
|
42
|
+
const handleKeyDown = useCallback((event) => {
|
|
43
|
+
if (event.key === 'Enter' || event.key === ' ') {
|
|
44
|
+
event.preventDefault();
|
|
45
|
+
handleToggle();
|
|
46
|
+
}
|
|
47
|
+
}, [handleToggle]);
|
|
39
48
|
useEffect(() => {
|
|
40
49
|
const timerId = setTimeout(() => {
|
|
41
50
|
setIsActive(pretendentActiveTab);
|
|
@@ -52,7 +61,7 @@ export const NHLoginButton = ({ data, headerRef, setupRouteChangeHandler }) => {
|
|
|
52
61
|
handleMouseLeave();
|
|
53
62
|
}), [handleMouseLeave, setupRouteChangeHandler]);
|
|
54
63
|
return (React.createElement("div", { className: b('wrapper'), onMouseEnter: handleMouseEnter, onMouseLeave: handleMouseLeave },
|
|
55
|
-
React.createElement("button", { className: b(), type: "button",
|
|
64
|
+
React.createElement("button", { className: b(), type: "button", onMouseDown: handleMouseDown, onKeyDown: handleKeyDown, "aria-expanded": isActive, "aria-controls": popupId },
|
|
56
65
|
data.text,
|
|
57
66
|
React.createElement(Icon, { data: isActive ? ChevronUp : ChevronDown, size: 16 })),
|
|
58
67
|
isActive && (React.createElement(NHNavigationPopup, { headerRef: headerRef, id: popupId },
|
|
@@ -14,7 +14,9 @@ export const NHNavigationItem = ({ item, isActive, handleActiveTab, handleFocusT
|
|
|
14
14
|
const setupRouteChangeHandler = useContext(RouteChangeHandlerContext);
|
|
15
15
|
const handleMouseEnter = useCallback(() => handleActiveTab(index), [handleActiveTab, index]);
|
|
16
16
|
const handleMouseLeave = useCallback(() => handleActiveTab(NO_MENU_TAB_SELECTED), [handleActiveTab]);
|
|
17
|
-
const
|
|
17
|
+
const handleMouseDown = useCallback((event) => {
|
|
18
|
+
event.preventDefault();
|
|
19
|
+
}, []);
|
|
18
20
|
const handlePopupFocus = useCallback(() => handleFocusTab(index), [handleFocusTab, index]);
|
|
19
21
|
const handleLinkFocus = useCallback(() => handleFocusTab(NO_MENU_TAB_SELECTED), [handleFocusTab]);
|
|
20
22
|
const handleKeyDown = useCallback((event) => {
|
|
@@ -22,7 +24,11 @@ export const NHNavigationItem = ({ item, isActive, handleActiveTab, handleFocusT
|
|
|
22
24
|
event.preventDefault();
|
|
23
25
|
handleFocusTabPopup(index);
|
|
24
26
|
}
|
|
25
|
-
|
|
27
|
+
else if (event.key === 'Enter' || event.key === ' ') {
|
|
28
|
+
event.preventDefault();
|
|
29
|
+
handleToggleTab(index);
|
|
30
|
+
}
|
|
31
|
+
}, [handleFocusTabPopup, handleToggleTab, index]);
|
|
26
32
|
useEffect(() => setupRouteChangeHandler === null || setupRouteChangeHandler === void 0 ? void 0 : setupRouteChangeHandler(() => {
|
|
27
33
|
handleMouseLeave();
|
|
28
34
|
}), [handleMouseLeave, setupRouteChangeHandler]);
|
|
@@ -32,7 +38,7 @@ export const NHNavigationItem = ({ item, isActive, handleActiveTab, handleFocusT
|
|
|
32
38
|
children));
|
|
33
39
|
}
|
|
34
40
|
return (React.createElement("li", { className: b({}), onMouseEnter: handleMouseEnter, onMouseLeave: handleMouseLeave },
|
|
35
|
-
React.createElement("button", { className: b('text', { active: isActive, cursor: 'default' }), type: "button",
|
|
41
|
+
React.createElement("button", { className: b('text', { active: isActive, cursor: 'default' }), type: "button", onMouseDown: handleMouseDown, onFocus: handlePopupFocus, onKeyDown: handleKeyDown, "aria-expanded": isActive, "aria-controls": tooltipId },
|
|
36
42
|
item.title,
|
|
37
43
|
React.createElement(Icon, { className: b('icon'), data: isActive ? ChevronUp : ChevronDown, size: 16 })),
|
|
38
44
|
children));
|
|
@@ -57,7 +57,7 @@ unpredictable css rules order in build */
|
|
|
57
57
|
opacity: 1;
|
|
58
58
|
}
|
|
59
59
|
|
|
60
|
-
.pc-addons-nh-navigation-popup-item:focus
|
|
60
|
+
.pc-addons-nh-navigation-popup-item:focus-visible, .pc-addons-nh-navigation-popup-item[data-keyboard-focus=true] {
|
|
61
61
|
outline: 2px solid var(--g-color-line-focus);
|
|
62
62
|
outline-offset: 4px;
|
|
63
63
|
}
|