@xh/hoist 74.0.0-SNAPSHOT.1748338432179 → 74.0.0-SNAPSHOT.1748339158877

package/build/types/cmp/viewmanager/View.d.ts

@@ -17,11 +17,6 @@ export declare class View<T extends PlainObject = PlainObject> {
      * state of the components is captured.
      */
     readonly value: Partial<T>;
-    /**
-     * Defaulted to value, but may be updated during ViewManagerModel's settleTime to be
-     * the "settled" state after loading. Used for comparison to determine dirtiness.
-     */
-    settledValue: Partial<T>;
     private readonly model;
     get name(): string;
     get group(): string;

package/build/types/cmp/viewmanager/ViewManagerModel.d.ts

@@ -43,11 +43,6 @@ export interface ViewManagerConfig {
      * True (default) to allow users to share their views with other users.
      */
     enableSharing?: boolean;
-    /**
-     * True (default) to save pending state to SessionStorage so that it can be restored across
-     * browser refreshes. Unlike auto-save, this does not write to the database.
-     */
-    preserveUnsavedChanges?: boolean;
     /**
      * Function to determine the initial view for a user, when no view has already been persisted.
      * Will be passed a list of views available to the current user.  Implementations where
@@ -137,7 +132,6 @@ export declare class ViewManagerModel<T = PlainObject> extends HoistModel {
     readonly enableDefault: boolean;
     readonly enableGlobal: boolean;
     readonly enableSharing: boolean;
-    readonly preserveUnsavedChanges: boolean;
     readonly manageGlobal: boolean;
     readonly settleTime: number;
     readonly initialViewSpec: (views: ViewInfo[]) => ViewInfo;
@@ -204,7 +198,6 @@ export declare class ViewManagerModel<T = PlainObject> extends HoistModel {
     resetAsync(): Promise<void>;
     getValue(): Partial<T>;
     setValue(value: Partial<T>): void;
-    noteStatePushed(): void;
     userPin(view: ViewInfo): void;
     userUnpin(view: ViewInfo): void;
     isUserPinned(view: ViewInfo): boolean | null;

package/cmp/viewmanager/View.ts

@@ -27,12 +27,6 @@ export class View<T extends PlainObject = PlainObject> {
      */
     readonly value: Partial<T> = null;
 
-    /**
-     * Defaulted to value, but may be updated during ViewManagerModel's settleTime to be
-     * the "settled" state after loading. Used for comparison to determine dirtiness.
-     */
-    settledValue: Partial<T> = null;
-
     private readonly model: ViewManagerModel;
 
     get name(): string {
@@ -98,7 +92,6 @@ export class View<T extends PlainObject = PlainObject> {
     constructor(info: ViewInfo, value: Partial<T>, model: ViewManagerModel) {
         this.info = info;
         this.value = value;
-        this.settledValue = value;
         this.model = model;
     }
 }

package/cmp/viewmanager/ViewManagerModel.ts

@@ -74,12 +74,6 @@ export interface ViewManagerConfig {
      */
     enableSharing?: boolean;
 
-    /**
-     * True (default) to save pending state to SessionStorage so that it can be restored across
-     * browser refreshes. Unlike auto-save, this does not write to the database.
-     */
-    preserveUnsavedChanges?: boolean;
-
     /**
      * Function to determine the initial view for a user, when no view has already been persisted.
      * Will be passed a list of views available to the current user.  Implementations where
@@ -182,7 +176,6 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
     readonly enableDefault: boolean;
     readonly enableGlobal: boolean;
     readonly enableSharing: boolean;
-    readonly preserveUnsavedChanges: boolean;
     readonly manageGlobal: boolean;
     readonly settleTime: number;
     readonly initialViewSpec: (views: ViewInfo[]) => ViewInfo;
@@ -303,7 +296,6 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
         enableDefault = true,
         enableGlobal = true,
         enableSharing = true,
-        preserveUnsavedChanges = true,
         settleTime = 1000,
         initialViewSpec = null
     }: ViewManagerConfig) {
@@ -325,7 +317,6 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
         this.enableGlobal = enableGlobal;
         this.enableSharing = enableSharing;
         this.enableAutoSave = enableAutoSave;
-        this.preserveUnsavedChanges = preserveUnsavedChanges;
         this.settleTime = settleTime;
         this.initialViewSpec = initialViewSpec;
 
@@ -430,14 +421,13 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
 
     @action
     setValue(value: Partial<T>) {
-        value = this.cleanState(value);
-
         const {view, pendingValue, lastPushed, settleTime} = this;
         if (!pendingValue && settleTime && !olderThan(lastPushed, settleTime)) {
-            this.view.settledValue = value;
+            return;
         }
 
-        if (!isEqual(value, view.settledValue)) {
+        value = this.cleanState(value);
+        if (!isEqual(value, view.value)) {
             this.pendingValue = {
                 token: pendingValue ? pendingValue.token : view.token,
                 baseUpdated: pendingValue ? pendingValue.baseUpdated : view.lastUpdated,
@@ -448,10 +438,6 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
         }
     }
 
-    noteStatePushed() {
-        this.lastPushed = Date.now();
-    }
-
     //------------------
     // Pinning
     //------------------
@@ -529,9 +515,7 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
                 this.views = views;
                 this.userPinned = state.userPinned;
                 this.autoSave = state.autoSave;
-                if (this.preserveUnsavedChanges) {
-                    this.pendingValue = XH.sessionStorageService.get(pendingValueStorageKey);
-                }
+                this.pendingValue = XH.sessionStorageService.get(pendingValueStorageKey);
             });
 
             // 2) Initialize/choose initial view.  Null is ok, and will yield default.
@@ -562,10 +546,7 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
     private pendingValueReaction(): ReactionSpec {
         return {
             track: () => this.pendingValue,
-            run: v => {
-                if (!this.preserveUnsavedChanges) return;
-                XH.sessionStorageService.set(this.pendingValueStorageKey, v);
-            }
+            run: v => XH.sessionStorageService.set(this.pendingValueStorageKey, v)
         };
     }
 
@@ -607,6 +588,7 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
             .thenAction(latest => {
                 this.setAsView(latest, pendingValue?.token == token ? pendingValue : null);
                 this.providers.forEach(it => it.pushStateToTarget());
+                this.lastPushed = Date.now();
             })
             .linkTo(this.selectTask);
     }

package/core/persist/provider/ViewManagerProvider.ts

@@ -19,13 +19,11 @@ export class ViewManagerProvider<S> extends PersistenceProvider<S> {
         throwIf(!viewManagerModel, `ViewManagerProvider requires a 'viewManagerModel'.`);
         this.viewManagerModel = viewManagerModel;
         viewManagerModel.providers.push(this);
-        viewManagerModel.noteStatePushed();
     }
 
     pushStateToTarget() {
         const state = this.read();
         this.target.setPersistableState(state ? state : this.defaultState);
-        this.viewManagerModel.noteStatePushed();
     }
 
     //----------------

package/package.json

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