@uploadcare/file-uploader 1.24.0 → 1.24.1

package/dist/env.js

@@ -25,7 +25,7 @@
  */
 
 // package.json
-var version = "1.24.0";
+var version = "1.24.1";
 
 // src/env.ts
 var PACKAGE_NAME = "blocks";

package/dist/index.js

@@ -1216,7 +1216,7 @@ import { TelemetryAPIService } from "@uploadcare/quality-insights";
 import { Queue as Queue2 } from "@uploadcare/upload-client";
 
 // package.json
-var version = "1.24.0";
+var version = "1.24.1";
 
 // src/env.ts
 var PACKAGE_NAME = "blocks";
@@ -8179,6 +8179,110 @@ var runAssertions = debounce((cfg) => {
   }
 }, 0);
 
+// src/blocks/Config/computed-properties.ts
+import { getPrefixedCdnBaseAsync, isPrefixedCdnBase } from "@uploadcare/cname-prefix/async";
+
+// src/utils/isPromiseLike.ts
+var isPromiseLike = (value) => {
+  return value instanceof Promise || Boolean(
+    value && typeof value === "object" && "then" in value && typeof value.then === "function"
+  );
+};
+
+// src/blocks/Config/computed-properties.ts
+var defineComputedProperty = (declaration) => declaration;
+var COMPUTED_PROPERTIES = [
+  defineComputedProperty({
+    key: "cameraModes",
+    deps: ["enableVideoRecording"],
+    fn: ({ cameraModes, enableVideoRecording }) => {
+      if (enableVideoRecording === null) {
+        return cameraModes;
+      }
+      let cameraModesCsv = deserializeCsv(cameraModes);
+      if (enableVideoRecording && !cameraModesCsv.includes("video")) {
+        cameraModesCsv = cameraModesCsv.concat("video");
+      } else if (!enableVideoRecording) {
+        cameraModesCsv = cameraModesCsv.filter((mode) => mode !== "video");
+      }
+      return serializeCsv(cameraModesCsv);
+    }
+  }),
+  defineComputedProperty({
+    key: "cameraModes",
+    deps: ["defaultCameraMode"],
+    fn: ({ cameraModes, defaultCameraMode }) => {
+      if (defaultCameraMode === null) {
+        return cameraModes;
+      }
+      let cameraModesCsv = deserializeCsv(cameraModes);
+      cameraModesCsv = cameraModesCsv.sort((a, b) => {
+        if (a === defaultCameraMode) return -1;
+        if (b === defaultCameraMode) return 1;
+        return 0;
+      });
+      return serializeCsv(cameraModesCsv);
+    }
+  }),
+  defineComputedProperty({
+    key: "cdnCname",
+    deps: ["pubkey", "cdnCnamePrefixed"],
+    fn: ({ pubkey, cdnCname, cdnCnamePrefixed }) => {
+      if (pubkey && (cdnCname === DEFAULT_CDN_CNAME || isPrefixedCdnBase(cdnCname, cdnCnamePrefixed))) {
+        return getPrefixedCdnBaseAsync(pubkey, cdnCnamePrefixed);
+      }
+      return cdnCname;
+    }
+  })
+];
+var abortControllers = /* @__PURE__ */ new Map();
+var computeProperty = ({ key, setValue, getValue }) => {
+  for (const computed of COMPUTED_PROPERTIES) {
+    if (computed.deps.includes(key)) {
+      const args = {
+        [computed.key]: getValue(computed.key)
+      };
+      for (const dep of computed.deps) {
+        args[dep] = getValue(dep);
+      }
+      const abortController = new AbortController();
+      abortControllers.get(computed.key)?.abort();
+      abortControllers.set(computed.key, abortController);
+      let result;
+      try {
+        result = computed.fn(args, {
+          signal: abortController.signal
+        });
+      } catch (error) {
+        if (abortControllers.get(computed.key) === abortController) {
+          abortControllers.delete(computed.key);
+        }
+        console.error(`Failed to compute value for "${computed.key}"`, error);
+        return;
+      }
+      if (isPromiseLike(result)) {
+        result.then((resolvedValue) => {
+          if (abortController.signal.aborted) {
+            return;
+          }
+          setValue(computed.key, resolvedValue);
+        }).catch((error) => {
+          if (abortController.signal.aborted) {
+            return;
+          }
+          console.error(`Failed to compute value for "${computed.key}"`, error);
+        }).finally(() => {
+          if (abortControllers.get(computed.key) === abortController) {
+            abortControllers.delete(computed.key);
+          }
+        });
+      } else {
+        setValue(computed.key, result);
+      }
+    }
+  }
+};
+
 // src/blocks/Config/validatorsType.ts
 var asString = (value) => String(value);
 var asNumber2 = (value) => {
@@ -8338,89 +8442,6 @@ var normalizeConfigValue = (key, value) => {
   }
 };
 
