@akinon/ui-shell-dev 1.6.28 → 1.7.0

package/dist/index.html

@@ -24,7 +24,7 @@
         box-sizing: border-box;
       }
     </style>
-    <script type="module" crossorigin src="/assets/index-CKAduHRb.js"></script>
+    <script type="module" crossorigin src="/assets/index-ZjGUam1u.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-CqHg0o1i.css">
   </head>
   <body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/ui-shell-dev",
-  "version": "1.6.28",
+  "version": "1.7.0",
   "private": false,
   "description": "Development shell application for Akinon UI Protocol plugins",
   "type": "module",
@@ -21,14 +21,14 @@
     "react-dom": "*",
     "react-router-dom": "^6.28.0",
     "vite": "*",
-    "@akinon/app-shell": "1.5.8",
+    "@akinon/ui-react": "1.6.7",
     "@akinon/fonts-jost-variable": "2.1.8",
+    "@akinon/app-shell": "1.6.0",
     "@akinon/icons": "1.5.0",
-    "@akinon/ui-react": "1.6.7",
-    "@akinon/ui-utils": "1.3.1",
+    "@akinon/ui-hooks": "1.1.8",
     "@akinon/akidate": "1.2.7",
     "@akinon/akilocale": "1.2.8",
-    "@akinon/ui-hooks": "1.1.8"
+    "@akinon/ui-utils": "1.3.1"
   },
   "devDependencies": {
     "@types/cors": "^2.8.17",

package/src/providers.tsx

@@ -1,6 +1,10 @@
 import { useTranslation } from '@akinon/akilocale/react';
 import type { ApplicationActions, RegisteredApp } from '@akinon/app-shell';
-import { AppShellProvider, type ShellNavigation } from '@akinon/app-shell';
+import {
+  AppShellProvider,
+  type ShellNavigation,
+  type ShellNavigationPayload
+} from '@akinon/app-shell';
 import { notification } from '@akinon/ui-react';
 import React from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
@@ -28,13 +32,43 @@ export const Providers: React.FC<ProvidersProps> = ({ config, children }) => {
     name: app.navTitle || app.name // Use navTitle if provided, otherwise use name
   }));
 
+  // One builder for every branch, so a same-tab navigation, a new-tab
+  // navigation and a resolved url can never point at different places.
+  const buildShellUri = ({ id, path, external }: ShellNavigationPayload) => {
+    const app = apps.find(app => app.id === id);
+    if (!app) return undefined;
+
+    return external ? path : `/external/${app.slug}${path || ''}`;
+  };
+
   const navigation: ShellNavigation = {
-    navigate: ({ id, path, external }) => {
-      const app = apps.find(app => app.id === id);
-      if (!app) return;
+    navigate: payload => {
+      const uri = buildShellUri(payload);
+      if (uri === undefined) return;
+
+      if (payload.newTab) {
+        // Absolute, so the new tab never resolves against the iframe's own url.
+        const target = new URL(uri, window.location.origin);
+
+        // An external path arrives from the iframe untouched, so only a web url
+        // may reach window.open: a javascript: or data: url would run in the
+        // shell's context.
+        if (target.protocol !== 'http:' && target.protocol !== 'https:') return;
+
+        window.open(target.href, '_blank', 'noopener,noreferrer');
+        return;
+      }
 
-      const uri = external ? path : `/external/${app.slug}${path || ''}`;
       navigate(uri);
+    },
+    resolveUrl: payload => {
+      const uri = buildShellUri(payload);
+      // An unknown app id has no url here, exactly as `navigate` has nowhere to
+      // go for one; returning nothing keeps the shell from emitting a base url
+      // that points at the shell root.
+      if (uri === undefined) return undefined;
+
+      return new URL(uri, window.location.origin).href;
     }
   };