@hanzo/rooms 0.1.100 → 0.1.101

package/dist/App.js

@@ -73,7 +73,7 @@ import { useRooms } from './host.js';
 import { useKept } from './kept.js';
 import { Mark, raised, Rail, Toggle } from './Rail.js';
 import { Foot, Layer, Lift, RAISED, useDrawer } from './Drawer.js';
-import { empty, openThread, useOpen } from './open.js';
+import { empty, openThread, showSettings, useOpen } from './open.js';
 import { Paned } from './Shell.js';
 import { Palette } from './Palette.js';
 import { summons } from './seek.js';
@@ -103,7 +103,7 @@ export function App({ bar } = {}) {
 /** The window itself, drawn once the organization is settled. */
 function Window({ bar }) {
     const drawer = useDrawer();
-    const { close: shut, depart } = drawer;
+    const { close: shut, depart, exit } = drawer;
     // On a phone the window stands in the visual viewport, so the keyboard never covers the composer (view.ts).
     const view = useView();
     const hold = drawer.window;
@@ -117,11 +117,12 @@ function Window({ bar }) {
     const [finding, setFinding] = useState(false);
     const found = useCallback(() => setFinding(false), []);
     const dev = useDevHost();
-    // The builder's moves put the drawer away, in its place in the history.
+    // The builder's moves put the drawer away, in its place in the history; one to
+    // a page outside the app (Settings) leaves it through the router.
     const host = useMemo(() => ({
         ...dev,
-        go: (to, how) => depart((replace) => dev.go(to, replace ? { ...how, replace } : how)),
-    }), [dev, depart]);
+        go: (to, how) => (place(app(to)) ? depart : exit)((replace) => dev.go(to, replace ? { ...how, replace } : how)),
+    }), [dev, depart, exit]);
     const { client } = useAi();
     const { router, path } = useRooms();
     const here = path ?? '/';