-// src/blocks/Config/side-effects.ts
-import { getPrefixedCdnBaseAsync, isPrefixedCdnBase } from "@uploadcare/cname-prefix/async";
-
-// src/utils/isPromiseLike.ts
-var isPromiseLike = (value) => {
-  return value instanceof Promise || Boolean(
-    value && typeof value === "object" && "then" in value && typeof value.then === "function"
-  );
-};
-
-// src/blocks/Config/side-effects.ts
-var defineComputedProperty = (declaration) => declaration;
-var COMPUTED_PROPERTIES = [
-  defineComputedProperty({
-    key: "cameraModes",
-    deps: ["enableVideoRecording"],
-    fn: ({ cameraModes, enableVideoRecording }) => {
-      if (enableVideoRecording === null) {
-        return cameraModes;
-      }
-      let cameraModesCsv = deserializeCsv(cameraModes);
-      if (enableVideoRecording && !cameraModesCsv.includes("video")) {
-        cameraModesCsv = cameraModesCsv.concat("video");
-      } else if (!enableVideoRecording) {
-        cameraModesCsv = cameraModesCsv.filter((mode) => mode !== "video");
-      }
-      return serializeCsv(cameraModesCsv);
-    }
-  }),
-  defineComputedProperty({
-    key: "cameraModes",
-    deps: ["defaultCameraMode"],
-    fn: ({ cameraModes, defaultCameraMode }) => {
-      if (defaultCameraMode === null) {
-        return cameraModes;
-      }
-      let cameraModesCsv = deserializeCsv(cameraModes);
-      cameraModesCsv = cameraModesCsv.sort((a, b) => {
-        if (a === defaultCameraMode) return -1;
-        if (b === defaultCameraMode) return 1;
-        return 0;
-      });
-      return serializeCsv(cameraModesCsv);
-    }
-  }),
-  defineComputedProperty({
-    key: "cdnCname",
-    deps: ["pubkey", "cdnCnamePrefixed"],
-    fn: ({ pubkey, cdnCname, cdnCnamePrefixed }) => {
-      if (pubkey && (cdnCname === DEFAULT_CDN_CNAME || isPrefixedCdnBase(cdnCname, cdnCnamePrefixed))) {
-        return getPrefixedCdnBaseAsync(pubkey, cdnCnamePrefixed);
-      }
-      return cdnCname;
-    }
-  })
-];
-var runSideEffects = ({ key, setValue, getValue }) => {
-  for (const computed of COMPUTED_PROPERTIES) {
-    if (computed.deps.includes(key)) {
-      const args = {
-        [computed.key]: getValue(computed.key)
-      };
-      for (const dep of computed.deps) {
-        args[dep] = getValue(dep);
-      }
-      const result = computed.fn(args);
-      if (isPromiseLike(result)) {
-        const prevValue = getValue(computed.key);
-        result.then((resolvedValue) => {
-          const currentValue = getValue(computed.key);
-          if (currentValue === prevValue) {
-            setValue(computed.key, resolvedValue);
-          }
-        }).catch((error) => {
-          console.error(`Failed to compute value for "${computed.key}"`, error);
-        });
-      } else {
-        setValue(computed.key, result);
-      }
-    }
-  }
-};
-
 // src/blocks/Config/Config.ts
 var allConfigKeys = [
   // "debug" option should go first to be able to print debug messages from the very beginning
@@ -8490,11 +8511,6 @@ var Config = class extends Block {
     this._flushValueToState(key, normalizedValue);
     this.debugPrint(`[uc-config] "${key}"`, normalizedValue);
     runAssertions(this.cfg);
-    runSideEffects({
-      key,
-      setValue: this._setValue.bind(this),
-      getValue: this._getValue.bind(this)
-    });
   }
   _getValue(key) {
     const anyThis = this;
@@ -8540,10 +8556,14 @@ var Config = class extends Block {
           return this._getValue(key);
         }
       });
