@xh/hoist 73.0.0-SNAPSHOT.1746050507413 → 73.0.0-SNAPSHOT.1746195895077

package/admin/AppModel.ts

@@ -170,7 +170,8 @@ export class AppModel extends HoistAppModel {
     async initViewManagerModelsAsync() {
         this.viewManagerModels.activityTracking = await ViewManagerModel.createAsync({
             type: 'xhAdminActivityTrackingView',
-            typeDisplayName: 'View'
+            typeDisplayName: 'View',
+            manageGlobal: XH.getUser().isHoistAdmin
         });
     }
 }

package/build/types/mobile/cmp/navigator/NavigatorModel.d.ts

@@ -27,6 +27,10 @@ export interface NavigatorConfig {
      * See enum for description of supported modes.
      */
     refreshMode?: RefreshMode;
+    /**
+     * Base route name for this navigator, with the route for each page being "[route]/[page.id]".
+     */
+    route?: string;
 }
 /**
  * Model for handling stack-based navigation between pages.
@@ -34,6 +38,8 @@ export interface NavigatorConfig {
  */
 export declare class NavigatorModel extends HoistModel {
     disableAppRefreshButton: boolean;
+    readonly route: string;
+    readonly routePrefix: string;
     stack: PageModel[];
     pages: PageConfig[];
     track: boolean;
@@ -49,7 +55,7 @@ export declare class NavigatorModel extends HoistModel {
     get activePageIdx(): number;
     get allowSlideNext(): boolean;
     get allowSlidePrev(): boolean;
-    constructor({ pages, track, pullDownToRefresh, transitionMs, renderMode, refreshMode }: NavigatorConfig);
+    constructor({ pages, route, track, pullDownToRefresh, transitionMs, renderMode, refreshMode }: NavigatorConfig);
     /**
      * @param callback - function to execute (once) after the next page transition.
      */

package/cmp/tab/TabContainerModel.ts

@@ -144,10 +144,10 @@ export class TabContainerModel extends HoistModel implements Persistable<{active
         this.refreshContextModel.xhImpl = xhImpl;
 
         if (route) {
-            if (XH.isMobileApp) {
-                this.logWarn('TabContainer routing is not supported for mobile applications.');
-                return;
-            }
+            // if (XH.isMobileApp) {
+            //     this.logWarn('TabContainer routing is not supported for mobile applications.');
+            //     return;
+            // }
 
             this.addReaction({
                 track: () => XH.routerState,
@@ -356,8 +356,11 @@ export class TabContainerModel extends HoistModel implements Persistable<{active
             {router} = XH,
             state = router.getState();
 
+        console.log('syncWithRouter', state, router.isActive(route));
+
         if (state && router.isActive(route)) {
             const tab = tabs.find(t => router.isActive(route + '.' + t.id, state.params));
+            console.log('activating', tab);
             if (tab && !tab.isActive && !tab.disabled) {
                 this.setActiveTabIdInternal(tab.id);
             }

package/mobile/cmp/navigator/NavigatorModel.ts

@@ -44,6 +44,11 @@ export interface NavigatorConfig {
      * See enum for description of supported modes.
      */
     refreshMode?: RefreshMode;
+
+    /**
+     * Base route name for this navigator, with the route for each page being "[route]/[page.id]".
+     */
+    route?: string;
 }
 
 /**
@@ -53,6 +58,9 @@ export interface NavigatorConfig {
 export class NavigatorModel extends HoistModel {
     @bindable disableAppRefreshButton: boolean;
 
+    readonly route: string;
+    readonly routePrefix: string;
+
     @bindable.ref
     stack: PageModel[] = [];
 
@@ -89,6 +97,7 @@ export class NavigatorModel extends HoistModel {
 
     constructor({
         pages,
+        route,
         track = false,
         pullDownToRefresh = true,
         transitionMs = 500,
@@ -101,6 +110,10 @@ export class NavigatorModel extends HoistModel {
         ensureNotEmpty(pages, 'NavigatorModel needs at least one page.');
         ensureUniqueBy(pages, 'id', 'Multiple NavigatorModel PageModels have the same id.');
 
+        this.route = route ?? '';
+        this.routePrefix = route ? route.substring(0, route.lastIndexOf('.') + 1) : '';
+        console.log(this.route, this.routePrefix);
+
         this.pages = pages;
         this.track = track;
         this.pullDownToRefresh = pullDownToRefresh;
@@ -199,19 +212,22 @@ export class NavigatorModel extends HoistModel {
             swiper.allowTouchMove = false;
         });
 
+        console.log('swiper change');
         this.onRouteChange(true);
     }
 
     /** @internal */
     @action
     onPageChange = () => {
+        console.log('onPageChange');
         // 1) Clear any pages after the active page. These can be left over from a back swipe.
         this.stack = this.stack.slice(0, this._swiper.activeIndex + 1);
 
         // 2) Sync route to match the current page stack
-        const newRouteName = this.stack.map(it => it.id).join('.'),
+        const newRouteName = this.routePrefix + this.stack.map(it => it.id).join('.'),
             newRouteParams = mergeDeep({}, ...this.stack.map(it => it.props));
 
+        console.log('newRouteName', newRouteName);
         XH.navigate(newRouteName, newRouteParams);
 
         // 3) Update state according to the active page and trigger optional callback
@@ -226,16 +242,18 @@ export class NavigatorModel extends HoistModel {
     };
 
     private onRouteChange(init: boolean = false) {
-        if (!this._swiper || !XH.routerState) return;
+        const {route: myRoute, routePrefix: myRoutePrefix, _swiper} = this;
+        console.log('onRouteChange', XH.router.isActive(myRoute));
+        if (!XH.routerState || (myRoute && !XH.router.isActive(myRoute)) || !_swiper) return;
 
-        // Break the current route name into parts, and collect any params for each part.
-        // Use meta.params to determine which params are associated with each route part.
-        // Save these params to use as props for the page.
+        // Break the current route name into parts, only looking at our part of it (myRoute and below).
+        // Collect any params for each part. Use meta.params to determine which params are associated
+        // with each route part. Save these params to use as props for the page.
         const {meta, name, params} = XH.routerState,
-            parts = name.split('.');
+            parts = name.replace(myRoutePrefix, '').split('.');
 
         const routeParts = parts.map((id, idx) => {
-            const metaKey = parts.slice(0, idx + 1).join('.'),
+            const metaKey = myRoutePrefix + parts.slice(0, idx + 1).join('.'),
                 props = {};
 
             // Extract props for this part
@@ -245,6 +263,7 @@ export class NavigatorModel extends HoistModel {
 
             return {id, props};
         });
+        console.log(myRoutePrefix, XH.routerState, parts, routeParts);
 
         // Loop through the route parts, rebuilding the page stack to match.
         const stack = [];
@@ -262,7 +281,7 @@ export class NavigatorModel extends HoistModel {
             // we drop the rest of the route and redirect to the route so far
             if (init && pageModelCfg.disableDirectLink) {
                 const completedRouteParts = routeParts.slice(0, i),
-                    newRouteName = completedRouteParts.map(it => it.id).join('.'),
+                    newRouteName = myRoutePrefix + completedRouteParts.map(it => it.id).join('.'),
                     newRouteParams = mergeDeep({}, ...completedRouteParts.map(it => it.props));
 
                 XH.navigate(newRouteName, newRouteParams, {replace: true});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xh/hoist",
-  "version": "73.0.0-SNAPSHOT.1746050507413",
+  "version": "73.0.0-SNAPSHOT.1746195895077",
   "description": "Hoist add-on for building and deploying React Applications.",
   "repository": "github:xh/hoist-react",
   "homepage": "https://xh.io",