chore: fixes after merge

abstract/ActivityBlock.js

@@ -1,6 +1,6 @@
 // @ts-check
-import { debounce } from '../blocks/utils/debounce.js';
 import { EventType } from '../blocks/UploadCtxProvider/EventEmitter.js';
+import { debounce } from '../blocks/utils/debounce.js';
 import { Block } from './Block.js';
 import { activityBlockCtx } from './CTX.js';
 
@@ -15,15 +15,15 @@ export class ActivityBlock extends Block {
 
   /** @private */
   _deactivate() {
-    let actDesc = ActivityBlock._activityCallbacks.get(this);
+    const actDesc = ActivityBlock._activityCallbacks.get(this);
     this[ACTIVE_PROP] = false;
     this.removeAttribute(ACTIVE_ATTR);
     actDesc?.deactivateCallback?.();
   }
 
   /** @private */
   _activate() {
-    let actDesc = ActivityBlock._activityCallbacks.get(this);
+    const actDesc = ActivityBlock._activityCallbacks.get(this);
     this.$['*historyBack'] = this.historyBack.bind(this);
     /** @private */
     this[ACTIVE_PROP] = true;
@@ -167,7 +167,7 @@ export class ActivityBlock extends Block {
 
   historyBack() {
     /** @type {String[]} */
-    let history = this.$['*history'];
+    const history = this.$['*history'];
     if (history) {
       let nextActivity = history.pop();
       while (nextActivity === this.activityType) {

abstract/Block.js

@@ -3,16 +3,16 @@ import { BaseComponent, Data } from '@symbiotejs/symbiote';
 import { initialConfig } from '../blocks/Config/initialConfig.js';
 import { EventEmitter } from '../blocks/UploadCtxProvider/EventEmitter.js';
 import { WindowHeightTracker } from '../utils/WindowHeightTracker.js';
-import { extractFilename, extractCdnUrlModifiers, extractUuid } from '../utils/cdn-utils.js';
+import { extractCdnUrlModifiers, extractFilename, extractUuid } from '../utils/cdn-utils.js';
 import { getLocaleDirection } from '../utils/getLocaleDirection.js';
 import { getPluralForm } from '../utils/getPluralForm.js';
 import { applyTemplateData, getPluralObjects } from '../utils/template-utils.js';
 import { waitForAttribute } from '../utils/waitForAttribute.js';
 import { blockCtx } from './CTX.js';
 import { LocaleManager, localeStateKey } from './LocaleManager.js';
+import { A11y } from './a11y.js';
 import { l10nProcessor } from './l10nProcessor.js';
 import { sharedConfigKey } from './sharedConfigKey.js';
-import { A11y } from './a11y.js';
 
 const TAG_PREFIX = 'lr-';
 
@@ -39,15 +39,15 @@ export class Block extends BaseComponent {
     if (!str) {
       return '';
     }
-    let template = this.$[localeStateKey(str)] || str;
-    let pluralObjects = getPluralObjects(template);
-    for (let pluralObject of pluralObjects) {
+    const template = this.$[localeStateKey(str)] || str;
+    const pluralObjects = getPluralObjects(template);
+    for (const pluralObject of pluralObjects) {
       variables[pluralObject.variable] = this.pluralize(
         pluralObject.pluralKey,
         Number(variables[pluralObject.countVariable]),
       );
     }
-    let result = applyTemplateData(template, variables);
+    const result = applyTemplateData(template, variables);
     return result;
   }
 
@@ -97,7 +97,7 @@ export class Block extends BaseComponent {
    * @returns {Boolean}
    */
   hasBlockInCtx(callback) {
-    for (let block of this.blocksRegistry) {
+    for (const block of this.blocksRegistry) {
       if (callback(block)) {
         return true;
       }
@@ -129,13 +129,13 @@ export class Block extends BaseComponent {
 
   connectedCallback() {
     const styleAttrs = /** @type {typeof Block} */ (this.constructor).styleAttrs;
-    styleAttrs.forEach((attr) => {
+    for (const attr of styleAttrs) {
       this.setAttribute(attr, '');
-    });
+    }
 
     if (this.hasAttribute('retpl')) {
       // @ts-ignore TODO: fix this
-      this.constructor['template'] = null;
+      this.constructor.template = null;
       this.processInnerHtml = true;
     }
     if (this.requireCtxName) {
@@ -168,7 +168,7 @@ export class Block extends BaseComponent {
       this.add('*blocksRegistry', new Set());
     }
 
-    let blocksRegistry = this.$['*blocksRegistry'];
+    const blocksRegistry = this.$['*blocksRegistry'];
     blocksRegistry.add(this);
 
     if (!this.has('*eventEmitter')) {
@@ -204,7 +204,7 @@ export class Block extends BaseComponent {
   }
 
   destroyCallback() {
-    let blocksRegistry = this.blocksRegistry;
+    const blocksRegistry = this.blocksRegistry;
     blocksRegistry.delete(this);
 
     this.localeManager?.destroyL10nBindings(this);
@@ -239,18 +239,18 @@ export class Block extends BaseComponent {
    * @param {Number} [decimals]
    */
   fileSizeFmt(bytes, decimals = 2) {
-    let units = ['B', 'KB', 'MB', 'GB', 'TB'];
+    const units = ['B', 'KB', 'MB', 'GB', 'TB'];
     /**
      * @param {String} str
      * @returns {String}
      */
     if (bytes === 0) {
       return `0 ${units[0]}`;
     }
-    let k = 1024;
-    let dm = decimals < 0 ? 0 : decimals;
-    let i = Math.floor(Math.log(bytes) / Math.log(k));
-    return parseFloat((bytes / k ** i).toFixed(dm)) + ' ' + units[i];
+    const k = 1024;
+    const dm = decimals < 0 ? 0 : decimals;
+    const i = Math.floor(Math.log(bytes) / Math.log(k));
+    return `${Number.parseFloat((bytes / k ** i).toFixed(dm))} ${units[i]}`;
   }
 
   /**
@@ -283,7 +283,7 @@ export class Block extends BaseComponent {
   /** @returns {import('../types').ConfigType} } */
   get cfg() {
     if (!this.__cfgProxy) {
-      let o = Object.create(null);
+      const o = Object.create(null);
       /** @private */
       this.__cfgProxy = new Proxy(o, {
         set: (obj, key, value) => {
@@ -342,10 +342,10 @@ export class Block extends BaseComponent {
   /** @param {String} [name] */
   static reg(name) {
     if (!name) {
-      super.reg();
+      BaseComponent.reg();
       return;
     }
-    super.reg(name.startsWith(TAG_PREFIX) ? name : TAG_PREFIX + name);
+    BaseComponent.reg(name.startsWith(TAG_PREFIX) ? name : TAG_PREFIX + name);
   }
 }
 

abstract/SolutionBlock.js

@@ -14,7 +14,7 @@ export class SolutionBlock extends Block {
   }
 
   static set template(value) {
-    SolutionBlock._template = `${svgIconsSprite + value}<slot></slot>`;
+    SolutionBlock._template = /* HTML */ `${svgIconsSprite + value}<slot></slot>`;
   }
 
   static get template() {

abstract/a11y.js

@@ -1,5 +1,5 @@
 // @ts-check
-import { startKeyUX, hiddenKeyUX, jumpKeyUX, focusGroupKeyUX, pressKeyUX } from 'keyux';
+import { focusGroupKeyUX, hiddenKeyUX, jumpKeyUX, pressKeyUX, startKeyUX } from 'keyux';
 
 /**
  * MinimalWindow interface is not exported by keyux, so we import it here using tricky way.