From c1940edeba894691965266d2cf7d072cd7c9e70a Mon Sep 17 00:00:00 2001
From: MickaelK <mickael@kerjean.me>
Date: Thu, 16 May 2024 21:27:13 +1000
Subject: [PATCH] chore (rewrite): filesystem

---
 .../decorator_shell_filemanager.css           |   9 +-
 .../components/decorator_shell_filemanager.js |  18 +-
 public/assets/components/menubar.css          |   6 +-
 public/assets/components/menubar.js           |   2 +-
 .../assets/pages/filespage/ctrl_filesystem.js |  64 ++++--
 .../assets/pages/filespage/ctrl_newitem.css   |   2 +-
 public/assets/pages/filespage/ctrl_newitem.js |   5 +-
 .../assets/pages/filespage/ctrl_submenu.css   |   3 +-
 public/assets/pages/filespage/ctrl_submenu.js |  34 ++-
 .../assets/pages/filespage/state_selection.js |  32 ++-
 public/assets/pages/filespage/thing.css       | 209 ++++++------------
 public/assets/pages/filespage/thing.js        | 105 +++++----
 12 files changed, 260 insertions(+), 229 deletions(-)

diff --git a/public/assets/components/decorator_shell_filemanager.css b/public/assets/components/decorator_shell_filemanager.css
index bdd62007..7fabfbce 100644
--- a/public/assets/components/decorator_shell_filemanager.css
+++ b/public/assets/components/decorator_shell_filemanager.css
@@ -72,13 +72,14 @@
     background: rgba(100,100,100,.05);
 }
 
-.component_filemanager_shell [data-bind="filemanager-children"] .container,
-.component_filemanager_shell [is="component-breadcrumb"] .container {
-    max-width: 2100px;
-}
+/* .component_filemanager_shell [data-bind="filemanager-children"] .container, */
+/* .component_filemanager_shell [is="component-breadcrumb"] .container { */
+/*     max-width: 2100px; */
+/* } */
 
 .component_filemanager_shell [data-bind="sidebar"] ~ div [is="component_filesystem"],
 .component_filemanager_shell [data-bind="sidebar"] ~ div [is="component_newitem"],
+.component_filemanager_shell [data-bind="sidebar"] ~ div component-menubar,
 .component_filemanager_shell [data-bind="sidebar"] ~ div [is="component-breadcrumb"],
 .component_filemanager_shell [data-bind="sidebar"] ~ div [is="component_submenu"] .component_submenu{
     padding: 0 30px;
diff --git a/public/assets/components/decorator_shell_filemanager.js b/public/assets/components/decorator_shell_filemanager.js
index 3e870d0b..5bf6fea6 100644
--- a/public/assets/components/decorator_shell_filemanager.js
+++ b/public/assets/components/decorator_shell_filemanager.js
@@ -1,5 +1,6 @@
 import { createElement, createRender } from "../lib/skeleton/index.js";
-import rxjs, { effect } from "../lib/rx.js";
+import { navigate } from "../lib/skeleton/router.js";
+import rxjs, { effect, preventDefault } from "../lib/rx.js";
 import { onDestroy } from "../lib/skeleton/lifecycle.js";
 import { animate, slideYOut } from "../lib/animate.js";
 import { qs } from "../lib/dom.js";
@@ -22,7 +23,8 @@ export default function(ctrl) {
         render($page);
 
         // feature1: setup the breadcrumb path
-        qs($page, `[is="component-breadcrumb"]`).setAttribute("path", urlToPath(location.pathname + location.hash));
+        const $breadcrumb = qs($page, `[is="component-breadcrumb"]`);
+        $breadcrumb.setAttribute("path", urlToPath(location.pathname + location.hash));
 
         // feature2: setup the childrens
         const $main = qs($page, `[data-bind="filemanager-children"]`);
@@ -44,6 +46,16 @@ export default function(ctrl) {
             rxjs.mapTo($page.firstElementChild),
             rxjs.tap(($sidebar) => document.body.clientWidth > 1250 ? $sidebar.classList.remove("hidden") : $sidebar.classList.add("hidden")),
         ));
+
+        // feature4: key shortcut
+        effect(rxjs.fromEvent(window, "keydown").pipe(
+            rxjs.filter((e) => new RegExp("^/files/.+").test(location.pathname) && e.keyCode === 8), // backspace in filemanager
+            rxjs.tap(() => {
+                const p = location.pathname.replace(new RegExp("/$"), "").split("/");
+                p.pop();
+                navigate(p.join("/") + "/" + location.hash);
+            }),
+        ));
     };
 }
 
