@enonic/nextjs-adapter 1.0.2 → 2.0.0-B2

package/views/StaticContent.d.ts

@@ -4,12 +4,12 @@ export interface StaticContentProps extends Record<string, any> {
     element?: string;
     condition: boolean;
 }
-export default function StaticContent({ children, element, condition, ...props }: StaticContentProps): import("react").DOMElement<{
-    [x: string]: any;
-}, Element> | import("react").ReactElement<{
-    ref: boolean | import("react").MutableRefObject<any>;
+export default function StaticContent({ children, element, condition, ...props }: StaticContentProps): import("react").ReactElement<{
+    ref: import("react").RefObject<unknown>;
     suppressHydrationWarning: boolean;
     dangerouslySetInnerHTML: {
         __html: string;
     };
-}, string | import("react").JSXElementConstructor<any>>;
+}, string | import("react").JSXElementConstructor<any>> | import("react").DOMElement<{
+    [x: string]: any;
+}, Element>;

package/views/StaticContent.jsx

@@ -9,30 +9,28 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import { createElement, useEffect, useRef, useState } from 'react';
-function useStaticContent() {
-    const ref = useRef(null);
-    const [render, setRender] = useState(typeof window === 'undefined');
-    useEffect(() => {
-        var _a;
-        // check if the innerHTML is empty as client side navigation
-        // need to render the component without server-side backup
-        const isEmpty = ((_a = ref === null || ref === void 0 ? void 0 : ref.current) === null || _a === void 0 ? void 0 : _a.innerHTML) === '';
-        if (isEmpty) {
-            setRender(true);
-        }
-    }, []);
-    return [render, ref];
+import { createElement, createRef } from 'react';
+function useStaticContent(ref, isServer) {
+    var _a;
+    if (isServer) {
+        return false;
+    }
+    if (((_a = ref === null || ref === void 0 ? void 0 : ref.current) === null || _a === void 0 ? void 0 : _a.innerHTML) === '') {
+        return false;
+    }
+    return true;
 }
 export default function StaticContent(_a) {
     var { children, element = 'div', condition = true } = _a, props = __rest(_a, ["children", "element", "condition"]);
-    const [render, ref] = useStaticContent();
+    const isServer = typeof window === 'undefined';
+    const ref = createRef();
+    const isStatic = useStaticContent(ref, isServer);
+    // avoid re-render on the client
+    if (isStatic && condition) {
+        return createElement(element, Object.assign(Object.assign({}, props), { ref, suppressHydrationWarning: true, dangerouslySetInnerHTML: { __html: '' } }));
+    }
     // just render if:
     // - condition is false
     // - we're in the server or a spa navigation
-    if (render || !condition) {
-        return createElement(element, props, ...[].concat(children));
-    }
-    // avoid re-render on the client
-    return createElement(element, Object.assign(Object.assign({}, props), { ref, suppressHydrationWarning: true, dangerouslySetInnerHTML: { __html: '' } }));
+    return createElement(element, props, ...[].concat(children));
 }

package/views/Text.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="react" />
+import React from 'react';
 import { MetaData, TextData } from '../guillotine/getMetaData';
 type Props = {
     meta: MetaData;
     component: TextData;
     path: string;
 };
-declare const DefaultTextView: ({ component, meta, path }: Props) => JSX.Element;
+declare const DefaultTextView: ({ component, meta, path }: Props) => React.JSX.Element;
 export default DefaultTextView;