@enonic/nextjs-adapter 0.12.0 → 1.0.0-RC1

package/views/Region.jsx

@@ -15,12 +15,7 @@ export const RegionView = (props) => {
         regionAttrs.id = name + 'Region';
         regionAttrs[PORTAL_REGION_ATTRIBUTE] = name;
     }
-    if (Object.keys(regionAttrs).length) {
-        return <div {...regionAttrs}>{children}</div>;
-    }
-    else {
-        return <>{children}</>;
-    }
+    return <div {...regionAttrs}>{children}</div>;
 };
 /** Multiple regions, or only one if named in props.selected */
 const RegionsView = (props) => {

package/views/RichTextView.jsx

@@ -14,10 +14,17 @@ export function createReplacer(allData, meta, renderMacroInEditMode = true, cust
         switch (el.tagName) {
             case UrlProcessor.IMG_TAG:
                 ref = el.attribs[UrlProcessor.IMG_ATTR];
-                const src = el.attribs['src'];
-                // do not process content images in next to keep it absolute
-                if (ref && src && UrlProcessor.isContentImage(ref, allData.images)) {
-                    el.attribs['src'] = getUrl(src, meta);
+                if (ref) {
+                    if (UrlProcessor.isContentImage(ref, allData.images)) {
+                        const src = el.attribs['src'];
+                        if (src) {
+                            el.attribs['src'] = getUrl(src, meta);
+                        }
+                        const srcset = el.attribs['srcset'];
+                        if (srcset) {
+                            el.attribs['srcset'] = UrlProcessor.processSrcSet(srcset, meta);
+                        }
+                    }
                 }
                 break;
             case UrlProcessor.LINK_TAG:

package/views/StaticContent.d.ts

@@ -0,0 +1,15 @@
+import { ReactNode } from 'react';
+export interface StaticContentProps extends Record<string, any> {
+    children?: ReactNode | ReactNode[];
+    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>;
+    suppressHydrationWarning: boolean;
+    dangerouslySetInnerHTML: {
+        __html: string;
+    };
+}, string | import("react").JSXElementConstructor<any>>;

package/views/StaticContent.jsx

@@ -0,0 +1,38 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    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];
+}
+export default function StaticContent(_a) {
+    var { children, element = 'div', condition = true } = _a, props = __rest(_a, ["children", "element", "condition"]);
+    const [render, ref] = useStaticContent();
+    // 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: '' } }));
+}