@doyourjob/gravity-ui-page-constructor-addons 2.1.53 → 2.1.55

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.
Files changed (7) hide show
  1. package/build/cjs/components/NewHeader/components/NHLoginButton/NHLoginButton.js +14 -2
  2. package/build/cjs/components/NewHeader/components/NHNavigation/NHNavigation.js +5 -1
  3. package/build/cjs/components/NewHeader/components/NHPopupItem/NHPopupItem.css +1 -1
  4. package/build/esm/components/NewHeader/components/NHLoginButton/NHLoginButton.js +14 -2
  5. package/build/esm/components/NewHeader/components/NHNavigation/NHNavigation.js +5 -1
  6. package/build/esm/components/NewHeader/components/NHPopupItem/NHPopupItem.css +1 -1
  7. package/package.json +1 -1
package/build/cjs/components/NewHeader/components/NHLoginButton/NHLoginButton.js CHANGED
@@ -19,7 +19,10 @@ const NHLoginButton = ({ data, headerRef, setupRouteChangeHandler }) => {
19
19
  const handleActiveTab = (0, react_1.useCallback)((val) => {
20
20
  setPreviouslyFocusedElement(document.activeElement);
21
21
  setPretendentAciveTab(val);
22
- }, []);
22
+ if (!isActive && val) {
23
+ setIsActive(true);
24
+ }
25
+ }, [isActive]);
23
26
  const onEscapeKeyDown = (0, react_1.useCallback)((event) => {
24
27
  if (event.key === 'Escape' && isActive) {
25
28
  setIsActive(false);
@@ -29,6 +32,9 @@ const NHLoginButton = ({ data, headerRef, setupRouteChangeHandler }) => {
29
32
  }, [isActive, previouslyFocusedElement]);
30
33
  const handleMouseEnter = (0, react_1.useCallback)(() => handleActiveTab(true), [handleActiveTab]);
31
34
  const handleMouseLeave = (0, react_1.useCallback)(() => handleActiveTab(false), [handleActiveTab]);
35
+ const handleMouseDown = (0, react_1.useCallback)((event) => {
36
+ event.preventDefault();
37
+ }, []);
32
38
  const handleToggle = (0, react_1.useCallback)(() => {
33
39
  const focusedElement = document.activeElement;
34
40
  const nextIsActive = !isActive;
@@ -39,6 +45,12 @@ const NHLoginButton = ({ data, headerRef, setupRouteChangeHandler }) => {
39
45
  focusedElement === null || focusedElement === void 0 ? void 0 : focusedElement.focus({ preventScroll: true });
40
46
  }
41
47
  }, [isActive]);
48
+ const handleKeyDown = (0, react_1.useCallback)((event) => {
49
+ if (event.key === 'Enter' || event.key === ' ') {
50
+ event.preventDefault();
51
+ handleToggle();
52
+ }
53
+ }, [handleToggle]);
42
54
  (0, react_1.useEffect)(() => {
43
55
  const timerId = setTimeout(() => {
44
56
  setIsActive(pretendentActiveTab);
@@ -55,7 +67,7 @@ const NHLoginButton = ({ data, headerRef, setupRouteChangeHandler }) => {
55
67
  handleMouseLeave();
56
68
  }), [handleMouseLeave, setupRouteChangeHandler]);
57
69
  return (react_1.default.createElement("div", { className: b('wrapper'), onMouseEnter: handleMouseEnter, onMouseLeave: handleMouseLeave },
58
- react_1.default.createElement("button", { className: b(), type: "button", onClick: handleToggle, "aria-expanded": isActive, "aria-controls": popupId },
70
+ react_1.default.createElement("button", { className: b(), type: "button", onMouseDown: handleMouseDown, onKeyDown: handleKeyDown, "aria-expanded": isActive, "aria-controls": popupId },
59
71
  data.text,
60
72
  react_1.default.createElement(uikit_1.Icon, { data: isActive ? ChevronUp_1.ChevronUp : ChevronDown_1.ChevronDown, size: 16 })),
61
73
  isActive && (react_1.default.createElement(NHNavigationPopup_1.NHNavigationPopup, { headerRef: headerRef, id: popupId },
package/build/cjs/components/NewHeader/components/NHNavigation/NHNavigation.js CHANGED
@@ -33,8 +33,12 @@ const NHNavigation = ({ activeNavigationId, data, headerRef, navigationId, setup
33
33
  }, [navigationId, setActiveNavigationId]);
34
34
  const handleActiveTab = (0, react_1.useCallback)((currentIndex) => {
35
35
  setPreviouslyFocusedElement(document.activeElement);
36
+ if (activeTab === constants_1.NO_MENU_TAB_SELECTED && currentIndex !== constants_1.NO_MENU_TAB_SELECTED) {
37
+ setNavigationTab(currentIndex);
38
+ return;
39
+ }
36
40
  setPretendentAciveTab(currentIndex);
37
- }, []);
41
+ }, [activeTab, setNavigationTab]);
38
42
  const handleToggleTab = (0, react_1.useCallback)((currentIndex) => {
39
43
  const focusedElement = document.activeElement;
40
44
  const nextActiveTab = activeTab === currentIndex ? constants_1.NO_MENU_TAB_SELECTED : currentIndex;
package/build/cjs/components/NewHeader/components/NHPopupItem/NHPopupItem.css CHANGED
@@ -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, .pc-addons-nh-navigation-popup-item:focus-visible, .pc-addons-nh-navigation-popup-item[data-keyboard-focus=true] {
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
  }
package/build/esm/components/NewHeader/components/NHLoginButton/NHLoginButton.js CHANGED
@@ -16,7 +16,10 @@ export const NHLoginButton = ({ data, headerRef, setupRouteChangeHandler }) => {
16
16
  const handleActiveTab = useCallback((val) => {
17
17
  setPreviouslyFocusedElement(document.activeElement);
18
18
  setPretendentAciveTab(val);
19
- }, []);
19
+ if (!isActive && val) {
20
+ setIsActive(true);
21
+ }
22
+ }, [isActive]);
20
23
  const onEscapeKeyDown = useCallback((event) => {
21
24
  if (event.key === 'Escape' && isActive) {
22
25
  setIsActive(false);
@@ -26,6 +29,9 @@ export const NHLoginButton = ({ data, headerRef, setupRouteChangeHandler }) => {
26
29
  }, [isActive, previouslyFocusedElement]);
27
30
  const handleMouseEnter = useCallback(() => handleActiveTab(true), [handleActiveTab]);
28
31
  const handleMouseLeave = useCallback(() => handleActiveTab(false), [handleActiveTab]);
32
+ const handleMouseDown = useCallback((event) => {
33
+ event.preventDefault();
34
+ }, []);
29
35
  const handleToggle = useCallback(() => {
30
36
  const focusedElement = document.activeElement;
31
37
  const nextIsActive = !isActive;
@@ -36,6 +42,12 @@ export const NHLoginButton = ({ data, headerRef, setupRouteChangeHandler }) => {
36
42
  focusedElement === null || focusedElement === void 0 ? void 0 : focusedElement.focus({ preventScroll: true });
37
43
  }
38
44
  }, [isActive]);
45
+ const handleKeyDown = useCallback((event) => {
46
+ if (event.key === 'Enter' || event.key === ' ') {
47
+ event.preventDefault();
48
+ handleToggle();
49
+ }
50
+ }, [handleToggle]);
39
51
  useEffect(() => {
40
52
  const timerId = setTimeout(() => {
41
53
  setIsActive(pretendentActiveTab);
@@ -52,7 +64,7 @@ export const NHLoginButton = ({ data, headerRef, setupRouteChangeHandler }) => {
52
64
  handleMouseLeave();
53
65
  }), [handleMouseLeave, setupRouteChangeHandler]);
54
66
  return (React.createElement("div", { className: b('wrapper'), onMouseEnter: handleMouseEnter, onMouseLeave: handleMouseLeave },
55
- React.createElement("button", { className: b(), type: "button", onClick: handleToggle, "aria-expanded": isActive, "aria-controls": popupId },
67
+ React.createElement("button", { className: b(), type: "button", onMouseDown: handleMouseDown, onKeyDown: handleKeyDown, "aria-expanded": isActive, "aria-controls": popupId },
56
68
  data.text,
57
69
  React.createElement(Icon, { data: isActive ? ChevronUp : ChevronDown, size: 16 })),
58
70
  isActive && (React.createElement(NHNavigationPopup, { headerRef: headerRef, id: popupId },
package/build/esm/components/NewHeader/components/NHNavigation/NHNavigation.js CHANGED
@@ -30,8 +30,12 @@ export const NHNavigation = ({ activeNavigationId, data, headerRef, navigationId
30
30
  }, [navigationId, setActiveNavigationId]);
31
31
  const handleActiveTab = useCallback((currentIndex) => {
32
32
  setPreviouslyFocusedElement(document.activeElement);
33
+ if (activeTab === NO_MENU_TAB_SELECTED && currentIndex !== NO_MENU_TAB_SELECTED) {
34
+ setNavigationTab(currentIndex);
35
+ return;
36
+ }
33
37
  setPretendentAciveTab(currentIndex);
34
- }, []);
38
+ }, [activeTab, setNavigationTab]);
35
39
  const handleToggleTab = useCallback((currentIndex) => {
36
40
  const focusedElement = document.activeElement;
37
41
  const nextActiveTab = activeTab === currentIndex ? NO_MENU_TAB_SELECTED : currentIndex;
package/build/esm/components/NewHeader/components/NHPopupItem/NHPopupItem.css CHANGED
@@ -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, .pc-addons-nh-navigation-popup-item:focus-visible, .pc-addons-nh-navigation-popup-item[data-keyboard-focus=true] {
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
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@doyourjob/gravity-ui-page-constructor-addons",
3
- "version": "2.1.53",
3
+ "version": "2.1.55",
4
4
  "description": "Components and plugins for @doyourjob/gravity-ui-page-constructor",
5
5
  "license": "MIT",
6
6
  "repository": {