@kubohiroya/turbowarp-plus-editor-git 0.14.0 → 0.14.1

package/dist/index.js

@@ -3574,26 +3574,25 @@ function GitPanel({ vm, document, host, controller }) {
 		});
 		running.current = true;
 		const ticket = ++epoch.current;
-		setState((previous) => automatic ? _objectSpread2$1(_objectSpread2$1({}, previous), {}, { busy: true }) : _objectSpread2$1(_objectSpread2$1({}, previous), {}, {
+		if (!automatic) setState((previous) => _objectSpread2$1(_objectSpread2$1({}, previous), {}, {
 			busy: true,
 			error: null,
 			notice: void 0
 		}));
 		try {
 			const update = await operation();
-			if (epoch.current === ticket) setState((previous) => _objectSpread2$1(_objectSpread2$1(_objectSpread2$1({}, previous), update), {}, { busy: false }));
+			if (epoch.current === ticket) setState((previous) => _objectSpread2$1(_objectSpread2$1(_objectSpread2$1({}, previous), update), {}, { busy: automatic ? previous.busy : false }));
 		} catch (error) {
 			if (epoch.current !== ticket) return;
 			const code = error instanceof GitPanelError ? error.code : "failed";
 			if (automatic && code === "changed") {
 				handled.current = null;
-				setState((previous) => _objectSpread2$1(_objectSpread2$1({}, previous), {}, { busy: false }));
 				return;
 			}
 			const message = labels[code] || labels.failed;
 			setState((previous) => _objectSpread2$1(_objectSpread2$1({}, previous), {}, {
 				error: automatic && previous.error ? previous.error : message,
-				busy: false,
+				busy: automatic ? previous.busy : false,
 				diff: null
 			}));
 		} finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubohiroya/turbowarp-plus-editor-git",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "description": "Read-only local Git panel for TurboWarp Plus Editor",
   "type": "module",
   "license": "MPL-2.0",

package/src/index.tsx

@@ -112,22 +112,24 @@ function GitPanel({vm, document, host, controller}: {vm: object; document: Docum
         if (automatic) background.current = new Promise(resolve => {settle = resolve;});
         running.current = true;
         const ticket = ++epoch.current;
-        // An automatic refresh keeps the current error and notice, such as an uncertain push result.
-        setState(previous => automatic ? {...previous, busy: true} : {...previous, busy: true, error: null, notice: undefined});
+        // An automatic refresh keeps the current error and notice, such as an uncertain push result. It also
+        // leaves the controls enabled: an operation clicked meanwhile waits for it above, whereas a button
+        // that turned disabled under the pointer would swallow the click.
+        if (!automatic) setState(previous => ({...previous, busy: true, error: null, notice: undefined}));
         try {
             const update = await operation();
-            if (epoch.current === ticket) setState(previous => ({...previous, ...update, busy: false}));
+            if (epoch.current === ticket) setState(previous => ({...previous, ...update, busy: automatic ? previous.busy : false}));
         } catch (error) {
             if (epoch.current !== ticket) return;
             const code = error instanceof GitPanelError ? error.code : 'failed';
             // A background read that met another tool still writing tries again on the next check, without an alert.
             if (automatic && code === 'changed') {
                 handled.current = null;
-                setState(previous => ({...previous, busy: false}));
                 return;
             }
             const message = labels[code as keyof typeof labels] || labels.failed;
-            setState(previous => ({...previous, error: automatic && previous.error ? previous.error : message, busy: false, diff: null}));
+            setState(previous => ({...previous, error: automatic && previous.error ? previous.error : message,
+                busy: automatic ? previous.busy : false, diff: null}));
         } finally {
             running.current = false;
             // A result dropped by a newer load still ends the busy state, unless a refresh follows at once.