@brillout/docpress 0.15.10-commit-ef0b9a0 → 0.15.10-commit-b6b1605
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.
- package/components/CodeSnippets.tsx +5 -1
- package/detypePlugin.ts +67 -23
- package/dist/+config.js +1 -1
- package/dist/NavItemComponent.js +46 -38
- package/dist/components/CodeBlockTransformer.js +3 -2
- package/dist/components/CodeSnippets.js +83 -21
- package/dist/components/Comment.js +2 -1
- package/dist/components/FileRemoved.js +6 -4
- package/dist/components/HorizontalLine.js +2 -1
- package/dist/components/ImportMeta.js +3 -2
- package/dist/components/Link.js +50 -34
- package/dist/components/Note.js +29 -17
- package/dist/components/P.js +12 -1
- package/dist/components/RepoLink.js +9 -7
- package/dist/determineNavItemsColumnLayout.js +62 -48
- package/dist/detypePlugin.js +143 -40
- package/dist/parseMarkdownMini.js +17 -5
- package/dist/parsePageSections.js +82 -41
- package/dist/renderer/usePageContext.js +7 -6
- package/dist/resolvePageContext.js +103 -91
- package/dist/utils/Emoji/Emoji.js +21 -13
- package/dist/utils/assert.js +16 -14
- package/dist/utils/cls.js +1 -1
- package/dist/utils/contentMap.d.ts +9 -0
- package/dist/utils/contentMap.js +22 -0
- package/dist/utils/determineSectionUrlHash.js +5 -5
- package/dist/utils/filter.js +2 -2
- package/dist/utils/getGlobalObject.js +3 -3
- package/dist/utils/useSelectedLanguage.js +12 -11
- package/dist/vite.config.js +7 -7
- package/package.json +2 -2
- package/tsconfig.json +0 -1
- package/utils/contentMap.ts +34 -0
package/dist/components/Link.js
CHANGED
|
@@ -1,22 +1,31 @@
|
|
|
1
|
+
var __assign = (this && this.__assign) || function () {
|
|
2
|
+
__assign = Object.assign || function(t) {
|
|
3
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
4
|
+
s = arguments[i];
|
|
5
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
6
|
+
t[p] = s[p];
|
|
7
|
+
}
|
|
8
|
+
return t;
|
|
9
|
+
};
|
|
10
|
+
return __assign.apply(this, arguments);
|
|
11
|
+
};
|
|
1
12
|
export { Link };
|
|
2
13
|
import React from 'react';
|
|
3
14
|
import { usePageContext } from '../renderer/usePageContext';
|
|
4
15
|
import { assert, assertUsage, assertWarning, determineSectionTitle, determineSectionUrlHash } from '../utils/server';
|
|
5
16
|
import { parseMarkdownMini } from '../parseMarkdownMini';
|
|
6
17
|
import pc from '@brillout/picocolors';
|
|
7
|
-
function Link(
|
|
8
|
-
|
|
9
|
-
|
|
18
|
+
function Link(_a) {
|
|
19
|
+
var href = _a.href, text = _a.text, noBreadcrumb = _a.noBreadcrumb, doNotInferSectionTitle = _a.doNotInferSectionTitle, noWarning = _a.noWarning, children = _a.children;
|
|
20
|
+
var pageContext = usePageContext();
|
|
21
|
+
assertUsage(href.startsWith('/') || href.startsWith('#'), "<Link href /> prop `href==='".concat(href, "'` but should start with '/' or '#'"));
|
|
10
22
|
assertUsage(!text || !children, 'Cannot use both `text` or `children`');
|
|
11
23
|
// assertWarning(!text, 'prop `text` is deprecated')
|
|
12
|
-
text = text
|
|
13
|
-
|
|
24
|
+
text = text !== null && text !== void 0 ? text : children;
|
|
25
|
+
var linkTextData = getLinkTextData({ href: href, pageContext: pageContext, doNotInferSectionTitle: doNotInferSectionTitle, noWarning: noWarning });
|
|
14
26
|
if (!text) {
|
|
15
27
|
if (linkTextData) {
|
|
16
|
-
text = getLinkText({
|
|
17
|
-
noBreadcrumb,
|
|
18
|
-
...linkTextData,
|
|
19
|
-
});
|
|
28
|
+
text = getLinkText(__assign({ noBreadcrumb: noBreadcrumb }, linkTextData));
|
|
20
29
|
}
|
|
21
30
|
else {
|
|
22
31
|
text = 'LINK-TARGET-NOT-FOUND';
|
|
@@ -24,10 +33,12 @@ function Link({ href, text, noBreadcrumb, doNotInferSectionTitle, noWarning, chi
|
|
|
24
33
|
}
|
|
25
34
|
return React.createElement("a", { href: href }, text);
|
|
26
35
|
}
|
|
27
|
-
function getLinkText(
|
|
28
|
-
|
|
36
|
+
function getLinkText(_a) {
|
|
37
|
+
var _b;
|
|
38
|
+
var noBreadcrumb = _a.noBreadcrumb, linkData = _a.linkData, sectionTitle = _a.sectionTitle, isLinkOnSamePage = _a.isLinkOnSamePage;
|
|
39
|
+
var breadcrumbParts = [];
|
|
29
40
|
if (linkData.linkBreadcrumb) {
|
|
30
|
-
breadcrumbParts.push(
|
|
41
|
+
breadcrumbParts.push.apply(breadcrumbParts, ((_b = linkData.linkBreadcrumb) !== null && _b !== void 0 ? _b : []).slice().reverse().map(parseMarkdownMini));
|
|
31
42
|
}
|
|
32
43
|
breadcrumbParts.push(parseMarkdownMini(linkData.title));
|
|
33
44
|
if (sectionTitle)
|
|
@@ -35,32 +46,33 @@ function getLinkText({ noBreadcrumb, linkData, sectionTitle, isLinkOnSamePage, }
|
|
|
35
46
|
if (noBreadcrumb || isLinkOnSamePage) {
|
|
36
47
|
return breadcrumbParts[breadcrumbParts.length - 1];
|
|
37
48
|
}
|
|
38
|
-
return (React.createElement(React.Fragment, null, breadcrumbParts.map((title, i)
|
|
39
|
-
|
|
49
|
+
return (React.createElement(React.Fragment, null, breadcrumbParts.map(function (title, i) {
|
|
50
|
+
var seperator = i === 0 ? React.createElement(React.Fragment, null) : ' > ';
|
|
40
51
|
return (React.createElement(React.Fragment, { key: i },
|
|
41
52
|
seperator,
|
|
42
53
|
title));
|
|
43
54
|
})));
|
|
44
55
|
}
|
|
45
|
-
function getLinkTextData(
|
|
46
|
-
|
|
47
|
-
|
|
56
|
+
function getLinkTextData(_a) {
|
|
57
|
+
var href = _a.href, pageContext = _a.pageContext, doNotInferSectionTitle = _a.doNotInferSectionTitle, noWarning = _a.noWarning;
|
|
58
|
+
var _b = parseHref(href), hrefPathname = _b.hrefPathname, hrefHash = _b.hrefHash;
|
|
59
|
+
var linkData = findLinkData(hrefPathname || pageContext.urlPathname, { pageContext: pageContext, noWarning: noWarning });
|
|
48
60
|
if (!linkData)
|
|
49
61
|
return null;
|
|
50
|
-
|
|
62
|
+
var isLinkOnSamePage = linkData.url === pageContext.urlPathname;
|
|
51
63
|
if (!hrefPathname)
|
|
52
64
|
assert(isLinkOnSamePage);
|
|
53
|
-
|
|
65
|
+
var sectionTitle = null;
|
|
54
66
|
if (hrefHash) {
|
|
55
67
|
assert(!hrefHash.startsWith('#'));
|
|
56
68
|
if (isLinkOnSamePage) {
|
|
57
|
-
|
|
69
|
+
var linkDataPageSection = findLinkData("#".concat(hrefHash), { pageContext: pageContext, noWarning: noWarning });
|
|
58
70
|
if (!linkDataPageSection)
|
|
59
71
|
return null;
|
|
60
72
|
sectionTitle = parseMarkdownMini(linkDataPageSection.title);
|
|
61
73
|
}
|
|
62
74
|
else if ('sectionTitles' in linkData && linkData.sectionTitles) {
|
|
63
|
-
linkData.sectionTitles.forEach((title)
|
|
75
|
+
linkData.sectionTitles.forEach(function (title) {
|
|
64
76
|
if (determineSectionUrlHash(title) === hrefHash) {
|
|
65
77
|
sectionTitle = parseMarkdownMini(title);
|
|
66
78
|
}
|
|
@@ -68,28 +80,32 @@ function getLinkTextData({ href, pageContext, doNotInferSectionTitle, noWarning,
|
|
|
68
80
|
}
|
|
69
81
|
if (!sectionTitle) {
|
|
70
82
|
if (doNotInferSectionTitle) {
|
|
71
|
-
assertWarning(false,
|
|
83
|
+
assertWarning(false, "Page section title not found for <Link href=\"`".concat(href, "`\" doNotInferSectionTitle={true} />."));
|
|
72
84
|
return null;
|
|
73
85
|
}
|
|
74
86
|
sectionTitle = React.createElement(React.Fragment, null, determineSectionTitle(href));
|
|
75
87
|
}
|
|
76
88
|
}
|
|
77
|
-
return { linkData, sectionTitle, isLinkOnSamePage };
|
|
89
|
+
return { linkData: linkData, sectionTitle: sectionTitle, isLinkOnSamePage: isLinkOnSamePage };
|
|
78
90
|
}
|
|
79
|
-
function findLinkData(href,
|
|
91
|
+
function findLinkData(href, _a) {
|
|
92
|
+
var pageContext = _a.pageContext, noWarning = _a.noWarning;
|
|
80
93
|
assert(href.startsWith('/') || href.startsWith('#'));
|
|
81
|
-
|
|
82
|
-
|
|
94
|
+
var linksAll = pageContext.resolved.linksAll;
|
|
95
|
+
var linkData = linksAll.find(function (_a) {
|
|
96
|
+
var url = _a.url;
|
|
97
|
+
return href === url;
|
|
98
|
+
});
|
|
83
99
|
if (href.startsWith('#')) {
|
|
84
100
|
if (!noWarning) {
|
|
85
|
-
assertWarning(linkData,
|
|
101
|
+
assertWarning(linkData, "Couldn't find ".concat(href, " in ").concat(pageContext.urlPathname, ", does it exist?"));
|
|
86
102
|
}
|
|
87
103
|
}
|
|
88
104
|
else {
|
|
89
105
|
if (!noWarning) {
|
|
90
106
|
assertWarning(linkData, [
|
|
91
|
-
|
|
92
|
-
|
|
107
|
+
"Couldn't find page with URL ".concat(pc.bold(href)),
|
|
108
|
+
"\u2014 did you define it in",
|
|
93
109
|
[
|
|
94
110
|
pc.cyan('docpress.config.js'),
|
|
95
111
|
pc.dim('#{'),
|
|
@@ -102,16 +118,16 @@ function findLinkData(href, { pageContext, noWarning }) {
|
|
|
102
118
|
].join(' '));
|
|
103
119
|
}
|
|
104
120
|
}
|
|
105
|
-
return linkData
|
|
121
|
+
return linkData !== null && linkData !== void 0 ? linkData : null;
|
|
106
122
|
}
|
|
107
123
|
function parseHref(href) {
|
|
108
|
-
|
|
109
|
-
|
|
124
|
+
var hrefHash = null;
|
|
125
|
+
var hrefPathname = null;
|
|
110
126
|
if (!href.includes('#')) {
|
|
111
127
|
hrefPathname = href;
|
|
112
128
|
}
|
|
113
129
|
else {
|
|
114
|
-
|
|
130
|
+
var _a = href.split('#'), partsFirst = _a[0], partsRest = _a.slice(1);
|
|
115
131
|
if (partsFirst) {
|
|
116
132
|
hrefPathname = partsFirst;
|
|
117
133
|
}
|
|
@@ -122,5 +138,5 @@ function parseHref(href) {
|
|
|
122
138
|
// Text highlight links e,g. #metadata:~:text=global%20or%20local.-,Global%20metadata,-.
|
|
123
139
|
if (hrefHash)
|
|
124
140
|
hrefHash = hrefHash.split(':~:text')[0];
|
|
125
|
-
return { hrefPathname, hrefHash };
|
|
141
|
+
return { hrefPathname: hrefPathname, hrefHash: hrefHash };
|
|
126
142
|
}
|
package/dist/components/Note.js
CHANGED
|
@@ -1,3 +1,14 @@
|
|
|
1
|
+
var __assign = (this && this.__assign) || function () {
|
|
2
|
+
__assign = Object.assign || function(t) {
|
|
3
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
4
|
+
s = arguments[i];
|
|
5
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
6
|
+
t[p] = s[p];
|
|
7
|
+
}
|
|
8
|
+
return t;
|
|
9
|
+
};
|
|
10
|
+
return __assign.apply(this, arguments);
|
|
11
|
+
};
|
|
1
12
|
export { Warning };
|
|
2
13
|
export { Advanced };
|
|
3
14
|
export { Construction };
|
|
@@ -16,38 +27,39 @@ import React from 'react';
|
|
|
16
27
|
import { assert } from '../utils/assert';
|
|
17
28
|
import './Note.css';
|
|
18
29
|
function Warning(props) {
|
|
19
|
-
return React.createElement(NoteGeneric, { type: "warning",
|
|
30
|
+
return React.createElement(NoteGeneric, __assign({ type: "warning" }, props));
|
|
20
31
|
}
|
|
21
32
|
function Advanced(props) {
|
|
22
|
-
return React.createElement(NoteGeneric, { type: "advanced",
|
|
33
|
+
return React.createElement(NoteGeneric, __assign({ type: "advanced" }, props));
|
|
23
34
|
}
|
|
24
35
|
function Construction(props) {
|
|
25
|
-
return React.createElement(NoteGeneric, { type: "construction",
|
|
36
|
+
return React.createElement(NoteGeneric, __assign({ type: "construction" }, props));
|
|
26
37
|
}
|
|
27
38
|
function Contribution(props) {
|
|
28
|
-
return React.createElement(NoteGeneric, { type: "contribution",
|
|
39
|
+
return React.createElement(NoteGeneric, __assign({ type: "contribution" }, props));
|
|
29
40
|
}
|
|
30
41
|
function Danger(props) {
|
|
31
|
-
return React.createElement(NoteGeneric, { type: "danger",
|
|
42
|
+
return React.createElement(NoteGeneric, __assign({ type: "danger" }, props));
|
|
32
43
|
}
|
|
33
44
|
function NoteWithoutIcon(props) {
|
|
34
|
-
return React.createElement(NoteGeneric, { icon: null,
|
|
45
|
+
return React.createElement(NoteGeneric, __assign({ icon: null }, props));
|
|
35
46
|
}
|
|
36
47
|
function NoteWithCustomIcon(props) {
|
|
37
|
-
|
|
48
|
+
var icon = props.icon;
|
|
38
49
|
if (!icon)
|
|
39
|
-
throw new Error(
|
|
40
|
-
return React.createElement(NoteGeneric, {
|
|
50
|
+
throw new Error("<NoteWithCustomIcon icon={/*...*/}> property 'icon' is `".concat(icon, "` which is forbidden"));
|
|
51
|
+
return React.createElement(NoteGeneric, __assign({}, props));
|
|
41
52
|
}
|
|
42
|
-
function NoteGeneric(
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
53
|
+
function NoteGeneric(_a) {
|
|
54
|
+
var type = _a.type, icon = _a.icon, iconMargin = _a.iconMargin, children = _a.children, style = _a.style;
|
|
55
|
+
assert(icon === null || icon || type, { icon: icon, type: type });
|
|
56
|
+
iconMargin !== null && iconMargin !== void 0 ? iconMargin : (iconMargin = 2);
|
|
57
|
+
var className = 'custom-icon';
|
|
46
58
|
if (type) {
|
|
47
|
-
className =
|
|
59
|
+
className = "".concat(className, " type-").concat(type);
|
|
48
60
|
}
|
|
49
61
|
if (!icon && type) {
|
|
50
|
-
|
|
62
|
+
var classColor = '';
|
|
51
63
|
if (type === 'danger') {
|
|
52
64
|
icon = '⛔';
|
|
53
65
|
classColor = 'note-color-red';
|
|
@@ -70,13 +82,13 @@ function NoteGeneric({ type, icon, iconMargin, children, style, }) {
|
|
|
70
82
|
}
|
|
71
83
|
assert(icon);
|
|
72
84
|
assert(classColor);
|
|
73
|
-
className =
|
|
85
|
+
className = "".concat(className, " ").concat(classColor);
|
|
74
86
|
}
|
|
75
87
|
return (React.createElement("blockquote", { className: className, style: style },
|
|
76
88
|
React.createElement("div", { style: { marginBottom: 20 } }),
|
|
77
89
|
icon && (React.createElement(React.Fragment, null,
|
|
78
90
|
React.createElement("span", { style: { fontFamily: 'emoji' } }, icon),
|
|
79
|
-
React.createElement("span", { style: { width: iconMargin
|
|
91
|
+
React.createElement("span", { style: { width: iconMargin !== null && iconMargin !== void 0 ? iconMargin : undefined, display: 'inline-block' } }),
|
|
80
92
|
' ')),
|
|
81
93
|
React.createElement("div", { className: "blockquote-content" }, children),
|
|
82
94
|
React.createElement("div", { style: { marginTop: 20 } })));
|
package/dist/components/P.js
CHANGED
|
@@ -1,6 +1,17 @@
|
|
|
1
|
+
var __assign = (this && this.__assign) || function () {
|
|
2
|
+
__assign = Object.assign || function(t) {
|
|
3
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
4
|
+
s = arguments[i];
|
|
5
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
6
|
+
t[p] = s[p];
|
|
7
|
+
}
|
|
8
|
+
return t;
|
|
9
|
+
};
|
|
10
|
+
return __assign.apply(this, arguments);
|
|
11
|
+
};
|
|
1
12
|
import React from 'react';
|
|
2
13
|
import './P.css';
|
|
3
14
|
export { P };
|
|
4
15
|
function P(props) {
|
|
5
|
-
return React.createElement("div", {
|
|
16
|
+
return React.createElement("div", __assign({}, props, { className: 'paragraph' }));
|
|
6
17
|
}
|
|
@@ -2,19 +2,21 @@ export { RepoLink };
|
|
|
2
2
|
export { getRepoHref };
|
|
3
3
|
import React from 'react';
|
|
4
4
|
import { usePageContext } from '../renderer/usePageContext';
|
|
5
|
-
function RepoLink(
|
|
5
|
+
function RepoLink(_a) {
|
|
6
|
+
var path = _a.path, text = _a.text;
|
|
6
7
|
text = text || path;
|
|
7
|
-
|
|
8
|
+
var href = getRepoHref(path);
|
|
8
9
|
return React.createElement("a", { href: href }, text);
|
|
9
10
|
}
|
|
10
|
-
function getRepoHref(path, editMode
|
|
11
|
-
|
|
11
|
+
function getRepoHref(path, editMode) {
|
|
12
|
+
if (editMode === void 0) { editMode = false; }
|
|
13
|
+
var pageContext = usePageContext();
|
|
12
14
|
if (!path.startsWith('/')) {
|
|
13
15
|
path = '/' + path;
|
|
14
16
|
}
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
17
|
+
var viewMode = path.endsWith('/') && !editMode ? 'tree' : 'blob';
|
|
18
|
+
var github = pageContext.globalContext.config.docpress.github;
|
|
19
|
+
var href = "".concat(github, "/").concat(viewMode, "/main").concat(path);
|
|
18
20
|
if (editMode)
|
|
19
21
|
href += '?plain=1';
|
|
20
22
|
return href;
|
|
@@ -1,26 +1,47 @@
|
|
|
1
|
+
var __assign = (this && this.__assign) || function () {
|
|
2
|
+
__assign = Object.assign || function(t) {
|
|
3
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
4
|
+
s = arguments[i];
|
|
5
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
6
|
+
t[p] = s[p];
|
|
7
|
+
}
|
|
8
|
+
return t;
|
|
9
|
+
};
|
|
10
|
+
return __assign.apply(this, arguments);
|
|
11
|
+
};
|
|
12
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
13
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
14
|
+
if (ar || !(i in from)) {
|
|
15
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
16
|
+
ar[i] = from[i];
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
20
|
+
};
|
|
1
21
|
export { determineNavItemsColumnLayout };
|
|
2
22
|
import { assert, assertUsage } from './utils/assert';
|
|
3
23
|
function determineNavItemsColumnLayout(navItems) {
|
|
4
|
-
|
|
5
|
-
columnLayouts.forEach((columnEntries)
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
columnEntries.forEach((columnEntry, i)
|
|
24
|
+
var columnLayouts = getColumnEntries(navItems);
|
|
25
|
+
columnLayouts.forEach(function (columnEntries) {
|
|
26
|
+
var _loop_1 = function (numberOfColumns) {
|
|
27
|
+
var columnMapping = determineColumnLayout(columnEntries.map(function (columnEntry) { return columnEntry.numberOfEntries; }), numberOfColumns);
|
|
28
|
+
columnEntries.forEach(function (columnEntry, i) {
|
|
9
29
|
var _a;
|
|
10
|
-
|
|
30
|
+
var _b;
|
|
31
|
+
(_a = (_b = columnEntry.navItemLeader).isColumnEntry) !== null && _a !== void 0 ? _a : (_b.isColumnEntry = {});
|
|
11
32
|
columnEntry.navItemLeader.isColumnEntry[numberOfColumns] = columnMapping[i];
|
|
12
33
|
});
|
|
34
|
+
};
|
|
35
|
+
for (var numberOfColumns = columnEntries.length; numberOfColumns >= 1; numberOfColumns--) {
|
|
36
|
+
_loop_1(numberOfColumns);
|
|
13
37
|
}
|
|
14
38
|
});
|
|
15
39
|
}
|
|
16
40
|
function getColumnEntries(navItems) {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
let navItemLevel1;
|
|
22
|
-
let navItemLevel4;
|
|
23
|
-
navItemsWithLength.forEach((navItem) => {
|
|
41
|
+
var navItemsWithLength = navItems.map(function (navItem) { return (__assign(__assign({}, navItem), { numberOfHeadings: navItem.level === 1 || navItem.level === 4 ? 0 : null })); });
|
|
42
|
+
var navItemLevel1;
|
|
43
|
+
var navItemLevel4;
|
|
44
|
+
navItemsWithLength.forEach(function (navItem) {
|
|
24
45
|
if (navItem.level === 1) {
|
|
25
46
|
navItemLevel1 = navItem;
|
|
26
47
|
navItemLevel4 = undefined;
|
|
@@ -30,7 +51,7 @@ function getColumnEntries(navItems) {
|
|
|
30
51
|
navItemLevel4 = navItem;
|
|
31
52
|
return;
|
|
32
53
|
}
|
|
33
|
-
|
|
54
|
+
var bumpNavItemLength = function (navItem) {
|
|
34
55
|
assert(navItem.numberOfHeadings !== null);
|
|
35
56
|
navItem.numberOfHeadings++;
|
|
36
57
|
};
|
|
@@ -40,13 +61,13 @@ function getColumnEntries(navItems) {
|
|
|
40
61
|
bumpNavItemLength(navItemLevel4);
|
|
41
62
|
}
|
|
42
63
|
});
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
navItemsWithLength.forEach((navItem, i)
|
|
47
|
-
|
|
64
|
+
var columnLayouts = [];
|
|
65
|
+
var columnEntries = [];
|
|
66
|
+
var isFullWidthCategory;
|
|
67
|
+
navItemsWithLength.forEach(function (navItem, i) {
|
|
68
|
+
var isFullWidthCategoryBegin = false;
|
|
48
69
|
if (navItem.level === 1) {
|
|
49
|
-
|
|
70
|
+
var isFullWidthCategoryPrevious = isFullWidthCategory;
|
|
50
71
|
isFullWidthCategory = !!navItem.menuModalFullWidth;
|
|
51
72
|
if (isFullWidthCategory)
|
|
52
73
|
isFullWidthCategoryBegin = true;
|
|
@@ -55,8 +76,8 @@ function getColumnEntries(navItems) {
|
|
|
55
76
|
columnEntries = [];
|
|
56
77
|
}
|
|
57
78
|
}
|
|
58
|
-
|
|
59
|
-
|
|
79
|
+
var navItemPrevious = navItemsWithLength[i - 1];
|
|
80
|
+
var navItemNext = navItemsWithLength[i + 1];
|
|
60
81
|
if (!isFullWidthCategory
|
|
61
82
|
? navItem.level === 1
|
|
62
83
|
: (navItem.level === 4 && navItemPrevious.level !== 1) || isFullWidthCategoryBegin) {
|
|
@@ -66,7 +87,7 @@ function getColumnEntries(navItems) {
|
|
|
66
87
|
else {
|
|
67
88
|
assert(navItem.level === 1);
|
|
68
89
|
}
|
|
69
|
-
|
|
90
|
+
var numberOfHeadings = navItem.numberOfHeadings;
|
|
70
91
|
assert(numberOfHeadings !== null);
|
|
71
92
|
if (isFullWidthCategoryBegin) {
|
|
72
93
|
assert(navItem.level === 1);
|
|
@@ -85,15 +106,15 @@ function getColumnEntries(navItems) {
|
|
|
85
106
|
}
|
|
86
107
|
function determineColumnLayout(columnsUnmerged, numberOfColumns) {
|
|
87
108
|
assert(numberOfColumns <= columnsUnmerged.length);
|
|
88
|
-
|
|
109
|
+
var columnsMergingInit = columnsUnmerged.map(function (columnHeight, i) { return ({
|
|
89
110
|
columnIdsMerged: [i],
|
|
90
111
|
heightTotal: columnHeight,
|
|
91
|
-
}));
|
|
92
|
-
|
|
93
|
-
|
|
112
|
+
}); });
|
|
113
|
+
var columnsMerged = mergeColumns(columnsMergingInit, numberOfColumns);
|
|
114
|
+
var columnsIdMap = new Array(columnsUnmerged.length);
|
|
94
115
|
assert(columnsMerged.length === numberOfColumns);
|
|
95
|
-
columnsMerged.forEach((columnMerged, columnMergedId)
|
|
96
|
-
columnMerged.columnIdsMerged.forEach((columnId)
|
|
116
|
+
columnsMerged.forEach(function (columnMerged, columnMergedId) {
|
|
117
|
+
columnMerged.columnIdsMerged.forEach(function (columnId) {
|
|
97
118
|
columnsIdMap[columnId] = columnMergedId;
|
|
98
119
|
});
|
|
99
120
|
});
|
|
@@ -103,32 +124,25 @@ function determineColumnLayout(columnsUnmerged, numberOfColumns) {
|
|
|
103
124
|
function mergeColumns(columnsMerging, numberOfColumns) {
|
|
104
125
|
if (columnsMerging.length <= numberOfColumns)
|
|
105
126
|
return columnsMerging;
|
|
106
|
-
|
|
107
|
-
for (
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
127
|
+
var mergeCandidate = null;
|
|
128
|
+
for (var i_1 = 0; i_1 <= columnsMerging.length - 2; i_1++) {
|
|
129
|
+
var column1 = columnsMerging[i_1 + 0];
|
|
130
|
+
var column2 = columnsMerging[i_1 + 1];
|
|
131
|
+
var heightTotal = column1.heightTotal + column2.heightTotal;
|
|
111
132
|
if (!mergeCandidate || mergeCandidate.heightTotal > heightTotal) {
|
|
112
133
|
mergeCandidate = {
|
|
113
|
-
i,
|
|
114
|
-
columnIdsMerged: [
|
|
115
|
-
|
|
116
|
-
...column1.columnIdsMerged,
|
|
117
|
-
...column2.columnIdsMerged,
|
|
118
|
-
],
|
|
119
|
-
heightTotal,
|
|
134
|
+
i: i_1,
|
|
135
|
+
columnIdsMerged: __spreadArray(__spreadArray([], column1.columnIdsMerged, true), column2.columnIdsMerged, true),
|
|
136
|
+
heightTotal: heightTotal,
|
|
120
137
|
};
|
|
121
138
|
}
|
|
122
139
|
}
|
|
123
140
|
assert(mergeCandidate);
|
|
124
|
-
|
|
141
|
+
var i = mergeCandidate.i;
|
|
125
142
|
assert(-1 < i && i < columnsMerging.length - 1);
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
mergeCandidate,
|
|
130
|
-
...columnsMerging.slice(i + 2),
|
|
131
|
-
];
|
|
143
|
+
var columnsMergingMod = __spreadArray(__spreadArray(__spreadArray([], columnsMerging.slice(0, i), true), [
|
|
144
|
+
mergeCandidate
|
|
145
|
+
], false), columnsMerging.slice(i + 2), true);
|
|
132
146
|
assert(columnsMergingMod.length === columnsMerging.length - 1);
|
|
133
147
|
return mergeColumns(columnsMergingMod, numberOfColumns);
|
|
134
148
|
}
|