@designcrowd/library.brand-page 5.17.25-undo-7 → 5.17.25-undo-9

package/src/shared/content-settings/components/logo-selection-field/LogoSelection.vue

@@ -256,39 +256,32 @@ const options = computed<ButtonGroupOption[]>(() => {
   return optionList;
 });
 
-onMounted(() => updateState());
+const updateState = () => {
+  const logoDraftAsset = logoStore.getLogoDraftAssetByToken(
+    props.selectedLogoDraftToken,
+  );
 
-watch(
-  () => props.isLogoVisible,
-  () => {
-    data.manualVisibleChoice = null;
-    updateState();
-  },
-);
+  data.logoEditUrl = logoDraftAsset?.logoEditUrl || '';
+};
 
-watch(
-  () => props.selectedLogoDraftToken,
-  () => {
-    data.manualVisibleChoice = null;
-    updateState();
-  },
-);
+onMounted(() => updateState());
 
+// Only `selectedLogoDraftToken` clears the manual override — that's the
+// signal for an *external* data change (upload landed, or undo/redo
+// restored a different draft). `isLogoVisible` flips on the user's own
+// click and propagates back through props, so resetting on it would
+// clobber the choice the user just made (e.g. None → Upload would land
+// on Logo because the watcher fires before the computed re-reads).
 watch(
-  () => props.selectedLogo,
+  () => props.selectedLogoDraftToken,
   () => {
     data.manualVisibleChoice = null;
     updateState();
   },
 );
 
-const updateState = () => {
-  const logoDraftAsset = logoStore.getLogoDraftAssetByToken(
-    props.selectedLogoDraftToken,
-  );
-
-  data.logoEditUrl = logoDraftAsset?.logoEditUrl || '';
-};
+watch(() => props.isLogoVisible, updateState);
+watch(() => props.selectedLogo, updateState);
 
 const logoSettingStore = useUiLogoSettingsStore();