@lowdefy/blocks-antd 4.0.0-alpha.18 → 4.0.0-alpha.19

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 (2) hide show
  1. package/dist/blocks/Menu/Menu.js +21 -21
  2. package/package.json +7 -7
package/dist/blocks/Menu/Menu.js CHANGED
@@ -33,10 +33,10 @@ import { type, get } from '@lowdefy/helpers';
33
33
  const getDefaultMenu = (menus, menuId = 'default', links)=>{
34
34
  if (type.isArray(links)) return links;
35
35
  if (!type.isArray(menus)) return [];
36
- const menu = menus.find((item)=>item.menuId === menuId) || menus[0] || {};
37
- return menu.links || [];
36
+ const menu = (menus.find((item)=>item.menuId === menuId) ?? menus[0]) ?? {};
37
+ return menu.links ?? [];
38
38
  };
39
- const getTitle = ({ id , properties , pageId , url })=>properties && properties.title || pageId || url || id;
39
+ const getTitle = ({ id , properties , pageId , url })=>(((properties && properties.title) ?? pageId) ?? url) ?? id;
40
40
  const MenuComp = ({ blockId , components: { Icon , Link } , events , menus , methods , pageId , properties , rename , })=>{
41
41
  const styles = {
42
42
  lineHeight: '64px',
@@ -49,7 +49,7 @@ const MenuComp = ({ blockId , components: { Icon , Link } , events , menus , me
49
49
  exProps.inlineIndent = properties.inlineIndent;
50
50
  }
51
51
  const menu = getDefaultMenu(menus, properties.menuId, properties.links);
52
- const theme = properties.theme || 'dark';
52
+ const theme = properties.theme ?? 'dark';
53
53
  return /*#__PURE__*/ React.createElement(Menu, _extends({
54
54
  id: blockId,
55
55
  expandIcon: properties.expandIcon && /*#__PURE__*/ React.createElement(Icon, {
@@ -65,14 +65,14 @@ const MenuComp = ({ blockId , components: { Icon , Link } , events , menus , me
65
65
  styles,
66
66
  properties.style
67
67
  ]),
68
- defaultOpenKeys: properties.defaultOpenKeys || properties.mode === 'inline' && properties.collapsed !== true && [
68
+ defaultOpenKeys: (properties.defaultOpenKeys ?? (properties.mode === 'inline' && properties.collapsed !== true && [
69
69
  (menu.find((link1)=>(link1.links || []).map((subLink)=>subLink.links ? subLink.links.map((subSubLink)=>subSubLink.pageId) : [
70
70
  subLink.pageId
71
- ]).flat().some((link)=>(properties.selectedKeys || [
71
+ ]).flat().some((link)=>(properties.selectedKeys ?? [
72
72
  pageId
73
- ]).indexOf(link) !== -1)) || {}).id,
74
- ] || [],
75
- selectedKeys: properties.selectedKeys || [
73
+ ]).indexOf(link) !== -1)) ?? {}).id,
74
+ ])) ?? [],
75
+ selectedKeys: properties.selectedKeys ?? [
76
76
  pageId
77
77
  ],
78
78
  subMenuCloseDelay: properties.subMenuCloseDelay,
@@ -105,7 +105,7 @@ const MenuComp = ({ blockId , components: { Icon , Link } , events , menus , me
105
105
  switch(link.type){
106
106
  case 'MenuDivider':
107
107
  return /*#__PURE__*/ React.createElement(Menu.Divider, {
108
- key: `${link.id}_${i}`,
108
+ key: link.id,
109
109
  className: methods.makeCssClass([
110
110
  link.style
111
111
  ]),
@@ -113,9 +113,9 @@ const MenuComp = ({ blockId , components: { Icon , Link } , events , menus , me
113
113
  });
114
114
  case 'MenuGroup':
115
115
  return /*#__PURE__*/ React.createElement(Menu.SubMenu, {
116
- key: `${link.pageId || link.id}_${i}`,
116
+ key: link.pageId ?? link.id,
117
117
  title: /*#__PURE__*/ React.createElement(Link, _extends({
118
- id: link.pageId || link.id || i,
118
+ id: (link.pageId ?? link.id) ?? i,
119
119
  className: methods.makeCssClass(link.style, true)
120
120
  }, link), getTitle(link)),
121
121
  icon: link.properties && link.properties.icon && /*#__PURE__*/ React.createElement(Icon, {
@@ -129,7 +129,7 @@ const MenuComp = ({ blockId , components: { Icon , Link } , events , menus , me
129
129
  switch(subLink.type){
130
130
  case 'MenuDivider':
131
131
  return /*#__PURE__*/ React.createElement(Menu.Divider, {
132
- key: `${subLink.id || i}_${j}`,
132
+ key: subLink.id ?? j,
133
133
  className: methods.makeCssClass([
134
134
  subLink.style
135
135
  ]),
@@ -137,9 +137,9 @@ const MenuComp = ({ blockId , components: { Icon , Link } , events , menus , me
137
137
  });
138
138
  case 'MenuGroup':
139
139
  return /*#__PURE__*/ React.createElement(Menu.ItemGroup, {
140
- key: `${subLink.pageId || subLink.id}_${j}`,
140
+ key: subLink.pageId ?? subLink.id,
141
141
  title: /*#__PURE__*/ React.createElement(Link, _extends({
142
- id: subLink.pageId || subLink.id || j,
142
+ id: (subLink.pageId ?? subLink.id) ?? j,
143
143
  className: methods.makeCssClass(subLink.style, true)
144
144
  }, subLink), getTitle(subLink))
145
145
  }, subLink.links.map((subLinkGroup, k)=>{
@@ -153,7 +153,7 @@ const MenuComp = ({ blockId , components: { Icon , Link } , events , menus , me
153
153
  });
154
154
  }
155
155
  return /*#__PURE__*/ React.createElement(Menu.Item, {
156
- key: `${subLinkGroup.pageId || subLinkGroup.id}_${k}`,
156
+ key: subLinkGroup.pageId ?? subLinkGroup.id,
157
157
  danger: get(subLinkGroup, 'properties.danger'),
158
158
  icon: subLinkGroup.properties && subLinkGroup.properties.icon && /*#__PURE__*/ React.createElement(Icon, {
159
159
  blockId: `${subLinkGroup.id}_icon`,
@@ -161,14 +161,14 @@ const MenuComp = ({ blockId , components: { Icon , Link } , events , menus , me
161
161
  properties: subLinkGroup.properties.icon
162
162
  })
163
163
  }, /*#__PURE__*/ React.createElement(Link, _extends({
164
- id: subLinkGroup.pageId || subLinkGroup.id || k,
164
+ id: (subLinkGroup.pageId ?? subLinkGroup.id) ?? k,
165
165
  className: methods.makeCssClass(subLinkGroup.style, true)
166
166
  }, subLinkGroup), getTitle(subLinkGroup)));
167
167
  }));
168
168
  case 'MenuLink':
169
169
  default:
170
170
  return /*#__PURE__*/ React.createElement(Menu.Item, {
171
- key: `${subLink.pageId || subLink.id}_${j}`,
171
+ key: subLink.pageId ?? subLink.id,
172
172
  danger: get(subLink, 'properties.danger'),
173
173
  icon: subLink.properties && subLink.properties.icon && /*#__PURE__*/ React.createElement(Icon, {
174
174
  blockId: `${subLink.id}_icon`,
@@ -176,7 +176,7 @@ const MenuComp = ({ blockId , components: { Icon , Link } , events , menus , me
176
176
  properties: subLink.properties.icon
177
177
  })
178
178
  }, /*#__PURE__*/ React.createElement(Link, _extends({
179
- id: subLink.pageId || subLink.id || j,
179
+ id: (subLink.pageId ?? subLink.id) ?? j,
180
180
  className: methods.makeCssClass(subLink.style, true)
181
181
  }, subLink), getTitle(subLink)));
182
182
  }
@@ -184,7 +184,7 @@ const MenuComp = ({ blockId , components: { Icon , Link } , events , menus , me
184
184
  case 'MenuLink':
185
185
  default:
186
186
  return /*#__PURE__*/ React.createElement(Menu.Item, {
187
- key: `${link.pageId || link.id}_${i}`,
187
+ key: link.pageId ?? link.id,
188
188
  danger: get(link, 'properties.danger'),
189
189
  icon: link.properties && link.properties.icon && /*#__PURE__*/ React.createElement(Icon, {
190
190
  blockId: `${link.id}_icon`,
@@ -192,7 +192,7 @@ const MenuComp = ({ blockId , components: { Icon , Link } , events , menus , me
192
192
  properties: link.properties.icon
193
193
  })
194
194
  }, /*#__PURE__*/ React.createElement(Link, _extends({
195
- id: link.pageId || link.id || i,
195
+ id: (link.pageId ?? link.id) ?? i,
196
196
  className: methods.makeCssClass(link.style, true)
197
197
  }, link), getTitle(link)));
198
198
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lowdefy/blocks-antd",
3
- "version": "4.0.0-alpha.18",
3
+ "version": "4.0.0-alpha.19",
4
4
  "license": "Apache-2.0",
5
5
  "description": "Lowdefy Ant Design Blocks",
6
6
  "homepage": "https://lowdefy.com",
@@ -52,8 +52,8 @@
52
52
  },
53
53
  "dependencies": {
54
54
  "@ant-design/icons": "4.7.0",
55
- "@lowdefy/block-utils": "4.0.0-alpha.18",
56
- "@lowdefy/helpers": "4.0.0-alpha.18",
55
+ "@lowdefy/block-utils": "4.0.0-alpha.19",
56
+ "@lowdefy/helpers": "4.0.0-alpha.19",
57
57
  "antd": "4.20.7",
58
58
  "classnames": "2.3.1",
59
59
  "moment": "2.29.3",
@@ -64,9 +64,9 @@
64
64
  },
65
65
  "devDependencies": {
66
66
  "@emotion/jest": "11.9.1",
67
- "@lowdefy/block-dev": "4.0.0-alpha.18",
68
- "@lowdefy/jest-yaml-transform": "4.0.0-alpha.18",
69
- "@lowdefy/node-utils": "4.0.0-alpha.18",
67
+ "@lowdefy/block-dev": "4.0.0-alpha.19",
68
+ "@lowdefy/jest-yaml-transform": "4.0.0-alpha.19",
69
+ "@lowdefy/node-utils": "4.0.0-alpha.19",
70
70
  "@swc/cli": "0.1.57",
71
71
  "@swc/core": "1.2.194",
72
72
  "@swc/jest": "0.2.21",
@@ -81,5 +81,5 @@
81
81
  "publishConfig": {
82
82
  "access": "public"
83
83
  },
84
- "gitHead": "9ba94a9ab39be2a165b3a58043fbb33f26b48ae3"
84
+ "gitHead": "5240a074f7225295a8c92aaf0236b7680c296b57"
85
85
  }