1.20.2

Disable closing modal during photo upload
2026-04-24 12:28:08 +01:00 · 2026-04-24 12:24:19 +01:00
11 changed files with 46 additions and 17 deletions
--- a/app/components/modal.gjs
+++ b/app/components/modal.gjs
@@ -11,6 +11,7 @@ export default class Modal extends Component {

  @action
  close() {
+    if (this.args.disableClose) return;
    if (this.args.onClose) {
      this.args.onClose();
    }
@@ -31,10 +32,11 @@ export default class Modal extends Component {
      >
        <button
          type="button"
-          class="close-modal-btn btn-text"
+          class="close-modal-btn btn-text {{if @disableClose 'disabled'}}"
+          disabled={{@disableClose}}
          {{on "click" this.close}}
        >
-          <Icon @name="x" @size={{24}} />
+          <Icon @name="x" @size={{24}} @color="currentColor" />
        </button>
        {{yield}}
      </div>
--- a/app/components/place-details.gjs
+++ b/app/components/place-details.gjs
@@ -27,6 +27,12 @@ export default class PlaceDetails extends Component {
  @tracked isPhotoUploadModalOpen = false;
  @tracked isNostrConnectModalOpen = false;
  @tracked newlyUploadedPhotoId = null;
+  @tracked isPhotoUploadActive = false;
+
+  @action
+  handleUploadStateChange(isActive) {
+    this.isPhotoUploadActive = isActive;
+  }

  @action
  openPhotoUploadModal(e) {
@@ -42,6 +48,7 @@ export default class PlaceDetails extends Component {

  @action
  closePhotoUploadModal(eventId) {
+    if (this.isPhotoUploadActive) return;
    this.isPhotoUploadModalOpen = false;
    if (typeof eventId === 'string') {
      this.newlyUploadedPhotoId = eventId;
@@ -585,10 +592,14 @@ export default class PlaceDetails extends Component {
    </div>

    {{#if this.isPhotoUploadModalOpen}}
-      <Modal @onClose={{this.closePhotoUploadModal}}>
+      <Modal
+        @onClose={{this.closePhotoUploadModal}}
+        @disableClose={{this.isPhotoUploadActive}}
+      >
        <PlacePhotoUpload
          @place={{this.saveablePlace}}
          @onClose={{this.closePhotoUploadModal}}
+          @onUploadStateChange={{this.handleUploadStateChange}}
        />
      </Modal>
    {{/if}}
--- a/app/components/place-photo-upload.gjs
+++ b/app/components/place-photo-upload.gjs
@@ -77,6 +77,9 @@ export default class PlacePhotoUpload extends Component {
    }
    this.file = file;
    this.uploadedPhoto = null;
+    if (this.args.onUploadStateChange) {
+      this.args.onUploadStateChange(true);
+    }
  }

  @action
@@ -91,6 +94,9 @@ export default class PlacePhotoUpload extends Component {
    }
    this.file = null;
    this.uploadedPhoto = null;
+    if (this.args.onUploadStateChange) {
+      this.args.onUploadStateChange(false);
+    }
  }

  deletePhotoTask = task(async (photoData) => {
@@ -191,6 +197,10 @@ export default class PlacePhotoUpload extends Component {
      this.file = null;
      this.uploadedPhoto = null;

+      if (this.args.onUploadStateChange) {
+        this.args.onUploadStateChange(false);
+      }
+
      if (this.args.onClose) {
        this.args.onClose(event.id);
      }
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -1815,6 +1815,12 @@ button.create-place {
  top: 1rem;
  right: 1rem;
  cursor: pointer;
+  color: #898989;
+}
+
+.close-modal-btn.disabled {
+  color: #ccc;
+  cursor: not-allowed;
 }

 .place-photo-upload h2 {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "marco",
-  "version": "1.20.1",
+  "version": "1.20.2",
  "private": true,
  "description": "Unhosted maps app",
  "repository": {
--- a/release/assets/main-9lfQuoS5.css
+++ b/release/assets/main-9lfQuoS5.css
--- a/release/assets/main-BA3LWr76.css
+++ b/release/assets/main-BA3LWr76.css
--- a/release/assets/main-D7SnY8s9.js
+++ b/release/assets/main-D7SnY8s9.js
--- a/release/assets/modules-4-12-15gZSq46.js
+++ b/release/assets/modules-4-12-15gZSq46.js
--- a/release/assets/negentropy-DlhF-sDV.js
+++ b/release/assets/negentropy-DlhF-sDV.js
--- a/release/index.html
+++ b/release/index.html
@@ -39,8 +39,8 @@
    <meta name="msapplication-TileColor" content="#F6E9A6">
    <meta name="msapplication-TileImage" content="/icons/icon-144.png">

-  <script type="module" crossorigin src="/assets/main-CGySSjv6.js"></script>
-  <link rel="stylesheet" crossorigin href="/assets/main-BA3LWr76.css">
+  <script type="module" crossorigin src="/assets/main-D7SnY8s9.js"></script>
+  <link rel="stylesheet" crossorigin href="/assets/main-9lfQuoS5.css">
 </head>
  <body>
 </body>
Author	SHA1	Message	Date
Râu Cao	e38f540c79	1.20.2 All checks were successful CI / Lint (push) Successful in 32s Details CI / Test (push) Successful in 58s Details	2026-04-24 12:28:08 +01:00
Râu Cao	73ad5b4eb1	Disable closing modal during photo upload	2026-04-24 12:24:19 +01:00