From f57e5b7f9b9cdd5c4b2a21c2691f4800d87f81fa Mon Sep 17 00:00:00 2001
From: dragonwocky <thedragonring.bod@gmail.com>
Date: Mon, 16 Jan 2023 13:34:41 +1100
Subject: [PATCH] feat(menu): animate slide b/w mod lists <-> options, add
 enabled mods to sidebar

---
 src/core/menu/components.mjs | 112 +++++++++++++-----
 src/core/menu/index.html     |   4 +-
 src/core/menu/menu.mjs       | 223 ++++++++++++++++++++---------------
 3 files changed, 219 insertions(+), 120 deletions(-)

diff --git a/src/core/menu/components.mjs b/src/core/menu/components.mjs
index 5ed75cb..277ef9c 100644
--- a/src/core/menu/components.mjs
+++ b/src/core/menu/components.mjs
@@ -9,7 +9,7 @@ import { setState, useState, getState } from "./state.mjs";
 function Sidebar({}, ...children) {
   const { html } = globalThis.__enhancerApi;
   return html`<aside
-    class="notion-enhancer--menu-sidebar min-w-[224.14px] max-w-[250px]
+    class="notion-enhancer--menu-sidebar z-10 row-span-1
     h-full overflow-y-auto bg-[color:var(--theme--bg-secondary)]"
   >
     ${children}
@@ -27,22 +27,24 @@ function SidebarSection({}, ...children) {
   </h2>`;
 }
 
