From 6a86de6c84de2fc342bc2aef3bb92cfab0615f22 Mon Sep 17 00:00:00 2001
From: Roman Timashev <roman@tmshv.ru>
Date: Sat, 15 Feb 2020 06:40:47 +0300
Subject: [PATCH] Html component update

---
 pages/album/[slug].tsx        | 2 +-
 pages/article/[slug].tsx      | 2 +-
 pages/teacher/[person].tsx    | 2 +-
 src/components/Html/index.jsx | 7 -------
 src/components/Html/index.tsx | 7 +++++++
 src/components/Page/index.tsx | 3 ++-
 6 files changed, 12 insertions(+), 11 deletions(-)
 delete mode 100644 src/components/Html/index.jsx
 create mode 100644 src/components/Html/index.tsx

diff --git a/pages/album/[slug].tsx b/pages/album/[slug].tsx
index 0fd48c06..66abe008 100644
--- a/pages/album/[slug].tsx
+++ b/pages/album/[slug].tsx
@@ -1,7 +1,7 @@
 import Head from 'next/head'
 import { App } from 'src/components/App'
 import Article from 'src/components/Article'
-import Html from 'src/components/Html'
+import { Html } from 'src/components/Html'
 import menuModel from 'src/models/menu'
 import { buildMenu } from 'src/lib/menu'
 import { createApiUrl, requestGet, IResponseItems } from 'src/next-lib'
diff --git a/pages/article/[slug].tsx b/pages/article/[slug].tsx
index a8e19c3e..b713f1c6 100644
--- a/pages/article/[slug].tsx
+++ b/pages/article/[slug].tsx
@@ -2,7 +2,7 @@ import Head from 'next/head'
 import { get } from 'lodash'
 import { App } from 'src/components/App'
 import Article from 'src/components/Article'
-import Html from 'src/components/Html'
+import { Html } from 'src/components/Html'
 import menuModel from 'src/models/menu'
 import { buildMenu } from 'src/lib/menu'
 import { Meta } from 'src/components/Meta'
diff --git a/pages/teacher/[person].tsx b/pages/teacher/[person].tsx
index cdedc89d..8393ae9f 100644
--- a/pages/teacher/[person].tsx
+++ b/pages/teacher/[person].tsx
@@ -8,7 +8,7 @@ import { meta } from 'src/lib/meta'
 import { createApiUrl, requestGet, IResponseItems } from 'src/next-lib'
 import { NextPage, NextPageContext } from 'next'
 import { IMeta } from 'src/types'
-import Html from 'src/components/Html'
+import { Html } from 'src/components/Html'
 
 interface IProps {
     pageUrl: string
diff --git a/src/components/Html/index.jsx b/src/components/Html/index.jsx
deleted file mode 100644
index 581285fb..00000000
--- a/src/components/Html/index.jsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import React from 'react'
-
-export default function Html(props) {
-    return (
-        <div dangerouslySetInnerHTML={{ __html: props.html }} />
-    )
-}
diff --git a/src/components/Html/index.tsx b/src/components/Html/index.tsx
new file mode 100644
index 00000000..74b3c30b
--- /dev/null
+++ b/src/components/Html/index.tsx
@@ -0,0 +1,7 @@
+export type HtmlProps = {
+    html: string
+}
+
+export const Html: React.FC<HtmlProps> = props => (
+    <div dangerouslySetInnerHTML={{ __html: props.html }} />
+)
diff --git a/src/components/Page/index.tsx b/src/components/Page/index.tsx
index ef73cc09..62f4e490 100644
--- a/src/components/Page/index.tsx
+++ b/src/components/Page/index.tsx
@@ -1,9 +1,10 @@
 import * as React from 'react'
 import { Share } from '../Share'
-import Html from '../Html'
+import { Html } from '../Html'
 
 export interface IPageProps {
     showSocialShare: boolean
+    children: string
 }
 
 export const Page: React.FC<IPageProps> = props => (