@uploadcare/file-uploader 1.19.5-alpha.0 → 1.20.0-alpha.0

package/abstract/UploaderBlock.d.ts

@@ -36,8 +36,6 @@ export class UploaderBlock extends ActivityBlock {
     private _unobserveCollection;
     /** @private */
     private _unobserveCollectionProperties;
-    /** @private */
-    private destroyCtxOwner;
     /**
      * @private
      * @param {import('../types').OutputCollectionState} collectionState

package/abstract/UploaderBlock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UploaderBlock.d.ts","sourceRoot":"","sources":["UploaderBlock.js"],"names":[],"mappings":"AAmBA;IACE,iBAAiB;IACjB,mCAAwB;IAExB,eAAe;IACf,mBAAmB;IAEnB;;;;;;;;;;;;;;MAA+B;IAE/B,eAAe;IACf,0BAOC;IA2BD;;;OAGG;IACH,mCAHa,iBAAiB,CAQ7B;IAED,mCAAmC;IACnC,WADc,iBAAiB,CAM9B;IAED,4BAEC;IAED,2DAA2D;IAC3D,wBADc,eAAe,CAAC,OAAO,iBAAiB,CAAC,CAMtD;IAsBD,eAAe;IACf,qBAkBC;IAfC,eAAe;IACf,6BAAiG;IAEjG,eAAe;IACf,uCAEC;IAWH,eAAe;IACf,wBASC;IAED;;;OAGG;IACH,qBAkBC;IAED,eAAe;IACf,0BAYQ;IAER;;;OAGG;IACH,gCAkCE;IAEF;;;OAGG;IACH,0CA6FE;IAEF,eAAe;IACf,mCAsBE;IAEF,6BAiBC;IAED,eAAe;IACf,uBAkDC;IAED;;;OAGG;IACH,kCAHW,MAAM,qEAWhB;IAED;;;OAGG;IACH,oCAHa,OAAO,CAAC,OAAO,2BAA2B,EAAE,eAAe,CAAC,CA4BxE;IAED,kEAAkE;IAClE,iBADc,OAAO,sBAAsB,EAAE,eAAe,EAAE,CAK7D;CACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BAxd6B,oBAAoB;qCAWb,2BAA2B;kCAG9B,wBAAwB;kCADxB,wBAAwB;gCAD1B,sBAAsB;kCAGpB,wBAAwB"}
+{"version":3,"file":"UploaderBlock.d.ts","sourceRoot":"","sources":["UploaderBlock.js"],"names":[],"mappings":"AAmBA;IACE,iBAAiB;IACjB,mCAAwB;IAExB,eAAe;IACf,mBAAmB;IAEnB;;;;;;;;;;;;;;MAA+B;IAE/B,eAAe;IACf,0BAOC;IA2BD;;;OAGG;IACH,mCAHa,iBAAiB,CAQ7B;IAED,mCAAmC;IACnC,WADc,iBAAiB,CAM9B;IAED,4BAEC;IAED,2DAA2D;IAC3D,wBADc,eAAe,CAAC,OAAO,iBAAiB,CAAC,CAMtD;IAkBD,eAAe;IACf,qBAkBC;IAfC,eAAe;IACf,6BAAiG;IAEjG,eAAe;IACf,uCAEC;IAWH;;;OAGG;IACH,qBAkBC;IAED,eAAe;IACf,0BAYQ;IAER;;;OAGG;IACH,gCAkCE;IAEF;;;OAGG;IACH,0CA6FE;IAEF,eAAe;IACf,mCAsBE;IAEF,6BAiBC;IAED,eAAe;IACf,uBAsDC;IAED;;;OAGG;IACH,kCAHW,MAAM,qEAWhB;IAED;;;OAGG;IACH,oCAHa,OAAO,CAAC,OAAO,2BAA2B,EAAE,eAAe,CAAC,CA4BxE;IAED,kEAAkE;IAClE,iBADc,OAAO,sBAAsB,EAAE,eAAe,EAAE,CAK7D;CACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BA5c6B,oBAAoB;qCAWb,2BAA2B;kCAG9B,wBAAwB;kCADxB,wBAAwB;gCAD1B,sBAAsB;kCAGpB,wBAAwB"}

package/abstract/UploaderBlock.js

@@ -94,9 +94,8 @@ export class UploaderBlock extends ActivityBlock {
 
   /** @protected */
   destroyCtxCallback() {
-    if (this.isCtxOwner) {
-      this.destroyCtxOwner();
-    }
+    this._unobserveCollectionProperties?.();
+    this._unobserveCollection?.();
     this.uploadCollection.destroy();
     this.$['*uploadCollection'] = null;
 
@@ -106,9 +105,6 @@ export class UploaderBlock extends ActivityBlock {
   destroyCallback() {
     super.destroyCallback();
 
-    if (this.isCtxOwner) {
-      this.destroyCtxOwner();
-    }
     this._flushOutputItems.cancel();
   }
 
@@ -133,18 +129,6 @@ export class UploaderBlock extends ActivityBlock {
     }
   }
 
-  /** @private */
-  destroyCtxOwner() {
-    if (!this.isCtxOwner) {
-      return;
-    }
-
-    this._unobserveCollectionProperties?.();
-    this._unobserveCollection?.();
-    this.$['*secureUploadsManager'] = null;
-    this.isCtxOwner = false;
-  }
-
   /**
    * @private
    * @param {import('../types').OutputCollectionState} collectionState
@@ -390,7 +374,11 @@ export class UploaderBlock extends ActivityBlock {
           continue;
         }
         const { width, height } = fileInfo.imageInfo;
-        const expectedAspectRatio = aspectRatioPreset.width / aspectRatioPreset.height;
+        console.log({ aspectRatioPreset });
+        const expectedAspectRatio =
+          typeof aspectRatioPreset?.width === 'number' && typeof aspectRatioPreset?.height === 'number'
+            ? aspectRatioPreset.width / aspectRatioPreset.height
+            : 1; // fallback to 1:1 if not present
         const crop = calculateMaxCenteredCropFrame(width, height, expectedAspectRatio);
         const cdnUrlModifiers = createCdnUrlModifiers(
           `crop/${crop.width}x${crop.height}/${crop.x},${crop.y}`,

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

@@ -1 +1 @@
-{"version":3,"file":"CropFrame.d.ts","sourceRoot":"","sources":["CropFrame.js"],"names":[],"mappings":"AA2BA;IAII;;MAGC;IAED,eAAe;IACf,yBAAyD;IAEzD,eAAe;IACf,2BAA6D;IAE7D,eAAe;IACf,8BAAmE;IAGrE;;;OAGG;IACH,+BAaC;IAED,eAAe;IACf,wBAyCC;IAFC,sCAAyB;IACzB,2CAAuC;IAGzC;;;OAGG;IACH,wBAUC;IAED,eAAe;IACf,wBASC;IAED,eAAe;IACf,qBAgEC;IAED;;;OAGG;IACH,0BAHW,OAAO,YAAY,EAAE,WAAW,aAChC,OAAO,YAAY,EAAE,SAAS,QA4BxC;IAED,eAAe;IACf,sBAiBC;IAED,eAAe;IACf,sBA4CC;IAED,eAAe;IACf,qBAeC;IAFC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAA+B;IAC/B,qCAA+B;IAGjC;;;;OAIG;IACH,2BAiBC;IAJC;;;;;kBAA2B;IAC3B,sCAA6B;IAC7B,6CAA6C;IAC7C,2DAAoC;IAGtC;;;OAGG;IACH,0BAUC;IAED;;;OAGG;IACH,4BAmBC;IAED;;;;OAIG;IACH,qBAsBC;IAED;;;OAGG;IACH,+BAqBC;IAFC;;;;;kBAA6B;IAI/B,eAAe;IACf,sBAGC;IAED;;;OAGG;IACH,oBAoBC;IADC,oCAA4B;IAG9B,oBAeC;IAED,eAAe;IACf,gBAIC;IAED,+BAA+B;IAC/B,sBADY,OAAO,QAclB;IAmBG,mCAAsF;CAmC3F;;;;sBArjBqB,4BAA4B"}
+{"version":3,"file":"CropFrame.d.ts","sourceRoot":"","sources":["CropFrame.js"],"names":[],"mappings":"AA2BA;IAII;;MAGC;IAED,eAAe;IACf,yBAAyD;IAEzD,eAAe;IACf,2BAA6D;IAE7D,eAAe;IACf,8BAAmE;IAGrE;;;OAGG;IACH,+BAaC;IAED,eAAe;IACf,wBAyCC;IAFC,sCAAyB;IACzB,2CAAuC;IAGzC;;;OAGG;IACH,wBAUC;IAED,eAAe;IACf,wBASC;IAED,eAAe;IACf,qBAgEC;IAED;;;OAGG;IACH,0BAHW,OAAO,YAAY,EAAE,WAAW,aAChC,OAAO,YAAY,EAAE,SAAS,QA4BxC;IAED,eAAe;IACf,sBAiBC;IAED,eAAe;IACf,sBA4CC;IAED,eAAe;IACf,qBAeC;IAFC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAA+B;IAC/B,qCAA+B;IAGjC;;;;OAIG;IACH,2BAiBC;IAJC;;;;;kBAA2B;IAC3B,sCAA6B;IAC7B,6CAA6C;IAC7C,2DAAoC;IAGtC;;;OAGG;IACH,0BAUC;IAED;;;OAGG;IACH,4BAmBC;IAED;;;;OAIG;IACH,qBAwBC;IAED;;;OAGG;IACH,+BAqBC;IAFC;;;;;kBAA6B;IAI/B,eAAe;IACf,sBAGC;IAED;;;OAGG;IACH,oBAoBC;IADC,oCAA4B;IAG9B,oBAeC;IAED,eAAe;IACf,gBAIC;IAED,+BAA+B;IAC/B,sBADY,OAAO,QAclB;IAmBG,mCAAsF;CAmC3F;;;;sBAvjBqB,4BAA4B"}

package/blocks/CloudImageEditor/src/CropFrame.js

@@ -394,8 +394,10 @@ export class CropFrame extends Block {
     /** @type {import('./types.js').Rectangle} */
     let imageBox = this.$['*imageBox'];
     let rect = /** @type {import('./types.js').Rectangle} */ (this._dragStartCrop) ?? this.$['*cropBox'];
-    /** @type {import('./types.js').CropPresetList[0]} */
-    const cropPreset = this.$['*cropPresetList']?.[0];
+
+    const cropPreset = /** @type {import('./types.js').CropPresetList} */ (this.$['*cropPresetList'])?.find(
+      (it) => it._active,
+    );
     const aspectRatio = cropPreset ? cropPreset.width / cropPreset.height : undefined;
 
     if (direction === '') {

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

@@ -0,0 +1,9 @@
+export class EditorAspectRatioButtonControl extends EditorButtonControl {
+    _aspectRatio: import("./types.js").CropAspectRatio | undefined;
+    handleFreedom(): void;
+    handleClick(): void;
+    /** @param {import('./types.js').CropAspectRatio} value */
+    _renderRectBasedOnAspectRatio(value: import("./types.js").CropAspectRatio): void;
+}
+import { EditorButtonControl } from './EditorButtonControl.js';
+//# sourceMappingURL=EditorAspectRatioButtonControl.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"EditorAspectRatioButtonControl.d.ts","sourceRoot":"","sources":["EditorAspectRatioButtonControl.js"],"names":[],"mappings":"AAOA;IAoBQ,+DAAyB;IAe/B,sBAEC;IAED,oBAeC;IAED,0DAA0D;IAC1D,qCADY,OAAO,YAAY,EAAE,eAAe,QAiC/C;CACF;oCA9FmC,0BAA0B"}

package/blocks/CloudImageEditor/src/EditorAspectRatioButtonControl.js

@@ -0,0 +1,98 @@
+//@ts-check
+
+import { createSvgNode } from './crop-utils.js';
+import { EditorButtonControl } from './EditorButtonControl.js';
+
+const FREEFORM_ID = 'freeform';
+
+export class EditorAspectRatioButtonControl extends EditorButtonControl {
+  initCallback() {
+    super.initCallback();
+
+    this.defineAccessor(
+      'aspectRatio',
+      /** @param {import('./types.js').CropAspectRatio} value */ (value) => {
+        if (!value) return;
+
+        if (value.hasFreeform) {
+          this.$['title'] = this.l10n('freeform');
+          this.$['icon'] = FREEFORM_ID;
+        } else {
+          this.$['icon'] = value.type;
+          if (value.width && value.height) {
+            this.$['title'] = `${value.width}:${value.height}`;
+          }
+          this._renderRectBasedOnAspectRatio(value);
+        }
+
+        this._aspectRatio = value;
+
+        this.bindL10n('title-prop', () => {
+          const isFreeform = !!value.hasFreeform;
+          const name = this.l10n(isFreeform ? 'freeform' : value.type).toLowerCase();
+
+          const val = isFreeform ? '' : `${value.width}:${value.height}`;
+          return this.l10n('a11y-cloud-editor-apply-aspect-ratio', { name, value: val });
+        });
+      },
+    );
+
+    this.$['on.click'] = this.handleClick.bind(this);
+  }
+
+  handleFreedom() {
+    this.$['*showListAspectRatio'] = true;
+  }
+
+  handleClick() {
+    if (this._aspectRatio?.hasFreeform) {
+      this.handleFreedom();
+      return;
+    }
+
+    const list = /** @type {import('./types.js').CropPresetList} */ (this.$['*cropPresetList']);
+    if (!Array.isArray(list)) return;
+
+    this.$['*cropPresetList'] = list.map(
+      /** @param {import('./types.js').CropAspectRatio} it */ (it) => ({
+        ...it,
+        _active: it.id === this._aspectRatio?.id,
+      }),
+    );
+  }
+
+  /** @param {import('./types.js').CropAspectRatio} value */
+  _renderRectBasedOnAspectRatio(value) {
+    const SIZE_RECT_FIXED = 12;
+    const SIZE_SVG_WRAPPER = 16;
+    let width = 12;
+    let height = 12;
+    const adjustResolutions = value.width / value.height;
+
+    if (adjustResolutions >= 1) {
+      width = SIZE_RECT_FIXED;
+      height = Math.round((SIZE_RECT_FIXED * value.height) / value.width);
+    } else {
+      height = SIZE_RECT_FIXED;
+      width = Math.round((SIZE_RECT_FIXED * value.width) / value.height);
+    }
+
+    const rect = createSvgNode('rect', {
+      'stroke-linejoin': 'round',
+      fill: 'none',
+      stroke: 'currentColor',
+      'stroke-width': 1.2,
+      'fill-rule': 'evenodd',
+      x: (SIZE_SVG_WRAPPER - width) / 2,
+      y: (SIZE_SVG_WRAPPER - height) / 2,
+      width,
+      height,
+    });
+
+    const svgEl = this.ref['icon-el']?.ref?.svg;
+
+    if (!svgEl) return;
+    svgEl.innerHTML = '';
+    svgEl.appendChild(rect);
+  }
+}

package/blocks/CloudImageEditor/src/EditorButtonControl.js

@@ -39,7 +39,7 @@ export class EditorButtonControl extends Block {
 
 EditorButtonControl.template = /* HTML */ `
   <button role="option" type="button" set="@aria-label:title-prop;" l10n="@title:title-prop;">
-    <uc-icon set="@name: icon;"></uc-icon>
+    <uc-icon ref="icon-el" set="@name: icon;"></uc-icon>
     <div class="uc-title" ref="title-el">{{title}}</div>
   </button>
 `;

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

@@ -1 +1 @@
-{"version":3,"file":"EditorCropButtonControl.d.ts","sourceRoot":"","sources":["EditorCropButtonControl.js"],"names":[],"mappings":"AAkBA;IASM,eAAe;IACf,mBAA2B;CAehC;oCA3CmC,0BAA0B"}
+{"version":3,"file":"EditorCropButtonControl.d.ts","sourceRoot":"","sources":["EditorCropButtonControl.js"],"names":[],"mappings":"AAkBA;IASM,eAAe;IACf,mBAA2B;CAgBhC;oCA5CmC,0BAA0B"}

package/blocks/CloudImageEditor/src/EditorCropButtonControl.js

@@ -28,6 +28,7 @@ export class EditorCropButtonControl extends EditorButtonControl {
       /** @private */
       this._operation = operation;
       this.$['icon'] = operation;
+
       this.bindL10n('title-prop', () =>
         this.l10n('a11y-cloud-editor-apply-crop', {
           name: this.l10n(operation).toLowerCase(),

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

@@ -1 +1 @@
-{"version":3,"file":"EditorImageCropper.d.ts","sourceRoot":"","sources":["EditorImageCropper.js"],"names":[],"mappings":"AA2CA;IAKI;;;QAIE,yBAAyB;uBAAd,UAAU;QAMrB,6CAA6C;qBAAlC,OAAO,YAAY,EAAE,SAAS;QAOzC,6CAA6C;oBAAlC,OAAO,YAAY,EAAE,SAAS;MAO1C;IAED,eAAe;IACf,yBAA8D;IAE9D,eAAe;IACf,+BAA0E;IAE1E;;;MAAyC;IAG3C,eAAe;IACf,sBASC;IAED,eAAe;IACf,6BAKC;IAED,eAAe;IACf,oBAgBC;IAFC,uCAAqB;IACrB,kDAAe;IAGjB,eAAe;IACf,oBAuCC;IAED,eAAe;IACf,mBAqDC;IAED,eAAe;IACf,mBAcC;IAED,eAAe;IACf,cAUC;IAED;;;OAGG;IACH,mBAYC;IAED;;;OAGG;IACH,2BAkBC;IAED;;;OAGG;IACH,+BA8BC;IAED,eAAe;IACf,gBAkBC;IAED;;;;OAIG;IACH,4CAFa,IAAI,CAehB;IAED;;;OAGG;IACH,oBAHW,MAAM,UAAU,GACd,SAAS,OAAO,CAI5B;IAED;;;OAGG;IACH,oBAHW,OAAO,YAAY,EAAE,SAAS,mBAC9B;QAAE,UAAU,CAAC,EAAE,OAAO,CAAA;KAAE,iBAyBlC;IAnBC,+BAAqB;IAYrB,sCAKE;IAGJ;;aAkBC;IAED,eAAe;IACf,0BAYC;IAED,eAAe;IACf,2BAMC;IAED,eAAe;IACf,eAKC;IAED;;;;;OAKG;IACH,sBAyBC;IATC,yCAA4B;IAW9B;;;;OAIG;IACH,4BAkBC;CAgCF;;;;;UA5gBa,OAAO;YACP,OAAO;;;sBApBC,4BAA4B"}
+{"version":3,"file":"EditorImageCropper.d.ts","sourceRoot":"","sources":["EditorImageCropper.js"],"names":[],"mappings":"AA2CA;IAKI;;;QAIE,yBAAyB;uBAAd,UAAU;QAMrB,6CAA6C;qBAAlC,OAAO,YAAY,EAAE,SAAS;QAOzC,6CAA6C;oBAAlC,OAAO,YAAY,EAAE,SAAS;MAO1C;IAED,eAAe;IACf,yBAA8D;IAE9D,eAAe;IACf,+BAA0E;IAE1E;;;MAAyC;IAG3C,eAAe;IACf,sBASC;IAED,eAAe;IACf,6BAKC;IAED,eAAe;IACf,oBAgBC;IAFC,uCAAqB;IACrB,kDAAe;IAGjB,eAAe;IACf,oBAuCC;IAED,eAAe;IACf,mBAsDC;IAED,eAAe;IACf,mBAcC;IAED,eAAe;IACf,cAUC;IAED;;;OAGG;IACH,mBAYC;IAED;;;OAGG;IACH,2BAkBC;IAED;;;OAGG;IACH,+BA8BC;IAED,eAAe;IACf,gBAkBC;IAED;;;;OAIG;IACH,4CAFa,IAAI,CAehB;IAED;;;OAGG;IACH,oBAHW,MAAM,UAAU,GACd,SAAS,OAAO,CAI5B;IAED;;;OAGG;IACH,oBAHW,OAAO,YAAY,EAAE,SAAS,mBAC9B;QAAE,UAAU,CAAC,EAAE,OAAO,CAAA;KAAE,iBAyBlC;IAnBC,+BAAqB;IAYrB,sCAKE;IAGJ;;aAkBC;IAED,eAAe;IACf,0BAYC;IAED,eAAe;IACf,2BAMC;IAED,eAAe;IACf,eAKC;IAED;;;;;OAKG;IACH,sBAyBC;IATC,yCAA4B;IAW9B;;;;OAIG;IACH,4BAkBC;CAgCF;;;;;UA7gBa,OAAO;YACP,OAAO;;;sBApBC,4BAA4B"}

package/blocks/CloudImageEditor/src/EditorImageCropper.js

@@ -189,8 +189,9 @@ export class EditorImageCropper extends Block {
       );
     }
 
-    /** @type {import('./types.js').CropPresetList[0] | undefined} */
-    const cropPreset = this.$['*cropPresetList']?.[0];
+    const cropPreset = /** @type {import('./types.js').CropPresetList} */ (this.$['*cropPresetList'])?.find(
+      (it) => it._active,
+    );
     const cropAspectRatio = cropPreset ? cropPreset.width / cropPreset.height : undefined;
 
     if (

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

@@ -1,9 +1,12 @@
 export class EditorToolbar extends Block {
     init$: {
         '*sliderEl': null;
+        '*listAspectRatioEl': null;
         /** @type {import('./types.js').LoadingOperations} */
         '*loadingOperations': import("./types.js").LoadingOperations;
         '*showSlider': boolean;
+        '*showListAspectRatio': boolean;
+        hideSliderOrList: boolean;
         '*currentFilter': string;
         '*currentOperation': null;
         showLoader: boolean;
@@ -72,6 +75,12 @@ export class EditorToolbar extends Block {
      * @param {String} operation
      */
     private _createToggleControl;
+    /**
+     * @private
+     * @param {import('./types.js').CropAspectRatio} config
+     */
+    private _createAspectRatioConrol;
+    _clearListAspectRatio(): void;
     /**
      * @private
      * @param {String} tabId

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"EditorToolbar.d.ts","sourceRoot":"","sources":["EditorToolbar.js"],"names":[],"mappings":"AA4DA;IAII;;;QAIE,qDAAqD;8BAA1C,OAAO,YAAY,EAAE,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAyDjD,4BAA4B;2BAAhB,UAAU;;;;;;;MAgBvB;IAED,eAAe;IAEf,6BAAsE;IAGxE,eAAe;IACf,uBAOC;IAED;;;OAGG;IACH,gCAKC;IAED;;;OAGG;IACH,6BAKC;IAED;;;OAGG;IACH,6BAKC;IAED;;;OAGG;IACH,iCAKC;IAED,8BAEC;IAED;;;OAGG;IACH,4BA8DC;IAED;;;;OAIG;IACH,qBAyBC;IAED;;;OAGG;IACH,4BAKC;IAED,eAAe;IACf,0BAIC;IAED,eAAe;IACf,4BAWC;IALG,oBAGC;IAIL;;;OAGG;IACH,oBAEC;IAED;;MAwBM;CA+FP;;;;sBA/cqB,4BAA4B"}

package/blocks/CloudImageEditor/src/EditorToolbar.js

@@ -2,6 +2,7 @@
 import { debounce } from '../../utils/debounce.js';
 import { Block } from '../../../abstract/Block.js';
 import { EditorCropButtonControl } from './EditorCropButtonControl.js';
+import { EditorAspectRatioButtonControl } from './EditorAspectRatioButtonControl.js';
 import { EditorFilterControl } from './EditorFilterControl.js';
 import { EditorOperationControl } from './EditorOperationControl.js';
 import { FAKE_ORIGINAL_FILTER } from './EditorSlider.js';
@@ -64,9 +65,12 @@ export class EditorToolbar extends Block {
     this.init$ = {
       ...this.init$,
       '*sliderEl': null,
+      '*listAspectRatioEl': null,
       /** @type {import('./types.js').LoadingOperations} */
       '*loadingOperations': new Map(),
       '*showSlider': false,
+      '*showListAspectRatio': false,
+      hideSliderOrList: false,
       '*currentFilter': FAKE_ORIGINAL_FILTER,
       '*currentOperation': null,
       showLoader: false,
@@ -145,6 +149,8 @@ export class EditorToolbar extends Block {
   /** @private */
   _onSliderClose() {
     this.$['*showSlider'] = false;
+    this.$['*showListAspectRatio'] = false;
+
     if (this.$['*tabId'] === TabId.TUNING) {
       this.ref['tooltip-el'].classList.toggle('uc-info-tooltip_visible', false);
     }
@@ -183,6 +189,21 @@ export class EditorToolbar extends Block {
     return el;
   }
 
+  /**
+   * @private
+   * @param {import('./types.js').CropAspectRatio} config
+   */
+  _createAspectRatioConrol(config) {
+    const el = new EditorAspectRatioButtonControl();
+    // @ts-expect-error TODO: fix
+    el.aspectRatio = config;
+    return el;
+  }
+
+  _clearListAspectRatio() {
+    this.$['*listAspectRatioEl'].innerHTML = '';
+  }
+
   /**
    * @private
    * @param {String} tabId
@@ -191,7 +212,33 @@ export class EditorToolbar extends Block {
     let listEl = this.ref[`controls-list-${tabId}`];
     let fr = document.createDocumentFragment();
 
+    this._clearListAspectRatio();
+
     if (tabId === TabId.CROP) {
+      const hasFreeformAspectRatio = this.$['*cropPresetList'].length >= 3;
+
+      if (hasFreeformAspectRatio) {
+        let el = this._createAspectRatioConrol({
+          id: 'freeform-aspect-ratio',
+          type: 'aspect-ratio',
+          width: 0,
+          height: 0,
+          hasFreeform: true,
+        });
+        fr.appendChild(el);
+      }
+
+      this.$['*cropPresetList'].forEach(
+        /** @param {import('./types.js').CropAspectRatio} it */ (it) => {
+          let el = this._createAspectRatioConrol(it);
+          fr.appendChild(el);
+
+          if (hasFreeformAspectRatio) {
+            this.$['*listAspectRatioEl'].appendChild(el);
+          }
+        },
+      );
+
       this.$.cropOperations.forEach(
         /** @param {string} operation */ (operation) => {
           let el = this._createToggleControl(operation);
@@ -327,6 +374,7 @@ export class EditorToolbar extends Block {
     super.initCallback();
 
     this.$['*sliderEl'] = this.ref['slider-el'];
+    this.$['*listAspectRatioEl'] = this.ref['list-el'];
 
     this.sub('*imageSize', (imageSize) => {
       if (imageSize) {
@@ -385,6 +433,14 @@ export class EditorToolbar extends Block {
     this.sub('*showSlider', (showSlider) => {
       this.$['presence.subToolbar'] = showSlider;
       this.$['presence.mainToolbar'] = !showSlider;
+
+      this.$.hideSliderOrList = true;
+    });
+
+    this.sub('*showListAspectRatio', (show) => {
+      this.$['presence.subToolbar'] = show;
+      this.$['presence.mainToolbar'] = !show;
+      this.$.hideSliderOrList = false;
     });
 
     this.sub('*tabList', (tabList) => {
@@ -405,6 +461,7 @@ export class EditorToolbar extends Block {
 
   destroyCallback() {
     this.$['*showSlider'] = false;
+    this.$['*showListAspectRatio'] = false;
   }
 }
 
@@ -439,9 +496,13 @@ EditorToolbar.template = /* HTML */ `
       class="uc-sub-toolbar"
       set="visible: presence.subToolbar; styles: presence.subBottomToolbarStyles"
     >
-      <div class="uc-slider">
+      <div class="uc-slider" set="@hidden:!hideSliderOrList">
         <uc-editor-slider ref="slider-el"></uc-editor-slider>
       </div>
+
+      <div set="@hidden:hideSliderOrList" class="uc-list-aspect-ratio-container">
+        <div class="uc-list-aspect-ratio" ref="list-el"></div>
+      </div>
       <div class="uc-controls-row">
         <uc-btn-ui theme="secondary" set="onclick: on.cancelSlider" l10n="@text:cancel"> </uc-btn-ui>
         <uc-btn-ui theme="primary" set="onclick: on.applySlider" l10n="@text:apply"> </uc-btn-ui>

package/blocks/CloudImageEditor/src/css/common.css

@@ -329,6 +329,7 @@ uc-crop-frame > .uc-guides--visible {
 
 uc-editor-button-control,
 uc-editor-crop-button-control,
+uc-editor-aspect-ratio-button-control,
 uc-editor-filter-control,
 uc-editor-operation-control {
   --l-base-min-width: var(--uc-button-size);
@@ -356,6 +357,7 @@ uc-editor-operation-control {
 
 uc-editor-button-control > button,
 uc-editor-crop-button-control > button,
+uc-editor-aspect-ratio-button-control > button,
 uc-editor-filter-control > button,
 uc-editor-operation-control > button {
   all: unset;
@@ -371,7 +373,13 @@ uc-editor-operation-control > button {
   transition: var(--l-width-transition);
 }
 
-:where(uc-editor-button-control, uc-editor-crop-button-control, uc-editor-filter-control, uc-editor-operation-control)
+:where(
+    uc-editor-button-control,
+    uc-editor-crop-button-control,
+    uc-editor-aspect-ratio-button-control,
+    uc-editor-filter-control,
+    uc-editor-operation-control
+  )
   > uc-icon
   > svg {
   width: var(--size-icon);
@@ -386,6 +394,7 @@ uc-editor-filter-control > uc-icon.uc-original-icon > svg {
 uc-editor-button-control.uc-active,
 uc-editor-operation-control.uc-active,
 uc-editor-crop-button-control.uc-active,
+uc-editor-aspect-ratio-button-control.uc-active,
 uc-editor-filter-control.uc-active {
   --idle-color-rgb: var(--uc-primary-foreground);
   --idle-background: var(--uc-primary);
@@ -406,6 +415,7 @@ uc-editor-filter-control.uc-active .uc-preview {
 uc-editor-button-control.uc-not_active,
 uc-editor-operation-control.uc-not_active,
 uc-editor-crop-button-control.uc-not_active,
+uc-editor-aspect-ratio-button-control.uc-not_active,
 uc-editor-filter-control.uc-not_active {
   --idle-color-rgb: var(--uc-secondary-foreground);
 }
@@ -413,6 +423,7 @@ uc-editor-filter-control.uc-not_active {
 :where(.uc-contrast) uc-editor-button-control.uc-not_active,
 :where(.uc-contrast) uc-editor-operation-control.uc-not_active,
 :where(.uc-contrast) uc-editor-crop-button-control.uc-not_active,
+:where(.uc-contrast) uc-editor-aspect-ratio-button-control.uc-not_active,
 :where(.uc-contrast) uc-editor-filter-control.uc-not_active {
   --idle-background: transparent;
   --hover-background: var(--uc-secondary);
@@ -424,6 +435,7 @@ uc-editor-filter-control.uc-not_active {
 uc-editor-button-control > button::before,
 uc-editor-operation-control > button::before,
 uc-editor-crop-button-control > button::before,
+uc-editor-aspect-ratio-button-control > button::before,
 uc-editor-filter-control > button::before {
   position: absolute;
   content: '';
@@ -440,6 +452,7 @@ uc-editor-filter-control > button::before {
 uc-editor-button-control > button .uc-title,
 uc-editor-operation-control > button .uc-title,
 uc-editor-crop-button-control > button .uc-title,
+uc-editor-aspect-ratio-button-control > button .uc-title,
 uc-editor-filter-control > button .uc-title {
   padding-right: var(--cldtr-gap-mid-1);
   font-size: 0.7em;
@@ -450,6 +463,7 @@ uc-editor-filter-control > button .uc-title {
 uc-editor-button-control > button uc-icon,
 uc-editor-operation-control > button uc-icon,
 uc-editor-crop-button-control > button uc-icon,
+uc-editor-aspect-ratio-button-control > button uc-icon,
 uc-editor-filter-control > button uc-icon {
   pointer-events: none;
 }
@@ -643,6 +657,15 @@ uc-editor-toolbar > .uc-toolbar-container > .uc-sub-toolbar {
     visibility var(--transition-duration-3) ease-in-out;
 }
 
+.uc-sub-toolbar > .uc-list-aspect-ratio-container > .uc-list-aspect-ratio {
+  display: grid;
+  grid-auto-flow: column;
+  justify-content: center;
+  align-items: center;
+  gap: 6px;
+  height: var(--size-panel-heading);
+}
+
 uc-editor-toolbar > .uc-toolbar-container > .uc-sub-toolbar.uc-sub-toolbar--visible {
   transform: translateY(0px);
   opacity: 1;

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

@@ -1,6 +1,7 @@
 export { CloudImageEditorBlock } from "./CloudImageEditorBlock.js";
 export { CropFrame } from "./CropFrame.js";
 export { EditorCropButtonControl } from "./EditorCropButtonControl.js";
+export { EditorAspectRatioButtonControl } from "./EditorAspectRatioButtonControl.js";
 export { EditorFilterControl } from "./EditorFilterControl.js";
 export { EditorOperationControl } from "./EditorOperationControl.js";
 export { EditorImageCropper } from "./EditorImageCropper.js";

package/blocks/CloudImageEditor/src/index.js

@@ -1,6 +1,7 @@
 export { CloudImageEditorBlock } from './CloudImageEditorBlock.js';
 export { CropFrame } from './CropFrame.js';
 export { EditorCropButtonControl } from './EditorCropButtonControl.js';
+export { EditorAspectRatioButtonControl } from './EditorAspectRatioButtonControl.js';
 export { EditorFilterControl } from './EditorFilterControl.js';
 export { EditorOperationControl } from './EditorOperationControl.js';
 export { EditorImageCropper } from './EditorImageCropper.js';

package/blocks/CloudImageEditor/src/lib/parseCropPreset.d.ts

@@ -1,2 +1,8 @@
-export function parseCropPreset(cropPreset: import("../../../../types/exported.d.ts").ConfigType["cropPreset"]): import("../types.js").CropAspectRatio[] | undefined;
+export function parseCropPreset(cropPreset: import("../../../../types/exported.d.ts").ConfigType["cropPreset"]): ({
+    id: string;
+    _active: boolean;
+    type: string;
+    width: number;
+    height: number;
+} | undefined)[];
 //# sourceMappingURL=parseCropPreset.d.ts.map

package/blocks/CloudImageEditor/src/lib/parseCropPreset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseCropPreset.d.ts","sourceRoot":"","sources":["parseCropPreset.js"],"names":[],"mappings":"AAGO,4CADK,OAAO,iCAAiC,EAAE,UAAU,CAAC,YAAY,CAAC,uDAW7E"}
+{"version":3,"file":"parseCropPreset.d.ts","sourceRoot":"","sources":["parseCropPreset.js"],"names":[],"mappings":"AAMO,4CADK,OAAO,iCAAiC,EAAE,UAAU,CAAC,YAAY,CAAC;;;;;;iBAe7E"}

package/blocks/CloudImageEditor/src/lib/parseCropPreset.js

@@ -1,14 +1,21 @@
 // @ts-check
 
+import { UID } from '@symbiotejs/symbiote';
+import { stringToArray } from '../../../../utils/stringToArray.js';
+
 /** @param {import('../../../../types/exported.d.ts').ConfigType['cropPreset']} cropPreset */
 export const parseCropPreset = (cropPreset) => {
-  if (!cropPreset) return [];
-  const [w, h] = cropPreset.split(':').map(Number);
-  if (!Number.isFinite(w) || !Number.isFinite(h)) {
-    console.error(`Invalid crop preset: ${cropPreset}`);
-    return;
-  }
-  /** @type {import('../types.js').CropAspectRatio} */
-  const aspectRatio = { type: 'aspect-ratio', width: w, height: h };
-  return [aspectRatio];
+  const list = stringToArray(cropPreset);
+
+  if (!list) return [];
+
+  return list.map((it, index) => {
+    const [w, h] = it.split(':').map(Number);
+    if (!Number.isFinite(w) || !Number.isFinite(h)) {
+      console.error(`Invalid crop preset: ${it}`);
+      return;
+    }
+    /** @type {import('../types.js').CropAspectRatio} */
+    return { id: UID.generate(), _active: index === 0, type: 'aspect-ratio', width: w, height: h };
+  });
 };

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

@@ -9,7 +9,6 @@ export function initState(fnCtx: import("./CloudImageEditorBlock.js").CloudImage
     '*imageSize': null;
     /** @type {import('./types.js').Transformations} */
     '*editorTransformations': import("./types.js").Transformations;
-    /** @type {import('./types.js').CropPresetList} */
     '*cropPresetList': import("./types.js").CropPresetList;
     '*tabList': ("crop" | "tuning" | "filters")[];
     '*tabId': "crop";

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

@@ -1 +1 @@
-{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["state.js"],"names":[],"mappings":"AAQA,gFAAgF;AAChF,iCADY,OAAO,4BAA4B,EAAE,qBAAqB;;;;;;;;IAUlE,mDAAmD;8BAAxC,OAAO,YAAY,EAAE,eAAe;IAE/C,kDAAkD;uBAAvC,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;IAmC9C,oEAAoE;mCAAxD,OAAO,YAAY,EAAE,eAAe;;EAoCnD"}
+{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["state.js"],"names":[],"mappings":"AAQA,gFAAgF;AAChF,iCADY,OAAO,4BAA4B,EAAE,qBAAqB;;;;;;;;IAUlE,mDAAmD;8BAAxC,OAAO,YAAY,EAAE,eAAe;uBAEjB,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;IAkCjE,oEAAoE;mCAAxD,OAAO,YAAY,EAAE,eAAe;;EAoCnD"}

package/blocks/CloudImageEditor/src/state.js

@@ -18,8 +18,7 @@ export function initState(fnCtx) {
     '*imageSize': null,
     /** @type {import('./types.js').Transformations} */
     '*editorTransformations': {},
-    /** @type {import('./types.js').CropPresetList} */
-    '*cropPresetList': [],
+    '*cropPresetList': /** @type {import('./types.js').CropPresetList} */ ([]),
     '*tabList': ALL_TABS,
     '*tabId': TabId.CROP,