@@ -56,7 +68,7 @@ async function ctrlSidebar(render) {
     // Tags:
     // - name + color
     const $comp = createElement(`
-        <div class="component_sidebar">
+        <div class="component_sidebar" style="display:none">
             <br>
 
             <h3>Quick Access</h3>
diff --git a/public/assets/components/menubar.css b/public/assets/components/menubar.css
index cdf70ab3..70fdb208 100644
--- a/public/assets/components/menubar.css
+++ b/public/assets/components/menubar.css
@@ -7,12 +7,12 @@
     z-index: 4;
     text-align: left;
 }
-.component_menubar .component_container {
+.component_menubar .container {
     padding: 0;
     color: var(--bg-color);
     font-size: 0.9em;
 }
-.component_menubar .component_container > span {
+.component_menubar .container > span {
     display: flex;
 }
 .component_menubar .titlebar {
@@ -37,7 +37,7 @@
 .dark-mode .component_menubar {
     background: var(--bg-color);
 }
-.dark-mode .component_menubar .component_container {
+.dark-mode .component_menubar .container {
     color: inherit;
 }
 
diff --git a/public/assets/components/menubar.js b/public/assets/components/menubar.js
index 42afc663..da830527 100644
--- a/public/assets/components/menubar.js
+++ b/public/assets/components/menubar.js
@@ -11,7 +11,7 @@ export default class ComponentMenubar extends window.HTMLElement {
 
         this.classList.add("component_menubar");
         this.innerHTML = `
-            <div class="component_container">
+            <div class="container">
                 <span>
                     <div class="titlebar">
                         ${basename(decodeURIComponent(location.pathname + location.hash)) || "&nbsp;"}
diff --git a/public/assets/pages/filespage/ctrl_filesystem.js b/public/assets/pages/filespage/ctrl_filesystem.js
index fcd0a796..21fa0aa0 100644
--- a/public/assets/pages/filespage/ctrl_filesystem.js
+++ b/public/assets/pages/filespage/ctrl_filesystem.js
@@ -18,6 +18,10 @@ const ICONS = {
     EMPTY_SEARCH: "<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns="http://www.w3.org/2000/svg" width="300" height="170" viewBox="0 0 300 170" fill="none">
  <path
     d="m 185.79369,58.561964 c 2.264,0 4.1,-1.8356 4.1,-4.1 0,-2.2644 -1.836,-4.1 -4.1,-4.1 -2.265,0 -4.1,1.8356 -4.1,4.1 0,2.2644 1.835,4.1 4.1,4.1 z"
     fill="#909090"
     id="path5065"
     style="fill:#909090;fill-opacity:0.2" />
  <path
     d="m 191.79369,42.562064 c 1.546,0 2.8,-1.2536 2.8,-2.8 0,-1.5464 -1.254,-2.8 -2.8,-2.8 -1.547,0 -2.8,1.2536 -2.8,2.8 0,1.5464 1.253,2.8 2.8,2.8 z"
     fill="#909090"
     id="path5067"
     style="fill:#909090;fill-opacity:0.2" />
  <path
     d="m 90.393595,58.461964 c 1.5464,0 2.8,-1.2536 2.8,-2.8 0,-1.5464 -1.2536,-2.8 -2.8,-2.8 -1.5464,0 -2.8,1.2536 -2.8,2.8 0,1.5464 1.2536,2.8 2.8,2.8 z"
     fill="#909090"
     id="path5069"
     style="fill:#909090;fill-opacity:0.2" />
  <path
     d="m 73.293565,112.46216 c 2.87189,0 5.20003,-2.3281 5.20003,-5.2 0,-2.8719 -2.32814,-5.2 -5.20003,-5.2 -2.87188,0 -5.199995,2.3281 -5.199995,5.2 0,2.8719 2.328115,5.2 5.199995,5.2 z"
     fill="#909090"
     id="path5071"
     style="fill:#909090;fill-opacity:0.2" />
  <g
     filter="url(#filter0_d)"
     id="g5075"
     transform="translate(67.546695,22.315564)">
    <path
       d="m 108.076,46.2575 0.8,64.4005 c 0,2.2 -1.8,3.9 -4,3.9 H 42.0762 c -2.2,0 -4,-1.8 -4,-3.9 V 27.8575 c 0,-2.2 1.8,-3.9 4,-3.9 h 45.5 z"
       fill="#ffffff"
       id="path5073" />
  </g>
  <path
     d="m 138.32279,59.772964 h -22.1 c -0.7,0 -1.3,-0.6 -1.3,-1.3 0,-0.7 0.6,-1.3 1.3,-1.3 h 22.1 c 0.7,0 1.3,0.6 1.3,1.3 0,0.7 -0.6,1.3 -1.3,1.3 z"
     fill="#f2f3f5"
     id="path5077"
     style="fill:#f2f3f5;fill-opacity:1" />
  <path
     d="m 127.82279,66.973164 h -11.6 c -0.7,0 -1.3,-0.6 -1.3,-1.3 0,-0.7 0.6,-1.3 1.3,-1.3 h 11.5 c 0.7,0 1.3,0.6 1.3,1.3 0,0.7 -0.6,1.3 -1.2,1.3 z"
     fill="#f2f3f5"
     id="path5079" />
  <path
     d="m 155.12289,46.273064 v 17.8 c 0,2.5 2.2,4.5 4.7,4.5 h 15.7998"
     fill="#f2f3f5"
     id="path5081" />
  <path
     d="m 124.85609,59.538264 4.7516,-16.76 19.5166,2.248 -6.8139,10.9224 5.2778,4.2167 -11.3628,24.8537 0.6331,-19.2416 z"
     fill="var(--bg-color_"
     id="path5083" />
  <defs
     id="defs5117">
    <filter
       id="filter0_d"
       x="16.0762"
       y="12.9575"
       width="114.8"
       height="134.60001"
       filterUnits="userSpaceOnUse"
       color-interpolation-filters="sRGB">
      <feFlood
         flood-opacity="0"
         result="BackgroundImageFix"
         id="feFlood5097" />
      <feColorMatrix
         in="SourceAlpha"
         type="matrix"
         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
         id="feColorMatrix5099" />
      <feOffset
         dy="11"
         id="feOffset5101" />
      <feGaussianBlur
         stdDeviation="11"
         id="feGaussianBlur5103" />
      <feColorMatrix
         type="matrix"
         values="0 0 0 0 0.397708 0 0 0 0 0.47749 0 0 0 0 0.575 0 0 0 0.27 0"
         id="feColorMatrix5105" />
      <feBlend
         mode="normal"
         in2="BackgroundImageFix"
         result="effect1_dropShadow"
         id="feBlend5107" />
      <feBlend
         mode="normal"
         in="SourceGraphic"
         in2="effect1_dropShadow"
         result="shape"
         id="feBlend5109" />
    </filter>
    <linearGradient
       id="paint0_linear"
       x1="73.453102"
       y1="21.8619"
       x2="73.453102"
       y2="115.534"
       gradientUnits="userSpaceOnUse">
      <stop
         stop-color="#FDFEFF"
         id="stop5112" />
      <stop
         offset="0.9964"
         stop-color="#ECF0F5"
         id="stop5114" />
    </linearGradient>
  </defs>
  <path
     d="m 180.18337,143.15046 c -1,0 -2,-0.4 -2.8,-1.3 l -16.6996,-16.7003 -0.6,0.4 c -5.4,4 -11.7,6.1 -18.1,6.1 -7.7,0 -15.4,-3.1 -21.1,-8.5 -5.99999,-5.69999 -9.29999,-13.39999 -9.29999,-21.79999 0,-16.700003 13.59999,-30.300003 30.29999,-30.300003 11.4,0 21.4,6 26.8,16.2 5.2996,10.1 4.5996,21.900003 -1.9,31.400003 l -0.4,0.6 16.7996,16.79999 c 1.7,1.7 1.3,3.4003 1,4.3003 -0.8,1.6 -2.4,2.8 -4,2.8 z m -38.2996,-63.800293 c -12.2,0 -21.99999,9.9 -21.99999,22.000003 0,13.8 11.29999,22.09999 22.29999,22.09999 6.7,0 12.8,-2.99999 17.1,-8.39999 5.3,-6.6 6.2,-15.500003 2.5,-23.200003 -3.8,-7.7 -11.4,-12.5 -19.9,-12.5 z"
     fill="#57595a"
     id="path4523" />
  <path
     d="m 132.38377,104.95027 c 1.3,0 2.4,-1.1 2.4,-2.4 0,-1.3 -1.1,-2.4 -2.4,-2.4 -1.3,0 -2.4,1.1 -2.4,2.4 0,1.3 1.1,2.4 2.4,2.4 z"
     fill="#909090"
     id="path4525" />
  <path
     d="m 150.78377,104.95027 c 1.3,0 2.4,-1.1 2.4,-2.4 0,-1.3 -1.1,-2.4 -2.4,-2.4 -1.3,0 -2.4,1.1 -2.4,2.4 0,1.4 1.1,2.4 2.4,2.4 z"
     fill="#909090"
     id="path4527" />
  <path
     d="m 132.28997,94.610067 -5.2795,2.8505 0.7127,1.3199 5.2794,-2.8506 z"
     fill="#909090"
     id="path4529" />
  <path
     d="m 150.45737,94.572267 -0.7125,1.32 5.28,2.85 0.7125,-1.32 z"
     fill="#909090"
     id="path4531" />
  <path
     d="m 141.58367,110.55027 c 1.5464,0 2.8,-0.9402 2.8,-2.1 0,-1.1598 -1.2536,-2.1 -2.8,-2.1 -1.5464,0 -2.8,0.9402 -2.8,2.1 0,1.1598 1.2536,2.1 2.8,2.1 z"
     fill="#909090"
     id="path4533" />
  <path
     d="M 12.082154,141.54408 H 7.1821544 c -0.3,0 -0.6,0.1 -0.7,0.4 l -2.4,4.3 c -0.1,0.3 -0.1,0.6 0,0.9 l 2.4,4.3 c 0.1,0.3 0.4,0.4 0.7,0.4 h 4.8999996 c 0.3,0 0.6,-0.1 0.7,-0.4 l 2.4,-4.3 c 0.1,-0.3 0.1,-0.6 0,-0.9 l -2.4,-4.3 c -0.1,-0.3 -0.4,-0.4 -0.7,-0.4 z"
     id="path4"
     style="fill:#909090;fill-opacity:0.2" />
  <path
     class="file"
     d="m 271.09259,11.652312 -7.37019,3.583918 c -0.76194,0.431116 -1.70491,0.583501 -2.57246,0.605222 -0.86754,0.02172 -1.78791,-0.161244 -2.63285,-0.474867 -1.61444,-0.757898 -3.0554,-2.112442 -3.93815,-3.841509 0,0 -1.50896,-3.3100372 -3.07075,-6.8247745 l -0.23388,-0.4834368 -15.96253,7.5074693 c -2.54223,1.145271 -3.61329,4.185144 -2.51928,6.732998 l 11.52855,25.644074 c 1.09402,2.547855 4.089,3.580205 6.63125,2.434931 l 25.59584,-12.049402 c 2.54224,-1.145275 3.61331,-4.185143 2.5193,-6.732998 L 271.70365,11.48249 Z"
     style="clip-rule:evenodd;fill:#909090;fill-opacity:0.2;fill-rule:evenodd;stroke-width:1.49471"
     id="path6" />
  <path
     class="file"
     d="m 259.41468,12.923368 c -1.10144,-0.461713 -1.97659,-1.31538 -2.62543,-2.561005 l -0.0528,-0.2047 -0.28668,-0.6881472 -1.04119,-2.343158 -0.57341,-1.376276 13.00599,4.7217702 -5.15993,2.421202 c -0.48277,0.243866 -1.01841,0.283028 -1.55401,0.322196 -0.53564,0.03916 -1.12406,-0.126364 -1.71249,-0.291899 z"
     style="clip-rule:evenodd;fill:#909090;fill-opacity:0.2;fill-rule:evenodd;stroke-width:1.49471"
     id="path8" />
  <path
     d="m 23.944403,17.635563 c -2.077419,1.199415 -2.474669,3.832798 -1.303579,5.861202 l 11.157969,19.326133 c 1.26869,2.197435 3.53196,2.919135 5.66264,1.688975 l 24.34312,-14.054491 c 1.38496,-0.79961 1.92411,-3.064169 0.62288,-5.317939 L 54.928543,8.6868627 c -1.04099,-1.803011 -3.07654,-2.130313 -4.46146,-1.330734 l -12.51782,7.2271693 -4.94944,-2.175869 z"
     id="path16"
     style="fill:#909090;fill-opacity:0.2;stroke-width:0.632594" />
  <g
     id="g20"
     transform="translate(243.28104,131.07346)"
     style="fill:#909090;fill-opacity:0.2">
    <path
       d="m 42.4,23.2 8.6,9.9 c 0.3,0.3 0.1,0.8 -0.3,0.9 L 38,36.2 c -0.4,0.1 -0.7,-0.3 -0.6,-0.7 l 4.1,-12.1 c 0.1,-0.4 0.7,-0.5 0.9,-0.2 z"
       id="path18"
       style="fill:#909090;fill-opacity:0.2" />
  </g>
  <path
     d="m 223.0733,92.373031 -2,1 c -0.3,0.1 -0.6,0 -0.8,-0.3 l -1,-2 c -0.1,-0.3 0,-0.6 0.3,-0.8 l 2,-1 c 0.3,-0.1 0.6,0 0.8,0.3 l 1,2 c 0.1,0.3 0,0.7 -0.3,0.8 z"
     id="path10"
     style="fill:#909090;fill-opacity:0.2" />
</svg>
",
 };
 
+const VIRTUAL_SCROLL_MINIMUM_TRIGGER = 100;
+
+export const files$ = new rxjs.BehaviorSubject(null);
+
 export default async function(render) {
     const $page = createElement(`
         <div class="component_filesystem container">
@@ -30,22 +34,22 @@ export default async function(render) {
         </div>
     `);
     render($page);
-    let _files = [];
+    onDestroy(() => files$.next(null));
 
     // feature: virtual scrolling
     const path = location.pathname.replace(new RegExp("^/files"), "");
-    const refreshOnResize$ = rxjs.fromEvent(window, "resize").pipe(
-        rxjs.startWith(null),
-        rxjs.map(() => [gridSize(qs($page, `[data-target="list"]`).clientWidth), document.body.clientHeight]),
-        rxjs.distinctUntilChanged((prev, curr) => {
-            return prev[0] === curr[0] && prev[1] && curr[1]
-        }),
-    );
     const $header = qs($page, `[data-target="header"]`);
     const $list = qs($page, `[data-target="list"]`);
     const removeLoader = createLoader($header);
     const $listBefore = qs($page, ".ifscroll-before");
     const $listAfter = qs($page, ".ifscroll-after");
+    const refreshOnResize$ = rxjs.fromEvent(window, "resize").pipe(
+        rxjs.startWith(null),
+        rxjs.map(() => [gridSize($list.clientWidth), document.body.clientHeight]),
+        rxjs.distinctUntilChanged((prev, curr) => {
+            return prev[0] === curr[0] && prev[1] && curr[1]
+        }),
+    );
 
     effect(ls(path).pipe(
         rxjs.switchMap(({ files, ...rest }) => getState$().pipe(rxjs.switchMap((state) => {
@@ -59,7 +63,6 @@ export default async function(render) {
                     ...rest, files, ...state, read_only: true,
                 })), removeLoader);
             }
-            _files = files;
             return rxjs.of({ ...rest, files, ...state, read_only: false });
         }))),
         rxjs.mergeMap(({ show_hidden, files, ...rest }) => {
@@ -69,6 +72,7 @@ export default async function(render) {
         }),
         removeLoader,
         rxjs.mergeMap(({ files, search, ...rest }) => {
+            files$.next(files);
             if (files.length === 0) {
                 renderEmpty(createRender(qs($page, `[data-target="header"]`)), !!search ? ICONS.EMPTY_SEARCH : ICONS.EMPTY_FILES);
                 return rxjs.EMPTY;
@@ -83,17 +87,18 @@ export default async function(render) {
             case "grid":
                 FILE_HEIGHT = 160;
                 COLUMN_PER_ROW = gridSize($list.clientWidth);
-                $list.style.gridTemplateColumns = `repeat(auto-fill, ${100 / COLUMN_PER_ROW}%)`;
+                $list.style.gridTemplateColumns = `repeat(${COLUMN_PER_ROW}, 1fr)`;
+                $list.style.gridGap = "4px";
                 break;
             case "list":
                 FILE_HEIGHT = 47;
                 COLUMN_PER_ROW = 1;
-                $list.style.gridTemplateColumns = `repeat(auto-fill, 100%)`;
+                $list.style.gridTemplateColumns = `repeat(1, 1fr)`;
+                $list.style.gridGap = "2px";
                 break;
             default:
                 throw new Error("Not Implemented");
             }
-            const VIRTUAL_SCROLL_MINIMUM_TRIGGER = 100;
             const BLOCK_SIZE = Math.ceil(document.body.clientHeight / FILE_HEIGHT) + 1;
 
             let size = files.length;
@@ -238,12 +243,24 @@ export default async function(render) {
         rxjs.tap(() => clearSelection()),
     ));
     effect(rxjs.fromEvent(window, "keydown").pipe(
-        rxjs.filter((e) => e.key === "a" && e.ctrlKey && _files.length > 0),
+        rxjs.filter((e) => e.key === "a" && (e.ctrlKey || e.metaKey) && (files$.value || []).length > 0),
         preventDefault(),
         rxjs.tap(() => {
             clearSelection();
-            addSelection({ n: 0 });
-            addSelection({ n: _files.length, shift: true });
+            if (!Array.isArray(files$.value) || files$.value.length === 0) return;
+            const path = location.pathname.replace(new RegExp("/files/"), "/");
+            const el0 = files$.value[0];
+            const elm1 = files$.value.slice(-1)[0];
+            addSelection({
+                n: 0,
+                path: path + el0.name + (el0.type === "directory" ? "/" : ""),
+                shift: false, files: [],
+            });
+            if (elm1) addSelection({
+                n: (files$.value || []).length,
+                path: path + elm1.name + (elm1.type === "directory" ? "/" : ""),
+                shift: true, files: (files$.value || []),
+            });
         }),
     ));
     effect(getSelection$().pipe(rxjs.tap((a) => {
@@ -256,15 +273,12 @@ export default async function(render) {
     })));
 
     // feature: remove long touch popup on mobile
-    const disableLongTouch = (e) => { // TODO: use lib for mobile detect
-        if(/iPhone|iPad|iPod|Android/i.test(navigator.userAgent) === false) {
-            return;
-        }
+    const disableLongTouch = (e) => {
+        if(isMobile === false) return;
         e.preventDefault();
-    }
+    };
     document.addEventListener("contextmenu", disableLongTouch);
     onDestroy(() => document.removeEventListener("contextmenu", disableLongTouch));
-
 }
 
 function renderEmpty(render, base64Icon) {
@@ -286,10 +300,14 @@ export function init() {
 }
 
 function createLink(file, currentPath) {
-    let path = file.path ? file.path : currentPath + file.name;
+    let path = file.path;
+    if (!path) path = currentPath + file.name;
     if (file.type === "directory") path += "/";
     const link = file.type === "directory" ? "/files" + path : "/view" + path;
-    return { path, link };
+    return {
+        path: path,
+        link: link,
+    };
 }
 
 function gridSize(size) {
diff --git a/public/assets/pages/filespage/ctrl_newitem.css b/public/assets/pages/filespage/ctrl_newitem.css
index db0c7970..4e24371e 100644
--- a/public/assets/pages/filespage/ctrl_newitem.css
+++ b/public/assets/pages/filespage/ctrl_newitem.css
@@ -2,7 +2,7 @@
     overflow: hidden;
 }
 .component_newitem .component_thing {
-    margin: 2px;
+    margin: 2px 0;
 }
 .component_newitem .component_thing .box {
     margin: 0;
diff --git a/public/assets/pages/filespage/ctrl_newitem.js b/public/assets/pages/filespage/ctrl_newitem.js
index 6ca1a7ec..aeb18328 100644
--- a/public/assets/pages/filespage/ctrl_newitem.js
+++ b/public/assets/pages/filespage/ctrl_newitem.js
@@ -13,7 +13,7 @@ export default async function(render) {
                 <div class="mouse-is-hover highlight box">
                     <img class="component_icon" draggable="false" alt="directory">
                     <span class="file-details">
-                        <form><input type="text" value=""></form>
+                        <form><input type="text" name="name" value=""><input type="hidden" name="type" value=""></form>
                     </span>
                     <span class="component_action">
                         <div class="action">
@@ -52,6 +52,7 @@ export default async function(render) {
             $icon.setAttribute("src", `data:image/svg+xml;base64,${img}`);
             $icon.setAttribute("alt", alt);
             $input.value = "";
+            $input.nextSibling.setAttribute("name", alt);
             if ($node.classList.contains("hidden")) animate($node, {
                 keyframes: [{ height: `0px` }, { height: "50px" }],
                 time: 100, fill: "forwards",
@@ -83,7 +84,7 @@ export default async function(render) {
     // feature3: submit form
     effect(rxjs.fromEvent($node, "submit").pipe(
         preventDefault(),
-        rxjs.tap(() => console.log("SUBMIT")),
+        rxjs.tap(() => console.log("SUBMIT", $input.value, "type", $input.nextSibling.getAttribute("name"))),
     ));
 }
 
diff --git a/public/assets/pages/filespage/ctrl_submenu.css b/public/assets/pages/filespage/ctrl_submenu.css
index dca67708..4d20e1d8 100644
--- a/public/assets/pages/filespage/ctrl_submenu.css
+++ b/public/assets/pages/filespage/ctrl_submenu.css
@@ -10,7 +10,7 @@
 }
 .scrolling [is="component_submenu"] {
     box-shadow: 0 5px 10px rgba(100,100,100,.05);
-    background: rgba(245,245,245,0.75);
+    background: rgba(245,245,245,0.9);
 }
 [is="component_submenu"] .component_submenu {
     display: flex;
@@ -36,6 +36,7 @@
     margin-left: 2px;
     overflow: hidden;
     white-space: nowrap;
+    text-overflow: ellipsis;
 }
 [is="component_submenu"] .component_submenu .action.right {
     margin-right:2px;
diff --git a/public/assets/pages/filespage/ctrl_submenu.js b/public/assets/pages/filespage/ctrl_submenu.js
index 5c4cabb6..3038e6ce 100644
--- a/public/assets/pages/filespage/ctrl_submenu.js
+++ b/public/assets/pages/filespage/ctrl_submenu.js
@@ -3,6 +3,7 @@ import rxjs, { effect, applyMutation, onClick, preventDefault } from "../../lib/
 import { animate, slideXIn, slideYIn } from "../../lib/animate.js";
 import { loadCSS } from "../../helpers/loader.js";
 import { qs, qsa } from "../../lib/dom.js";
+import { basename } from "../../lib/path.js";
 
 import "../../components/dropdown.js";
 import "../../components/icon.js";
@@ -14,7 +15,7 @@ import componentTag from "./modal_tag.js";
 import componentRename from "./modal_rename.js";
 import componentDelete from "./modal_delete.js";
 
-import { getSelection$, clearSelection, lengthSelection } from "./state_selection.js";
+import { getSelection$, clearSelection, lengthSelection, expandSelection } from "./state_selection.js";
 import { getAction$, setAction } from "./state_event.js";
 import { setState, getState$ } from "./state_filesystem.js";
 
@@ -72,7 +73,9 @@ function componentLeft(render, { $scroll }) {
     effect(getSelection$().pipe(
         rxjs.filter((selections) => selections.length === 1),
         rxjs.map(() => render(createFragment(`
-            <a><button data-action="download">Download</button></a>
+            <a ${generateLinkAttributes(expandSelection())}>
+                <button data-action="download">Download</button>
+            </a>
             <button data-action="delete">Delete</button>
             <button data-action="share">Share</button>
             <button data-action="embed">Embed</button>
@@ -99,22 +102,18 @@ function componentLeft(render, { $scroll }) {
             onClick(qs($page, `[data-action="delete"]`)).pipe(rxjs.tap(() => {
                 componentDelete(createModal(modalOpt));
             })),
-            // getSelection$().pipe(rxjs.tap((a) => {
-            //     console.log("HH", a);
-            // })),
         )),
     ));
 
     effect(getSelection$().pipe(
         rxjs.filter((selections) => selections.length > 1),
         rxjs.map(() => render(createFragment(`
-            <button data-action="download">Download</button>
+            <a ${generateLinkAttributes(expandSelection())}>
+                <button data-action="download">Download</button>
+            </a>
             <button data-action="delete">Delete</button>
         `))),
         rxjs.mergeMap(($page) => rxjs.merge(
-            onClick(qs($page, `[data-action="download"]`)).pipe(
-                rxjs.mergeMap(() => rxjs.EMPTY),
-            ),
             onClick(qs($page, `[data-action="delete"]`)).pipe(rxjs.tap(() => {
                 componentDelete(createModal(modalOpt));
             })),
@@ -235,7 +234,7 @@ function componentRight(render) {
                 rxjs.merge(
                     onClick(qs($page, `[data-action="search"]`)),
                     rxjs.fromEvent(window, "keydown").pipe(
-                        rxjs.filter((e) => e.ctrlKey && e.key === "f"),
+                        rxjs.filter((e) => (e.ctrlKey || e.metaKey) && e.key === "f"),
                         preventDefault(),
                     ),
                 ).pipe(rxjs.map(($el) => qs($page, "input").classList.contains("hidden"))),
@@ -320,3 +319,18 @@ export function init() {
         loadCSS(import.meta.url, "./ctrl_submenu.css"),
     ]);
 }
+
+function generateLinkAttributes(selections) {
+    let filename = "archive.zip";
+    let href = "/api/files/zip?";
+    if (selections.length === 1) {
+        const path = selections[0].path;
+        const regDir = new RegExp("/$");
+        filename = regDir.test(path) ?
+            basename(path.replace(regDir, "")) + ".zip" :
+            basename(path);
+        href = "/api/files/cat?"
+    }
+    href += selections.map(({path}) => "path=" + encodeURIComponent(path)).join("&");
+    return `href="${href}" download="${filename}"`
+}
diff --git a/public/assets/pages/filespage/state_selection.js b/public/assets/pages/filespage/state_selection.js
index e11a5037..ca4cbf5e 100644
--- a/public/assets/pages/filespage/state_selection.js
+++ b/public/assets/pages/filespage/state_selection.js
@@ -1,11 +1,12 @@
 import rxjs from "../../lib/rx.js";
 import { onDestroy } from "../../lib/skeleton/index.js";
+import { ApplicationError } from "../../lib/error.js";
 
 const selection$ = new rxjs.BehaviorSubject([]);
 
 onDestroy(() => selection$.next([]));
 
-export function addSelection({ shift = false, n = 0 }) {
+export function addSelection({ shift = false, n = 0, ...rest }) {
     const newSelection = selection$.value;
     let alreadyKnown = false;
     for (let i=0; i<newSelection.length; i++) {
@@ -22,7 +23,7 @@ export function addSelection({ shift = false, n = 0 }) {
 
     if (alreadyKnown === false) selection$.next(
         selection$.value
-            .concat({ shift, n })
+            .concat({ shift, n, ...rest })
             .sort((prev, curr) => prev.n - curr.n)
     );
 }
@@ -40,7 +41,7 @@ export function isSelected(n) {
     for (let i=0;i<selection$.value.length;i++) {
         if (selection$.value[i]["n"] === n) isChecked = !isChecked;
         else if (selection$.value[i]["shift"]
-                 && isBetween(n, selection$.value[i-1]["n"], selection$.value[i]["n"]))
+                 && isBetween(n, selection$.value[i-1]?.n, selection$.value[i]?.n))
             isChecked = !isChecked
     }
     return isChecked;
@@ -57,6 +58,31 @@ export function lengthSelection() {
     return l;
 }
 
+export function expandSelection() {
+    const selections = [];
+    for (let i=0; i<selection$.value.length; i++) {
+        const curr = selection$.value[i];
+        if (curr.shift === false) {
+            selections.push({ path: curr.path });
+            continue;
+        }
+        let prev = selection$.value[i-1];
+        if (!prev) prev = { n: 0 };
+        for (let i=1; i<= curr.n - prev.n; i++) {
+            if (i > 100000) throw new ApplicationError(
+                "Internal error",
+                `pages::state_selection.js curr=${curr.n} prev=${prev.n}`,
+            );
+            const path = location.pathname.replace(new RegExp("^/files"), "");
+            const f = curr.files[prev.n + i];
+            console.log(f)
+            selections.push({
+                path: path + f.name + (f.type === "directory" ? "/" : ""),
+            });
+        }
+    }
+    return selections;
+}
 
 function isBetween(n, lowerBound, higherBound) {
     return n < higherBound && n > lowerBound;
diff --git a/public/assets/pages/filespage/thing.css b/public/assets/pages/filespage/thing.css
index 8be2ed14..559268ed 100644
--- a/public/assets/pages/filespage/thing.css
+++ b/public/assets/pages/filespage/thing.css
@@ -1,20 +1,14 @@
-.component_thing {
-    clear: both;
-}
-.component_thing:hover .box, .component_thing .highlight.box,
-.component_thing.hover .box, .component_thing .highlight.box {
+.component_thing:hover, .component_thing .highlight,
+.component_thing.hover, .component_thing .highlight {
     transition: 0.1s ease-out background;
     background: var(--border);
     border-color: var(--super-light);
     border-radius: 5px;
 }
-.component_thing:hover .box:not(.loading) .component_datetime {
+.component_thing:not(.loading):hover .component_datetime {
     display: none;
 }
-.component_thing:hover .box:not(.loading) .component_action {
-    display: block;
-}
-.component_thing .component_action, .component_thing .component_checkbox {
+.component_thing .component_checkbox {
     display: none;
 }
 .component_thing .file-is-hover {
@@ -48,22 +42,6 @@
     border-bottom: 2px solid var(--emphasis-primary);
     color: var(--color);
 }
-.component_thing .component_icon {
-    width: 25px;
-    height: 25px;
-}
-.component_thing .component_filesize span {
-    color: var(--light);
-    font-size: 0.85em;
-}
-.component_thing .component_datetime {
-    float: right;
-    color: var(--light);
-    line-height: 25px;
-    margin: 0 -10px;
-    padding: 0 10px;
-    position: relative;
-}
 .component_thing .component_action {
     float: right;
     color: #6f6f6f;
@@ -72,9 +50,22 @@
     padding: 0 10px;
     position: relative;
 }
-.component_thing .component_action .component_icon {
-    padding: 1px 0;
-    box-sizing: border-box;
+.component_thing .component_icon {
+    width: 25px;
+    height: 25px;
+}
+.component_thing .component_filesize {
+    color: var(--light);
+    font-size: 0.85em;
+    padding-left: 3px;
+}
+.component_thing .component_datetime {
+    float: right;
+    color: var(--light);
+    line-height: 25px;
+    margin: 0 -10px;
+    padding: 0 10px;
+    position: relative;
 }
 .component_thing .component_checkbox {
     opacity: 0;
@@ -87,9 +78,10 @@
 }
 .component_thing .component_checkbox .indicator {
     top: 7px;
-    left: 7px;
+    left: 6px;
 }
-.touch-no .component_thing:hover .component_checkbox, .component_thing.selected .component_checkbox {
+.touch-no .component_thing:hover .component_checkbox,
+.component_thing.selected .component_checkbox {
     transition-delay: 0.1s;
     opacity: 1;
 }
@@ -114,73 +106,22 @@
 }
 .list > .component_thing {
     width: 100%;
-}
-.list > .component_thing .box {
-    margin: 0px 0 2px 0;
+    position: relative;
+    box-sizing: border-box;
 }
 .list > .component_thing.view-grid {
-    width: 100%;
-    text-align: center;
-    transition: 0.1s ease transform;
-}
-.list > .component_thing.view-grid .box {
-    height: 156px;
-}
-/* @media (max-width: 699px) { */
-/*     .list > .component_thing.view-grid { */
-/*         width: 33.33%; */
-/*     } */
-/*     .list > .component_thing.view-grid .box { */
-/*         height: 200px; */
-/*     } */
-/* } */
-/* @media (max-width: 670px) { */
-/*     .list > .component_thing.view-grid .box { */
-/*         height: 170px; */
-/*     } */
-/* } */
-/* @media (max-width: 550px) { */
-/*     .list > .component_thing.view-grid { */
-/*         width: 50%; */
-/*     } */
-/*     .list > .component_thing.view-grid .box { */
-/*         height: 200px; */
-/*     } */
-/* } */
-/* @media (max-width: 480px) { */
-/*     .list > .component_thing.view-grid .box { */
-/*         height: 170px; */
-/*     } */
-/* } */
-/* @media (max-width: 400px) { */
-/*     .list > .component_thing.view-grid .box { */
-/*         height: 140px; */
-/*     } */
-/*     .list > .component_thing.view-grid .box .info_extension { */
-/*         font-size: 0.8em !important; */
-/*         padding: 3px 10px; */
-/*     } */
-/* } */
-/* @media (max-width: 340px) { */
-/*     .list > .component_thing.view-grid .box { */
-/*         height: 130px; */
-/*     } */
-/* } */
-.list > .component_thing.view-grid .box {
-    margin: 2px;
-    padding: 0;
-    position: relative;
-    border-width: 0;
-    box-sizing: border-box;
     border: 2px solid var(--border);
     border-radius: 5px;
+    text-align: center;
+    height: 160px;
+    box-sizing: border-box;
 }
-.list > .component_thing.view-grid .box > span > img {
+.list > .component_thing.view-grid > img {
     padding: 0;
     margin: 0;
     display: block;
 }
-.list > .component_thing.view-grid .box > span > img.component_icon {
+.list > .component_thing.view-grid > img.component_icon {
     padding: 30px;
     box-sizing: border-box;
     width: 100%;
@@ -189,7 +130,7 @@
     margin: 0 auto;
     z-index: 0;
 }
-.list > .component_thing.view-grid .box > span > img.thumbnail {
+.list > .component_thing.view-grid > img.thumbnail {
     width: 100%;
     height: 100%;
     object-fit: cover;
@@ -197,7 +138,7 @@
     background: var(--dark);
     z-index: 0;
 }
-.list > .component_thing.view-grid .box .info_extension {
+.list > .component_thing.view-grid .info_extension {
     position: absolute;
     top: 45%;
     text-align: right;
@@ -208,7 +149,7 @@
     font-size: 0.95em;
     text-shadow: 0px 0px 2px rgba(0, 0, 0, 0.2);
 }
-.list > .component_thing.view-grid .box .info_extension span {
+.list > .component_thing.view-grid .info_extension span {
     background: var(--color);
     color: var(--bg-color);
     border-radius: 4px;
@@ -221,10 +162,10 @@
     overflow: hidden;
     text-overflow: ellipsis;
 }
-.list > .component_thing.view-list .info_extension {
+.list > .component_thing .info_extension span:empty {
     display: none;
 }
-.list > .component_thing.view-grid .box .component_filename {
+.list > .component_thing.view-grid .component_filename {
     letter-spacing: -0.5px;
     z-index: 2;
     position: absolute;
@@ -234,20 +175,20 @@
     border-radius: 2px;
     padding: 3px 0px;
 }
-.list > .component_thing.view-grid .box .component_filename .file-details {
+.list > .component_thing.view-grid .component_filename .file-details {
     width: calc(100% - 10px);
     display: block;
 }
-.list > .component_thing.view-grid .box .component_filename .file-details > span {
+.list > .component_thing.view-grid .component_filename .file-details > span {
     width: 100%;
 }
-.list > .component_thing.view-grid .box .component_filename .file-details > span form input {
+.list > .component_thing.view-grid .component_filename .file-details > span form input {
     letter-spacing: -0.5px;
     text-align: center;
     width: 100%;
     padding: 0;
 }
-.list > .component_thing.view-grid .box .image_layer {
+.list > .component_thing.view-grid .image_layer {
     position: absolute;
     top: 0;
     bottom: 0;
@@ -257,42 +198,27 @@
     background: rgba(0, 0, 0, 0);
     transition: 0.2s ease-out background;
 }
-.list > .component_thing.view-grid .box .component_filesize, .list > .component_thing.view-grid .box .component_datetime {
+.list > .component_thing.view-grid .component_filesize,
+.list > .component_thing.view-grid .component_datetime {
     display: none;
 }
-.list > .component_thing.view-grid .box .component_action {
-    transform: translateX(5px);
-    transition: 0.15s ease-out all;
-    z-index: 2;
-    display: block;
-    position: absolute;
-    top: 5px;
-    right: 5px;
-    border-radius: 5px;
-    margin-right: 0px;
-    padding: 0px;
-}
-.list > .component_thing.view-grid .box img.thumbnail {
+.list > .component_thing.view-grid img.thumbnail {
     transition: 0.2s ease-out transform;
 }
-.list > .component_thing.view-grid.not-selected .box:hover .component_action {
-    transition-delay: 0.1s;
-    transform: translateX(0);
-}
-.list > .component_thing.view-grid.not-selected .box:hover img.thumbnail {
+.list > .component_thing.view-grid.not-selected:hover img.thumbnail {
     transform: scale(0.6);
 }
-.list > .component_thing.view-grid.not-selected .box:hover .image_layer {
+.list > .component_thing.view-grid.not-selected:hover .image_layer {
     background: var(--border);
 }
-.list > .component_thing.view-grid.not-selected .box.preview:hover .component_filename {
+.list > .component_thing.view-grid.not-selected.preview:hover .component_filename {
     opacity: 1;
 }
-.list > .component_thing.view-grid.not-selected .box.preview .component_filename {
+.list > .component_thing.view-grid.not-selected.preview .component_filename {
     transition: 0.2s ease-out opacity;
     opacity: 0;
 }
-.list > .component_thing.view-grid.selected .box img.thumbnail {
+.list > .component_thing.view-grid.selected img.thumbnail {
     transform: scale(0.6);
 }
 .list > .component_thing.view-grid .component_checkbox {
@@ -301,9 +227,17 @@
     left: 3px;
     transform: translateX(-5px);
 }
-.list > .component_thing.view-grid:hover .component_checkbox, .list > .component_thing.view-grid.selected .component_checkbox {
+.list > .component_thing.view-grid:hover .component_checkbox,
+.list > .component_thing.view-grid.selected .component_checkbox {
     transform: translateX(0px);
 }
+
+.list > .component_thing.view-list {
+    padding: 10px;
+}
+.list > .component_thing.view-list .info_extension {
+    display: none;
+}
 .list > .component_thing.view-list .component_checkbox {
     top: 8px;
     left: 8px;
@@ -313,42 +247,39 @@
 .list > .component_thing.view-list .component_checkbox:hover {
     background: rgba(0, 0, 0, 0.1);
 }
-.list > .component_thing.view-list:hover .component_checkbox, .list > .component_thing.view-list.selected .component_checkbox {
+.list > .component_thing.view-list:hover .component_checkbox,
+.list > .component_thing.view-list.selected .component_checkbox {
     display: block;
 }
-.list > .component_thing.view-list:hover .component_checkbox ~ span > .component_icon, .list > .component_thing.view-list.selected .component_checkbox ~ span > .component_icon {
+.list > .component_thing.view-list:hover .component_checkbox ~ .component_icon,
+.list > .component_thing.view-list.selected .component_checkbox ~ .component_icon {
     visibility: hidden;
 }
-.list > .component_thing.view-list:hover .component_checkbox .indicator, .list > .component_thing.view-list.selected .component_checkbox .indicator {
+.list > .component_thing.view-list:hover .component_checkbox .indicator,
+.list > .component_thing.view-list.selected .component_checkbox .indicator {
     border-color: var(--color);
 }
-.list > .component_thing.view-list:hover .component_checkbox input ~ span, .list > .component_thing.view-list.selected .component_checkbox input ~ span {
+.list > .component_thing.view-list:hover .component_checkbox input ~ span,
+.list > .component_thing.view-list.selected .component_checkbox input ~ span {
     background-color: rgba(255, 255, 255, 0.4);
 }
-.list > .component_thing.view-list:hover .component_checkbox input:checked ~ span, .list > .component_thing.view-list.selected .component_checkbox input:checked ~ span {
+.list > .component_thing.view-list:hover .component_checkbox input:checked ~ span,
+.list > .component_thing.view-list.selected .component_checkbox input:checked ~ span {
     background-color: var(--color);
 }
-.list .not-selected .box:hover .component_action {
-    opacity: 1;
-}
-.list .not-selected .box .component_action {
-    opacity: 0;
-}
-.list .selected .box .component_action {
-    opacity: 0;
-}
 
-.dark-mode .component_thing:hover .box {
+/* Dark Mode */
+.dark-mode .component_thing:hover {
     background: rgba(255, 255, 255, 0.05);
     border-radius: 2px;
 }
-.dark-mode .component_thing .box {
+.dark-mode .component_thing {
     background: inherit;
 }
 .dark-mode .component_thing .component_filename {
     color: var(--light);
 }
-.dark-mode .component_thing .box.highlight {
+.dark-mode .component_thing.highlight {
     background: rgba(255, 255, 255, 0.05);
 }
 .dark-mode .component_thing form input {
diff --git a/public/assets/pages/filespage/thing.js b/public/assets/pages/filespage/thing.js
index ee9bdc20..50cf268f 100644
--- a/public/assets/pages/filespage/thing.js
+++ b/public/assets/pages/filespage/thing.js
@@ -1,7 +1,8 @@
-import { createElement } from "../../lib/skeleton/index.js";
+import { createElement, createFragment } from "../../lib/skeleton/index.js";
 import { qs } from "../../lib/dom.js";
 import assert from "../../lib/assert.js";
 
+import { files$ } from "./ctrl_filesystem.js";
 import { addSelection, isSelected } from "./state_selection.js";
 
 const IMAGE = {
@@ -10,25 +11,18 @@ const IMAGE = {
 };
 
 const $tmpl = createElement(`
-    <div class="component_thing no-select" draggable="true">
-        <a href="__TEMPLATE__" data-link>
-            <div class="box">
-                <div class="component_checkbox"><input type="checkbox"><span class="indicator"></span></div>
-                <span>
-                    <img class="component_icon" draggable="false" src="__TEMPLATE__" alt="directory">
-                    <div class="info_extension"></div>
-                </span>
-                <span class="component_filename">
-                    <span class="file-details">
-                        <span>__TEMPLATE__<span class="extension"></span></span>
-                    </span>
-                </span>
-                <span class="component_datetime"></span>
-                <div class="component_action"></div>
-                <div class="selectionOverlay"></div>
-            </div>
-        </a>
-    </div>
+    <a href="__TEMPLATE__" class="component_thing no-select" draggable="true" data-link>
+        <div class="component_checkbox"><input type="checkbox"><span class="indicator"></span></div>
+        <img class="component_icon" draggable="false" src="__TEMPLATE__" alt="directory">
+        <div class="info_extension"><span></span></div>
+        <span class="component_filename">
+            <span class="file-details"><span>
+                <span class="component_filesize">(281B)</span>
+            </span></span>
+        </span>
+        <span class="component_datetime"></span>
+        <div class="selectionOverlay"></div>
+    </a>
 `);
 
 // a filesystem "thing" is typically either a file or folder which have a lot of behavior builtin.
@@ -41,7 +35,7 @@ export function createThing({
     type = "N/A",
     time = 0,
     path = null,
-    // size = 0,
+    size = 0,
     // time = null,
     link = "",
     // permissions = {}
@@ -51,23 +45,36 @@ export function createThing({
 }) {
     const $thing = $tmpl.cloneNode(true);
     assert.type($thing, window.HTMLElement);
-    const $time = qs($thing, ".component_datetime");
-    const $label = qs($thing, ".component_filename .file-details > span");
-    const $extension = qs($thing, ".info_extension");
 
-    $thing.querySelector("a").setAttribute("href", link);
-    $thing.querySelector("img").setAttribute("src", (type === "file" ? IMAGE.FILE : IMAGE.FOLDER));
+    // querySelector is nicer but slower and this is the hot path so we want
+    // it fast!
+    const $link = $thing;
+    const $checkbox = $thing.children[0]; // = qs($thing, ".component_checkbox");
+    const $img = $thing.children[1]; // = qs($thing, "img")
+    const $extension = $thing.children[2].firstElementChild; // = qs($thing, ".info_extension > span");
+    const $label = $thing.children[3].firstElementChild.firstElementChild; // = qs($thing, ".component_filename .file-details > span");
+    const $time = $thing.children[4]; // = qs($thing, ".component_datetime");
+
+    $link.setAttribute("href", link);
+    $img.setAttribute("src", (type === "file" ? IMAGE.FILE : IMAGE.FOLDER));
     $thing.setAttribute("data-droptarget", type === "directory");
     $thing.setAttribute("data-n", n);
+    $thing.setAttribute("data-path", path);
     $thing.classList.add("view-" + view);
     $time.textContent = formatTime(new Date(time));
 
     const [filename, ext] = formatFile(name);
-    $label.innerHTML = type === "file" ? `${filename}<span class="extension">${formatDot(ext)}</span>` : name;
-    if (type === "file" && !!ext) $extension.innerHTML = `<span>${ext}</span>`;
+    $label.textContent = name;
+    if (type === "file") {
+        $extension.textContent = ext;
+        const $filesize = document.createElement("span");
+        $filesize.classList.add("component_filesize");
+        $filesize.textContent = formatSize(size);
+        $label.appendChild($filesize);
+    }
 
     if (read_only === true) {
-        qs($thing, ".component_checkbox").classList.add("hidden");
+        $checkbox.classList.add("hidden");
         return $thing;
     } else if (type === "hidden") {
         $thing.classList.add("hidden");
@@ -76,14 +83,15 @@ export function createThing({
 
     const checked = isSelected(n);
     $thing.classList.add(checked ? "selected" : "not-selected");
-    qs($thing, `input[type="checkbox"]`).checked = checked;
+    $checkbox.firstElementChild.checked = checked;
 
-    $thing.querySelector(".component_checkbox").onclick = function(e) {
+    $checkbox.onclick = (e) => {
         e.preventDefault();
         e.stopPropagation();
         addSelection({
-            name, type,
-            shift: e.shiftKey, n,
+            n,
+            path: $thing.getAttribute("data-path"),
+            shift: (e.shiftKey || e.metaKey), files: (files$.value || []),
         });
     };
     $thing.ondragstart = (e) => {
@@ -92,7 +100,7 @@ export function createThing({
 
         const crt = $thing.cloneNode(true);
         $thing.style.opacity = "0.7";
-        const $box = crt.querySelector(".box");
+        const $box = crt;
         crt.style.opacity = "0.2";
         crt.style.backgroundColor = "var(--border)";
         $box.style.backgroundColor = "inherit";
@@ -119,11 +127,14 @@ export function createThing({
 
 function formatTime(date) {
     if (!date) return "";
-    return new Intl.DateTimeFormat(navigator.language || "en-US")
-        .format(date)
-        .split("/")
-        .map((chunk) => chunk.padStart(2, "0"))
-        .join("/");
+    // Intl.DateTimeFormat is slow and in the hot path, so
+    // let's render date manually if possible
+    if (navigator.language.substr(0, 2) === "en") {
+        return date.getFullYear() + "/" +
+            (date.getMonth() + 1).toString().padStart(2, "0") + "/" +
+            date.getDate().toString().padStart(2, "0");
+    }
+    return new Intl.DateTimeFormat(navigator.language).format(date);
 }
 
 function formatFile(filename) {
@@ -139,3 +150,19 @@ function formatDot(ext) {
     if (!ext) return "";
     return "." + ext;
 }
+
+function formatSize(bytes) {
+    if (Number.isNaN(bytes) || bytes < 0 || bytes === undefined) {
+        return "";
+    } else if (bytes < 1024) {
+        return "("+bytes+"B)";
+    } else if (bytes < 1048576) {
+        return "("+Math.round(bytes/1024*10)/10+"KB)";
+    } else if (bytes < 1073741824) {
+        return "("+Math.round(bytes/(1024*1024)*10)/10+"MB)";
+    } else if (bytes < 1099511627776) {
+        return "("+Math.round(bytes/(1024*1024*1024)*10)/10+"GB)";
+    } else {
+        return "("+Math.round(bytes/(1024*1024*1024*1024))+"TB)";
+    }
+}