@uploadcare/file-uploader 1.19.0-rc.0 → 1.19.1

package/blocks/CloudImageEditor/src/EditorCropButtonControl.js

@@ -35,16 +35,9 @@ export class EditorCropButtonControl extends EditorButtonControl {
       );
     });
 
-    this.$['on.click'] = (e) => {
+    this.$['on.click'] = () => {
       let prev = this.$['*cropperEl'].getValue(this._operation);
       let next = nextValue(this._operation, prev);
-
-      this.telemetryManager.sendEventCloudImageEditor(e, this.$['*tabId'], {
-        operation: this._operation,
-        next,
-        prev,
-      });
-
       this.$['*cropperEl'].setValue(this._operation, next);
     };
   }

package/blocks/CloudImageEditor/src/EditorFilterControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EditorFilterControl.d.ts","sourceRoot":"","sources":["EditorFilterControl.js"],"names":[],"mappings":"AAQA;IAeE,sBA2BC;IAED;;;OAGG;IACH,2BAHW,yBAAyB,EAAE,YAC3B,oBAAoB,iBAuB9B;IAfG,yCAA4B;IAyC1B,+BAA0B;IAC1B,4BAAqB;IAYzB,4CAEE;IAGF,kBAA+B;CAgDlC;;;;oCAvKmC,0BAA0B"}
+{"version":3,"file":"EditorFilterControl.d.ts","sourceRoot":"","sources":["EditorFilterControl.js"],"names":[],"mappings":"AAOA;IAeE,sBA2BC;IAED;;;OAGG;IACH,2BAHW,yBAAyB,EAAE,YAC3B,oBAAoB,iBAuB9B;IAfG,yCAA4B;IAoC1B,+BAA0B;IAC1B,4BAAqB;IAYzB,4CAEE;IAGF,kBAA+B;CAgDlC;;;;oCAjKmC,0BAA0B"}

package/blocks/CloudImageEditor/src/EditorFilterControl.js

@@ -4,7 +4,6 @@ import { EditorButtonControl } from './EditorButtonControl.js';
 import { FAKE_ORIGINAL_FILTER } from './EditorSlider.js';
 import { COMMON_OPERATIONS, transformationsToOperations } from './lib/transformationUtils.js';
 import { preloadImage } from '../../utils/preloadImage.js';
