High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: reset and unsaved change states in editor (#25588)
Brandon Wees1a04caee2948
diff --git a/web/src/lib/components/asset-viewer/asset-viewer.svelte b/web/src/lib/components/asset-viewer/asset-viewer.svelteindex 333e76d2ea..6284e207c6 100644--- a/web/src/lib/components/asset-viewer/asset-viewer.svelte+++ b/web/src/lib/components/asset-viewer/asset-viewer.svelte@@ -194,9 +194,7 @@const closeEditor = async () => {if (editManager.hasAppliedEdits) {- console.log(asset);const refreshedAsset = await getAssetInfo({ id: asset.id });- console.log(refreshedAsset);onAssetChange?.(refreshedAsset);assetViewingStore.setAsset(refreshedAsset);}diff --git a/web/src/lib/components/asset-viewer/editor/editor-panel.svelte b/web/src/lib/components/asset-viewer/editor/editor-panel.svelteindex c52b63793b..d9a344cdc8 100644--- a/web/src/lib/components/asset-viewer/editor/editor-panel.svelte+++ b/web/src/lib/components/asset-viewer/editor/editor-panel.svelte@@ -75,7 +75,7 @@<Buttonvariant="outline"onclick={() => editManager.resetAllChanges()}- disabled={!editManager.hasChanges}+ disabled={!editManager.canReset}class="self-start"shape="round"size="small"diff --git a/web/src/lib/managers/edit/edit-manager.svelte.ts b/web/src/lib/managers/edit/edit-manager.svelte.tsindex 8adfbe1f61..be74c6ead8 100644--- a/web/src/lib/managers/edit/edit-manager.svelte.ts+++ b/web/src/lib/managers/edit/edit-manager.svelte.ts@@ -15,6 +15,7 @@ export interface EditToolManager {onDeactivate: () => void;resetAllChanges: () => Promise<void>;hasChanges: boolean;+ canReset: boolean;edits: EditAction[];}@@ -41,19 +42,22 @@ export class EditManager {currentAsset = $state<AssetResponseDto | null>(null);selectedTool = $state<EditTool | null>(null);- hasChanges = $derived(this.tools.some((t) => t.manager.hasChanges));// used to disable multiple confirm dialogs and mouse events while one is openisShowingConfirmDialog = $state(false);isApplyingEdits = $state(false);hasAppliedEdits = $state(false);+ hasUnsavedChanges = $derived(this.tools.some((t) => t.manager.hasChanges) && !this.hasAppliedEdits);+ canReset = $derived(this.tools.some((t) => t.manager.canReset));+async closeConfirm(): Promise<boolean> {// Prevent multiple dialogs (usually happens with rapid escape key presses)if (this.isShowingConfirmDialog) {return false;}- if (!this.hasChanges || this.hasAppliedEdits) {++ if (!this.hasUnsavedChanges) {return true;}diff --git a/web/src/lib/managers/edit/transform-manager.svelte.ts b/web/src/lib/managers/edit/transform-manager.svelte.tsindex 7673889185..63e9d2e43f 100644--- a/web/src/lib/managers/edit/transform-manager.svelte.ts+++ b/web/src/lib/managers/edit/transform-manager.svelte.ts@@ -38,7 +38,8 @@ type RegionConvertParams = {};class TransformManager implements EditToolManager {- hasChanges: boolean = $derived.by(() => this.checkEdits());+ canReset: boolean = $derived.by(() => this.checkEdits());+ hasChanges: boolean = $state(false);darkenLevel = $state(0.65);isInteracting = $state(false);@@ -56,7 +57,7 @@ class TransformManager implements EditToolManager {cropAspectRatio = $state('free');originalImageSize = $state<ImageDimensions>({ width: 1000, height: 1000 });region = $state({ x: 0, y: 0, width: 100, height: 100 });- preveiwImgSize = $derived({+ previewImageSize = $derived({width: this.cropImageSize.width * this.cropImageScale,height: this.cropImageSize.height * this.cropImageScale,});@@ -73,6 +74,7 @@ class TransformManager implements EditToolManager {edits = $derived.by(() => this.getEdits());setAspectRatio(aspectRatio: string) {+ this.hasChanges = true;this.cropAspectRatio = aspectRatio;if (!this.imgElement || !this.cropAreaEl) {@@ -88,8 +90,8 @@ class TransformManager implements EditToolManager {checkEdits() {return (- Math.abs(this.preveiwImgSize.width - this.region.width) > 2 ||- Math.abs(this.preveiwImgSize.height - this.region.height) > 2 ||+ Math.abs(this.previewImageSize.width - this.region.width) > 2 ||+ Math.abs(this.previewImageSize.height - this.region.height) > 2 ||this.mirrorHorizontal ||this.mirrorVertical ||this.normalizedRotation !== 0@@ -98,8 +100,8 @@ class TransformManager implements EditToolManager {checkCropEdits() {return (- Math.abs(this.preveiwImgSize.width - this.region.width) > 2 ||- Math.abs(this.preveiwImgSize.height - this.region.height) > 2+ Math.abs(this.previewImageSize.width - this.region.width) > 2 ||+ Math.abs(this.previewImageSize.height - this.region.height) > 2);}@@ -232,9 +234,12 @@ class TransformManager implements EditToolManager {this.originalImageSize = { width: 1000, height: 1000 };this.cropImageScale = 1;this.cropAspectRatio = 'free';+ this.hasChanges = false;}mirror(axis: 'horizontal' | 'vertical') {+ this.hasChanges = true;+if (this.imageRotation % 180 !== 0) {axis = axis === 'horizontal' ? 'vertical' : 'horizontal';}@@ -247,6 +252,8 @@ class TransformManager implements EditToolManager {}async rotate(angle: number) {+ this.hasChanges = true;+this.imageRotation += angle;await tick();this.onImageLoad();@@ -760,6 +767,7 @@ class TransformManager implements EditToolManager {return;}+ this.hasChanges = true;const newX = Math.max(0, Math.min(mouseX - this.dragOffset.x, cropArea.clientWidth - this.region.width));const newY = Math.max(0, Math.min(mouseY - this.dragOffset.y, cropArea.clientHeight - this.region.height));@@ -781,6 +789,7 @@ class TransformManager implements EditToolManager {}this.fadeOverlay(false);+ this.hasChanges = true;const { x, y, width, height } = crop;const minSize = 50;let newRegion = { ...crop };