unframer 2.6.6 → 2.7.1

package/dist/framer.js

@@ -14631,7 +14631,7 @@ function steps(numSteps, direction = 'end') {
         return clamp(0, 1, rounded / numSteps);
     };
 }
-// https :https://app.framerstatic.com/framer.PLXHDWID.mjs
+// https :https://app.framerstatic.com/framer.7SGKTLCE.mjs
 init_chunk_QLPHEVXG();
 const react_11 = __importDefault(require("react"));
 const react_12 = require("react");
@@ -17857,7 +17857,7 @@ function useNavigationTransition(enableAsyncURLUpdates) {
         });
     }), [enableAsyncURLUpdates, monitorNextPaintAfterRender, startNativeSpinner,]);
 }
-function Router({ defaultPageStyle, disableHistory, initialPathVariables, initialRoute, notFoundPage, collectionUtils, routes, initialLocaleId, locales = EMPTY_ARRAY, preserveQueryParams = false, enableAsyncURLUpdates = false, }) {
+function Router({ defaultPageStyle, disableHistory, initialPathVariables, initialRoute, notFoundPage, collectionUtils, routes, initialLocaleId, locales = EMPTY_ARRAY, preserveQueryParams = false, enableAsyncURLUpdates = false, LayoutTemplate, }) {
     useMarkRouterEffects();
     useReplaceInitialState({
         disabled: disableHistory,
@@ -18059,14 +18059,20 @@ function Router({ defaultPageStyle, disableHistory, initialPathVariables, initia
                         notFoundPage,
                         defaultPageStyle,
                         forceUpdateKey: dep,
-                        children: (0, jsx_runtime_1.jsxs)(react_8.Fragment, {
-                            children: [
-                                (0, jsx_runtime_1.jsx)(MarkSuspenseEffects.Start, {}),
-                                pageExistsInCurrentLocale
-                                    ? renderPage(current.page, defaultPageStyle)
-                                    : notFoundPage && renderPage(notFoundPage, defaultPageStyle),
-                            ],
-                        }, remountKey),
+                        children: (0, jsx_runtime_1.jsx)(WithLayoutTemplate, {
+                            LayoutTemplate,
+                            routeId: currentRouteId,
+                            children: (0, jsx_runtime_1.jsxs)(react_8.Fragment, {
+                                children: [
+                                    (0, jsx_runtime_1.jsx)(MarkSuspenseEffects.Start, {}),
+                                    pageExistsInCurrentLocale
+                                        ? renderPage(current.page, LayoutTemplate
+                                            ? Object.assign(Object.assign({}, defaultPageStyle), { display: 'content' }) : defaultPageStyle)
+                                        : // LAYOUT_TEMPLATE @TODO: display: content for not found page?
+                                            notFoundPage && renderPage(notFoundPage, defaultPageStyle),
+                                ],
+                            }, remountKey),
+                        }),
                     }),
                     (0, jsx_runtime_1.jsx)(TurnOnReactEventHandling, {}),
                     (0, jsx_runtime_1.jsx)(MarkSuspenseEffects.End, {}),
@@ -18075,6 +18081,14 @@ function Router({ defaultPageStyle, disableHistory, initialPathVariables, initia
         }),
     });
 }
+function WithLayoutTemplate({ LayoutTemplate, routeId, children, }) {
+    if (!LayoutTemplate)
+        return children;
+    return (0, jsx_runtime_1.jsx)(LayoutTemplate, {
+        routeId,
+        children,
+    });
+}
 function scrollElementIntoView(element, smoothScroll) {
     const scrollIntoViewOptions = smoothScroll
         ? {
@@ -34447,7 +34461,7 @@ function createHook(forwardedRef) {
     let preventNextCall = false;
     function cloneChildrenWithPropsAndRef(children, props) {
         if (preventNextCall) {
-            throw new ReferenceError('useCloneChildrenWithPropsAndRef: You should not call cloneChildrenWithPropsAndRef more than once during the render cycle.');
+            ;
         }
         preventNextCall = true;
         if (React2.Children.count(children) > 1 && forwardedRef) {
@@ -40231,6 +40245,16 @@ var Ordering = class {
             return false;
         return this.getHash() === other.getHash();
     }
+    providedByFields(fields) {
+        for (const { field, } of this.fields) {
+            if (fields.has(field))
+                continue;
+            if (field.name === VIRTUAL_INDEX_FIELD)
+                continue;
+            return false;
+        }
+        return true;
+    }
 };
 var Scope = class {
     constructor(parent) {
@@ -42736,13 +42760,17 @@ var Normalizer = class {
         return this.newRelationalLeftJoin(right, left, constraint);
     }
     newRelationalFilter(input, predicate) {
-        if (input instanceof RelationalLeftJoin && predicate.referencedFields.subsetOf(input.leftGroup.relational.outputFields)) {
-            const left = this.newRelationalFilter(input.left, predicate);
-            return this.newRelationalLeftJoin(left, input.right, input.constraint);
-        }
-        if (input instanceof RelationalRightJoin && predicate.referencedFields.subsetOf(input.rightGroup.relational.outputFields)) {
-            const right = this.newRelationalFilter(input.right, predicate);
-            return this.newRelationalLeftJoin(input.left, right, input.constraint);
+        if (input instanceof RelationalLeftJoin &&
+            // Check that the predicate doesn't depend on any joined field.
+            predicate.referencedFields.subsetOf(input.leftGroup.relational.outputFields)) {
+            const pushedFilter = this.newRelationalFilter(input.left, predicate);
+            return this.newRelationalLeftJoin(pushedFilter, input.right, input.constraint);
+        }
+        if (input instanceof RelationalRightJoin &&
+            // Check that the predicate doesn't depend on any joined field.
+            predicate.referencedFields.subsetOf(input.rightGroup.relational.outputFields)) {
+            const pushedFilter = this.newRelationalFilter(input.right, predicate);
+            return this.newRelationalLeftJoin(input.left, pushedFilter, input.constraint);
         }
         const node = new RelationalFilter(input, predicate);
         return this.finishRelational(node);
@@ -42752,6 +42780,14 @@ var Normalizer = class {
         return this.finishRelational(node);
     }
     newRelationalLimit(input, limit, ordering) {
+        if (input instanceof RelationalProject &&
+            // Check that the limit doesn't depend on any projected field.
+            limit.referencedFields.subsetOf(input.inputGroup.relational.outputFields) &&
+            // Check that the ordering doesn't depend on any projected field.
+            ordering.providedByFields(input.inputGroup.relational.outputFields)) {
+            const pushedLimit = this.newRelationalLimit(input.input, limit, ordering);
+            return this.newRelationalProject(pushedLimit, input.projections, input.passthrough);
+        }
         const node = new RelationalLimit(input, limit, ordering);
         return this.finishRelational(node);
     }
@@ -50387,7 +50423,7 @@ var package_default = {
         react: '^18.2.0',
         'react-dom': '^18.2.0',
         semver: '^7.5.2',
-        typescript: '^5.6.2',
+        typescript: '^5.7.2',
         yargs: '^17.6.2',
     },
     peerDependencies: {