-import { parseFilterValue } from './utils/parseFilterValue.js';
 
 export class EditorFilterControl extends EditorButtonControl {
   constructor() {
@@ -80,8 +79,7 @@ export class EditorFilterControl extends EditorButtonControl {
   initCallback() {
     super.initCallback();
 
-    /** @param {MouseEvent} e */
-    this.$['on.click'] = (e) => {
+    this.$['on.click'] = () => {
       if (!this.$.active) {
         this.$['*sliderEl'].setOperation(this._operation, this._filter);
         this.$['*sliderEl'].apply();
@@ -90,10 +88,6 @@ export class EditorFilterControl extends EditorButtonControl {
         this.$['*showSlider'] = true;
       }
 
-      this.telemetryManager.sendEventCloudImageEditor(e, this.$['*tabId'], {
-        operation: parseFilterValue(this.$['*operationTooltip']),
-      });
-
       this.$['*currentFilter'] = this._filter;
     };
 

package/blocks/CloudImageEditor/src/EditorOperationControl.d.ts

@@ -1,7 +1,7 @@
 export class EditorOperationControl extends EditorButtonControl {
     /**
      * @private
-     * @type {import('./toolbar-constants.js').ColorOperation | ''}
+     * @type {String}
      */
     private _operation;
 }

package/blocks/CloudImageEditor/src/EditorOperationControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EditorOperationControl.d.ts","sourceRoot":"","sources":["EditorOperationControl.js"],"names":[],"mappings":"AAKA;IACE;;;OAGG;IACH,mBAAgB;CAuCjB;oCAhDmC,0BAA0B"}
+{"version":3,"file":"EditorOperationControl.d.ts","sourceRoot":"","sources":["EditorOperationControl.js"],"names":[],"mappings":"AAGA;IACE;;;OAGG;IACH,mBAAgB;CAmCjB;oCA3CmC,0BAA0B"}

package/blocks/CloudImageEditor/src/EditorOperationControl.js

@@ -1,29 +1,23 @@
-//@ts-check
 import { EditorButtonControl } from './EditorButtonControl.js';
 import { COLOR_OPERATIONS_CONFIG } from './toolbar-constants.js';
-import { parseFilterValue } from './utils/parseFilterValue.js';
 
 export class EditorOperationControl extends EditorButtonControl {
   /**
    * @private
-   * @type {import('./toolbar-constants.js').ColorOperation | ''}
+   * @type {String}
    */
   _operation = '';
 
   initCallback() {
     super.initCallback();
 
-    this.$['on.click'] = (/** @type {MouseEvent} */ e) => {
+    this.$['on.click'] = (e) => {
       this.$['*sliderEl'].setOperation(this._operation);
       this.$['*showSlider'] = true;
       this.$['*currentOperation'] = this._operation;
-
-      this.telemetryManager.sendEventCloudImageEditor(e, this.$['*tabId'], {
-        operation: parseFilterValue(this.$['*operationTooltip']),
-      });
     };
 
-    this.defineAccessor('operation', (/** @type {import('./toolbar-constants.js').ColorOperation} */ operation) => {
+    this.defineAccessor('operation', (operation) => {
       if (operation) {
         this._operation = operation;
         this.$['icon'] = operation;

package/blocks/CloudImageEditor/src/EditorToolbar.d.ts

@@ -40,14 +40,10 @@ export class EditorToolbar extends Block {
             hidden: string;
             visible: string;
         };
-        /** @param {MouseEvent} e */
-        'on.cancel': (e: MouseEvent) => void;
-        /** @param {MouseEvent} e */
-        'on.apply': (e: MouseEvent) => void;
-        /** @param {MouseEvent} e */
-        'on.applySlider': (e: MouseEvent) => void;
-        /** @param {MouseEvent} e */
-        'on.cancelSlider': (e: MouseEvent) => void;
+        'on.cancel': () => void;
+        'on.apply': () => void;
+        'on.applySlider': () => void;
+        'on.cancelSlider': () => void;
         /** @param {MouseEvent} e */
         'on.clickTab': (e: MouseEvent) => void;
         tab_role: string;

package/blocks/CloudImageEditor/src/EditorToolbar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EditorToolbar.d.ts","sourceRoot":"","sources":["EditorToolbar.js"],"names":[],"mappings":"AA4DA;IAII;;QAGE,qDAAqD;8BAA1C,OAAO,YAAY,EAAE,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAwCjD,4BAA4B;yBAAhB,UAAU;QAStB,4BAA4B;wBAAhB,UAAU;QAOtB,4BAA4B;8BAAhB,UAAU;QAStB,4BAA4B;+BAAhB,UAAU;QAQtB,4BAA4B;2BAAhB,UAAU;;;;;;;MAiBvB;IAED,eAAe;IAEf,6BAAsE;IAGxE,eAAe;IACf,uBAKC;IAED;;;OAGG;IACH,gCAKC;IAED;;;OAGG;IACH,6BAKC;IAED;;;OAGG;IACH,6BAKC;IAED;;;OAGG;IACH,4BAoCC;IAED;;;;OAIG;IACH,qBAyBC;IAED;;;OAGG;IACH,4BAKC;IAED,eAAe;IACf,0BAIC;IAED,eAAe;IACf,4BAWC;IALG,oBAGC;IAIL;;;OAGG;IACH,oBAEC;IAED;;MAwBM;CAqFP;;;;sBA1aqB,4BAA4B"}
+{"version":3,"file":"EditorToolbar.d.ts","sourceRoot":"","sources":["EditorToolbar.js"],"names":[],"mappings":"AA2DA;IAII;;QAGE,qDAAqD;8BAA1C,OAAO,YAAY,EAAE,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAuDjD,4BAA4B;2BAAhB,UAAU;;;;;;;MAgBvB;IAED,eAAe;IAEf,6BAAsE;IAGxE,eAAe;IACf,uBAKC;IAED;;;OAGG;IACH,gCAKC;IAED;;;OAGG;IACH,6BAKC;IAED;;;OAGG;IACH,6BAKC;IAED;;;OAGG;IACH,4BAoCC;IAED;;;;OAIG;IACH,qBAyBC;IAED;;;OAGG;IACH,4BAKC;IAED,eAAe;IACf,0BAIC;IAED,eAAe;IACf,4BAWC;IALG,oBAGC;IAIL;;;OAGG;IACH,oBAEC;IAED;;MAwBM;CAqFP;;;;sBAtZqB,4BAA4B"}

package/blocks/CloudImageEditor/src/EditorToolbar.js

@@ -15,7 +15,6 @@ import {
   TabId,
 } from './toolbar-constants.js';
 import { viewerImageSrc } from './util.js';
-import { parseFilterValue } from './utils/parseFilterValue.js';
 
 /** @param {String} id */
 function renderTabToggle(id) {
@@ -105,36 +104,18 @@ export class EditorToolbar extends Block {
         hidden: 'uc-tab-toggles--hidden',
         visible: 'uc-tab-toggles--visible',
       },
-      /** @param {MouseEvent} e */
-      'on.cancel': (e) => {
-        this.telemetryManager.sendEventCloudImageEditor(e, this.$['*tabId'], {
-          action: 'cancel',
-        });
-
+      'on.cancel': () => {
         this._cancelPreload?.();
         this.$['*on.cancel']();
       },
-      /** @param {MouseEvent} e */
-      'on.apply': (e) => {
-        this.telemetryManager.sendEventCloudImageEditor(e, this.$['*tabId'], {
-          action: 'apply',
-        });
+      'on.apply': () => {
         this.$['*on.apply'](this.$['*editorTransformations']);
       },
-      /** @param {MouseEvent} e */
-      'on.applySlider': (e) => {
-        this.telemetryManager.sendEventCloudImageEditor(e, this.$['*tabId'], {
-          action: 'apply-slider',
-          operation: parseFilterValue(this.$['*operationTooltip']),
-        });
+      'on.applySlider': () => {
         this.ref['slider-el'].apply();
         this._onSliderClose();
       },
-      /** @param {MouseEvent} e */
-      'on.cancelSlider': (e) => {
-        this.telemetryManager.sendEventCloudImageEditor(e, this.$['*tabId'], {
-          action: 'cancel-slider',
-        });
+      'on.cancelSlider': () => {
         this.ref['slider-el'].cancel();
         this._onSliderClose();
       },
@@ -142,7 +123,6 @@ export class EditorToolbar extends Block {
       'on.clickTab': (e) => {
         const id = /** @type {HTMLElement} */ (e.currentTarget).getAttribute('data-id');
         if (id) {
-          this.telemetryManager.sendEventCloudImageEditor(e, id);
           this._activateTab(id, { fromViewer: false });
         }
       },

package/blocks/CloudImageEditor/src/toolbar-constants.d.ts

@@ -55,5 +55,4 @@ export const COLOR_OPERATIONS_CONFIG: Readonly<{
         keypointsNumber: number;
     };
 }>;
-export type ColorOperation = keyof typeof COLOR_OPERATIONS_CONFIG;
 //# sourceMappingURL=toolbar-constants.d.ts.map

package/blocks/CloudImageEditor/src/toolbar-constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toolbar-constants.d.ts","sourceRoot":"","sources":["toolbar-constants.js"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,yDAAkE;AAElE,4CASE;AAEF,mCAyCE;AAEF,2CAAgE;AAEhE,iGAAiG;AACjG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;6BAEW,MAAM,OAAO,uBAAuB"}
+{"version":3,"file":"toolbar-constants.d.ts","sourceRoot":"","sources":["toolbar-constants.js"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,yDAAkE;AAElE,4CASE;AAEF,mCAyCE;AAEF,2CAAgE;AAEhE,iGAAiG;AACjG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG"}

package/blocks/CloudImageEditor/src/toolbar-constants.js

@@ -112,5 +112,3 @@ export const COLOR_OPERATIONS_CONFIG = Object.freeze({
     keypointsNumber: 1,
   },
 });
-
-/** @typedef {keyof typeof COLOR_OPERATIONS_CONFIG} ColorOperation */

package/blocks/Config/Config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["Config.js"],"names":[],"mappings":"AAcA;;;;;;;;;;;;;GAaG;AACH,gCAXU,CACT,UAAc,EACd,0BAA8B,EAC9B,gCAAoC,EACpC,gCAAoC,EACpC,kBAAsB,EACtB,gBAAoB,EACpB,sBAA0B,EAC1B,sBAA0B,CACvB,CAWF;qBAyNY,OAAO,2BAA2B,EAAE,UAAU,CAAC,OAAO,WAAW,EAAE,OAAO,aAAa,EAAE,UAAU,CAAC;AAAlH,6HAA6H;AAG7H,qBAAiC,MAAM,CAA4C;AA/LnF;IAkBE;;;;OAIG;IACH,+BAYC;IAED;;;;OAIG;IACH,2BAQC;IAED;;;;OAIG;IACH,kBAyBC;IAED;;;OAGG;IACH,kBAIC;IAED;;;;OAIG;IACH,wCAJW,MAAM,iBACN,OAAO,aACP,OAAO,QAoBjB;IA0CD;;;;OAIG;IACH,+BAJW,MAAM,OAAO,gBAAgB,UAC7B,MAAM,UACN,MAAM,QAahB;CACF;sBAjPqB,yBAAyB;AAwD/C,0CAA0C;AAC1C,gCAAoC,MAAM,CAAC,MAAM,OAAO,aAAa,EAAE,oBAAoB,EAAE,MAAM,CAAC,CAGjG"}
+{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["Config.js"],"names":[],"mappings":"AAcA;;;;;;;;;;;;;GAaG;AACH,gCAXU,CACT,UAAc,EACd,0BAA8B,EAC9B,gCAAoC,EACpC,gCAAoC,EACpC,kBAAsB,EACtB,gBAAoB,EACpB,sBAA0B,EAC1B,sBAA0B,CACvB,CAWF;qBA8NY,OAAO,2BAA2B,EAAE,UAAU,CAAC,OAAO,WAAW,EAAE,OAAO,aAAa,EAAE,UAAU,CAAC;AAAlH,6HAA6H;AAG7H,qBAAiC,MAAM,CAA4C;AApMnF;IAkBE;;;;OAIG;IACH,+BAYC;IAED;;;;OAIG;IACH,2BAQC;IAED;;;;OAIG;IACH,kBAwBC;IAED;;;OAGG;IACH,kBAIC;IAED;;;;OAIG;IACH,wCAJW,MAAM,iBACN,OAAO,aACP,OAAO,QAoBjB;IAgDD;;;;OAIG;IACH,+BAJW,MAAM,OAAO,gBAAgB,UAC7B,MAAM,UACN,MAAM,QAahB;CACF;sBAtPqB,yBAAyB;AAwD/C,0CAA0C;AAC1C,gCAAoC,MAAM,CAAC,MAAM,OAAO,aAAa,EAAE,oBAAoB,EAAE,MAAM,CAAC,CAGjG"}

package/blocks/Config/Config.js

@@ -142,7 +142,6 @@ class ConfigClass extends Block {
     runAssertions(this.cfg);
     runSideEffects({
       key,
-      value: normalizedValue ?? null,
       setValue: this._setValue.bind(this),
       getValue: this._getValue.bind(this),
     });
@@ -220,6 +219,12 @@ class ConfigClass extends Block {
           return this._getValue(key);
         },
       });
+
+      runSideEffects({
+        key,
+        setValue: this._setValue.bind(this),
+        getValue: this._getValue.bind(this),
+      });
     }
   }
 

package/blocks/Config/initialConfig.d.ts

@@ -1,6 +1,7 @@
 export const DEFAULT_CDN_CNAME: "https://ucarecdn.com";
 export const DEFAULT_BASE_URL: "https://upload.uploadcare.com";
 export const DEFAULT_SOCIAL_BASE_URL: "https://social.uploadcare.com";
+export const DEFAULT_PREFIXED_CDN_BASE_DOMAIN: "https://ucarecd.net";
 /** @type {import('../../types/exported').ConfigType} */
 export const initialConfig: import("../../types/exported").ConfigType;
 //# sourceMappingURL=initialConfig.d.ts.map

package/blocks/Config/initialConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initialConfig.d.ts","sourceRoot":"","sources":["initialConfig.js"],"names":[],"mappings":"AAKA,gCAAiC,sBAAsB,CAAC;AACxD,+BAAgC,+BAA+B,CAAC;AAChE,sCAAuC,+BAA+B,CAAC;AAEvE,wDAAwD;AACxD,4BADW,OAAO,sBAAsB,EAAE,UAAU,CA6ElD"}
+{"version":3,"file":"initialConfig.d.ts","sourceRoot":"","sources":["initialConfig.js"],"names":[],"mappings":"AAKA,gCAAiC,sBAAsB,CAAC;AACxD,+BAAgC,+BAA+B,CAAC;AAChE,sCAAuC,+BAA+B,CAAC;AACvE,+CAAgD,qBAAqB,CAAC;AAEtE,wDAAwD;AACxD,4BADW,OAAO,sBAAsB,EAAE,UAAU,CA8ElD"}

package/blocks/Config/initialConfig.js

@@ -6,6 +6,7 @@ import { serializeCsv } from '../utils/comma-separated.js';
 export const DEFAULT_CDN_CNAME = 'https://ucarecdn.com';
 export const DEFAULT_BASE_URL = 'https://upload.uploadcare.com';
 export const DEFAULT_SOCIAL_BASE_URL = 'https://social.uploadcare.com';
+export const DEFAULT_PREFIXED_CDN_BASE_DOMAIN = 'https://ucarecd.net';
 
 /** @type {import('../../types/exported').ConfigType} */
 export const initialConfig = {
@@ -23,6 +24,7 @@ export const initialConfig = {
   cameraMirror: false,
   cameraCapture: '',
   sourceList: 'local, url, camera, dropbox, gdrive',
+  topLevelOrigin: '',
   cloudImageEditorTabs: serializeCsv(ALL_TABS),
   maxLocalFileSizeBytes: 0,
   thumbSize: 76,
@@ -40,12 +42,14 @@ export const initialConfig = {
 
   remoteTabSessionKey: '',
   cdnCname: DEFAULT_CDN_CNAME,
+  cdnCnamePrefixed: DEFAULT_PREFIXED_CDN_BASE_DOMAIN,
   baseUrl: DEFAULT_BASE_URL,
   socialBaseUrl: DEFAULT_SOCIAL_BASE_URL,
   secureSignature: '',
   secureExpire: '',
   secureDeliveryProxy: '',
   retryThrottledRequestMaxTimes: 10,
+  retryNetworkErrorMaxTimes: 3,
   multipartMinFileSize: 26214400,
   multipartChunkSize: 5242880,
   maxConcurrentRequests: 10,
@@ -82,6 +86,4 @@ export const initialConfig = {
   cloudImageEditorMaskHref: null,
 
   testMode: false,
-
-  qualityInsights: true,
 };

package/blocks/Config/normalizeConfigValue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalizeConfigValue.d.ts","sourceRoot":"","sources":["normalizeConfigValue.js"],"names":[],"mappings":"AAgHO,qCAL+C,CAAC,SAA1C,MAAO,OAAO,aAAa,EAAE,UAAW,OAC1C,CAAC,SACD,OAAO,GACL,OAAO,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAa3D"}
+{"version":3,"file":"normalizeConfigValue.d.ts","sourceRoot":"","sources":["normalizeConfigValue.js"],"names":[],"mappings":"AAiHO,qCAL+C,CAAC,SAA1C,MAAO,OAAO,aAAa,EAAE,UAAW,OAC1C,CAAC,SACD,OAAO,GACL,OAAO,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAa3D"}

package/blocks/Config/normalizeConfigValue.js

@@ -38,6 +38,7 @@ const mapping = {
   cameraMirror: asBoolean,
   cameraCapture: asCameraCapture,
   sourceList: asString,
+  topLevelOrigin: asString,
   maxLocalFileSizeBytes: asNumber,
   thumbSize: asNumber,
   showEmptyList: asBoolean,
@@ -55,12 +56,14 @@ const mapping = {
 
   remoteTabSessionKey: asString,
   cdnCname: asString,
+  cdnCnamePrefixed: asString,
   baseUrl: asString,
   socialBaseUrl: asString,
   secureSignature: asString,
   secureExpire: asString,
   secureDeliveryProxy: asString,
   retryThrottledRequestMaxTimes: asNumber,
+  retryNetworkErrorMaxTimes: asNumber,
   multipartMinFileSize: asNumber,
   multipartChunkSize: asNumber,
   maxConcurrentRequests: asNumber,
@@ -100,8 +103,6 @@ const mapping = {
   cloudImageEditorMaskHref: asString,
 
   testMode: asBoolean,
-
-  qualityInsights: asBoolean,
 };
 
 /**

package/blocks/Config/side-effects.d.ts

@@ -1,7 +1,11 @@
-export function runSideEffects<T extends keyof import("../../types").ConfigType>({ key, value, setValue, getValue }: {
+export function runSideEffects<T extends keyof import("../../types").ConfigType>({ key, setValue, getValue }: {
     key: T;
-    value: import("../../types").ConfigType[T];
-    setValue: (key: T, value: import("../../types").ConfigType[T]) => void;
-    getValue: (key: T) => import("../../types").ConfigType[T];
+    setValue: <TSetValue extends keyof import("../../types").ConfigType>(key: TSetValue, value: import("../../types").ConfigType[TSetValue]) => void;
+    getValue: <TGetValue extends keyof import("../../types").ConfigType>(key: TGetValue) => import("../../types").ConfigType[TGetValue];
 }): void;
+export type ComputedPropertyDeclaration<TKey extends keyof import("../../types").ConfigType, TDeps extends Exclude<keyof import("../../types").ConfigType, TKey>[]> = {
+    key: TKey;
+    deps: TDeps;
+    fn: (args: Record<TKey, import("../../types").ConfigType[TKey]> & { [K in TDeps[number]]: import("../../types").ConfigType[K]; }) => import("../../types").ConfigType[TKey] | Promise<import("../../types").ConfigType[TKey]>;
+};
 //# sourceMappingURL=side-effects.d.ts.map

package/blocks/Config/side-effects.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"side-effects.d.ts","sourceRoot":"","sources":["side-effects.js"],"names":[],"mappings":"AAWO,+BAR+C,CAAC,SAA1C,MAAO,OAAO,aAAa,EAAE,UAAW,sCAC1C;IACN,GAAG,EAAE,CAAC,CAAC;IACP,KAAK,EAAE,OAAO,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IAC3C,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;IACvE,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;CAC3D,QAsBH"}
+{"version":3,"file":"side-effects.d.ts","sourceRoot":"","sources":["side-effects.js"],"names":[],"mappings":"AAwFO,+BAZ+C,CAAC,SAA1C,MAAO,OAAO,aAAa,EAAE,UAAW,+BAC1C;IACN,GAAG,EAAE,CAAC,CAAC;IACP,QAAQ,EAAE,CAAC,SAAS,SAAS,MAAM,OAAO,aAAa,EAAE,UAAU,EACjE,GAAG,EAAE,SAAS,EACd,KAAK,EAAE,OAAO,aAAa,EAAE,UAAU,CAAC,SAAS,CAAC,KAC/C,IAAI,CAAC;IACV,QAAQ,EAAE,CAAC,SAAS,SAAS,MAAM,OAAO,aAAa,EAAE,UAAU,EACjE,GAAG,EAAE,SAAS,KACX,OAAO,aAAa,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;CAClD,QAqCH;wCAlHqD,IAAI,SAA7C,MAAO,OAAO,aAAa,EAAE,UAAW,EACkB,KAAK,SAA9D,OAAO,CAAC,MAAM,OAAO,aAAa,EAAE,UAAU,EAAE,IAAI,CAAC,EAAG;SAExD,IAAI;UACJ,KAAK;QACL,CACT,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,aAAa,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,GAC1D,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,OAAO,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,GAC1D,KACE,OAAO,aAAa,EAAE,UAAU,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,OAAO,aAAa,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC"}

package/blocks/Config/side-effects.js

@@ -1,32 +1,124 @@
+// @ts-check
+
+// TODO: Here is troubles with tsd: it can't resolve types from `@uploadcare/cname-prefix/async` due to unsupported bundler moduleResolution.
+// @ts-ignore
+import { getPrefixedCdnBaseAsync } from '@uploadcare/cname-prefix/async';
 import { deserializeCsv, serializeCsv } from '../utils/comma-separated.js';
+import { DEFAULT_CDN_CNAME } from './initialConfig.js';
+
+/**
+ * @template {keyof import('../../types').ConfigType} TKey
+ * @template {Exclude<keyof import('../../types').ConfigType, TKey>[]} TDeps
+ * @typedef {Object} ComputedPropertyDeclaration
+ * @property {TKey} key
+ * @property {TDeps} deps
+ * @property {(
+ *   args: Record<TKey, import('../../types').ConfigType[TKey]> & {
+ *     [K in TDeps[number]]: import('../../types').ConfigType[K];
+ *   },
+ * ) => import('../../types').ConfigType[TKey] | Promise<import('../../types').ConfigType[TKey]>} fn
+ */
+
+/**
+ * @template {keyof import('../../types').ConfigType} TKey
+ * @template {Exclude<keyof import('../../types').ConfigType, TKey>[]} TDeps
+ * @param {ComputedPropertyDeclaration<TKey, TDeps>} declaration
+ */
+function defineComputedProperty(declaration) {
+  return declaration;
+}
+
+const 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 (cdnCname !== DEFAULT_CDN_CNAME) {
+        return cdnCname;
+      }
+      return getPrefixedCdnBaseAsync(pubkey, cdnCnamePrefixed);
+    },
+  }),
+];
 
 /**
  * @template {keyof import('../../types').ConfigType} T
  * @param {{
  *   key: T;
- *   value: import('../../types').ConfigType[T];
- *   setValue: (key: T, value: import('../../types').ConfigType[T]) => void;
- *   getValue: (key: T) => import('../../types').ConfigType[T];
+ *   setValue: <TSetValue extends keyof import('../../types').ConfigType>(
+ *     key: TSetValue,
+ *     value: import('../../types').ConfigType[TSetValue],
+ *   ) => void;
+ *   getValue: <TGetValue extends keyof import('../../types').ConfigType>(
+ *     key: TGetValue,
+ *   ) => import('../../types').ConfigType[TGetValue];
  * }} options
  */
-export const runSideEffects = ({ key, value, setValue, getValue }) => {
-  if (key === 'enableVideoRecording' && value !== null) {
-    let cameraModes = deserializeCsv(getValue('cameraModes'));
-    if (value && !cameraModes.includes('video')) {
-      cameraModes = cameraModes.concat('video');
-    } else if (!value) {
-      cameraModes = cameraModes.filter((mode) => mode !== 'video');
+export const runSideEffects = ({ key, setValue, getValue }) => {
+  for (const computed of COMPUTED_PROPERTIES) {
+    if (computed.deps.includes(key)) {
+      const args = {
+        [computed.key]: getValue(computed.key),
+        ...computed.deps.reduce(
+          (acc, dep) => ({
+            ...acc,
+            [dep]: getValue(dep),
+          }),
+          /**
+           * @type {Record<typeof computed.key, import('../../types').ConfigType[typeof computed.key]> & {
+           *   [K in (typeof computed.deps)[number]]: import('../../types').ConfigType[K];
+           * }}
+           */ ({}),
+        ),
+      };
+      const result = computed.fn(args);
+      if (result instanceof Promise) {
+        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);
+      }
     }
-    setValue('cameraModes', serializeCsv(cameraModes));
-  }
-
-  if (key === 'defaultCameraMode' && value !== null) {
-    let cameraModes = deserializeCsv(getValue('cameraModes'));
-    cameraModes = cameraModes.sort((a, b) => {
-      if (a === value) return -1;
-      if (b === value) return 1;
-      return 0;
-    });
-    setValue('cameraModes', serializeCsv(cameraModes));
   }
 };

package/blocks/DropArea/DropArea.d.ts

@@ -16,7 +16,7 @@ export class DropArea extends UploaderBlock {
         '*collectionState': import("../../index.js").OutputCollectionState | null;
         '*groupInfo': import("@uploadcare/upload-client").UploadcareGroup | null;
         '*uploadTrigger': Set<string>;
-        '*secureUploadsManager': import("../../abstract/managers/SecureUploadsManager.js").SecureUploadsManager | null;
+        '*secureUploadsManager': import("../../abstract/SecureUploadsManager.js").SecureUploadsManager | null;
         '*currentActivity': null;
         '*currentActivityParams': {};
         '*history': never[];

package/blocks/ExternalSource/ExternalSource.d.ts

@@ -14,6 +14,7 @@ export class ExternalSource extends UploaderBlock {
         showSelectionStatus: boolean;
         counterText: string;
         doneBtnTextClass: string;
+        toolbarVisible: boolean;
         onDone: () => void;
         onCancel: () => void;
         onSelectAll: () => void;
@@ -25,7 +26,7 @@ export class ExternalSource extends UploaderBlock {
         '*collectionState': import("../../index.js").OutputCollectionState | null;
         '*groupInfo': import("@uploadcare/upload-client").UploadcareGroup | null;
         '*uploadTrigger': Set<string>;
-        '*secureUploadsManager': import("../../abstract/managers/SecureUploadsManager.js").SecureUploadsManager | null;
+        '*secureUploadsManager': import("../../abstract/SecureUploadsManager.js").SecureUploadsManager | null;
         '*currentActivity': null;
         '*currentActivityParams': {};
         '*history': never[];
@@ -39,6 +40,11 @@ export class ExternalSource extends UploaderBlock {
      * @param {NonNullable<import('./types.js').InputMessageMap['selected-files-change']['selectedFiles']>[number]} selectedFile
      */
     private extractUrlFromSelectedFile;
+    /**
+     * @private
+     * @param {import('./types.js').InputMessageMap['toolbar-state-change']} message
+     */
+    private handleToolbarStateChange;
     /**
      * @private
      * @param {import('./types.js').InputMessageMap['selected-files-change']} message

package/blocks/ExternalSource/ExternalSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExternalSource.d.ts","sourceRoot":"","sources":["ExternalSource.js"],"names":[],"mappings":"AAWA,+DAA+D;AAE/D;IAEE,yBAAiD;IAK/C;;;QAKE,6FAA6F;sBAAlF,OAAO,YAAY,EAAE,eAAe,CAAC,uBAAuB,CAAC,CAAC,eAAe,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;MAkC1F;IAGH,6BAA6B;IAC7B,sBADW,cAAc,CAOxB;IAgDD;;;OAGG;IACH,mCAcC;IAED;;;OAGG;IACH,kCAsBC;IAED,eAAe;IACf,yBAIC;IAED,eAAe;IACf,mBAKC;IAED;;;OAGG;IACH,sBAKC;IAED,eAAe;IACf,kBAKC;IAED,eAAe;IACf,kBAeC;IAED,eAAe;IACf,oBA6BC;IALC,eAAe;IACf,uBAA6D;IAM/D,eAAe;IACf,sBAMC;IAED,eAAe;IACf,6BASC;CACF;;;;6BAlQa;IAAE,kBAAkB,EAAE,MAAM,CAAA;CAAE;8BAPd,iCAAiC"}
+{"version":3,"file":"ExternalSource.d.ts","sourceRoot":"","sources":["ExternalSource.js"],"names":[],"mappings":"AAkBA,+DAA+D;AAE/D;IAEE,yBAAiD;IAK/C;;;QAKE,6FAA6F;sBAAlF,OAAO,YAAY,EAAE,eAAe,CAAC,uBAAuB,CAAC,CAAC,eAAe,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;MAmC1F;IAGH,6BAA6B;IAC7B,sBADW,cAAc,CAOxB;IAgDD;;;OAGG;IACH,mCAcC;IAED;;;OAGG;IACH,iCAIC;IAED;;;OAGG;IACH,kCAsBC;IAED,eAAe;IACf,yBAIC;IAED,eAAe;IACf,mBAKC;IAED;;;OAGG;IACH,sBAKC;IAED,eAAe;IACf,kBAKC;IAED,eAAe;IACf,kBAkBC;IAED,eAAe;IACf,oBA8BC;IANC,eAAe;IACf,uBAA6D;IAO/D,eAAe;IACf,sBAMC;IAED,eAAe;IACf,6BASC;CACF;;;;6BAjRa;IAAE,kBAAkB,EAAE,MAAM,CAAA;CAAE;8BAdd,iCAAiC"}

package/blocks/ExternalSource/ExternalSource.js

@@ -8,6 +8,13 @@ import { wildcardRegexp } from '../../utils/wildcardRegexp.js';
 import { buildThemeDefinition } from './buildThemeDefinition.js';
 import { MessageBridge } from './MessageBridge.js';
 import { queryString } from './query-string.js';
+import { getTopLevelOrigin } from '../../utils/get-top-level-origin.js';
+import { ExternalUploadSource } from '../utils/UploadSource.js';
+
+/** @type {Record<string, string>} */
+const SOCIAL_SOURCE_MAPPING = {
+  [ExternalUploadSource.GDRIVE]: 'ngdrive',
+};
 
 /** @typedef {{ externalSourceType: string }} ActivityParams */
 
@@ -34,6 +41,7 @@ export class ExternalSource extends UploaderBlock {
       showSelectionStatus: false,
       counterText: '',
       doneBtnTextClass: 'uc-hidden',
+      toolbarVisible: true,
 
       onDone: () => {
         for (const message of this.$.selectedList) {
@@ -135,6 +143,16 @@ export class ExternalSource extends UploaderBlock {
     return selectedFile.url;
   }
 
+  /**
+   * @private
+   * @param {import('./types.js').InputMessageMap['toolbar-state-change']} message
+   */
+  handleToolbarStateChange(message) {
+    this.set$({
+      toolbarVisible: message.isVisible,
+    });
+  }
+
   /**
    * @private
    * @param {import('./types.js').InputMessageMap['selected-files-change']} message
@@ -201,6 +219,7 @@ export class ExternalSource extends UploaderBlock {
   remoteUrl() {
     const { pubkey, remoteTabSessionKey, socialBaseUrl, multiple } = this.cfg;
     const { externalSourceType } = this.activityParams;
+    const sourceName = SOCIAL_SOURCE_MAPPING[externalSourceType] ?? externalSourceType;
     const lang = this.l10n('social-source-lang')?.split('-')?.[0] || 'en';
     const params = {
       lang,
@@ -209,8 +228,10 @@ export class ExternalSource extends UploaderBlock {
       session_key: remoteTabSessionKey,
       wait_for_theme: true,
       multiple: multiple.toString(),
+      origin: this.cfg.topLevelOrigin || getTopLevelOrigin(),
+      debug: this.cfg.debug,
     };
-    const url = new URL(`/window4/${externalSourceType}`, socialBaseUrl);
+    const url = new URL(`/window4/${sourceName}`, socialBaseUrl);
     url.search = queryString(params);
     return url.toString();
   }
@@ -243,6 +264,7 @@ export class ExternalSource extends UploaderBlock {
     /** @private */
     this._messageBridge = new MessageBridge(iframe.contentWindow);
     this._messageBridge.on('selected-files-change', this.handleSelectedFilesChange.bind(this));
+    this._messageBridge.on('toolbar-state-change', this.handleToolbarStateChange.bind(this));
 
     this.resetSelectionStatus();
   }
@@ -282,7 +304,7 @@ ExternalSource.template = /* HTML */ `
   </uc-activity-header>
   <div class="uc-content">
     <div ref="iframeWrapper" class="uc-iframe-wrapper"></div>
-    <div class="uc-toolbar">
+    <div class="uc-toolbar" set="@hidden: !toolbarVisible">
       <button type="button" class="uc-cancel-btn uc-secondary-btn" set="onclick: onCancel" l10n="cancel"></button>
       <div set="@hidden: !showSelectionStatus" class="uc-selection-status-box">
         <span>{{counterText}}</span>

package/blocks/ExternalSource/MessageBridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessageBridge.d.ts","sourceRoot":"","sources":["MessageBridge.js"],"names":[],"mappings":"AAgBA;IAOE,8BAA8B;IAC9B,qBADY,MAAM,EAKjB;IAXD,0GAA0G;IAC1G,aADW,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,SAAS,EAAE,mBAAmB,CAAC,OAAO,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAC9E;IAExB,qBAAqB;IACrB,UADW,MAAM,CACR;IAST,8BAA8B;IAC9B,iBAAkB,GADN,YACO,UAejB;IAEF;;;;OAIG;IACH,GAJkD,CAAC,SAAtC,OAAQ,SAAS,EAAE,gBAAiB,QACtC,CAAC,WACD,OAAO,SAAS,EAAE,mBAAmB,CAAC,CAAC,CAAC,QASlD;IAED,uDAAuD;IACvD,cADY,OAAO,SAAS,EAAE,aAAa,QAG1C;IAED,gBAEC;CACF"}
+{"version":3,"file":"MessageBridge.d.ts","sourceRoot":"","sources":["MessageBridge.js"],"names":[],"mappings":"AAkBA;IAOE,8BAA8B;IAC9B,qBADY,MAAM,EAKjB;IAXD,0GAA0G;IAC1G,aADW,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,SAAS,EAAE,mBAAmB,CAAC,OAAO,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAC9E;IAExB,qBAAqB;IACrB,UADW,MAAM,CACR;IAST,8BAA8B;IAC9B,iBAAkB,GADN,YACO,UAejB;IAEF;;;;OAIG;IACH,GAJkD,CAAC,SAAtC,OAAQ,SAAS,EAAE,gBAAiB,QACtC,CAAC,WACD,OAAO,SAAS,EAAE,mBAAmB,CAAC,CAAC,CAAC,QASlD;IAED,uDAAuD;IACvD,cADY,OAAO,SAAS,EAAE,aAAa,QAG1C;IAED,gBAEC;CACF"}

package/blocks/ExternalSource/MessageBridge.js

@@ -1,5 +1,7 @@
+// @ts-check
+
 /** @type {import('./types').InputMessageType[]} */
-const MESSAGE_TYPE_WHITELIST = ['selected-files-change'];
+const MESSAGE_TYPE_WHITELIST = ['selected-files-change', 'toolbar-state-change'];
 
 /**
  * @param {unknown} message

package/blocks/ExternalSource/types.d.ts

@@ -24,6 +24,10 @@ export type InputMessageMap = {
         isMultipleMode: false;
         selectedFiles: [DoneSuccessResponse] | [];
     });
+    "toolbar-state-change": {
+        type: "toolbar-state-change";
+        isVisible: boolean;
+    };
 };
 export type InputMessageType = keyof InputMessageMap;
 export type InputMessage = InputMessageMap[InputMessageType];