-      runSideEffects({
-        key,
-        setValue: this._setValue.bind(this),
-        getValue: this._getValue.bind(this)
+    }
+    for (const key of allConfigKeys) {
+      this.sub(sharedConfigKey(key), () => {
+        computeProperty({
+          key,
+          setValue: this._setValue.bind(this),
+          getValue: this._getValue.bind(this)
+        });
       });
     }
   }
@@ -9112,8 +9132,10 @@ var isWhitelistedMessage = (message) => {
 var MessageBridge = class {
   _handlerMap = /* @__PURE__ */ new Map();
   _context;
-  constructor(context) {
+  _getTargetOrigin;
+  constructor(context, getTargetOrigin) {
     this._context = context;
+    this._getTargetOrigin = getTargetOrigin;
     window.addEventListener("message", this._handleMessage);
   }
   _handleMessage = (e) => {
@@ -9139,7 +9161,8 @@ var MessageBridge = class {
     handlers.add(handler);
   }
   send(message) {
-    this._context.postMessage(message, "*");
+    const targetOrigin = this._getTargetOrigin();
+    this._context.postMessage(message, targetOrigin);
   }
   destroy() {
     window.removeEventListener("message", this._handleMessage);
@@ -9289,11 +9312,9 @@ var ExternalSource = class extends UploaderBlock {
       showSelectionStatus: message.isMultipleMode && message.total > 0,
       couldSelectAll: message.selectedCount < message.total,
       couldDeselectAll: message.selectedCount === message.total,
-      selectedList: message.selectedFiles
+      selectedList: message.selectedFiles,
+      showDoneBtn: message.total > 0
     });
-    if (!this.$.showDoneBtn && message.isReady) {
-      this.$.showDoneBtn = true;
-    }
   }
   handleIframeLoad() {
     this.applyEmbedCss(this.cfg.externalSourcesEmbedCss);
@@ -9355,7 +9376,7 @@ var ExternalSource = class extends UploaderBlock {
       return;
     }
     this._messageBridge?.destroy();
-    this._messageBridge = new MessageBridge(iframe.contentWindow);
+    this._messageBridge = new MessageBridge(iframe.contentWindow, () => this.cfg.socialBaseUrl);
     this._messageBridge.on("selected-files-change", this.handleSelectedFilesChange.bind(this));
     this._messageBridge.on("toolbar-state-change", this.handleToolbarStateChange.bind(this));
     this.resetSelectionStatus();
@@ -9572,6 +9593,7 @@ var FileItem = class _FileItem extends FileItemConfig {
       const errorText = entry.getValue("errors")?.[0]?.message;
       const source = entry.getValue("source");
       const externalUrl = entry.getValue("externalUrl");
+      const isFinished = state === FileItemState.FINISHED;
       const isUploading = state === FileItemState.UPLOADING;
       const isQueuedForUploading = state === FileItemState.QUEUED_UPLOADING;
       const isQueuedForValidation = state === FileItemState.QUEUED_VALIDATION;
@@ -9580,7 +9602,7 @@ var FileItem = class _FileItem extends FileItemConfig {
       let hint = "";
       if (errorText) {
         hint = "";
-      } else if (externalUrl && source && Object.values(ExternalUploadSource).includes(source)) {
+      } else if (!isFinished && externalUrl && source && Object.values(ExternalUploadSource).includes(source)) {
         hint = this.l10n("waiting-for", { source: this.l10n(`src-type-${source}`) });
       }
       this.set$({

package/dist/index.ssr.js

@@ -1132,7 +1132,7 @@ export const ModalEvents = {
 	DESTROY: "modal:destroy",
 };
 export const PACKAGE_NAME = `blocks`;
-export const PACKAGE_VERSION = `1.24.0`;
+export const PACKAGE_VERSION = `1.24.1`;
 export const PresenceToggle = class {
 	static template = `<slot></slot> `;
 	static reg = () => {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uploadcare/file-uploader",
-  "version": "1.24.0",
+  "version": "1.24.1",
   "description": "Building blocks for Uploadcare products integration",
   "keywords": [
     "web components",