@xh/hoist 74.0.0-SNAPSHOT.1747519346365 → 74.0.0-SNAPSHOT.1747520442842

package/admin/tabs/userData/roles/editor/form/RoleFormModel.ts

@@ -11,7 +11,7 @@ import {HoistModel, managed, ReactionSpec, SelectOption, TaskObserver, XH} from
 import {RecordActionSpec, required} from '@xh/hoist/data';
 import {actionCol, calcActionColWidth, selectEditor} from '@xh/hoist/desktop/cmp/grid';
 import {Icon} from '@xh/hoist/icon';
-import {action, computed, observable} from '@xh/hoist/mobx';
+import {action, computed, makeObservable, observable} from '@xh/hoist/mobx';
 import {groupBy, isNil, isString, map, sortBy, uniq, without} from 'lodash';
 import {RoleModel} from '../../RoleModel';
 import {HoistRole, RoleMemberType, RoleModuleConfig} from '../../Types';
@@ -72,6 +72,8 @@ export class RoleFormModel extends HoistModel {
 
     constructor(roleModel: RoleModel) {
         super();
+        makeObservable(this);
+
         this.roleModel = roleModel;
         this.addReaction(
             this.clearDegenerateRowReaction(this.usersGridModel),

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

@@ -27,10 +27,6 @@ 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.
@@ -38,8 +34,6 @@ export interface NavigatorConfig {
  */
 export declare class NavigatorModel extends HoistModel {
     disableAppRefreshButton: boolean;
-    readonly route: string;
-    readonly routePrefix: string;
     stack: PageModel[];
     pages: PageConfig[];
     track: boolean;
@@ -55,7 +49,7 @@ export declare class NavigatorModel extends HoistModel {
     get activePageIdx(): number;
     get allowSlideNext(): boolean;
     get allowSlidePrev(): boolean;
-    constructor({ pages, route, track, pullDownToRefresh, transitionMs, renderMode, refreshMode }: NavigatorConfig);
+    constructor({ pages, 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,

package/mobile/cmp/navigator/NavigatorModel.ts

@@ -44,11 +44,6 @@ 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;
 }
 
 /**
@@ -58,9 +53,6 @@ export interface NavigatorConfig {
 export class NavigatorModel extends HoistModel {
     @bindable disableAppRefreshButton: boolean;
 
-    readonly route: string;
-    readonly routePrefix: string;
-
     @bindable.ref
     stack: PageModel[] = [];
 
@@ -97,7 +89,6 @@ export class NavigatorModel extends HoistModel {
 
     constructor({
         pages,
-        route,
         track = false,
         pullDownToRefresh = true,
         transitionMs = 500,
@@ -110,9 +101,6 @@ 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) : '';
-
         this.pages = pages;
         this.track = track;
         this.pullDownToRefresh = pullDownToRefresh;
@@ -221,7 +209,7 @@ export class NavigatorModel extends HoistModel {
         this.stack = this.stack.slice(0, this._swiper.activeIndex + 1);
 
         // 2) Sync route to match the current page stack
-        const newRouteName = this.routePrefix + this.stack.map(it => it.id).join('.'),
+        const newRouteName = this.stack.map(it => it.id).join('.'),
             newRouteParams = mergeDeep({}, ...this.stack.map(it => it.props));
 
         XH.navigate(newRouteName, newRouteParams);
@@ -238,17 +226,16 @@ export class NavigatorModel extends HoistModel {
     };
 
     private onRouteChange(init: boolean = false) {
-        const {route: myRoute, routePrefix: myRoutePrefix, _swiper} = this;
-        if (!XH.routerState || (myRoute && !XH.router.isActive(myRoute)) || !_swiper) return;
+        if (!this._swiper || !XH.routerState) return;
 
-        // 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.
+        // 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.
         const {meta, name, params} = XH.routerState,
-            parts = name.replace(myRoutePrefix, '').split('.');
+            parts = name.split('.');
 
         const routeParts = parts.map((id, idx) => {
-            const metaKey = myRoutePrefix + parts.slice(0, idx + 1).join('.'),
+            const metaKey = parts.slice(0, idx + 1).join('.'),
                 props = {};
 
             // Extract props for this part
@@ -275,7 +262,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 = myRoutePrefix + completedRouteParts.map(it => it.id).join('.'),
+                    newRouteName = 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": "74.0.0-SNAPSHOT.1747519346365",
+  "version": "74.0.0-SNAPSHOT.1747520442842",
   "description": "Hoist add-on for building and deploying React Applications.",
   "repository": "github:xh/hoist-react",
   "homepage": "https://xh.io",