@@ -145,12 +146,6 @@ function Window({ bar }) {
     const run = where !== null && route(where).kind === 'run';
     const asked = at.mode === 'chat' ? at.thread : null;
     const { thread, settings: wanted } = useOpen();
-    // A row of the account menu asks for Settings: the drawer goes away as the
-    // router leaves for the page (dev.tsx).
-    useEffect(() => {
-        if (wanted)
-            shut();
-    }, [wanted, shut]);
     const plans = where !== null && isPlans(where);
     useEffect(() => {
         if (plans)
@@ -197,8 +192,19 @@ function Window({ bar }) {
         if (!inPlace)
             away.current = `${window.location.pathname}${window.location.search}`;
     }, [inPlace, here]);
-    /** A move: the drawer away, the address in its place; a page that is not the app's (Settings) through the router. */
-    const move = useCallback((address) => depart((replace) => visit(router, address, replace)), [depart, router]);
+    /**
+     * A move: the drawer away, the address in its place. One of the app's moves
+     * the app; any other page of the site (Settings) is the router's, and leaves it.
+     */
+    const move = useCallback((address) => (place(address.split(/[?#]/)[0]) ? depart : exit)((replace) => visit(router, address, replace)), [depart, exit, router]);
+    // A pane asks for Settings — the account menu's rows, Chat's See usage: its
+    // page (lib/host `settings`), through the router, the drawer away.
+    useEffect(() => {
+        if (!wanted)
+            return;
+        showSettings(null);
+        move(settings(wanted));
+    }, [wanted, move]);
     // The app's keys.
     useEffect(() => {
         const key = (e) => {

package/dist/Drawer.d.ts

@@ -9,6 +9,12 @@ export interface Drawer {
     close: () => void;
     /** Moves the app from the menu: the move replaces the menu's history entry, and the menu goes. */
     depart: (move: Move) => void;
+    /**
+     * Leaves the app from the menu for a page the host's router draws: the page
+     * takes the menu's history entry, and the menu goes. Nothing is popped, for
+     * the router moves the address after this returns.
+     */
+    exit: (move: Move) => void;
     /** The address moved under the menu, by a way that was not `depart`: the menu goes, and its entry stays behind the move. */
     drop: () => void;
     /** The window: everything in it but the menu is inert while the menu is out. */

package/dist/Drawer.js

@@ -31,7 +31,9 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // back to what opened it as it shuts; Escape closes it, unless a menu or dialog
 // it opened holds the focus; Back closes it, because opening it pushed an entry
 // of the same address that Back pops. A move made from inside it takes that
-// entry's place (`depart`), so the history holds the move and never the menu.
+// entry's place (`depart`), so the history holds the move and never the menu;
+// so does a page the host's router draws outside the app (`exit`: Settings),
+// whose address moves only after the press returns.
 // Its list's scroll stays its own (Recents' `overscrollBehavior`), and the pane,
 // never unmounted, keeps its own.
 import { useI18n } from '@hanzo/i18n/react';
@@ -112,6 +114,12 @@ export function useDrawer() {
             window.history.back();
         home();
     }, [home]);
+    const exit = useCallback((move) => {
+        const replace = marked.current;
+        marked.current = false;
+        move(replace);
+        home();
+    }, [home]);
     const drop = useCallback(() => {
         marked.current = false;
         home();
@@ -287,6 +295,7 @@ export function useDrawer() {
         open,
         close,
         depart,
+        exit,
         drop,
         window: useCallback((node) => {
             win.current = element(node);

package/dist/Me.js

@@ -10,7 +10,7 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
 // Help ›, the site's own pages and the keyboard shortcuts (⌘/ / Ctrl+/ from
 // anywhere); and Log out. Every row opens a real destination: Settings'
 // pages through `showSettings` (open.ts), which the app answers with the
-// site's Settings at /settings (dev.tsx) and the shell with its own pane; the plans on the
+// site's Settings at /settings (App.tsx) and the shell with its own pane; the plans on the
 // pay site (`leave`); the site's pages through `site()`, so hanzo.team names
 // hanzo.ai (help.ts).
 //

package/dist/dev.js

@@ -17,10 +17,10 @@
 //
 // SETTINGS IS THE SITE'S, never Dev's: one tree at /settings, the host's own
 // pages (lib/host.ts `settings`). A builder section the builder moves to
-// (`go`), a link it opens (`open`) and a pane that asks for Settings
-// (`showSettings`, open.ts: the account menu's rows, Chat's "See usage") all
-// reach that page through the host's router (`visit`). The rooms' shell draws
-// its own Settings pane; the app has none.
+// (`go`) and a link it opens (`open`) reach that page through the host's router
+// (`visit`); a pane that asks for Settings (`showSettings`, open.ts) is App's to
+// answer, where the phone's menu is. The rooms' shell draws its own Settings
+// pane; the app has none.
 //
 // THE PLANS ARE THE PAY SITE'S. Every way the app reaches the plans — the
 // account menu's View all plans and its plan's Upgrade, Billing's Adjust plan,
@@ -29,7 +29,7 @@
 // coming back once paid. A typed or reloaded plans address leaves the same way
 // (App.tsx). A page load, at once, not a move inside the app: the pay site is
 // where a plan is bought.
-import { useEffect, useMemo } from 'react';
+import { useMemo } from 'react';
 import { useLook, useRooms } from './host.js';
 import { useIam } from '@hanzo/iam/react';
 import { useSignOut } from './lib/signout.js';
@@ -41,7 +41,6 @@ import { CAST } from './agents.js';
 import { app, place, settings, visit } from './lib/host.js';
 import { link } from './lib/tags.js';
 import { payUrl } from './lib/pay.js';
-import { showSettings, useOpen } from './open.js';
 /** Where the builder links out: every one of them an address of this site. */
 const LINKS = {
     github: app('-/sync'),
@@ -81,14 +80,6 @@ export function useDevHost() {
     const { router, path: pathname } = useRooms();
     const here = path(route(at(pathname)));
     const look = useLook();
-    const { settings: asked } = useOpen();
-    // A pane asked for Settings: its page, through the router.
-    useEffect(() => {
-        if (!asked)
-            return;
-        showSettings(null);
-        router.push(settings(asked));
-    }, [asked, router]);
     // The token's claims change only when the token does: a sign-in, a refresh.
     const memberships = useMemo(() => orgs(), [accessToken]); // eslint-disable-line react-hooks/exhaustive-deps
     const scoped = useMemo(() => org(), [accessToken]); // eslint-disable-line react-hooks/exhaustive-deps

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanzo/rooms",
-  "version": "0.1.100",
+  "version": "0.1.101",
   "description": "The workspace rooms — Home, Chat, Inbox, Contacts, Meet, Cal, Drive, Board, Work, Bots — and the frame that holds them, once, for every Hanzo surface.",
   "type": "module",
   "main": "./dist/index.js",