@lmzhen/dsh-evolution-merge-ui 0.39.2 → 0.40.1

package/lib/client.js

@@ -36,7 +36,7 @@ window.__ModuleLoader__.load({
 				}
 			}, spec.namespace + ": locale");
 			ctx.effect(() => injectStyles(typeof document === "undefined" ? void 0 : document, spec.styles.css, spec.styles.tagId), spec.namespace + ": styles");
-			const fallback = spec.dictionaries.zh;
+			const fallback = spec.dictionaries["en"];
 			const lookup = (key) => {
 				const own = fallback[key] ?? key;
 				if (!registered) return own;
@@ -205,6 +205,7 @@ window.__ModuleLoader__.load({
 				notify();
 			};
 			const refresh = async () => {
+				startRemote();
 				const ticket = ++generation;
 				const next = await describe(namespace);
 				if (ticket !== generation) return;
@@ -265,13 +266,16 @@ window.__ModuleLoader__.load({
 			return form;
 		}
 		/**
-		* Build one seat per client registration; every form's remote listener is released by
-		* the caller's effect. No module-level WeakMap: a replaced registration must not share
-		* a dead seat with the previous one.
+		* Build/return the ONE seat for one ClientContext. All panels share the same form,
+		* snapshot and revision; dispose removes the seat so a replacement context starts clean.
 		*/
+		const seats = /* @__PURE__ */ new WeakMap();
 		function createSettingsSeat(ctx) {
+			const key = ctx;
+			const existing = seats.get(key);
+			if (existing !== void 0) return existing;
 			const forms = /* @__PURE__ */ new Map();
-			return {
+			const seat = {
 				get(namespace) {
 					let form = forms.get(namespace);
 					if (form === void 0) {
@@ -283,8 +287,14 @@ window.__ModuleLoader__.load({
 				dispose: () => {
 					for (const form of forms.values()) form.dispose?.();
 					forms.clear();
+					seats.delete(key);
 				}
 			};
+			seats.set(key, seat);
+			ctx.inject?.(["remote"], () => {
+				for (const form of forms.values()) form.refresh?.();
+			});
+			return seat;
 		}
 		//#endregion
 		//#region ../evolution-client-kit/src/workspace.ts
@@ -2850,7 +2860,7 @@ window.__ModuleLoader__.load({
 		];
 		/** The view component receives the workbench's activeView marker alongside its face. */
 		function MergeView(props) {
-			return props.activeView === "merge" ? MergePanel(props) : null;
+			return (0, react.createElement)("div", { hidden: props.activeView !== "merge" }, MergePanel(props));
 		}
 		/**
 		* Register the merge view on the workbench page.
@@ -2858,9 +2868,16 @@ window.__ModuleLoader__.load({
 		*/
 		function apply(ctx) {
 			const seat = createSettingsSeat(ctx);
+			const store = new MergeStore({
+				view,
+				rows,
+				body,
+				history
+			});
 			ctx.effect(() => () => {
+				store.dispose();
 				seat.dispose?.();
-			}, "evolution-merge-ui: settings seat");
+			}, "evolution-merge-ui: settings seat + store");
 			registerWorkbenchView(ctx, {
 				id: PANEL_ID,
 				order: 45,
@@ -2875,15 +2892,9 @@ window.__ModuleLoader__.load({
 				},
 				component: MergeView,
 				face: (t) => {
-					const source = {
-						view,
-						rows,
-						body,
-						history
-					};
 					const workspaceId = panelWorkspaceId(ctx);
 					return {
-						store: new MergeStore(source),
+						store,
 						t,
 						doctorCommand: "/evolution doctor",
 						settings: {

package/package.json

@@ -11,7 +11,7 @@
       ]
     }
   },
-  "version": "0.39.2",
+  "version": "0.40.1",
   "publishConfig": {
     "access": "public"
   },
@@ -51,7 +51,7 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@lmzhen/dsh-evolution-client-kit": "^0.39.2"
+    "@lmzhen/dsh-evolution-client-kit": "^0.40.1"
   },
   "engines": {
     "dsh": ">=0.2.2-rc.0 <0.2.3-0"