Merge pull request #105 from perimetre/dev

Promoting dev
perimetre · Apr 14, 2022 · a4ea309 · a4ea309
2 parents 68fddeb + 8e00e98
commit a4ea309
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/public/unity/Build/unity.data b/public/unity/Build/unity.data
diff --git a/public/unity/Build/unity.framework.js b/public/unity/Build/unity.framework.js
diff --git a/public/unity/Build/unity.wasm b/public/unity/Build/unity.wasm
diff --git a/src/components/UI/PlannerSidebar/SidebarModules/index.tsx b/src/components/UI/PlannerSidebar/SidebarModules/index.tsx
@@ -31,7 +31,11 @@ const SidebarModules: React.FC<SidebarModulesProps> = ({ modules: modulesProps,
   const { state: projectState, projectModule, didFinishSetup } = usePlannerContext();
 
   const modules = useMemo(
-    () => modulesProps?.filter((module) => module.categories.some((cat) => cat.slug === category?.slug)),
+    () =>
+      modulesProps
+        ?.filter((module) => module.categories.some((cat) => cat.slug === category?.slug))
+        // Sort by category so the ones that doesn't belong to same category show up at the end
+        .sort((a) => (a.categories.some((cat) => cat.slug === category?.slug) ? -1 : 1)),
     [modulesProps, category]
   );
 
@@ -79,7 +83,7 @@ const SidebarModules: React.FC<SidebarModulesProps> = ({ modules: modulesProps,
           {/* By setting the height value to any value with h-0, we force it to recalculate, which shows the scrollbar */}
           <div className="flex flex-grow h-0 mui-scrollbar">
             <motion.div
-              className="flex flex-col p-4 mr-4 overflow-auto gap-4"
+              className="flex flex-col w-5/12 p-4 mr-4 overflow-auto gap-4"
               variants={container}
               initial="hidden"
               animate="show"
@@ -114,7 +118,7 @@ const SidebarModules: React.FC<SidebarModulesProps> = ({ modules: modulesProps,
                 </motion.div>
               ))}
             </motion.div>
-            <div className="flex-grow">{selectedModule && <SidebarModuleDetail module={selectedModule} />}</div>
+            <div className="flex-grow w-min">{selectedModule && <SidebarModuleDetail module={selectedModule} />}</div>
           </div>
         </>
       )}

diff --git a/src/components/UI/PlannerSidebar/index.tsx b/src/components/UI/PlannerSidebar/index.tsx
@@ -41,8 +41,8 @@ const PlannerSidebar: React.FC<PlannerSidebarProps> = ({ project, isSidebarOpen,
   }, []);
 
   const handleCategoryOpen = useCallback(() => {
-    if (state === 'categories' && project?.modules) {
-      const all = project?.modules[0].categories.find((f) => f.slug === 'all');
+    if (state === 'categories' && project?.modules && project.modules.length > 0) {
+      const all = project?.modules[0]?.categories.find((f) => f.slug === 'all');
       onCategoryClick(all);
     }
   }, [state, project, onCategoryClick]);