-function SidebarButton({ icon, ...props }, ...children) {
+function SidebarButton({ id, icon, ...props }, ...children) {
   const { html } = globalThis.__enhancerApi,
-    iconSize = icon.startsWith("notion-enhancer")
-      ? "w-[17px] h-[17px] ml-[1.5px] mr-[9.5px]"
-      : "w-[18px] h-[18px] ml-px mr-[9px]",
+    $icon = icon
+      ? html`<i
+          class="i-${icon} ${icon.startsWith("notion-enhancer")
+            ? "w-[17px] h-[17px] ml-[1.5px] mr-[9.5px]"
+            : "w-[18px] h-[18px] ml-px mr-[9px]"}"
+        ></i>`
+      : "",
     $el = html`<${props.href ? "a" : "button"}
       class="flex select-none cursor-pointer w-full
       items-center py-[5px] px-[15px] text-[14px] last:mb-[12px]
       transition hover:bg-[color:var(--theme--bg-hover)]"
       ...${props}
-    >
-      <i class="i-${icon} ${iconSize}"></i>
+      >${$icon}
       <span class="leading-[20px]">${children}</span>
     <//>`;
   if (!props.href) {
-    const id = $el.innerText;
     $el.onclick ??= () => setState({ transition: "fade", view: id });
     useState(["view"], ([view = "welcome"]) => {
       const active = view.toLowerCase() === id.toLowerCase();
@@ -55,11 +57,10 @@ function SidebarButton({ icon, ...props }, ...children) {
 
 function View({ id }, ...children) {
   const { html } = globalThis.__enhancerApi,
-    duration = 100,
     $el = html`<article
       id=${id}
-      class="notion-enhancer--menu-view h-full
-      grow overflow-y-auto px-[60px] py-[36px]"
+      class="notion-enhancer--menu-view h-full w-full
+      absolute overflow-y-auto px-[60px] py-[36px]"
     >
       ${children}
     </article>`;
@@ -67,21 +68,55 @@ function View({ id }, ...children) {
     const [transition] = getState(["transition"]),
       isVisible = $el.style.display !== "none",
       nowActive = view.toLowerCase() === id.toLowerCase();
-    if (transition === "fade") {
-      $el.style.opacity = "0";
-      $el.style.transition = `opacity ${duration}ms`;
-      if (isVisible && !nowActive) {
-        setTimeout(() => ($el.style.display = "none"), duration);
-      } else if (!isVisible && nowActive) {
-        setTimeout(() => {
-          $el.style.display = "";
-          requestIdleCallback(() => ($el.style.opacity = "1"));
-        }, duration);
+    switch (transition) {
+      case "fade": {
+        const duration = 100;
+        $el.style.transition = `opacity ${duration}ms`;
+        $el.style.opacity = "0";
+        if (isVisible && !nowActive) {
+          setTimeout(() => ($el.style.display = "none"), duration);
+        } else if (!isVisible && nowActive) {
+          setTimeout(() => {
+            $el.style.display = "";
+            requestIdleCallback(() => ($el.style.opacity = "1"));
+          }, duration);
+        }
+        break;
       }
-    } else {
-      $el.style.transition = "";
-      $el.style.opacity = nowActive ? "1" : "0";
-      $el.style.display = nowActive ? "" : "none";
+      case "slide-to-left":
+      case "slide-to-right": {
+        const duration = 200,
+          cssTransition = `opacity ${duration}ms, transform ${duration}ms`,
+          transformOut = `translateX(${
+            transition === "slide-to-right" ? "-100%" : "100%"
+          })`,
+          transformIn = `translateX(${
+            transition === "slide-to-right" ? "100%" : "-100%"
+          })`;
+        if (isVisible && !nowActive) {
+          $el.style.transition = cssTransition;
+          $el.style.transform = transformOut;
+          $el.style.opacity = "0";
+          setTimeout(() => {
+            $el.style.display = "none";
+            $el.style.transform = "";
+          }, duration);
+        } else if (!isVisible && nowActive) {
+          $el.style.transform = transformIn;
+          $el.style.opacity = "0";
+          $el.style.display = "";
+          requestIdleCallback(() => {
+            $el.style.transition = cssTransition;
+            $el.style.transform = "";
+            $el.style.opacity = "1";
+          });
+        }
+        break;
+      }
+      default:
+        $el.style.transition = "";
+        $el.style.opacity = nowActive ? "1" : "0";
+        $el.style.display = nowActive ? "" : "none";
     }
   });
   return $el;
@@ -153,7 +188,7 @@ function Mod({
           class="flex items-center p-[4px] rounded-[4px] transition
           text-[color:var(--theme--fg-secondary)] my-auto mr-[8px]
           duration-[20ms] hover:bg-[color:var(--theme--bg-hover)]"
-          onclick=${() => setState({ transition: "none", view: id })}
+          onclick=${() => setState({ transition: "slide-to-right", view: id })}
         >
           <i class="i-settings w-[18px] h-[18px]"></i>
         </button>`
@@ -260,6 +295,20 @@ function Option({ type, value, description, _get, _set, ...props }) {
   <//>`;
 }
 
+function Button({ icon, ...props }, children) {
+  const { html } = globalThis.__enhancerApi;
+  return html`<button
+    class="mt-[14px] first:mt-0 mb-[14px] last:mb-0
+    flex items-center h-[32px] px-[12px] rounded-[4px]
+    cursor-pointer border-(& [color:var(--theme--fg-border)])
+    transition duration-[20ms] hover:bg-[color:var(--theme--bg-hover)]"
+    ...${props}
+  >
+    <i class="i-${icon} w-[18px] h-[18px]"></i>
+    <span class="ml-[8px] text-[14px]">${children}</span>
+  </button>`;
+}
+
 function Input({ size, icon, transparent, onrerender, ...props }) {
   const { html } = globalThis.__enhancerApi,
     $input = html`<input
@@ -626,4 +675,13 @@ function Toggle({ _get, _set, ...props }) {
   </div>`;
 }
 
-export { Sidebar, SidebarSection, SidebarButton, View, List, Mod, Option };
+export {
+  Sidebar,
+  SidebarSection,
+  SidebarButton,
+  View,
+  List,
+  Mod,
+  Button,
+  Option,
+};
diff --git a/src/core/menu/index.html b/src/core/menu/index.html
index a808aba..25e951c 100644
--- a/src/core/menu/index.html
+++ b/src/core/menu/index.html
@@ -10,7 +10,9 @@
     <script src="../../vendor/coloris.min.js" type="module"></script>
     <script src="./menu.mjs" type="module" defer></script>
   </head>
+  <!-- prettier-ignore -->
   <body
-    class="flex flex-row w-screen h-screen text-[color:var(--theme--fg-primary)] font-[family:var(--theme--font-sans)]"
+    class="grid grid-rows-1 grid-cols-[224.14px auto] w-screen h-screen
+    text-[color:var(--theme--fg-primary)] font-[family:var(--theme--font-sans)]"
   ></body>
 </html>
diff --git a/src/core/menu/menu.mjs b/src/core/menu/menu.mjs
index 20933d7..eeb2d35 100644
--- a/src/core/menu/menu.mjs
+++ b/src/core/menu/menu.mjs
@@ -12,56 +12,59 @@ import {
   View,
   List,
   Mod,
+  Button,
   Option,
 } from "./components.mjs";
 
-const renderOptions = async (mod) => {
-  const { html, platform, getProfile } = globalThis.__enhancerApi,
-    { optionDefaults, initDatabase } = globalThis.__enhancerApi,
-    profile = await getProfile();
-  const db = initDatabase([profile, mod.id], await optionDefaults(mod.id));
-  let options = mod.options.reduce((options, opt, i) => {
-    if (!opt.key && (opt.type !== "heading" || !opt.label)) return options;
-    if (opt.platforms && !opt.platforms.includes(platform)) return options;
-    const prevOpt = options[options.length - 1];
-    // no consective headings
-    if (opt.type === "heading" && prevOpt?.type === opt.type) {
-      options[options.length - 1] = opt;
-    } else options.push(opt);
-    return options;
-  }, []);
-  // no empty/end headings e.g. if section is platform-specific
-  if (options[options.length - 1]?.type === "heading") options.pop();
-  options = options.map(async (opt) => {
-    if (opt.type === "heading") return html`<${Option} ...${opt} />`;
-    const _get = () => db.get(opt.key),
-      _set = async (value) => {
-        await db.set(opt.key, value);
-        setState({ rerender: true });
-      };
-    return html`<${Option} ...${{ ...opt, _get, _set }} />`;
+const compatibleMods = (mods) => {
+  const { platform } = globalThis.__enhancerApi;
+  return mods.filter((mod) => {
+    const required =
+        mod.id &&
+        mod.name &&
+        mod.version &&
+        mod.description &&
+        mod.thumbnail &&
+        mod.authors,
+      compatible = !mod.platforms || mod.platforms.includes(platform);
+    return required && compatible;
   });
-  return Promise.all(options);
 };
 
-const compatibleMods = (mods) => {
-    const { platform } = globalThis.__enhancerApi;
-    return mods.filter((mod) => {
-      const required =
-          mod.id &&
-          mod.name &&
-          mod.version &&
-          mod.description &&
-          mod.thumbnail &&
-          mod.authors,
-        compatible = !mod.platforms || mod.platforms.includes(platform);
-      return required && compatible;
-    });
+const renderSidebar = (items, categories) => {
+    const { html, isEnabled } = globalThis.__enhancerApi,
+      $sidebar = html`<${Sidebar}>
+        ${items.map((item) => {
+          if (typeof item === "object") {
+            const { title, ...props } = item;
+            return html`<${SidebarButton} ...${props}>${title}<//>`;
+          } else return html`<${SidebarSection}>${item}<//>`;
+        })}
+      <//>`;
+    for (const { title, mods } of categories) {
+      const $title = html`<${SidebarSection}>${title}<//>`,
+        $mods = mods.map((mod) => [
+          mod.id,
+          html`<${SidebarButton} id=${mod.id}>${mod.name}<//>`,
+        ]);
+      $sidebar.append($title, ...$mods.map(([, $btn]) => $btn));
+      useState(["rerender"], async () => {
+        let sectionVisible = false;
+        for (const [id, $btn] of $mods) {
+          if (await isEnabled(id)) {
+            $btn.style.display = "";
+            sectionVisible = true;
+          } else $btn.style.display = "none";
+        }
+        $title.style.display = sectionVisible ? "" : "none";
+      });
+    }
+    return $sidebar;
   },
   renderList = async (mods, description) => {
     const { html, getProfile, initDatabase } = globalThis.__enhancerApi,
       enabledMods = initDatabase([await getProfile(), "enabledMods"]);
-    mods = compatibleMods(mods).map(async (mod) => {
+    mods = mods.map(async (mod) => {
       const _get = () => enabledMods.get(mod.id),
         _set = async (enabled) => {
           await enabledMods.set(mod.id, enabled);
@@ -73,10 +76,38 @@ const compatibleMods = (mods) => {
       ${await Promise.all(mods)}
     <//>`;
   },
-  renderOptionViews = async (parentView, mods) => {
+  renderOptions = async (mod) => {
+    const { html, platform, getProfile } = globalThis.__enhancerApi,
+      { optionDefaults, initDatabase } = globalThis.__enhancerApi,
+      profile = await getProfile();
+    const db = initDatabase([profile, mod.id], await optionDefaults(mod.id));
+    let options = mod.options.reduce((options, opt, i) => {
+      if (!opt.key && (opt.type !== "heading" || !opt.label)) return options;
+      if (opt.platforms && !opt.platforms.includes(platform)) return options;
+      const prevOpt = options[options.length - 1];
+      // no consective headings
+      if (opt.type === "heading" && prevOpt?.type === opt.type) {
+        options[options.length - 1] = opt;
+      } else options.push(opt);
+      return options;
+    }, []);
+    // no empty/end headings e.g. if section is platform-specific
+    if (options[options.length - 1]?.type === "heading") options.pop();
+    options = options.map(async (opt) => {
+      if (opt.type === "heading") return html`<${Option} ...${opt} />`;
+      const _get = () => db.get(opt.key),
+        _set = async (value) => {
+          await db.set(opt.key, value);
+          setState({ rerender: true });
+        };
+      return html`<${Option} ...${{ ...opt, _get, _set }} />`;
+    });
+    return Promise.all(options);
+  },
+  renderMods = async (category, mods) => {
     const { html, getProfile, initDatabase } = globalThis.__enhancerApi,
       enabledMods = initDatabase([await getProfile(), "enabledMods"]);
-    mods = compatibleMods(mods)
+    mods = mods
       .filter((mod) => {
         return mod.options?.filter((opt) => opt.type !== "heading").length;
       })
@@ -87,9 +118,17 @@ const compatibleMods = (mods) => {
             setState({ rerender: true });
           };
         return html`<${View} id=${mod.id}>
+          <${Button}
+            icon="chevron-left"
+            onclick=${() => {
+              setState({ transition: "slide-to-left", view: category.id });
+            }}
+          >
+            ${category.title}
+          <//>
           <${Mod} ...${{ ...mod, options: [], _get, _set }} />
-          ${await renderOptions(mod)}<//
-        >`;
+          ${await renderOptions(mod)}
+        <//>`;
       });
     return Promise.all(mods);
   };
@@ -101,11 +140,42 @@ const render = async () => {
   if (!html || !getCore || !icon || renderStarted) return;
   setState({ renderStarted: true });
 
-  const sidebar = [
+  const categories = [
+      {
+        icon: "palette",
+        id: "themes",
+        title: "Themes",
+        description: `Themes override Notion's colour schemes. To switch between
+        dark mode and light mode, go to <span class="py-[2px] px-[4px] rounded-[3px]
+        bg-[color:var(--theme--bg-hover)]">Settings & members → My notifications &
+        settings → My settings → Appearance</span>.`,
+        mods: compatibleMods(await getThemes()),
+      },
+      {
+        icon: "zap",
+        id: "extensions",
+        title: "Extensions",
+        description: `Extensions add to the functionality and layout of the Notion
+        client, interacting with and modifying existing interfaces.`,
+        mods: compatibleMods(await getExtensions()),
+      },
+      {
+        icon: "plug",
+        id: "integrations",
+        title: "Integrations",
+        description: `<span class="text-[color:var(--theme--fg-red)]">
+        Integrations access and modify Notion content. They interact directly with
+        <span class="py-[2px] px-[4px] rounded-[3px] bg-[color:var(--theme--bg-hover)]">
+        https://www.notion.so/api/v3</span>. Use at your own risk.</span>`,
+        mods: compatibleMods(await getIntegrations()),
+      },
+    ],
+    sidebar = [
       "notion-enhancer",
       {
-        icon: `notion-enhancer${icon === "Monochrome" ? "?mask" : ""}`,
+        id: "welcome",
         title: "Welcome",
+        icon: `notion-enhancer${icon === "Monochrome" ? "?mask" : ""}`,
       },
       {
         icon: "message-circle",
@@ -133,53 +203,22 @@ const render = async () => {
         href: "https://github.com/sponsors/dragonwocky",
       },
       "Settings",
-      { icon: "sliders-horizontal", title: "Core" },
-      { icon: "palette", title: "Themes" },
-      { icon: "zap", title: "Extensions" },
-      { icon: "plug", title: "Integrations" },
-    ],
-    $sidebar = html`<${Sidebar}>
-      ${sidebar.map((item) => {
-        if (typeof item === "object") {
-          const { title, ...props } = item;
-          return html`<${SidebarButton} ...${props}>${title}<//>`;
-        } else return html`<${SidebarSection}>${item}<//>`;
-      })}
-    <//>`;
-  document.body.append(
-    $sidebar,
-    html`<${View} id="welcome">welcome<//>`,
-    html`<${View} id="core">${await renderOptions(await getCore())}<//>`
-  );
-  for (const { id, mods, description } of [
-    {
-      id: "themes",
-      mods: await getThemes(),
-      description: `Themes override Notion's colour schemes. To switch between
-      dark mode and light mode, go to <span class="py-[2px] px-[4px] rounded-[3px]
-      bg-[color:var(--theme--bg-hover)]">Settings & members → My notifications &
-      settings → My settings → Appearance</span>.`,
-    },
-    {
-      id: "extensions",
-      mods: await getExtensions(),
-      description: `Extensions add to the functionality and layout of the Notion
-      client, interacting with and modifying existing interfaces.`,
-    },
-    {
-      id: "integrations",
-      mods: await getIntegrations(),
-      description: `<span class="text-[color:var(--theme--fg-red)]">
-      Integrations access and modify Notion content. They interact directly with
-      <span class="py-[2px] px-[4px] rounded-[3px] bg-[color:var(--theme--bg-hover)]">
-      https://www.notion.so/api/v3</span>. Use at your own risk.</span>`,
-    },
-  ]) {
-    document.body.append(
-      html`<${View} id=${id}>${await renderList(mods, description)}<//>`,
-      ...(await renderOptionViews(id, mods))
-    );
+      { icon: "sliders-horizontal", id: "core", title: "Core" },
+      ...categories.map((c) => ({ icon: c.icon, id: c.id, title: c.title })),
+    ];
+
+  // view wrapper necessary for transitions
+  const $views = html`<div class="relative overflow-hidden">
+    <${View} id="welcome">welcome<//>
+    <${View} id="core">${await renderOptions(await getCore())}<//>
+  </div>`;
+  for (const { id, title, description, mods } of categories) {
+    const $list = await renderList(mods, description),
+      $mods = await renderMods({ id, title }, mods);
+    $views.append(html`<${View} id=${id}>${$list}<//>`, ...$mods);
   }
+
+  document.body.append(renderSidebar(sidebar, categories), $views);
 };
 
 window.addEventListener("focus", () => setState({ rerender: true }));