1.20.3

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>

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}}

app/components/place-photo-upload.gjs

@@ -19,7 +19,6 @@ export default class PlacePhotoUpload extends Component {
 
   @tracked file = null;
   @tracked uploadedPhoto = null;
-  @tracked status = '';
   @tracked error = '';
   @tracked isPublishing = false;
   @tracked isDragging = false;
@@ -77,6 +76,9 @@ export default class PlacePhotoUpload extends Component {
     }
     this.file = file;
     this.uploadedPhoto = null;
+    if (this.args.onUploadStateChange) {
+      this.args.onUploadStateChange(true);
+    }
   }
 
   @action
@@ -91,6 +93,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) => {
@@ -126,7 +131,6 @@ export default class PlacePhotoUpload extends Component {
       return;
     }
 
-    this.status = 'Publishing event...';
     this.error = '';
     this.isPublishing = true;
 
@@ -185,18 +189,20 @@ export default class PlacePhotoUpload extends Component {
       this.nostrData.store.add(event);
 
       this.toast.show('Photo published successfully');
-      this.status = '';
 
       // Clear out the file so user can upload more or be done
       this.file = null;
       this.uploadedPhoto = null;
 
+      if (this.args.onUploadStateChange) {
+        this.args.onUploadStateChange(false);
+      }
+
       if (this.args.onClose) {
         this.args.onClose(event.id);
       }
     } catch (e) {
       this.error = 'Failed to publish: ' + e.message;
-      this.status = '';
     } finally {
       this.isPublishing = false;
     }
@@ -212,12 +218,6 @@ export default class PlacePhotoUpload extends Component {
         </div>
       {{/if}}
 
-      {{#if this.status}}
-        <div class="alert alert-info">
-          {{this.status}}
-        </div>
-      {{/if}}
-
       {{#if this.file}}
         <div class="photo-grid">
           <PlacePhotoUploadItem

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 {
@@ -1833,11 +1839,6 @@ button.create-place {
   color: #c00;
 }
 
-.alert-info {
-  background: #eef;
-  color: #00c;
-}
-
 .preview-group {
   margin-bottom: 1rem;
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "marco",
-  "version": "1.20.1",
+  "version": "1.20.3",
   "private": true,
   "description": "Unhosted maps app",
   "repository": {

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-CfJ9up1Y.js"></script>
+  <link rel="stylesheet" crossorigin href="/assets/main-CHuW_yI-.css">
 </head>
   <body>
  </body>