@citygross/components 0.7.102 → 0.7.103
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.
|
@@ -14,7 +14,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
|
|
|
14
14
|
var Nav = function (_a) {
|
|
15
15
|
var _b;
|
|
16
16
|
var logo = _a.logo, maxWidth = _a.maxWidth, height = _a.height, topPosition = _a.topPosition, mainLinks = _a.mainLinks, rightContent = _a.rightContent, searchResultElement = _a.searchResultElement, searchCancelLabel = _a.searchCancelLabel, searchIcon = _a.searchIcon, searchPlaceHolder = _a.searchPlaceHolder, searchOnChange = _a.searchOnChange, searchValue = _a.searchValue, searchOnSubmit = _a.searchOnSubmit, onSearchClick = _a.onSearchClick, closeSearch = _a.closeSearch, searchIsOpen = _a.searchIsOpen;
|
|
17
|
-
var
|
|
17
|
+
var navContainerRef = React.useRef(null);
|
|
18
18
|
var searchInputRef = React.useRef(null);
|
|
19
19
|
var searchInputMobileRef = React.useRef(null);
|
|
20
20
|
var navRef = React.useRef(null);
|
|
@@ -43,8 +43,8 @@ var Nav = function (_a) {
|
|
|
43
43
|
React__default["default"].useEffect(function () {
|
|
44
44
|
var handleClick = function (event) {
|
|
45
45
|
var _a;
|
|
46
|
-
if ((
|
|
47
|
-
!((_a =
|
|
46
|
+
if ((navContainerRef === null || navContainerRef === void 0 ? void 0 : navContainerRef.current) &&
|
|
47
|
+
!((_a = navContainerRef.current) === null || _a === void 0 ? void 0 : _a.contains(event.target))) {
|
|
48
48
|
event.stopPropagation();
|
|
49
49
|
closeSearch && closeSearch();
|
|
50
50
|
}
|
|
@@ -53,14 +53,14 @@ var Nav = function (_a) {
|
|
|
53
53
|
return function () {
|
|
54
54
|
document.removeEventListener('click', function (e) { return handleClick(e); }, true);
|
|
55
55
|
};
|
|
56
|
-
}, [
|
|
56
|
+
}, [navContainerRef]);
|
|
57
57
|
return (React__default["default"].createElement(Nav_styles.Nav, { height: height, topPosition: topPosition, ref: navRef },
|
|
58
|
-
React__default["default"].createElement(Nav_styles.NavContainer, { maxWidth: maxWidth },
|
|
58
|
+
React__default["default"].createElement(Nav_styles.NavContainer, { maxWidth: maxWidth, ref: navContainerRef },
|
|
59
59
|
logo,
|
|
60
60
|
React__default["default"].createElement(Nav_styles.NavChildContainer, null,
|
|
61
|
-
searchIsOpen ? (React__default["default"].createElement(Nav_styles.NavSearchContainer,
|
|
61
|
+
searchIsOpen ? (React__default["default"].createElement(Nav_styles.NavSearchContainer, null,
|
|
62
62
|
React__default["default"].createElement(SearchBar.SearchBar, { icon: searchIcon, cancelLabel: searchCancelLabel, flexGrow: 1, placeholder: searchPlaceHolder, onChange: searchOnChange, value: searchValue, inputRef: searchInputRef, searchInputMobileRef: searchInputMobileRef, searchOnSubmit: searchOnSubmit, isOpen: searchIsOpen }, searchResultElement))) : (React__default["default"].createElement(React__default["default"].Fragment, null,
|
|
63
|
-
React__default["default"].createElement(Nav_styles.NavMainLinks, null, (_b = mainLinks === null || mainLinks === void 0 ? void 0 : mainLinks.slice(0, mainLinks.length - elToRemove)) === null || _b === void 0 ? void 0 : _b.map(function (link) { return link; })),
|
|
63
|
+
React__default["default"].createElement(Nav_styles.NavMainLinks, null, (_b = mainLinks === null || mainLinks === void 0 ? void 0 : mainLinks.slice(0, (mainLinks === null || mainLinks === void 0 ? void 0 : mainLinks.length) - elToRemove)) === null || _b === void 0 ? void 0 : _b.map(function (link) { return link; })),
|
|
64
64
|
React__default["default"].createElement(Nav_styles.NavDummySearchContainer, { onClick: function () {
|
|
65
65
|
onSearchClick && onSearchClick();
|
|
66
66
|
} },
|
|
@@ -6,7 +6,7 @@ import { Nav as Nav$1, NavContainer, NavChildContainer, NavSearchContainer, NavM
|
|
|
6
6
|
var Nav = function (_a) {
|
|
7
7
|
var _b;
|
|
8
8
|
var logo = _a.logo, maxWidth = _a.maxWidth, height = _a.height, topPosition = _a.topPosition, mainLinks = _a.mainLinks, rightContent = _a.rightContent, searchResultElement = _a.searchResultElement, searchCancelLabel = _a.searchCancelLabel, searchIcon = _a.searchIcon, searchPlaceHolder = _a.searchPlaceHolder, searchOnChange = _a.searchOnChange, searchValue = _a.searchValue, searchOnSubmit = _a.searchOnSubmit, onSearchClick = _a.onSearchClick, closeSearch = _a.closeSearch, searchIsOpen = _a.searchIsOpen;
|
|
9
|
-
var
|
|
9
|
+
var navContainerRef = useRef(null);
|
|
10
10
|
var searchInputRef = useRef(null);
|
|
11
11
|
var searchInputMobileRef = useRef(null);
|
|
12
12
|
var navRef = useRef(null);
|
|
@@ -35,8 +35,8 @@ var Nav = function (_a) {
|
|
|
35
35
|
React.useEffect(function () {
|
|
36
36
|
var handleClick = function (event) {
|
|
37
37
|
var _a;
|
|
38
|
-
if ((
|
|
39
|
-
!((_a =
|
|
38
|
+
if ((navContainerRef === null || navContainerRef === void 0 ? void 0 : navContainerRef.current) &&
|
|
39
|
+
!((_a = navContainerRef.current) === null || _a === void 0 ? void 0 : _a.contains(event.target))) {
|
|
40
40
|
event.stopPropagation();
|
|
41
41
|
closeSearch && closeSearch();
|
|
42
42
|
}
|
|
@@ -45,14 +45,14 @@ var Nav = function (_a) {
|
|
|
45
45
|
return function () {
|
|
46
46
|
document.removeEventListener('click', function (e) { return handleClick(e); }, true);
|
|
47
47
|
};
|
|
48
|
-
}, [
|
|
48
|
+
}, [navContainerRef]);
|
|
49
49
|
return (React.createElement(Nav$1, { height: height, topPosition: topPosition, ref: navRef },
|
|
50
|
-
React.createElement(NavContainer, { maxWidth: maxWidth },
|
|
50
|
+
React.createElement(NavContainer, { maxWidth: maxWidth, ref: navContainerRef },
|
|
51
51
|
logo,
|
|
52
52
|
React.createElement(NavChildContainer, null,
|
|
53
|
-
searchIsOpen ? (React.createElement(NavSearchContainer,
|
|
53
|
+
searchIsOpen ? (React.createElement(NavSearchContainer, null,
|
|
54
54
|
React.createElement(SearchBar, { icon: searchIcon, cancelLabel: searchCancelLabel, flexGrow: 1, placeholder: searchPlaceHolder, onChange: searchOnChange, value: searchValue, inputRef: searchInputRef, searchInputMobileRef: searchInputMobileRef, searchOnSubmit: searchOnSubmit, isOpen: searchIsOpen }, searchResultElement))) : (React.createElement(React.Fragment, null,
|
|
55
|
-
React.createElement(NavMainLinks, null, (_b = mainLinks === null || mainLinks === void 0 ? void 0 : mainLinks.slice(0, mainLinks.length - elToRemove)) === null || _b === void 0 ? void 0 : _b.map(function (link) { return link; })),
|
|
55
|
+
React.createElement(NavMainLinks, null, (_b = mainLinks === null || mainLinks === void 0 ? void 0 : mainLinks.slice(0, (mainLinks === null || mainLinks === void 0 ? void 0 : mainLinks.length) - elToRemove)) === null || _b === void 0 ? void 0 : _b.map(function (link) { return link; })),
|
|
56
56
|
React.createElement(NavDummySearchContainer, { onClick: function () {
|
|
57
57
|
onSearchClick && onSearchClick();
|
|
58
58
|
} },
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@citygross/components",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.103",
|
|
4
4
|
"license": "ISC",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"main": "./build/cjs/components/src/index.js",
|
|
@@ -71,5 +71,5 @@
|
|
|
71
71
|
"moment": "^2.29.1",
|
|
72
72
|
"react-loading-skeleton": "^2.2.0"
|
|
73
73
|
},
|
|
74
|
-
"gitHead": "
|
|
74
|
+
"gitHead": "b357dd2831ef445c6d7a5214171d4999ea055398"
|
|
75
75
|
}
|