From 6b1ff5ef1d8be47b54ac87e6211814f49bf77ca2 Mon Sep 17 00:00:00 2001
From: squidfunk <martin.donath@squidfunk.com>
Date: Thu, 19 Dec 2019 09:48:16 +0100
Subject: [PATCH] Fixed element typings

---
 src/assets/javascripts/extensions/jsx/index.ts      | 13 ++++++++++++-
 src/assets/javascripts/templates/search/_/index.tsx |  8 ++++----
 .../javascripts/templates/search/article/index.tsx  |  8 ++++----
 .../javascripts/templates/search/section/index.tsx  |  8 ++++----
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/assets/javascripts/extensions/jsx/index.ts b/src/assets/javascripts/extensions/jsx/index.ts
index 3bd603a6a..337ef8af2 100644
--- a/src/assets/javascripts/extensions/jsx/index.ts
+++ b/src/assets/javascripts/extensions/jsx/index.ts
@@ -83,7 +83,7 @@ function appendChild(el: Element, child: Child): void {
 export function h(
   tag: string, attributes: Attributes | null,
   ...children: Array<Element | Text | string | number>
-) {
+): Element {
   const el = document.createElement(tag)
 
   /* Set attributes, if any */
@@ -102,6 +102,17 @@ export function h(
   return el
 }
 
+/**
+ * JSX factory wrapper
+ *
+ * @param el - JSX element
+ *
+ * @return Element
+ */
+export function toElement(el: JSXInternal.Element): Element {
+  return el as any // Hack: if you have a better idea, PR!
+}
+
 /* ----------------------------------------------------------------------------
  * Namespace
  * ------------------------------------------------------------------------- */
diff --git a/src/assets/javascripts/templates/search/_/index.tsx b/src/assets/javascripts/templates/search/_/index.tsx
index 2796b96b2..dfddf7790 100644
--- a/src/assets/javascripts/templates/search/_/index.tsx
+++ b/src/assets/javascripts/templates/search/_/index.tsx
@@ -20,7 +20,7 @@
  * IN THE SOFTWARE.
  */
 
-import { h } from "extensions"
+import { h, toElement } from "extensions"
 import { SearchResult } from "modules"
 
 import { renderArticleDocument } from "../article"
@@ -46,12 +46,12 @@ const css = {
  *
  * @param article - Search result
  *
- * @return JSX element
+ * @return Element
  */
 export function renderSearchResult(
   { article, sections }: SearchResult
-) {
-  return (
+): Element {
+  return toElement(
     <li class={css.item}>
       {renderArticleDocument(article)}
       {...sections.map(renderSectionDocument)}
diff --git a/src/assets/javascripts/templates/search/article/index.tsx b/src/assets/javascripts/templates/search/article/index.tsx
index 5d4257193..ba51108e9 100644
--- a/src/assets/javascripts/templates/search/article/index.tsx
+++ b/src/assets/javascripts/templates/search/article/index.tsx
@@ -20,7 +20,7 @@
  * IN THE SOFTWARE.
  */
 
-import { h } from "extensions"
+import { h, toElement } from "extensions"
 import { ArticleDocument } from "modules"
 import { truncate } from "utilities"
 
@@ -47,12 +47,12 @@ const css = {
  *
  * @param article - Article document
  *
- * @return JSX element
+ * @return Element
  */
 export function renderArticleDocument(
   { location, title, text }: ArticleDocument
-) {
-  return (
+): Element {
+  return toElement(
     <a href={location} title={title} class={css.link} tabIndex={-1}>
       <article class={css.article}>
         <h1 class={css.title}>{title}</h1>
diff --git a/src/assets/javascripts/templates/search/section/index.tsx b/src/assets/javascripts/templates/search/section/index.tsx
index 1f776fd0e..43905d53d 100644
--- a/src/assets/javascripts/templates/search/section/index.tsx
+++ b/src/assets/javascripts/templates/search/section/index.tsx
@@ -20,7 +20,7 @@
  * IN THE SOFTWARE.
  */
 
-import { h } from "extensions"
+import { h, toElement } from "extensions"
 import { SectionDocument } from "modules"
 import { truncate } from "utilities"
 
@@ -47,12 +47,12 @@ const css = {
  *
  * @param section - Section document
  *
- * @return JSX element
+ * @return Element
  */
 export function renderSectionDocument(
   { location, title, text }: SectionDocument
-) {
-  return (
+): Element {
+  return toElement(
     <a href={location} title={title} class={css.link} tabIndex={-1}>
       <article class={css.article}>
         <h1 class={css.title}>{title}</h1>