Router Performance fix to include theme in route's context

imports/plugins/core/layout/client/templates/theme/theme.js

@@ -3,41 +3,8 @@ import { Tracker } from "meteor/tracker";
 import { Session } from "meteor/session";
 import { $ } from "meteor/jquery";
 import { Reaction, Router } from "/client/api";
-import { Packages, Shops } from "/lib/collections";
+import { Shops } from "/lib/collections";
 
-/**
- * getRouteLayout
- * Gets layout combo based on current route context
- * @param  {Object} context - route context
- * @returns {Object|null} The layout hash
- */
-function getRouteLayout(context) {
-  const pkg = Packages.findOne({ "registry.name": context.route.name, "enabled": true });
-
-  if (pkg) {
-    const registryRoute = pkg.registry.find((x) => {
-      return x.name === context.route.name;
-    });
-
-    if (registryRoute) {
-      // set a default layout if none is given
-      if (!registryRoute.layout) {
-        registryRoute.layout = Session.get("DEFAULT_LAYOUT") || "coreLayout";
-      }
-
-      const shop = Shops.findOne(Reaction.getShopId());
-      const currentLayout = shop && shop.layout.find((x) => {
-        if (x.layout === registryRoute.layout && x.workflow === registryRoute.workflow && x.enabled === true) {
-          return true;
-        }
-      });
-
-      return currentLayout;
-    }
-  }
-
-  return null;
-}
 
 /**
  * addBodyClasses
@@ -59,15 +26,9 @@ function addBodyClasses(context) {
     ];
   }
 
-  // find the layout combo for this route
-  const currentLayout = getRouteLayout(context);
 
-  // add theme class for route layout or default
-  if (currentLayout && currentLayout.theme) {
-    classes.push(currentLayout.theme);
-  } else {
-    classes.push("default");
-  }
+  // add theme class for route layout
+  classes.push(context.route.options.theme);
 
   classes = classes.join(" ");
 

imports/plugins/core/router/lib/router.js

@@ -466,15 +466,22 @@ export function ReactionLayout(options = {}) {
     adminControlsFooter: ""
   };
 
+  let layoutTheme = "default";
+
   // Find a registered layout using the layoutName and workflowName
   if (shop) {
     const sortedLayout = shop.layout.sort((prev, next) => prev.priority - next.priority);
     const foundLayout = sortedLayout.find((x) => selectLayout(x, layoutName, workflowName));
 
-    if (foundLayout && foundLayout.structure) {
-      layoutStructure = {
-        ...foundLayout.structure
-      };
+    if (foundLayout) {
+      if (foundLayout.structure) {
+        layoutStructure = {
+          ...foundLayout.structure
+        };
+      }
+      if (foundLayout.theme) {
+        layoutTheme = foundLayout.theme;
+      }
     }
   }
 
@@ -511,6 +518,7 @@ export function ReactionLayout(options = {}) {
 
   // Render the layout
   return {
+    theme: layoutTheme,
     structure: layoutStructure,
     component: (props) => { // eslint-disable-line react/no-multi-comp, react/display-name
       const route = Router.current().route;
@@ -610,6 +618,7 @@ Router.initPackageRoutes = (options) => {
         options: {
           name: "index",
           ...options.indexRoute,
+          theme: indexLayout.theme,
           component: indexLayout.component,
           structure: indexLayout.structure
         }
@@ -622,6 +631,7 @@ Router.initPackageRoutes = (options) => {
           name: "index",
           type: "shop-prefix",
           ...options.indexRoute,
+          theme: indexLayout.theme,
           component: indexLayout.component,
           structure: indexLayout.structure
         }
@@ -634,6 +644,7 @@ Router.initPackageRoutes = (options) => {
         options: {
           name: "not-found",
           ...notFoundLayout.indexRoute,
+          theme: notFoundLayout.theme,
           component: notFoundLayout.component,
           structure: notFoundLayout.structure
         }
@@ -674,6 +685,7 @@ Router.initPackageRoutes = (options) => {
                   triggersEnter: Router.Hooks.get("onEnter", name),
                   triggersExit: Router.Hooks.get("onExit", name),
                   component: reactionLayout.component,
+                  theme: reactionLayout.theme,
                   structure: reactionLayout.structure
                 }
               };