@panneau/element-menu 1.0.3-alpha.1 → 1.0.3-alpha.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.
Files changed (3) hide show
  1. package/es/index.js +9 -7
  2. package/lib/index.js +13 -11
  3. package/package.json +4 -4
package/es/index.js CHANGED
@@ -2,13 +2,13 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
2
2
  import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
3
3
  import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
4
4
  import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
5
- import React, { useState } from 'react';
6
- import PropTypes$1 from 'prop-types';
7
5
  import classNames from 'classnames';
6
+ import PropTypes$1 from 'prop-types';
7
+ import React, { useState } from 'react';
8
8
  import { PropTypes } from '@panneau/core';
9
- import Link from '@panneau/element-link';
10
- import Label from '@panneau/element-label';
11
9
  import Dropdown from '@panneau/element-dropdown';
10
+ import Label from '@panneau/element-label';
11
+ import Link from '@panneau/element-link';
12
12
 
13
13
  var _excluded = ["id", "className", "linkClassName", "href", "label", "external", "items", "dropdown", "active", "onClick"];
14
14
  var propTypes = {
@@ -104,6 +104,7 @@ var Menu = function Menu(_ref) {
104
104
 
105
105
  var onClickItem = dropdown !== null ? function (e) {
106
106
  e.preventDefault();
107
+ e.stopPropagation();
107
108
  setDropdownsVisible([].concat(_toConsumableArray(dropdownsVisible.slice(0, index)), [!(dropdownsVisible[index] || false)], _toConsumableArray(dropdownsVisible.slice(index + 1))));
108
109
 
109
110
  if (customOnClick !== null) {
@@ -114,6 +115,7 @@ var Menu = function Menu(_ref) {
114
115
  setDropdownsVisible([].concat(_toConsumableArray(dropdownsVisible.slice(0, index)), [false], _toConsumableArray(dropdownsVisible.slice(index + 1))));
115
116
  } : null;
116
117
  var ItemComponent = itemTagName;
118
+ var dropdownVisible = dropdownsVisible[index] || false;
117
119
  return linkAsItem ? /*#__PURE__*/React.createElement(Link, Object.assign({}, itemProps, {
118
120
  key: "item-".concat(id || index),
119
121
  onClick: onClickItem,
@@ -128,9 +130,9 @@ var Menu = function Menu(_ref) {
128
130
  dropdown: dropdown !== null,
129
131
  active: active
130
132
  }, _defineProperty(_classNames2, itemClassName, itemClassName !== null), _defineProperty(_classNames2, customClassName, customClassName !== null), _defineProperty(_classNames2, hasSubMenuClassName, subItems !== null && hasSubMenuClassName !== null), _defineProperty(_classNames2, hasDropdownClassName, subItems !== null && hasDropdownClassName !== null), _classNames2))
131
- }, href !== null ? /*#__PURE__*/React.createElement(Link, Object.assign({}, itemProps, {
133
+ }, href !== null || dropdown !== null ? /*#__PURE__*/React.createElement(Link, Object.assign({}, itemProps, {
132
134
  onClick: onClickItem,
133
- href: href,
135
+ href: href || '#',
134
136
  external: external,
135
137
  className: classNames((_classNames3 = {}, _defineProperty(_classNames3, linkClassName, linkClassName !== null), _defineProperty(_classNames3, 'dropdown-toggle', dropdown !== null), _defineProperty(_classNames3, customLinkClassName, customLinkClassName !== null), _classNames3))
136
138
  }), label) : /*#__PURE__*/React.createElement(Label, itemProps, label), subItems !== null ? /*#__PURE__*/React.createElement(Menu, {
@@ -140,7 +142,7 @@ var Menu = function Menu(_ref) {
140
142
  linkClassName: classNames((_classNames5 = {}, _defineProperty(_classNames5, subMenuLinkClassName, subMenuLinkClassName !== null), _defineProperty(_classNames5, linkClassName, subMenuLinkClassName === null && linkClassName !== null), _classNames5))
141
143
  }) : null, dropdown !== null ? /*#__PURE__*/React.createElement(Dropdown, {
142
144
  items: dropdown,
143
- visible: dropdownsVisible[index] || false,
145
+ visible: dropdownVisible,
144
146
  className: dropdownClassName,
145
147
  itemClassName: classNames((_classNames6 = {}, _defineProperty(_classNames6, dropdownItemClassName, dropdownItemClassName !== null), _defineProperty(_classNames6, itemClassName, dropdownItemClassName === null && itemClassName !== null), _classNames6)),
146
148
  linkClassName: classNames((_classNames7 = {}, _defineProperty(_classNames7, dropdownLinkClassName, dropdownLinkClassName !== null), _defineProperty(_classNames7, linkClassName, dropdownLinkClassName === null && linkClassName !== null), _classNames7)),
package/lib/index.js CHANGED
@@ -6,13 +6,13 @@ var _defineProperty = require('@babel/runtime/helpers/defineProperty');
6
6
  var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
7
7
  var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
8
8
  var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
9
- var React = require('react');
10
- var PropTypes = require('prop-types');
11
9
  var classNames = require('classnames');
10
+ var PropTypes = require('prop-types');
11
+ var React = require('react');
12
12
  var core = require('@panneau/core');
13
- var Link = require('@panneau/element-link');
14
- var Label = require('@panneau/element-label');
15
13
  var Dropdown = require('@panneau/element-dropdown');
14
+ var Label = require('@panneau/element-label');
15
+ var Link = require('@panneau/element-link');
16
16
 
17
17
  function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
18
18
 
@@ -20,12 +20,12 @@ var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_definePropert
20
20
  var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
21
21
  var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
22
22
  var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
23
- var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
24
- var PropTypes__default = /*#__PURE__*/_interopDefaultLegacy(PropTypes);
25
23
  var classNames__default = /*#__PURE__*/_interopDefaultLegacy(classNames);
26
- var Link__default = /*#__PURE__*/_interopDefaultLegacy(Link);
27
- var Label__default = /*#__PURE__*/_interopDefaultLegacy(Label);
24
+ var PropTypes__default = /*#__PURE__*/_interopDefaultLegacy(PropTypes);
25
+ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
28
26
  var Dropdown__default = /*#__PURE__*/_interopDefaultLegacy(Dropdown);
27
+ var Label__default = /*#__PURE__*/_interopDefaultLegacy(Label);
28
+ var Link__default = /*#__PURE__*/_interopDefaultLegacy(Link);
29
29
 
30
30
  var _excluded = ["id", "className", "linkClassName", "href", "label", "external", "items", "dropdown", "active", "onClick"];
31
31
  var propTypes = {
@@ -121,6 +121,7 @@ var Menu = function Menu(_ref) {
121
121
 
122
122
  var onClickItem = dropdown !== null ? function (e) {
123
123
  e.preventDefault();
124
+ e.stopPropagation();
124
125
  setDropdownsVisible([].concat(_toConsumableArray__default["default"](dropdownsVisible.slice(0, index)), [!(dropdownsVisible[index] || false)], _toConsumableArray__default["default"](dropdownsVisible.slice(index + 1))));
125
126
 
126
127
  if (customOnClick !== null) {
@@ -131,6 +132,7 @@ var Menu = function Menu(_ref) {
131
132
  setDropdownsVisible([].concat(_toConsumableArray__default["default"](dropdownsVisible.slice(0, index)), [false], _toConsumableArray__default["default"](dropdownsVisible.slice(index + 1))));
132
133
  } : null;
133
134
  var ItemComponent = itemTagName;
135
+ var dropdownVisible = dropdownsVisible[index] || false;
134
136
  return linkAsItem ? /*#__PURE__*/React__default["default"].createElement(Link__default["default"], Object.assign({}, itemProps, {
135
137
  key: "item-".concat(id || index),
136
138
  onClick: onClickItem,
@@ -145,9 +147,9 @@ var Menu = function Menu(_ref) {
145
147
  dropdown: dropdown !== null,
146
148
  active: active
147
149
  }, _defineProperty__default["default"](_classNames2, itemClassName, itemClassName !== null), _defineProperty__default["default"](_classNames2, customClassName, customClassName !== null), _defineProperty__default["default"](_classNames2, hasSubMenuClassName, subItems !== null && hasSubMenuClassName !== null), _defineProperty__default["default"](_classNames2, hasDropdownClassName, subItems !== null && hasDropdownClassName !== null), _classNames2))
148
- }, href !== null ? /*#__PURE__*/React__default["default"].createElement(Link__default["default"], Object.assign({}, itemProps, {
150
+ }, href !== null || dropdown !== null ? /*#__PURE__*/React__default["default"].createElement(Link__default["default"], Object.assign({}, itemProps, {
149
151
  onClick: onClickItem,
150
- href: href,
152
+ href: href || '#',
151
153
  external: external,
152
154
  className: classNames__default["default"]((_classNames3 = {}, _defineProperty__default["default"](_classNames3, linkClassName, linkClassName !== null), _defineProperty__default["default"](_classNames3, 'dropdown-toggle', dropdown !== null), _defineProperty__default["default"](_classNames3, customLinkClassName, customLinkClassName !== null), _classNames3))
153
155
  }), label) : /*#__PURE__*/React__default["default"].createElement(Label__default["default"], itemProps, label), subItems !== null ? /*#__PURE__*/React__default["default"].createElement(Menu, {
@@ -157,7 +159,7 @@ var Menu = function Menu(_ref) {
157
159
  linkClassName: classNames__default["default"]((_classNames5 = {}, _defineProperty__default["default"](_classNames5, subMenuLinkClassName, subMenuLinkClassName !== null), _defineProperty__default["default"](_classNames5, linkClassName, subMenuLinkClassName === null && linkClassName !== null), _classNames5))
158
160
  }) : null, dropdown !== null ? /*#__PURE__*/React__default["default"].createElement(Dropdown__default["default"], {
159
161
  items: dropdown,
160
- visible: dropdownsVisible[index] || false,
162
+ visible: dropdownVisible,
161
163
  className: dropdownClassName,
162
164
  itemClassName: classNames__default["default"]((_classNames6 = {}, _defineProperty__default["default"](_classNames6, dropdownItemClassName, dropdownItemClassName !== null), _defineProperty__default["default"](_classNames6, itemClassName, dropdownItemClassName === null && itemClassName !== null), _classNames6)),
163
165
  linkClassName: classNames__default["default"]((_classNames7 = {}, _defineProperty__default["default"](_classNames7, dropdownLinkClassName, dropdownLinkClassName !== null), _defineProperty__default["default"](_classNames7, linkClassName, dropdownLinkClassName === null && linkClassName !== null), _classNames7)),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@panneau/element-menu",
3
- "version": "1.0.3-alpha.1",
3
+ "version": "1.0.3-alpha.2",
4
4
  "description": "Menu element",
5
5
  "keywords": [
6
6
  "javascript"
@@ -55,9 +55,9 @@
55
55
  "dependencies": {
56
56
  "@babel/runtime": "^7.12.5",
57
57
  "@panneau/core": "^1.0.3-alpha.1",
58
- "@panneau/element-dropdown": "^1.0.3-alpha.1",
58
+ "@panneau/element-dropdown": "^1.0.3-alpha.2",
59
59
  "@panneau/element-label": "^1.0.3-alpha.1",
60
- "@panneau/element-link": "^1.0.3-alpha.1",
60
+ "@panneau/element-link": "^1.0.3-alpha.2",
61
61
  "classnames": "^2.2.6",
62
62
  "prop-types": "^15.7.2",
63
63
  "react-intl": "^5.15.8||^6.0.0"
@@ -65,5 +65,5 @@
65
65
  "publishConfig": {
66
66
  "access": "public"
67
67
  },
68
- "gitHead": "e04e663c7f1eb692f89a0136f2e8f45024fbe355"
68
+ "gitHead": "3fb9865bb17e8ddc0b2d372d38f39700c90e2605"
69
69
  }