@redocly/theme 0.1.29 → 0.1.32
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/JsonViewer/JsonViewer.js +1 -1
- package/Navbar/Navbar.d.ts +2 -1
- package/Navbar/Navbar.js +3 -2
- package/PageNavigation/NextPageLink.js +3 -3
- package/PageNavigation/PageNavigation.d.ts +1 -1
- package/PageNavigation/PageNavigation.js +7 -1
- package/PageNavigation/PreviousPageLink.js +3 -3
- package/Profile/Profile.js +3 -4
- package/TableOfContent/TableOfContent.js +10 -2
- package/hooks/__tests__/mocks/MockIntersectionObserver.d.ts +15 -0
- package/hooks/__tests__/mocks/MockIntersectionObserver.js +39 -0
- package/hooks/useActiveHeading.d.ts +1 -1
- package/hooks/useActiveHeading.js +69 -20
- package/mocks/hooks/index.d.ts +3 -3
- package/mocks/hooks/index.js +5 -8
- package/package.json +1 -1
- package/settings.yaml +4 -0
- package/src/JsonViewer/JsonViewer.tsx +19 -17
- package/src/Navbar/Navbar.tsx +3 -1
- package/src/PageNavigation/NextPageLink.tsx +1 -1
- package/src/PageNavigation/PageNavigation.tsx +10 -2
- package/src/PageNavigation/PreviousPageLink.tsx +2 -2
- package/src/Profile/Profile.tsx +4 -5
- package/src/TableOfContent/TableOfContent.tsx +12 -2
- package/src/hooks/useActiveHeading.ts +92 -28
- package/src/mocks/hooks/index.ts +6 -9
- package/src/utils/color.ts +9 -6
- package/utils/color.d.ts +1 -2
- package/utils/color.js +11 -9
package/JsonViewer/JsonViewer.js
CHANGED
|
@@ -141,7 +141,7 @@ function JsonComponent(_a) {
|
|
|
141
141
|
exports.Json = (0, react_1.memo)(JsonComponent);
|
|
142
142
|
exports.JsonViewer = (0, styled_components_1.default)(exports.Json).attrs(function () { return ({
|
|
143
143
|
'data-component-name': 'JsonViewer/JsonViewer',
|
|
144
|
-
}); })(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n .redoc-json code {\n background-color: var(--samples-panel-controls-background-color);\n color: var(--color-content-inverse);\n padding: inherit;\n border: none;\n }\n\n contain: content;\n overflow-x: auto;\n position: relative;\n padding: 10px;\n border-radius: var(--global-border-radius);\n background-color: var(--samples-panel-controls-background-color);\n color: var(--color-content-inverse);\n font-size: var(--code-font-size);\n font-family: var(--code-font-family);\n white-space: var(--code-wrap, pre);\n\n &.line-numbers {\n padding: 20px 20px 20px 3em;\n\n *[data-line]:not(.collapsed *[data-line]) {\n &:before {\n content: attr(data-line);\n position: absolute;\n left: 0;\n min-width: 2em;\n text-align: right;\n pointer-events: none;\n user-select: none;\n padding: 0 0.5em;\n font-size: 13px;\n }\n }\n }\n\n .callback-function {\n color: gray;\n }\n\n .
|
|
144
|
+
}); })(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n .redoc-json code {\n background-color: var(--samples-panel-controls-background-color);\n color: var(--color-content-inverse);\n padding: inherit;\n border: none;\n }\n\n contain: content;\n overflow-x: auto;\n position: relative;\n padding: 10px;\n border-radius: var(--global-border-radius);\n background-color: var(--samples-panel-controls-background-color);\n color: var(--color-content-inverse);\n font-size: var(--code-font-size);\n font-family: var(--code-font-family);\n white-space: var(--code-wrap, pre);\n\n &.line-numbers {\n padding: 20px 20px 20px 3em;\n\n *[data-line]:not(.collapsed *[data-line]) {\n &:before {\n content: attr(data-line);\n position: absolute;\n left: 0;\n min-width: 2em;\n text-align: right;\n pointer-events: none;\n user-select: none;\n padding: 0 0.5em;\n font-size: 13px;\n }\n }\n }\n\n .callback-function {\n color: gray;\n }\n\n .ellipsis:after {\n content: ' \u2026 ';\n }\n\n .collapsible {\n padding-left: 2ch;\n display: inline-block;\n }\n\n .hoverable {\n padding: 1px 2px;\n display: inline-block;\n }\n\n .collapsed {\n white-space: nowrap;\n\n & > .collapser:after {\n content: '+';\n }\n }\n\n .hovered {\n background-color: rgba(235, 238, 249, 1);\n }\n\n .collapser {\n --size: 15px;\n --margin-right: 3px;\n\n display: inline-block;\n background-color: transparent;\n border: 0;\n padding: 1px;\n color: #fff;\n width: var(--size);\n height: var(--size);\n margin-left: calc((var(--size) + var(--margin-right)) * -1);\n margin-right: var(--margin-right);\n cursor: pointer;\n user-select: none;\n -webkit-user-select: none;\n font-family: var(--code-font-family);\n font-size: var(--code-font-size);\n\n &:after {\n content: '-';\n display: flex;\n align-items: center;\n justify-content: center;\n height: 100%;\n width: 100%;\n }\n\n &:focus {\n outline: #fff dotted 1px;\n }\n }\n\n .selected {\n outline-width: 1px;\n outline-style: dotted;\n }\n\n .collapsed > .collapsible {\n display: none;\n }\n\n .ellipsis {\n display: none;\n }\n\n .collapsed > .ellipsis {\n display: inline;\n }\n"], ["\n .redoc-json code {\n background-color: var(--samples-panel-controls-background-color);\n color: var(--color-content-inverse);\n padding: inherit;\n border: none;\n }\n\n contain: content;\n overflow-x: auto;\n position: relative;\n padding: 10px;\n border-radius: var(--global-border-radius);\n background-color: var(--samples-panel-controls-background-color);\n color: var(--color-content-inverse);\n font-size: var(--code-font-size);\n font-family: var(--code-font-family);\n white-space: var(--code-wrap, pre);\n\n &.line-numbers {\n padding: 20px 20px 20px 3em;\n\n *[data-line]:not(.collapsed *[data-line]) {\n &:before {\n content: attr(data-line);\n position: absolute;\n left: 0;\n min-width: 2em;\n text-align: right;\n pointer-events: none;\n user-select: none;\n padding: 0 0.5em;\n font-size: 13px;\n }\n }\n }\n\n .callback-function {\n color: gray;\n }\n\n .ellipsis:after {\n content: ' \u2026 ';\n }\n\n .collapsible {\n padding-left: 2ch;\n display: inline-block;\n }\n\n .hoverable {\n padding: 1px 2px;\n display: inline-block;\n }\n\n .collapsed {\n white-space: nowrap;\n\n & > .collapser:after {\n content: '+';\n }\n }\n\n .hovered {\n background-color: rgba(235, 238, 249, 1);\n }\n\n .collapser {\n --size: 15px;\n --margin-right: 3px;\n\n display: inline-block;\n background-color: transparent;\n border: 0;\n padding: 1px;\n color: #fff;\n width: var(--size);\n height: var(--size);\n margin-left: calc((var(--size) + var(--margin-right)) * -1);\n margin-right: var(--margin-right);\n cursor: pointer;\n user-select: none;\n -webkit-user-select: none;\n font-family: var(--code-font-family);\n font-size: var(--code-font-size);\n\n &:after {\n content: '-';\n display: flex;\n align-items: center;\n justify-content: center;\n height: 100%;\n width: 100%;\n }\n\n &:focus {\n outline: #fff dotted 1px;\n }\n }\n\n .selected {\n outline-width: 1px;\n outline-style: dotted;\n }\n\n .collapsed > .collapsible {\n display: none;\n }\n\n .ellipsis {\n display: none;\n }\n\n .collapsed > .ellipsis {\n display: inline;\n }\n"])));
|
|
145
145
|
exports.JsonViewerWrap = styled_components_1.default.div(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n display: flex;\n flex-direction: column;\n flex: 1;\n\n &:hover > ", " {\n opacity: 1;\n }\n"], ["\n display: flex;\n flex-direction: column;\n flex: 1;\n\n &:hover > ", " {\n opacity: 1;\n }\n"])), SamplesPanelControls_1.SampleControls);
|
|
146
146
|
exports.StyledCodeBlock = (0, styled_components_1.default)(CodeBlock_1.CodeBlock)(templateObject_3 || (templateObject_3 = __makeTemplateObject(["\n flex: 1;\n\n code {\n font-family: var(--code-font-family);\n font-size: 14px;\n line-height: 18px;\n }\n"], ["\n flex: 1;\n\n code {\n font-family: var(--code-font-family);\n font-size: 14px;\n line-height: 18px;\n }\n"])));
|
|
147
147
|
var templateObject_1, templateObject_2, templateObject_3;
|
package/Navbar/Navbar.d.ts
CHANGED
|
@@ -4,7 +4,8 @@ interface NavbarProps {
|
|
|
4
4
|
menu: ResolvedConfigLinks;
|
|
5
5
|
logo: React.ReactNode;
|
|
6
6
|
search: React.ReactNode;
|
|
7
|
+
profile?: React.ReactNode;
|
|
7
8
|
}
|
|
8
|
-
export declare function Navbar({ menu, logo, search }: NavbarProps): JSX.Element | null;
|
|
9
|
+
export declare function Navbar({ menu, logo, search, profile }: NavbarProps): JSX.Element | null;
|
|
9
10
|
export declare const NavbarContainer: import("styled-components").StyledComponent<"nav", any, {}, never>;
|
|
10
11
|
export {};
|
package/Navbar/Navbar.js
CHANGED
|
@@ -33,7 +33,7 @@ var useMobileMenu_1 = require("../hooks/useMobileMenu");
|
|
|
33
33
|
var MobileNavbarMenuButton_1 = require("../Navbar/MobileNavbarMenuButton");
|
|
34
34
|
var MobileNavbarMenu_1 = require("../Navbar/MobileNavbarMenu");
|
|
35
35
|
function Navbar(_a) {
|
|
36
|
-
var menu = _a.menu, logo = _a.logo, search = _a.search;
|
|
36
|
+
var menu = _a.menu, logo = _a.logo, search = _a.search, profile = _a.profile;
|
|
37
37
|
var _b = __read((0, useMobileMenu_1.useMobileMenu)(false), 2), isOpen = _b[0], setIsOpen = _b[1];
|
|
38
38
|
var _c = (0, hooks_1.useThemeSettings)(constants_1.DEFAULT_THEME_NAME), searchSettings = _c.search, navbar = _c.navbar;
|
|
39
39
|
var hideSearch = (searchSettings === null || searchSettings === void 0 ? void 0 : searchSettings.hide) || ((searchSettings === null || searchSettings === void 0 ? void 0 : searchSettings.placement) && (searchSettings === null || searchSettings === void 0 ? void 0 : searchSettings.placement) !== 'navbar');
|
|
@@ -47,7 +47,8 @@ function Navbar(_a) {
|
|
|
47
47
|
isOpen && react_1.default.createElement(MobileNavbarMenu_1.MobileNavbarMenu, { closeMenu: closeMobileMenu, menuItems: menu }),
|
|
48
48
|
logo,
|
|
49
49
|
react_1.default.createElement(Navbar_1.NavbarMenu, { menuItems: menu }),
|
|
50
|
-
hideSearch ? null : search
|
|
50
|
+
hideSearch ? null : search,
|
|
51
|
+
profile));
|
|
51
52
|
}
|
|
52
53
|
exports.Navbar = Navbar;
|
|
53
54
|
exports.NavbarContainer = styled_components_1.default.nav(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n height: var(--navbar-height);\n box-sizing: border-box;\n display: flex;\n color: var(--navbar-text-color);\n align-items: center;\n justify-content: space-between;\n flex-shrink: 0;\n\n font-size: 0.875rem;\n position: sticky;\n top: 0;\n z-index: 200;\n padding: 10px var(--sidebar-margin-left);\n background: var(--navbar-background-color);\n font-family: var(--h-font-family);\n\n ", " {\n padding: 10px var(--sidebar-margin-left);\n font-size: 1rem;\n }\n\n ", " {\n background: transparent;\n display: none;\n > :not(a, img) {\n display: none !important;\n }\n img {\n padding: 0;\n margin: 0;\n }\n }\n"], ["\n height: var(--navbar-height);\n box-sizing: border-box;\n display: flex;\n color: var(--navbar-text-color);\n align-items: center;\n justify-content: space-between;\n flex-shrink: 0;\n\n font-size: 0.875rem;\n position: sticky;\n top: 0;\n z-index: 200;\n padding: 10px var(--sidebar-margin-left);\n background: var(--navbar-background-color);\n font-family: var(--h-font-family);\n\n ", " {\n padding: 10px var(--sidebar-margin-left);\n font-size: 1rem;\n }\n\n ", " {\n background: transparent;\n display: none;\n > :not(a, img) {\n display: none !important;\n }\n img {\n padding: 0;\n margin: 0;\n }\n }\n"])), function (_a) {
|
|
@@ -14,13 +14,13 @@ var hooks_1 = require("../mocks/hooks");
|
|
|
14
14
|
var constants_1 = require("../mocks/constants");
|
|
15
15
|
var Button_1 = require("../Button/Button");
|
|
16
16
|
function NextPageLink() {
|
|
17
|
-
var _a;
|
|
17
|
+
var _a, _b;
|
|
18
18
|
var nextPage = ((0, hooks_1.useSidebarSiblingsData)() || {}).nextPage;
|
|
19
19
|
var navigation = (0, hooks_1.useThemeSettings)(constants_1.DEFAULT_THEME_NAME).navigation;
|
|
20
|
-
if (!nextPage || (navigation === null || navigation === void 0 ? void 0 : navigation.hide)) {
|
|
20
|
+
if (!nextPage || (navigation === null || navigation === void 0 ? void 0 : navigation.hide) || ((_a = navigation === null || navigation === void 0 ? void 0 : navigation.nextPageLink) === null || _a === void 0 ? void 0 : _a.hide)) {
|
|
21
21
|
return react_1.default.createElement("div", null, "\u00A0");
|
|
22
22
|
}
|
|
23
|
-
var label = ((
|
|
23
|
+
var label = ((_b = navigation === null || navigation === void 0 ? void 0 : navigation.nextPageLink) === null || _b === void 0 ? void 0 : _b.label) || "Next to ".concat(nextPage.label);
|
|
24
24
|
return (react_1.default.createElement(StyledButton, { variant: "outlined", size: "large", to: nextPage.link, "data-component-name": "PageNavigation/NextPageLink" }, label));
|
|
25
25
|
}
|
|
26
26
|
exports.NextPageLink = NextPageLink;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
|
-
export declare function PageNavigation(): JSX.Element;
|
|
2
|
+
export declare function PageNavigation(): JSX.Element | null;
|
|
@@ -12,11 +12,17 @@ var react_1 = __importDefault(require("react"));
|
|
|
12
12
|
var styled_components_1 = __importDefault(require("styled-components"));
|
|
13
13
|
var PreviousPageLink_1 = require("../PageNavigation/PreviousPageLink");
|
|
14
14
|
var NextPageLink_1 = require("../PageNavigation/NextPageLink");
|
|
15
|
+
var hooks_1 = require("../mocks/hooks");
|
|
16
|
+
var constants_1 = require("../mocks/constants");
|
|
15
17
|
function PageNavigation() {
|
|
18
|
+
var navigation = (0, hooks_1.useThemeSettings)(constants_1.DEFAULT_THEME_NAME).navigation;
|
|
19
|
+
if (navigation === null || navigation === void 0 ? void 0 : navigation.hide) {
|
|
20
|
+
return null;
|
|
21
|
+
}
|
|
16
22
|
return (react_1.default.createElement(PageNavigationWrapper, { "data-component-name": "PageNavigation/PageNavigation" },
|
|
17
23
|
react_1.default.createElement(PreviousPageLink_1.PreviousPageLink, null),
|
|
18
24
|
react_1.default.createElement(NextPageLink_1.NextPageLink, null)));
|
|
19
25
|
}
|
|
20
26
|
exports.PageNavigation = PageNavigation;
|
|
21
|
-
var PageNavigationWrapper = styled_components_1.default.div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n display: flex;\n justify-content: space-between;\n margin: 25px
|
|
27
|
+
var PageNavigationWrapper = styled_components_1.default.div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n display: flex;\n justify-content: space-between;\n margin: 25px 0;\n"], ["\n display: flex;\n justify-content: space-between;\n margin: 25px 0;\n"])));
|
|
22
28
|
var templateObject_1;
|
|
@@ -14,13 +14,13 @@ var hooks_1 = require("../mocks/hooks");
|
|
|
14
14
|
var constants_1 = require("../mocks/constants");
|
|
15
15
|
var Button_1 = require("../Button/Button");
|
|
16
16
|
function PreviousPageLink() {
|
|
17
|
-
var _a;
|
|
17
|
+
var _a, _b;
|
|
18
18
|
var prevPage = ((0, hooks_1.useSidebarSiblingsData)() || {}).prevPage;
|
|
19
19
|
var navigation = (0, hooks_1.useThemeSettings)(constants_1.DEFAULT_THEME_NAME).navigation;
|
|
20
|
-
if (!prevPage || (navigation === null || navigation === void 0 ? void 0 : navigation.hide)) {
|
|
20
|
+
if (!prevPage || (navigation === null || navigation === void 0 ? void 0 : navigation.hide) || ((_a = navigation === null || navigation === void 0 ? void 0 : navigation.previousPageLink) === null || _a === void 0 ? void 0 : _a.hide)) {
|
|
21
21
|
return react_1.default.createElement("div", null, "\u00A0");
|
|
22
22
|
}
|
|
23
|
-
var label = ((
|
|
23
|
+
var label = ((_b = navigation === null || navigation === void 0 ? void 0 : navigation.previousPageLink) === null || _b === void 0 ? void 0 : _b.label) || "Back to ".concat(prevPage.label);
|
|
24
24
|
return (react_1.default.createElement(StyledButton, { variant: "outlined", size: "large", to: prevPage.link, "data-component-name": "PageNavigation/PreviousPageLink" }, label));
|
|
25
25
|
}
|
|
26
26
|
exports.PreviousPageLink = PreviousPageLink;
|
package/Profile/Profile.js
CHANGED
|
@@ -31,7 +31,6 @@ exports.Profile = void 0;
|
|
|
31
31
|
var react_1 = __importStar(require("react"));
|
|
32
32
|
var styled_components_1 = __importStar(require("styled-components"));
|
|
33
33
|
var utils_1 = require("../utils");
|
|
34
|
-
var RANDOM_BG_COLOR = (0, utils_1.getRandomColor)();
|
|
35
34
|
function ProfileComponent(_a) {
|
|
36
35
|
var _b;
|
|
37
36
|
var name = _a.name, imageUrl = _a.imageUrl, onClick = _a.onClick, color = _a.color;
|
|
@@ -44,14 +43,14 @@ function ProfileComponent(_a) {
|
|
|
44
43
|
var avatarLetters = "".concat(name.charAt(0).toUpperCase()).concat(((_b = name.split(' ')[1]) === null || _b === void 0 ? void 0 : _b.charAt(0).toUpperCase()) || '');
|
|
45
44
|
return (react_1.default.createElement(ProfileWrapper, { onClick: onClick },
|
|
46
45
|
react_1.default.createElement(StyledUserName, { "data-cy": "user-name", color: color }, name),
|
|
47
|
-
react_1.default.createElement(AvatarWrapper, { background:
|
|
46
|
+
react_1.default.createElement(AvatarWrapper, { background: (0, utils_1.stringToHslColor)(name) },
|
|
48
47
|
react_1.default.createElement("span", null, avatarLetters))));
|
|
49
48
|
}
|
|
50
49
|
exports.Profile = (0, react_1.memo)(ProfileComponent);
|
|
51
|
-
var ProfileWrapper = styled_components_1.default.div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n display: flex;\n align-items: center;\n cursor: pointer;\n width: auto;\n"], ["\n display: flex;\n align-items: center;\n cursor: pointer;\n width: auto;\n"])));
|
|
50
|
+
var ProfileWrapper = styled_components_1.default.div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n display: flex;\n align-items: center;\n cursor: pointer;\n width: auto;\n padding-left: calc(var(--sidebar-spacing-horizontal) * 2);\n"], ["\n display: flex;\n align-items: center;\n cursor: pointer;\n width: auto;\n padding-left: calc(var(--sidebar-spacing-horizontal) * 2);\n"])));
|
|
52
51
|
var StyledUserName = styled_components_1.default.span(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n color: ", ";\n"], ["\n color: ", ";\n"])), function (_a) {
|
|
53
52
|
var color = _a.color;
|
|
54
|
-
return color || 'var(--color
|
|
53
|
+
return color || 'var(--navbar-text-color)';
|
|
55
54
|
});
|
|
56
55
|
var AvatarWrapper = styled_components_1.default.div(templateObject_4 || (templateObject_4 = __makeTemplateObject(["\n width: 40px;\n height: 40px;\n display: flex;\n overflow: hidden;\n position: relative;\n font-size: 1.25rem;\n align-items: center;\n flex-shrink: 0;\n line-height: 1;\n user-select: none;\n border-radius: 50%;\n justify-content: center;\n margin-left: 16px;\n\n ", "\n\n & > img {\n color: transparent;\n width: 100%;\n height: 100%;\n object-fit: cover;\n text-align: center;\n text-indent: 10000px;\n }\n"], ["\n width: 40px;\n height: 40px;\n display: flex;\n overflow: hidden;\n position: relative;\n font-size: 1.25rem;\n align-items: center;\n flex-shrink: 0;\n line-height: 1;\n user-select: none;\n border-radius: 50%;\n justify-content: center;\n margin-left: 16px;\n\n ", "\n\n & > img {\n color: transparent;\n width: 100%;\n height: 100%;\n object-fit: cover;\n text-align: center;\n text-indent: 10000px;\n }\n"])), function (_a) {
|
|
57
56
|
var background = _a.background;
|
|
@@ -42,8 +42,16 @@ function TableOfContent(props) {
|
|
|
42
42
|
var headings = props.headings, tocMaxDepth = props.tocMaxDepth, contentWrapper = props.contentWrapper;
|
|
43
43
|
var sidebar = (0, react_1.useRef)(null);
|
|
44
44
|
(0, useFullHeight_1.useFullHeight)(sidebar);
|
|
45
|
-
var activeHeadingId = (0, useActiveHeading_1.useActiveHeading)(contentWrapper);
|
|
46
45
|
var toc = (0, hooks_1.useThemeSettings)(constants_1.DEFAULT_THEME_NAME).toc;
|
|
46
|
+
var getDisplayedHeaderIds = function () {
|
|
47
|
+
if (!headings) {
|
|
48
|
+
return [];
|
|
49
|
+
}
|
|
50
|
+
return headings
|
|
51
|
+
.filter(function (header) { return header && tocMaxDepth >= header.depth; })
|
|
52
|
+
.map(function (header) { return header === null || header === void 0 ? void 0 : header.id; });
|
|
53
|
+
};
|
|
54
|
+
var activeHeadingId = (0, useActiveHeading_1.useActiveHeading)(contentWrapper, getDisplayedHeaderIds());
|
|
47
55
|
if (toc === null || toc === void 0 ? void 0 : toc.hide) {
|
|
48
56
|
return null;
|
|
49
57
|
}
|
|
@@ -68,7 +76,7 @@ function TableOfContent(props) {
|
|
|
68
76
|
return null;
|
|
69
77
|
}
|
|
70
78
|
var href = '#' + heading.id;
|
|
71
|
-
return (react_1.default.createElement(MenuItem, { key: href, href: href, depth: heading.depth || 0, className: activeHeadingId === heading.id ? 'active' : '', dangerouslySetInnerHTML: { __html: heading.value || '' }, "data-cy": "toc-".concat(heading.value) }));
|
|
79
|
+
return (react_1.default.createElement(MenuItem, { key: href + idx, href: href, depth: heading.depth || 0, className: activeHeadingId === heading.id ? 'active' : '', dangerouslySetInnerHTML: { __html: heading.value || '' }, "data-cy": "toc-".concat(heading.value) }));
|
|
72
80
|
}))))));
|
|
73
81
|
}
|
|
74
82
|
exports.TableOfContent = TableOfContent;
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
export declare class MockIntersectionObserver {
|
|
2
|
+
readonly root: Element | Document | null;
|
|
3
|
+
readonly rootMargin: string;
|
|
4
|
+
readonly thresholds: ReadonlyArray<number>;
|
|
5
|
+
private viewPort;
|
|
6
|
+
private entries;
|
|
7
|
+
private readonly callback;
|
|
8
|
+
constructor(callback: IntersectionObserverCallback, options?: IntersectionObserverInit);
|
|
9
|
+
private intersect;
|
|
10
|
+
isInViewPort(target: HTMLElement): boolean;
|
|
11
|
+
observe(target: HTMLElement): void;
|
|
12
|
+
unobserve(target: HTMLElement): void;
|
|
13
|
+
disconnect(): void;
|
|
14
|
+
takeRecords(): any[];
|
|
15
|
+
}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MockIntersectionObserver = void 0;
|
|
4
|
+
var MockIntersectionObserver = /** @class */ (function () {
|
|
5
|
+
function MockIntersectionObserver(callback, options) {
|
|
6
|
+
var _this = this;
|
|
7
|
+
this.intersect = function () {
|
|
8
|
+
_this.entries.map(function (entry) {
|
|
9
|
+
entry.isIntersecting = _this.isInViewPort(entry.target);
|
|
10
|
+
});
|
|
11
|
+
_this.callback(_this.entries, _this);
|
|
12
|
+
};
|
|
13
|
+
this.viewPort = (options === null || options === void 0 ? void 0 : options.root) ? options.root : window;
|
|
14
|
+
this.entries = [];
|
|
15
|
+
this.root = null;
|
|
16
|
+
this.rootMargin = '0px';
|
|
17
|
+
this.thresholds = [1];
|
|
18
|
+
this.callback = callback;
|
|
19
|
+
this.viewPort.addEventListener('scroll', this.intersect);
|
|
20
|
+
}
|
|
21
|
+
MockIntersectionObserver.prototype.isInViewPort = function (target) {
|
|
22
|
+
return target.id !== 'toc-0';
|
|
23
|
+
};
|
|
24
|
+
MockIntersectionObserver.prototype.observe = function (target) {
|
|
25
|
+
this.entries.push({ isIntersecting: false, target: target });
|
|
26
|
+
};
|
|
27
|
+
MockIntersectionObserver.prototype.unobserve = function (target) {
|
|
28
|
+
this.entries = this.entries.filter(function (ob) { return ob.target !== target; });
|
|
29
|
+
};
|
|
30
|
+
MockIntersectionObserver.prototype.disconnect = function () {
|
|
31
|
+
this.viewPort.removeEventListener('scroll', this.intersect);
|
|
32
|
+
this.entries = [];
|
|
33
|
+
};
|
|
34
|
+
MockIntersectionObserver.prototype.takeRecords = function () {
|
|
35
|
+
return this.entries;
|
|
36
|
+
};
|
|
37
|
+
return MockIntersectionObserver;
|
|
38
|
+
}());
|
|
39
|
+
exports.MockIntersectionObserver = MockIntersectionObserver;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export declare type UseActiveHeadingReturnType = string | undefined;
|
|
2
|
-
export declare function useActiveHeading(contentElement:
|
|
2
|
+
export declare function useActiveHeading(contentElement: HTMLDivElement | null, displayedHeaders: Array<string | undefined>): UseActiveHeadingReturnType;
|
|
@@ -18,33 +18,82 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
18
18
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
19
|
exports.useActiveHeading = void 0;
|
|
20
20
|
var react_1 = require("react");
|
|
21
|
-
|
|
21
|
+
var react_router_dom_1 = require("react-router-dom");
|
|
22
|
+
function useActiveHeading(contentElement, displayedHeaders) {
|
|
22
23
|
var _a = __read((0, react_1.useState)(undefined), 2), heading = _a[0], setHeading = _a[1];
|
|
23
|
-
var
|
|
24
|
-
var
|
|
25
|
-
|
|
26
|
-
function () {
|
|
27
|
-
|
|
24
|
+
var _b = __read((0, react_1.useState)([]), 2), headingElements = _b[0], setHeadingElements = _b[1];
|
|
25
|
+
var headingElementsRef = (0, react_1.useRef)({});
|
|
26
|
+
var history = (0, react_router_dom_1.useHistory)();
|
|
27
|
+
var getVisibleHeadings = function () {
|
|
28
|
+
var visibleHeadings = [];
|
|
29
|
+
for (var key in headingElementsRef.current) {
|
|
30
|
+
var headingElement = headingElementsRef.current[key];
|
|
31
|
+
if (headingElement.isIntersecting) {
|
|
32
|
+
visibleHeadings.push(headingElement);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
return visibleHeadings;
|
|
36
|
+
};
|
|
37
|
+
var getIndexFromId = function (id) {
|
|
38
|
+
return headingElements.findIndex(function (item) { return item.id === id; });
|
|
39
|
+
};
|
|
40
|
+
var findHeaders = function (allContent) {
|
|
41
|
+
var allHeaders = allContent.querySelectorAll('.heading-anchor');
|
|
42
|
+
return Array.from(allHeaders);
|
|
43
|
+
};
|
|
44
|
+
var intersectionCallback = function (headings) {
|
|
45
|
+
var _a;
|
|
46
|
+
headingElementsRef.current = headings.reduce(function (map, headingElement) {
|
|
47
|
+
map[headingElement.target.id] = headingElement;
|
|
48
|
+
return map;
|
|
49
|
+
}, headingElementsRef.current);
|
|
50
|
+
var totalHeight = window.scrollY + window.innerHeight;
|
|
51
|
+
// handle bottom of the page
|
|
52
|
+
if (totalHeight >= document.body.scrollHeight) {
|
|
53
|
+
var newHeading = ((_a = headingElements[(headingElements === null || headingElements === void 0 ? void 0 : headingElements.length) - 1]) === null || _a === void 0 ? void 0 : _a.id) || undefined;
|
|
54
|
+
setHeading(newHeading);
|
|
28
55
|
return;
|
|
29
56
|
}
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
57
|
+
var visibleHeadings = getVisibleHeadings();
|
|
58
|
+
if (!visibleHeadings.length) {
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
61
|
+
if (visibleHeadings.length === 1) {
|
|
62
|
+
setHeading(visibleHeadings[0].target.id);
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
visibleHeadings.sort(function (a, b) {
|
|
66
|
+
return getIndexFromId(a.target.id) - getIndexFromId(b.target.id);
|
|
67
|
+
});
|
|
68
|
+
setHeading(visibleHeadings[0].target.id);
|
|
69
|
+
};
|
|
70
|
+
(0, react_1.useEffect)(function () {
|
|
71
|
+
if (!contentElement) {
|
|
72
|
+
return;
|
|
36
73
|
}
|
|
37
|
-
|
|
74
|
+
setHeadingElements(findHeaders(contentElement));
|
|
75
|
+
var unlisten = history.listen(function () {
|
|
76
|
+
setHeadingElements(findHeaders(contentElement));
|
|
77
|
+
});
|
|
78
|
+
return function () { return unlisten(); };
|
|
79
|
+
}, [contentElement]);
|
|
38
80
|
(0, react_1.useEffect)(function () {
|
|
39
|
-
if (
|
|
40
|
-
return
|
|
81
|
+
if (!(headingElements === null || headingElements === void 0 ? void 0 : headingElements.length)) {
|
|
82
|
+
return;
|
|
41
83
|
}
|
|
42
|
-
|
|
43
|
-
|
|
84
|
+
headingElementsRef.current = {};
|
|
85
|
+
// Bottom rootMargin -30% changes part of the view where IntersectionObserver starts to detect headers
|
|
86
|
+
var observer = new IntersectionObserver(intersectionCallback, {
|
|
87
|
+
rootMargin: '0px 0px -30% 0px',
|
|
88
|
+
threshold: 1,
|
|
89
|
+
});
|
|
90
|
+
headingElements === null || headingElements === void 0 ? void 0 : headingElements.forEach(function (element) {
|
|
91
|
+
if (displayedHeaders.includes(element.id)) {
|
|
92
|
+
observer.observe(element);
|
|
93
|
+
}
|
|
44
94
|
});
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
}, [handler, headings]);
|
|
95
|
+
return function () { return observer.disconnect(); };
|
|
96
|
+
}, [headingElements, displayedHeaders]);
|
|
48
97
|
return heading;
|
|
49
98
|
}
|
|
50
99
|
exports.useActiveHeading = useActiveHeading;
|
package/mocks/hooks/index.d.ts
CHANGED
|
@@ -7,9 +7,9 @@ interface PageLink {
|
|
|
7
7
|
link: string;
|
|
8
8
|
type: 'link';
|
|
9
9
|
}
|
|
10
|
-
export declare function useThemeSettings(
|
|
10
|
+
export declare function useThemeSettings(_: string): RawTheme['settings'];
|
|
11
11
|
export declare function useSidebarSiblingsData(): {
|
|
12
|
-
nextPage: PageLink;
|
|
13
|
-
prevPage: PageLink;
|
|
12
|
+
nextPage: PageLink | null;
|
|
13
|
+
prevPage: PageLink | null;
|
|
14
14
|
};
|
|
15
15
|
export {};
|
package/mocks/hooks/index.js
CHANGED
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.useSidebarSiblingsData = exports.useThemeSettings = void 0;
|
|
4
|
-
function useThemeSettings(
|
|
4
|
+
function useThemeSettings(_) {
|
|
5
5
|
return {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
nextPageLink: { label: 'next page' },
|
|
11
|
-
previousPageLink: { label: 'prev page' },
|
|
12
|
-
},
|
|
6
|
+
toc: { header: 'header', hide: false },
|
|
7
|
+
navigation: {
|
|
8
|
+
nextPageLink: { label: 'next page theme settings label' },
|
|
9
|
+
previousPageLink: { label: 'prev page theme settings label' },
|
|
13
10
|
},
|
|
14
11
|
};
|
|
15
12
|
}
|
package/package.json
CHANGED
package/settings.yaml
CHANGED
|
@@ -154,11 +154,6 @@ export const JsonViewer = styled(Json).attrs(() => ({
|
|
|
154
154
|
color: gray;
|
|
155
155
|
}
|
|
156
156
|
|
|
157
|
-
.collapsed > .collapser:after {
|
|
158
|
-
content: '+';
|
|
159
|
-
cursor: pointer;
|
|
160
|
-
}
|
|
161
|
-
|
|
162
157
|
.ellipsis:after {
|
|
163
158
|
content: ' … ';
|
|
164
159
|
}
|
|
@@ -174,7 +169,11 @@ export const JsonViewer = styled(Json).attrs(() => ({
|
|
|
174
169
|
}
|
|
175
170
|
|
|
176
171
|
.collapsed {
|
|
177
|
-
|
|
172
|
+
white-space: nowrap;
|
|
173
|
+
|
|
174
|
+
& > .collapser:after {
|
|
175
|
+
content: '+';
|
|
176
|
+
}
|
|
178
177
|
}
|
|
179
178
|
|
|
180
179
|
.hovered {
|
|
@@ -182,13 +181,19 @@ export const JsonViewer = styled(Json).attrs(() => ({
|
|
|
182
181
|
}
|
|
183
182
|
|
|
184
183
|
.collapser {
|
|
184
|
+
--size: 15px;
|
|
185
|
+
--margin-right: 3px;
|
|
186
|
+
|
|
187
|
+
display: inline-block;
|
|
185
188
|
background-color: transparent;
|
|
186
189
|
border: 0;
|
|
187
|
-
padding:
|
|
190
|
+
padding: 1px;
|
|
188
191
|
color: #fff;
|
|
189
|
-
width:
|
|
190
|
-
height:
|
|
191
|
-
|
|
192
|
+
width: var(--size);
|
|
193
|
+
height: var(--size);
|
|
194
|
+
margin-left: calc((var(--size) + var(--margin-right)) * -1);
|
|
195
|
+
margin-right: var(--margin-right);
|
|
196
|
+
cursor: pointer;
|
|
192
197
|
user-select: none;
|
|
193
198
|
-webkit-user-select: none;
|
|
194
199
|
font-family: var(--code-font-family);
|
|
@@ -196,18 +201,15 @@ export const JsonViewer = styled(Json).attrs(() => ({
|
|
|
196
201
|
|
|
197
202
|
&:after {
|
|
198
203
|
content: '-';
|
|
199
|
-
cursor: pointer;
|
|
200
204
|
display: flex;
|
|
201
205
|
align-items: center;
|
|
202
206
|
justify-content: center;
|
|
203
|
-
width: 15px;
|
|
204
207
|
height: 100%;
|
|
205
|
-
|
|
206
|
-
|
|
208
|
+
width: 100%;
|
|
209
|
+
}
|
|
207
210
|
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
}
|
|
211
|
+
&:focus {
|
|
212
|
+
outline: #fff dotted 1px;
|
|
211
213
|
}
|
|
212
214
|
}
|
|
213
215
|
|
package/src/Navbar/Navbar.tsx
CHANGED
|
@@ -13,9 +13,10 @@ interface NavbarProps {
|
|
|
13
13
|
menu: ResolvedConfigLinks;
|
|
14
14
|
logo: React.ReactNode;
|
|
15
15
|
search: React.ReactNode;
|
|
16
|
+
profile?: React.ReactNode;
|
|
16
17
|
}
|
|
17
18
|
|
|
18
|
-
export function Navbar({ menu, logo, search }: NavbarProps): JSX.Element | null {
|
|
19
|
+
export function Navbar({ menu, logo, search, profile }: NavbarProps): JSX.Element | null {
|
|
19
20
|
const [isOpen, setIsOpen] = useMobileMenu(false);
|
|
20
21
|
const { search: searchSettings, navbar } = useThemeSettings(DEFAULT_THEME_NAME);
|
|
21
22
|
const hideSearch =
|
|
@@ -35,6 +36,7 @@ export function Navbar({ menu, logo, search }: NavbarProps): JSX.Element | null
|
|
|
35
36
|
{logo}
|
|
36
37
|
<NavbarMenu menuItems={menu} />
|
|
37
38
|
{hideSearch ? null : search}
|
|
39
|
+
{profile}
|
|
38
40
|
</NavbarContainer>
|
|
39
41
|
);
|
|
40
42
|
}
|
|
@@ -14,7 +14,7 @@ export function NextPageLink(): JSX.Element {
|
|
|
14
14
|
const { nextPage }: NextPageType = useSidebarSiblingsData() || {};
|
|
15
15
|
const { navigation } = useThemeSettings(DEFAULT_THEME_NAME);
|
|
16
16
|
|
|
17
|
-
if (!nextPage || navigation?.hide) {
|
|
17
|
+
if (!nextPage || navigation?.hide || navigation?.nextPageLink?.hide) {
|
|
18
18
|
return <div> </div>;
|
|
19
19
|
}
|
|
20
20
|
|
|
@@ -3,8 +3,16 @@ import styled from 'styled-components';
|
|
|
3
3
|
|
|
4
4
|
import { PreviousPageLink } from '@theme/PageNavigation/PreviousPageLink';
|
|
5
5
|
import { NextPageLink } from '@theme/PageNavigation/NextPageLink';
|
|
6
|
+
import { useThemeSettings } from '@portal/hooks';
|
|
7
|
+
import { DEFAULT_THEME_NAME } from '@portal/constants';
|
|
8
|
+
|
|
9
|
+
export function PageNavigation(): JSX.Element | null {
|
|
10
|
+
const { navigation } = useThemeSettings(DEFAULT_THEME_NAME);
|
|
11
|
+
|
|
12
|
+
if (navigation?.hide) {
|
|
13
|
+
return null;
|
|
14
|
+
}
|
|
6
15
|
|
|
7
|
-
export function PageNavigation(): JSX.Element {
|
|
8
16
|
return (
|
|
9
17
|
<PageNavigationWrapper data-component-name="PageNavigation/PageNavigation">
|
|
10
18
|
<PreviousPageLink />
|
|
@@ -16,5 +24,5 @@ export function PageNavigation(): JSX.Element {
|
|
|
16
24
|
const PageNavigationWrapper = styled.div`
|
|
17
25
|
display: flex;
|
|
18
26
|
justify-content: space-between;
|
|
19
|
-
margin: 25px
|
|
27
|
+
margin: 25px 0;
|
|
20
28
|
`;
|
|
@@ -14,11 +14,11 @@ export function PreviousPageLink(): JSX.Element {
|
|
|
14
14
|
const { prevPage }: PreviousPageType = useSidebarSiblingsData() || {};
|
|
15
15
|
const { navigation } = useThemeSettings(DEFAULT_THEME_NAME);
|
|
16
16
|
|
|
17
|
-
if (!prevPage || navigation?.hide) {
|
|
17
|
+
if (!prevPage || navigation?.hide || navigation?.previousPageLink?.hide) {
|
|
18
18
|
return <div> </div>;
|
|
19
19
|
}
|
|
20
20
|
|
|
21
|
-
const label = navigation?.
|
|
21
|
+
const label = navigation?.previousPageLink?.label || `Back to ${prevPage.label}`;
|
|
22
22
|
|
|
23
23
|
return (
|
|
24
24
|
<StyledButton
|
package/src/Profile/Profile.tsx
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React, { memo } from 'react';
|
|
2
2
|
import styled, { css } from 'styled-components';
|
|
3
3
|
|
|
4
|
-
import {
|
|
4
|
+
import { stringToHslColor } from '@theme/utils';
|
|
5
5
|
|
|
6
6
|
export interface ProfileProps {
|
|
7
7
|
name: string;
|
|
@@ -10,8 +10,6 @@ export interface ProfileProps {
|
|
|
10
10
|
onClick?: () => void;
|
|
11
11
|
}
|
|
12
12
|
|
|
13
|
-
const RANDOM_BG_COLOR: string = getRandomColor();
|
|
14
|
-
|
|
15
13
|
function ProfileComponent({ name, imageUrl, onClick, color }: ProfileProps): JSX.Element {
|
|
16
14
|
if (imageUrl) {
|
|
17
15
|
return (
|
|
@@ -37,7 +35,7 @@ function ProfileComponent({ name, imageUrl, onClick, color }: ProfileProps): JSX
|
|
|
37
35
|
<StyledUserName data-cy="user-name" color={color}>
|
|
38
36
|
{name}
|
|
39
37
|
</StyledUserName>
|
|
40
|
-
<AvatarWrapper background={
|
|
38
|
+
<AvatarWrapper background={stringToHslColor(name)}>
|
|
41
39
|
<span>{avatarLetters}</span>
|
|
42
40
|
</AvatarWrapper>
|
|
43
41
|
</ProfileWrapper>
|
|
@@ -51,10 +49,11 @@ const ProfileWrapper = styled.div`
|
|
|
51
49
|
align-items: center;
|
|
52
50
|
cursor: pointer;
|
|
53
51
|
width: auto;
|
|
52
|
+
padding-left: calc(var(--sidebar-spacing-horizontal) * 2);
|
|
54
53
|
`;
|
|
55
54
|
|
|
56
55
|
const StyledUserName = styled.span`
|
|
57
|
-
color: ${({ color }) => color || 'var(--color
|
|
56
|
+
color: ${({ color }) => color || 'var(--navbar-text-color)'};
|
|
58
57
|
`;
|
|
59
58
|
|
|
60
59
|
const AvatarWrapper = styled.div<{ background?: string }>`
|
|
@@ -18,9 +18,19 @@ export function TableOfContent(props: TableOfContentProps): JSX.Element | null {
|
|
|
18
18
|
|
|
19
19
|
const sidebar = useRef<HTMLDivElement | null>(null);
|
|
20
20
|
useFullHeight(sidebar);
|
|
21
|
-
const activeHeadingId = useActiveHeading(contentWrapper);
|
|
22
21
|
const { toc } = useThemeSettings(DEFAULT_THEME_NAME);
|
|
23
22
|
|
|
23
|
+
const getDisplayedHeaderIds = () => {
|
|
24
|
+
if (!headings) {
|
|
25
|
+
return [];
|
|
26
|
+
}
|
|
27
|
+
return headings
|
|
28
|
+
.filter((header) => header && tocMaxDepth >= header.depth)
|
|
29
|
+
.map((header) => header?.id);
|
|
30
|
+
};
|
|
31
|
+
|
|
32
|
+
const activeHeadingId = useActiveHeading(contentWrapper, getDisplayedHeaderIds());
|
|
33
|
+
|
|
24
34
|
if (toc?.hide) {
|
|
25
35
|
return null;
|
|
26
36
|
}
|
|
@@ -51,7 +61,7 @@ export function TableOfContent(props: TableOfContentProps): JSX.Element | null {
|
|
|
51
61
|
const href = '#' + heading.id;
|
|
52
62
|
return (
|
|
53
63
|
<MenuItem
|
|
54
|
-
key={href}
|
|
64
|
+
key={href + idx}
|
|
55
65
|
href={href}
|
|
56
66
|
depth={heading.depth || 0}
|
|
57
67
|
className={activeHeadingId === heading.id ? 'active' : ''}
|
|
@@ -1,46 +1,110 @@
|
|
|
1
|
-
import { useState,
|
|
1
|
+
import { useState, useEffect, useRef } from 'react';
|
|
2
|
+
import { useHistory } from 'react-router-dom';
|
|
2
3
|
|
|
3
4
|
export type UseActiveHeadingReturnType = string | undefined;
|
|
4
5
|
|
|
5
|
-
|
|
6
|
+
type HeadingEntry = {
|
|
7
|
+
[key: string]: IntersectionObserverEntry;
|
|
8
|
+
};
|
|
9
|
+
|
|
10
|
+
export function useActiveHeading(
|
|
11
|
+
contentElement: HTMLDivElement | null,
|
|
12
|
+
displayedHeaders: Array<string | undefined>,
|
|
13
|
+
): UseActiveHeadingReturnType {
|
|
6
14
|
const [heading, setHeading] = useState<string | undefined>(undefined);
|
|
15
|
+
const [headingElements, setHeadingElements] = useState<HTMLElement[]>([]);
|
|
16
|
+
const headingElementsRef = useRef<HeadingEntry>({});
|
|
7
17
|
|
|
8
|
-
const
|
|
9
|
-
() => contentElement && contentElement.querySelectorAll<HTMLElement>('.heading-anchor'),
|
|
10
|
-
[contentElement],
|
|
11
|
-
);
|
|
18
|
+
const history = useHistory();
|
|
12
19
|
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
}
|
|
20
|
+
const getVisibleHeadings = () => {
|
|
21
|
+
const visibleHeadings: IntersectionObserverEntry[] = [];
|
|
22
|
+
|
|
23
|
+
for (const key in headingElementsRef.current) {
|
|
24
|
+
const headingElement = headingElementsRef.current[key];
|
|
19
25
|
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
const newHeading = i === 0 ? undefined : headings[i - 1].getAttribute('id') || undefined;
|
|
23
|
-
setHeading(newHeading);
|
|
24
|
-
return;
|
|
25
|
-
}
|
|
26
|
+
if (headingElement.isIntersecting) {
|
|
27
|
+
visibleHeadings.push(headingElement);
|
|
26
28
|
}
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
return visibleHeadings;
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
const getIndexFromId = (id: string) => {
|
|
35
|
+
return headingElements.findIndex((item) => item.id === id);
|
|
36
|
+
};
|
|
37
|
+
|
|
38
|
+
const findHeaders = (allContent: HTMLDivElement) => {
|
|
39
|
+
const allHeaders = allContent.querySelectorAll<HTMLElement>('.heading-anchor');
|
|
40
|
+
return Array.from(allHeaders);
|
|
41
|
+
};
|
|
42
|
+
|
|
43
|
+
const intersectionCallback = (headings: IntersectionObserverEntry[]) => {
|
|
44
|
+
headingElementsRef.current = headings.reduce(
|
|
45
|
+
(map: HeadingEntry, headingElement: IntersectionObserverEntry) => {
|
|
46
|
+
map[headingElement.target.id] = headingElement;
|
|
47
|
+
return map;
|
|
48
|
+
},
|
|
49
|
+
headingElementsRef.current,
|
|
50
|
+
);
|
|
51
|
+
|
|
52
|
+
const totalHeight = window.scrollY + window.innerHeight;
|
|
53
|
+
// handle bottom of the page
|
|
54
|
+
if (totalHeight >= document.body.scrollHeight) {
|
|
55
|
+
const newHeading = headingElements[headingElements?.length - 1]?.id || undefined;
|
|
56
|
+
setHeading(newHeading);
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
const visibleHeadings = getVisibleHeadings();
|
|
61
|
+
if (!visibleHeadings.length) {
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
if (visibleHeadings.length === 1) {
|
|
66
|
+
setHeading(visibleHeadings[0].target.id);
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
visibleHeadings.sort((a, b) => {
|
|
71
|
+
return getIndexFromId(a.target.id) - getIndexFromId(b.target.id);
|
|
72
|
+
});
|
|
73
|
+
setHeading(visibleHeadings[0].target.id);
|
|
74
|
+
};
|
|
30
75
|
|
|
31
76
|
useEffect(() => {
|
|
32
|
-
if (
|
|
33
|
-
return
|
|
77
|
+
if (!contentElement) {
|
|
78
|
+
return;
|
|
34
79
|
}
|
|
80
|
+
setHeadingElements(findHeaders(contentElement));
|
|
35
81
|
|
|
36
|
-
|
|
37
|
-
|
|
82
|
+
const unlisten = history.listen(() => {
|
|
83
|
+
setHeadingElements(findHeaders(contentElement));
|
|
38
84
|
});
|
|
39
85
|
|
|
40
|
-
|
|
86
|
+
return () => unlisten();
|
|
87
|
+
}, [contentElement]);
|
|
88
|
+
|
|
89
|
+
useEffect(() => {
|
|
90
|
+
if (!headingElements?.length) {
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
93
|
+
headingElementsRef.current = {};
|
|
94
|
+
|
|
95
|
+
// Bottom rootMargin -30% changes part of the view where IntersectionObserver starts to detect headers
|
|
96
|
+
const observer = new IntersectionObserver(intersectionCallback, {
|
|
97
|
+
rootMargin: '0px 0px -30% 0px',
|
|
98
|
+
threshold: 1,
|
|
99
|
+
});
|
|
100
|
+
headingElements?.forEach((element) => {
|
|
101
|
+
if (displayedHeaders.includes(element.id)) {
|
|
102
|
+
observer.observe(element);
|
|
103
|
+
}
|
|
104
|
+
});
|
|
41
105
|
|
|
42
|
-
return () =>
|
|
43
|
-
}, [
|
|
106
|
+
return () => observer.disconnect();
|
|
107
|
+
}, [headingElements, displayedHeaders]);
|
|
44
108
|
|
|
45
109
|
return heading;
|
|
46
110
|
}
|
package/src/mocks/hooks/index.ts
CHANGED
|
@@ -9,20 +9,17 @@ interface PageLink {
|
|
|
9
9
|
type: 'link';
|
|
10
10
|
}
|
|
11
11
|
|
|
12
|
-
export function useThemeSettings(
|
|
12
|
+
export function useThemeSettings(_: string): RawTheme['settings'] {
|
|
13
13
|
return {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
nextPageLink: { label: 'next page' },
|
|
19
|
-
previousPageLink: { label: 'prev page' },
|
|
20
|
-
},
|
|
14
|
+
toc: { header: 'header', hide: false },
|
|
15
|
+
navigation: {
|
|
16
|
+
nextPageLink: { label: 'next page theme settings label' },
|
|
17
|
+
previousPageLink: { label: 'prev page theme settings label' },
|
|
21
18
|
},
|
|
22
19
|
};
|
|
23
20
|
}
|
|
24
21
|
|
|
25
|
-
export function useSidebarSiblingsData(): { nextPage: PageLink; prevPage: PageLink } {
|
|
22
|
+
export function useSidebarSiblingsData(): { nextPage: PageLink | null; prevPage: PageLink | null } {
|
|
26
23
|
return {
|
|
27
24
|
nextPage: {
|
|
28
25
|
type: 'link',
|
package/src/utils/color.ts
CHANGED
|
@@ -1,9 +1,12 @@
|
|
|
1
|
-
export
|
|
1
|
+
export function stringToHslColor(value: string): string {
|
|
2
|
+
const s = 30;
|
|
3
|
+
const l = 80;
|
|
4
|
+
let hash = 0;
|
|
2
5
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const l = getRandomNumber(100);
|
|
6
|
+
for (let i = 0; i < value.length; i++) {
|
|
7
|
+
hash = value.charCodeAt(i) + ((hash << 5) - hash);
|
|
8
|
+
}
|
|
7
9
|
|
|
8
|
-
|
|
10
|
+
const h = hash % 360;
|
|
11
|
+
return `hsl(${h}, ${s}%, ${l}%)`;
|
|
9
12
|
}
|
package/utils/color.d.ts
CHANGED
|
@@ -1,2 +1 @@
|
|
|
1
|
-
export declare
|
|
2
|
-
export declare function getRandomColor(): string;
|
|
1
|
+
export declare function stringToHslColor(value: string): string;
|
package/utils/color.js
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
var
|
|
8
|
-
var
|
|
9
|
-
|
|
10
|
-
|
|
3
|
+
exports.stringToHslColor = void 0;
|
|
4
|
+
function stringToHslColor(value) {
|
|
5
|
+
var s = 30;
|
|
6
|
+
var l = 80;
|
|
7
|
+
var hash = 0;
|
|
8
|
+
for (var i = 0; i < value.length; i++) {
|
|
9
|
+
hash = value.charCodeAt(i) + ((hash << 5) - hash);
|
|
10
|
+
}
|
|
11
|
+
var h = hash % 360;
|
|
12
|
+
return "hsl(".concat(h, ", ").concat(s, "%, ").concat(l, "%)");
|
|
11
13
|
}
|
|
12
|
-
exports.
|
|
14
|
+
exports.stringToHslColor = stringToHslColor;
|