fix: remove withThemeValueContext

Author: gorgeousvlad

src/containers/PageConstructor/PageConstructor.tsx

@@ -1,4 +1,4 @@
-import React, {useMemo} from 'react';
+import React, {useContext, useMemo} from 'react';
 import _ from 'lodash';
 
 import {
@@ -20,9 +20,9 @@ import {
     getThemedValue,
     getCustomItems,
 } from '../../utils';
-import {withThemeValue, WithThemeValueProps} from '../../context/theme/withThemeValue';
 import {AnimateContext} from '../../context/animateContext';
 import {InnerContext} from '../../context/innerContext';
+import {ThemeValueContext} from '../../context/theme/ThemeValueContext';
 import {ConstructorRow} from './components/ConstructorRow';
 import {ConstructorFootnotes} from './components/ConstructorFootnotes';
 import {ConstructorHeader} from './components/ConstructorItem';
@@ -40,9 +40,7 @@ export interface PageConstructorProps {
     renderMenu?: () => React.ReactNode;
 }
 
-type Props = PageConstructorProps & WithThemeValueProps;
-
-export const Constructor = (props: Props) => {
+export const Constructor = (props: PageConstructorProps) => {
     const {context, headerBlockTypes} = useMemo(
         () => ({
             context: {
@@ -59,10 +57,10 @@ export const Constructor = (props: Props) => {
         [props.custom],
     );
 
+    const {themeValue: theme} = useContext(ThemeValueContext);
     const {
         content: {blocks = [], background = {}, footnotes = []} = {},
         renderMenu,
-        themeValue: theme,
         shouldRenderBlock,
     } = props;
 
@@ -100,14 +98,12 @@ export const Constructor = (props: Props) => {
     );
 };
 
-const ThemedConstructor = withThemeValue(Constructor);
-
 export const PageConstructor = (props: PageConstructorProps) => {
     const {content: {animated = true} = {}, ...rest} = props;
 
     return (
         <AnimateContext.Provider value={{animated}}>
-            <ThemedConstructor content={props.content} {...rest} />
+            <Constructor content={props.content} {...rest} />
         </AnimateContext.Provider>
     );
 };

src/context/locationContext/locationContext.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import {RouterLinkProps} from '../../components/RouterLink/RouterLink';
+import {WithChildren} from '../../models';
 
 export interface History {
     action: 'PUSH' | 'POP' | 'REPLACE' | '';
@@ -15,7 +16,7 @@ export interface History {
 
 export type RouterLink =
     | React.ComponentClass<RouterLinkProps>
-    | React.FunctionComponent<RouterLinkProps>;
+    | React.FC<WithChildren<RouterLinkProps>>;
 
 export type LocationContextProps = {
     history?: History;

src/context/theme/index.ts

@@ -1,6 +1,4 @@
 export * from './ThemeContext';
 export * from './ThemeProvider';
 export * from './useTheme';
-export * from './useThemeValue';
 export * from './withTheme';
-export * from './withThemeValue';