Consume all pending events at once

api.cpp

@@ -75,13 +75,20 @@ class Context {
     return result;
   }
 
-  bool hasPendingEvent() {
+  bool consumeEvents() {
     return gpp_rethrow([=]() {
-      CameraEventType event_type = GP_EVENT_UNKNOWN;
+      bool had_events = false;
-      gpp_unique_ptr<void, free> event_data(GPP_CALL(
+      for (;;) {
-          void *, gp_camera_wait_for_event(camera.get(), 0, &event_type, _,
+        CameraEventType event_type = GP_EVENT_UNKNOWN;
-                                           context.get())));
+        gpp_unique_ptr<void, free> event_data(GPP_CALL(
-      return event_type != GP_EVENT_TIMEOUT;
+            void *, gp_camera_wait_for_event(camera.get(), 0, &event_type, _,
+                                             context.get())));
+        if (event_type == GP_EVENT_TIMEOUT) {
+          break;
+        }
+        had_events = true;
+      }
+      return had_events;
     });
   }
 
@@ -312,6 +319,6 @@ EMSCRIPTEN_BINDINGS(gphoto2_js_api) {
       .function("setConfigValue", &Context::setConfigValue)
       .function("capturePreviewAsBlob", &Context::capturePreviewAsBlob)
       .function("captureImageAsFile", &Context::captureImageAsFile)
-      .function("hasPendingEvent", &Context::hasPendingEvent)
+      .function("consumeEvents", &Context::consumeEvents)
       .function("supportedOps", &Context::supportedOps);
 }

libapi.mjs.d.ts

@@ -30,7 +30,7 @@ declare class Context {
   ): Promise<undefined>;
   capturePreviewAsBlob(): Promise<Blob>;
   captureImageAsFile(): Promise<File>;
-  hasPendingEvent(): Promise<boolean>;
+  consumeEvents(): Promise<boolean>;
   supportedOps(): SupportedOps;
 
   delete(): void;

ui/index.js

@@ -73,6 +73,7 @@ class App extends Component {
         context.configToJS()
       );
       if (!isDebug) {
+        delete config.children.actions;
         delete config.children.other;
       }
       this.setState({
@@ -83,10 +84,10 @@ class App extends Component {
         await new Promise(resolve =>
           requestIdleCallback(resolve, { timeout: 500 })
         );
-        let hasPendingEvent = await this.connection.schedule(context =>
+        let hadEvents = await this.connection.schedule(context =>
-          context.hasPendingEvent()
+          context.consumeEvents()
         );
-        if (hasPendingEvent) {
+        if (hadEvents) {
           break;
         }
       }