luna-one 3.1.512 → 3.1.513

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 (3) hide show
  1. package/dist/luna/other-organisms/SubNav/{SubNavSiblingsMenu.js → SiblingsMenu.js} +48 -30
  2. package/dist/luna/other-organisms/SubNav/SubNav.js +8 -12
  3. package/package.json +1 -1
package/dist/luna/other-organisms/SubNav/{SubNavSiblingsMenu.js → SiblingsMenu.js} RENAMED
@@ -1,5 +1,7 @@
1
1
  "use strict";
2
2
 
3
+ var _interopRequireWildcard3 = require("@babel/runtime/helpers/interopRequireWildcard")["default"];
4
+
3
5
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
4
6
 
5
7
  Object.defineProperty(exports, "__esModule", {
@@ -9,9 +11,11 @@ exports["default"] = void 0;
9
11
 
10
12
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
11
13
 
14
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
15
+
12
16
  var _interopRequireWildcard2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/interopRequireWildcard"));
13
17
 
14
- var _react = _interopRequireDefault(require("react"));
18
+ var _react = _interopRequireWildcard3(require("react"));
15
19
 
16
20
  var _useMouse2 = _interopRequireDefault(require("../../utils/hooks/useMouse"));
17
21
 
@@ -25,7 +29,7 @@ var _caratUp = _interopRequireDefault(require("../../../application/assets/image
25
29
 
26
30
  var _close = _interopRequireDefault(require("../../../application/assets/images/close.svg"));
27
31
 
28
- var _lodash = _interopRequireDefault(require("lodash"));
32
+ var _lodash = require("lodash");
29
33
 
30
34
  var _component = _interopRequireDefault(require("@loadable/component"));
31
35
 
@@ -39,8 +43,8 @@ var LunaLink = (0, _component["default"])(function () {
39
43
  }
40
44
  });
41
45
 
42
- var SubNavSiblingsMenu = function SubNavSiblingsMenu(_ref) {
43
- var _window;
46
+ var SiblingsMenu = function SiblingsMenu(_ref) {
47
+ var _window, _window$location, _window2;
44
48
 
45
49
  var title = _ref.title,
46
50
  _ref$siblings = _ref.siblings,
@@ -48,7 +52,6 @@ var SubNavSiblingsMenu = function SubNavSiblingsMenu(_ref) {
48
52
  isOpen = _ref.isOpen,
49
53
  width = _ref.width,
50
54
  closeSiblingsWithEnter = _ref.closeSiblingsWithEnter,
51
- path = _ref.path,
52
55
  _onClick = _ref.onClick,
53
56
  onClose = _ref.onClose,
54
57
  Link = _ref.Link;
@@ -56,32 +59,47 @@ var SubNavSiblingsMenu = function SubNavSiblingsMenu(_ref) {
56
59
  var _useMouse = (0, _useMouse2["default"])(),
57
60
  mouse = _useMouse.mouse;
58
61
 
62
+ var path = (_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname;
63
+
64
+ var _useState = (0, _react.useState)([]),
65
+ _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
66
+ orderedSiblings = _useState2[0],
67
+ setOrderedSiblings = _useState2[1];
68
+
69
+ (0, _react.useEffect)(function () {
70
+ var equals = function equals(arr) {
71
+ return (0, _lodash.orderBy)(siblings === null || siblings === void 0 ? void 0 : siblings.filter(function (d) {
72
+ return arr.map(function (str) {
73
+ var _d$pageName, _d$pageName$toLowerCa;
74
+
75
+ return (d === null || d === void 0 ? void 0 : (_d$pageName = d.pageName) === null || _d$pageName === void 0 ? void 0 : (_d$pageName$toLowerCa = _d$pageName.toLowerCase()) === null || _d$pageName$toLowerCa === void 0 ? void 0 : _d$pageName$toLowerCa.indexOf(str)) === 0;
76
+ }).reduce(function (a, b) {
77
+ return a && b;
78
+ });
79
+ }), ['pageName']);
80
+ };
81
+
82
+ var notEquals = function notEquals(arr) {
83
+ return (0, _lodash.orderBy)(siblings === null || siblings === void 0 ? void 0 : siblings.filter(function (d) {
84
+ return arr.map(function (str) {
85
+ var _d$pageName2, _d$pageName2$toLowerC;
86
+
87
+ return (d === null || d === void 0 ? void 0 : (_d$pageName2 = d.pageName) === null || _d$pageName2 === void 0 ? void 0 : (_d$pageName2$toLowerC = _d$pageName2.toLowerCase()) === null || _d$pageName2$toLowerC === void 0 ? void 0 : _d$pageName2$toLowerC.indexOf(str)) !== 0;
88
+ }).reduce(function (a, b) {
89
+ return a && b;
90
+ });
91
+ }), ['pageName']);
92
+ };
93
+
94
+ setOrderedSiblings([].concat((0, _toConsumableArray2["default"])(equals(['overview'])), (0, _toConsumableArray2["default"])(notEquals(['overview', 'contact'])), (0, _toConsumableArray2["default"])(equals(['contact']))));
95
+ }, [siblings]);
96
+
59
97
  if ((siblings === null || siblings === void 0 ? void 0 : siblings.length) <= 1) {
60
98
  return /*#__PURE__*/_react["default"].createElement("p", {
61
99
  className: "ter-sub-nav__breadcrumbs__text ter-sub-nav__breadcrumbs__text--last"
62
100
  }, title);
63
- } // REORDER SIBLINGS MENU
64
-
65
-
66
- var siblingsOverview = siblings === null || siblings === void 0 ? void 0 : siblings.filter(function (d) {
67
- var _d$pageName, _d$pageName$toLowerCa;
68
-
69
- return (d === null || d === void 0 ? void 0 : (_d$pageName = d.pageName) === null || _d$pageName === void 0 ? void 0 : (_d$pageName$toLowerCa = _d$pageName.toLowerCase()) === null || _d$pageName$toLowerCa === void 0 ? void 0 : _d$pageName$toLowerCa.indexOf('overview')) === 0;
70
- });
71
- var siblingsContact = siblings === null || siblings === void 0 ? void 0 : siblings.filter(function (d) {
72
- var _d$pageName2, _d$pageName2$toLowerC;
73
-
74
- return (d === null || d === void 0 ? void 0 : (_d$pageName2 = d.pageName) === null || _d$pageName2 === void 0 ? void 0 : (_d$pageName2$toLowerC = _d$pageName2.toLowerCase()) === null || _d$pageName2$toLowerC === void 0 ? void 0 : _d$pageName2$toLowerC.indexOf('contact')) === 0;
75
- });
76
- var siblingsSubset = siblings === null || siblings === void 0 ? void 0 : siblings.filter(function (d) {
77
- var _d$pageName3, _d$pageName3$toLowerC, _d$pageName4, _d$pageName4$toLowerC;
78
-
79
- return (d === null || d === void 0 ? void 0 : (_d$pageName3 = d.pageName) === null || _d$pageName3 === void 0 ? void 0 : (_d$pageName3$toLowerC = _d$pageName3.toLowerCase()) === null || _d$pageName3$toLowerC === void 0 ? void 0 : _d$pageName3$toLowerC.indexOf('overview')) !== 0 && (d === null || d === void 0 ? void 0 : (_d$pageName4 = d.pageName) === null || _d$pageName4 === void 0 ? void 0 : (_d$pageName4$toLowerC = _d$pageName4.toLowerCase()) === null || _d$pageName4$toLowerC === void 0 ? void 0 : _d$pageName4$toLowerC.indexOf('contact')) !== 0;
80
- });
81
-
82
- var siblingsSubsetOrdered = _lodash["default"].orderBy(siblingsSubset, ['pageName']);
101
+ }
83
102
 
84
- var siblingsOrdered = [].concat((0, _toConsumableArray2["default"])(siblingsOverview), (0, _toConsumableArray2["default"])(siblingsSubsetOrdered), (0, _toConsumableArray2["default"])(siblingsContact));
85
103
  return /*#__PURE__*/_react["default"].createElement("div", {
86
104
  style: {
87
105
  position: "relative",
@@ -117,7 +135,7 @@ var SubNavSiblingsMenu = function SubNavSiblingsMenu(_ref) {
117
135
  flexDirection: "column",
118
136
  flexWrap: "wrap",
119
137
  position: width > 600 ? "absolute" : "fixed",
120
- top: width > 600 ? "46px" : ((_window = window) === null || _window === void 0 ? void 0 : _window.scrollY) > 0 ? "48px" : "108px",
138
+ top: width > 600 ? "46px" : ((_window2 = window) === null || _window2 === void 0 ? void 0 : _window2.scrollY) > 0 ? "48px" : "108px",
121
139
  left: width < 600 && "0px",
122
140
  width: width > 600 ? "280px" : "100vw"
123
141
  }
@@ -153,8 +171,8 @@ var SubNavSiblingsMenu = function SubNavSiblingsMenu(_ref) {
153
171
  }
154
172
  })), /*#__PURE__*/_react["default"].createElement("ul", {
155
173
  className: "ter-sub-nav__siblings__list"
156
- }, siblingsOrdered && (siblingsOrdered === null || siblingsOrdered === void 0 ? void 0 : siblingsOrdered.map(function (sibling, i) {
157
- var active = sibling.slug.includes(path);
174
+ }, orderedSiblings && (orderedSiblings === null || orderedSiblings === void 0 ? void 0 : orderedSiblings.map(function (sibling, i) {
175
+ var active = sibling.slug === path;
158
176
  return sibling.slug && !active ? /*#__PURE__*/_react["default"].createElement("li", {
159
177
  key: "sibling-item-".concat(i),
160
178
  className: "ter-sub-nav__siblings__list__list-item"
@@ -177,5 +195,5 @@ var SubNavSiblingsMenu = function SubNavSiblingsMenu(_ref) {
177
195
  })))));
178
196
  };
179
197
 
180
- var _default = SubNavSiblingsMenu;
198
+ var _default = SiblingsMenu;
181
199
  exports["default"] = _default;
package/dist/luna/other-organisms/SubNav/SubNav.js CHANGED
@@ -29,9 +29,9 @@ var _ellipses = _interopRequireDefault(require("../../../application/assets/imag
29
29
 
30
30
  var _close = _interopRequireDefault(require("../../../application/assets/images/close.svg"));
31
31
 
32
- var SubNavSiblingsMenu = (0, _component["default"])(function () {
32
+ var SiblingsMenu = (0, _component["default"])(function () {
33
33
  return Promise.resolve().then(function () {
34
- return (0, _interopRequireWildcard2["default"])(require('./SubNavSiblingsMenu'));
34
+ return (0, _interopRequireWildcard2["default"])(require('./SiblingsMenu'));
35
35
  });
36
36
  });
37
37
  var LunaLink = (0, _component["default"])(function () {
@@ -45,7 +45,7 @@ var LunaLink = (0, _component["default"])(function () {
45
45
  });
46
46
 
47
47
  var SubNav = function SubNav(_ref) {
48
- var _window, _window$location, _breadcrumbs, _breadcrumbs2;
48
+ var _breadcrumbs, _breadcrumbs2;
49
49
 
50
50
  var _ref$breadcrumbs = _ref.breadcrumbs,
51
51
  breadcrumbs = _ref$breadcrumbs === void 0 ? [] : _ref$breadcrumbs,
@@ -57,8 +57,6 @@ var SubNav = function SubNav(_ref) {
57
57
  var _useMouse = (0, _useMouse2["default"])(),
58
58
  mouse = _useMouse.mouse;
59
59
 
60
- var path = (_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname.replace(/(\/(.*?)\/)/, "");
61
-
62
60
  var _useState = (0, _react.useState)(false),
63
61
  _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
64
62
  openBreadcrumbs = _useState2[0],
@@ -91,9 +89,9 @@ var SubNav = function SubNav(_ref) {
91
89
  var width = 0;
92
90
 
93
91
  if (typeof window !== "undefined") {
94
- var _window2 = window,
95
- innerWidth = _window2.innerWidth,
96
- innerHeight = _window2.innerHeight;
92
+ var _window = window,
93
+ innerWidth = _window.innerWidth,
94
+ innerHeight = _window.innerHeight;
97
95
  width = innerWidth;
98
96
  height = innerHeight;
99
97
  }
@@ -171,13 +169,12 @@ var SubNav = function SubNav(_ref) {
171
169
  }, breadcrumbs && (breadcrumbs === null || breadcrumbs === void 0 ? void 0 : breadcrumbs.length) <= 3 && width > 600 ? breadcrumbs === null || breadcrumbs === void 0 ? void 0 : breadcrumbs.map(function (breadcrumb, i) {
172
170
  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, {
173
171
  key: "breadcrumb-".concat(i)
174
- }, (breadcrumbs === null || breadcrumbs === void 0 ? void 0 : breadcrumbs.length) === i + 1 ? /*#__PURE__*/_react["default"].createElement(SubNavSiblingsMenu, {
172
+ }, (breadcrumbs === null || breadcrumbs === void 0 ? void 0 : breadcrumbs.length) === i + 1 ? /*#__PURE__*/_react["default"].createElement(SiblingsMenu, {
175
173
  title: breadcrumb.title,
176
174
  siblings: siblings,
177
175
  isOpen: openSiblings,
178
176
  width: width,
179
177
  closeSiblingsWithEnter: closeSiblingsWithEnter,
180
- path: path,
181
178
  Link: Link,
182
179
  onClose: function onClose() {
183
180
  setOpenSiblings(false);
@@ -253,13 +250,12 @@ var SubNav = function SubNav(_ref) {
253
250
  "aria-controls": "sub-nav-siblings",
254
251
  role: "button",
255
252
  id: (0, _formatID["default"])("".concat((_breadcrumbs = breadcrumbs[(breadcrumbs === null || breadcrumbs === void 0 ? void 0 : breadcrumbs.length) - 1]) === null || _breadcrumbs === void 0 ? void 0 : _breadcrumbs.title, "-subnav-breadcumb"))
256
- }, /*#__PURE__*/_react["default"].createElement(SubNavSiblingsMenu, {
253
+ }, /*#__PURE__*/_react["default"].createElement(SiblingsMenu, {
257
254
  title: (_breadcrumbs2 = breadcrumbs[(breadcrumbs === null || breadcrumbs === void 0 ? void 0 : breadcrumbs.length) - 1]) === null || _breadcrumbs2 === void 0 ? void 0 : _breadcrumbs2.title,
258
255
  siblings: siblings,
259
256
  isOpen: openSiblings,
260
257
  width: width,
261
258
  closeSiblingsWithEnter: closeSiblingsWithEnter,
262
- path: path,
263
259
  Link: Link,
264
260
  onClose: function onClose() {
265
261
  setOpenSiblings(false);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "luna-one",
3
- "version": "3.1.512",
3
+ "version": "3.1.513",
4
4
  "peerDependencies": {
5
5
  "react": "^17.0.2",
6
6
  "react-dom": "^17.0.2",