@@ -49,8 +49,7 @@ let makeBreadcrumbs = (~basePath: string, route: string): list<Url.breadcrumb> =
|
49 | 49 | @react.component
|
50 | 50 | let make = (
|
51 | 51 | ~breadcrumbs: option<list<Url.breadcrumb>>=?,
|
52 |
| -~title: string, |
53 |
| -~metaTitleCategory: option<string>=?, // e.g. Introduction | My Meta Title Category |
| 52 | +~metaTitleCategory: string, // e.g. Introduction | My Meta Title Category |
54 | 53 | ~frontmatter=?,
|
55 | 54 | ~version: option<string>=?,
|
56 | 55 | ~availableVersions: option<array<(string, string)>>=?,
|
@@ -86,7 +85,6 @@ let make = (
|
86 | 85 |
|
87 | 86 | let preludeSection =
|
88 | 87 | <div className="flex flex-col justify-between text-fire font-medium items-baseline">
|
89 |
| -{React.string(title)} |
90 | 88 | {switch version {
|
91 | 89 | | Some(version) =>
|
92 | 90 | switch availableVersions {
|
@@ -111,30 +109,23 @@ let make = (
|
111 | 109 | </div>
|
112 | 110 |
|
113 | 111 | let sidebar =
|
114 |
| -<Sidebar |
115 |
| -isOpen=isSidebarOpen toggle=toggleSidebar preludeSection title ?activeToc categories route |
116 |
| -/> |
| 112 | +<Sidebar isOpen=isSidebarOpen toggle=toggleSidebar preludeSection ?activeToc categories route /> |
117 | 113 |
|
118 |
| -let metaTitle = switch metaTitleCategory { |
119 |
| -| Some(titleCategory) => titleCategory ++ (" | " ++ "ReScript Documentation") |
120 |
| -| None => title |
121 |
| -} |
| 114 | +let metaTitle = metaTitleCategory ++ (" | " ++ "ReScript Documentation") |
122 | 115 |
|
123 | 116 | let (metaElement, editHref) = switch frontmatter {
|
124 | 117 | | Some(frontmatter) =>
|
125 | 118 | switch DocFrontmatter.decode(frontmatter) {
|
126 | 119 | | Some(fm) =>
|
127 | 120 | let canonical = Null.toOption(fm.canonical)
|
128 | 121 | let description = Null.toOption(fm.description)
|
129 |
| -let title = switch metaTitleCategory { |
130 |
| -| Some(titleCategory) => |
| 122 | +let title = { |
131 | 123 | // We will prefer an existing metaTitle over just a title
|
132 | 124 | let metaTitle = switch Null.toOption(fm.metaTitle) {
|
133 | 125 | | Some(metaTitle) => metaTitle
|
134 | 126 | | None => fm.title
|
135 | 127 | }
|
136 |
| -metaTitle ++ (" | " ++ titleCategory) |
137 |
| -| None => title |
| 128 | +metaTitle ++ (" | " ++ metaTitleCategory) |
138 | 129 | }
|
139 | 130 | let meta = <Meta title ?description ?canonical version=Url.parse(router.route).version />
|
140 | 131 |
|
@@ -173,8 +164,7 @@ module Make = (Content: StaticContent) => {
|
173 | 164 | let make = (
|
174 | 165 | // base breadcrumbs without the very last element (the currently shown document)
|
175 | 166 | ~breadcrumbs: option<list<Url.breadcrumb>>=?,
|
176 |
| -~title: string, |
177 |
| -~metaTitleCategory: option<string>=?, |
| 167 | +~metaTitleCategory: string, |
178 | 168 | ~frontmatter=?,
|
179 | 169 | ~version: option<string>=?,
|
180 | 170 | ~availableVersions: option<array<(string, string)>>=?,
|
@@ -235,8 +225,7 @@ module Make = (Content: StaticContent) => {
|
235 | 225 |
|
236 | 226 | make({
|
237 | 227 | ?breadcrumbs,
|
238 |
| -title, |
239 |
| -?metaTitleCategory, |
| 228 | +metaTitleCategory, |
240 | 229 | ?frontmatter,
|
241 | 230 | ?version,
|
242 | 231 | ?availableVersions,
|
|
0 commit comments