@vaadin/component-base 24.2.0-alpha3 → 24.2.0-alpha5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/component-base",
-  "version": "24.2.0-alpha3",
+  "version": "24.2.0-alpha5",
   "publishConfig": {
     "access": "public"
   },
@@ -39,8 +39,8 @@
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/testing-helpers": "^0.4.2",
+    "@vaadin/testing-helpers": "^0.4.3",
     "sinon": "^13.0.2"
   },
-  "gitHead": "e5d1e1ed2d01b56d5922e18a3fcb7cd306351954"
+  "gitHead": "73db22a5e8993e3ce48d1e6540d30eff9cb5c257"
 }

package/src/controller-mixin.js

@@ -15,62 +15,67 @@ import { dedupingMixin } from '@polymer/polymer/lib/utils/mixin.js';
  *
  * @polymerMixin
  */
-export const ControllerMixin = dedupingMixin(
-  (superClass) =>
-    class ControllerMixinClass extends superClass {
-      constructor() {
-        super();
+export const ControllerMixin = dedupingMixin((superClass) => {
+  // If the superclass extends from LitElement,
+  // use its own controllers implementation.
+  if (typeof superClass.prototype.addController === 'function') {
+    return superClass;
+  }
 
-        /**
-         * @type {Set<ReactiveController>}
-         */
-        this.__controllers = new Set();
-      }
+  return class ControllerMixinClass extends superClass {
+    constructor() {
+      super();
 
-      /** @protected */
-      connectedCallback() {
-        super.connectedCallback();
+      /**
+       * @type {Set<ReactiveController>}
+       */
+      this.__controllers = new Set();
+    }
 
-        this.__controllers.forEach((c) => {
-          if (c.hostConnected) {
-            c.hostConnected();
-          }
-        });
-      }
+    /** @protected */
+    connectedCallback() {
+      super.connectedCallback();
 
-      /** @protected */
-      disconnectedCallback() {
-        super.disconnectedCallback();
+      this.__controllers.forEach((c) => {
+        if (c.hostConnected) {
+          c.hostConnected();
+        }
+      });
+    }
 
-        this.__controllers.forEach((c) => {
-          if (c.hostDisconnected) {
-            c.hostDisconnected();
-          }
-        });
-      }
+    /** @protected */
+    disconnectedCallback() {
+      super.disconnectedCallback();
 
-      /**
-       * Registers a controller to participate in the element update cycle.
-       *
-       * @param {ReactiveController} controller
-       * @protected
-       */
-      addController(controller) {
-        this.__controllers.add(controller);
-        // Call hostConnected if a controller is added after the element is attached.
-        if (this.$ !== undefined && this.isConnected && controller.hostConnected) {
-          controller.hostConnected();
+      this.__controllers.forEach((c) => {
+        if (c.hostDisconnected) {
+          c.hostDisconnected();
         }
-      }
+      });
+    }
 
-      /**
-       * Removes a controller from the element.
-       *
-       * @param {ReactiveController} controller
-       * @protected
-       */
-      removeController(controller) {
-        this.__controllers.delete(controller);
+    /**
+     * Registers a controller to participate in the element update cycle.
+     *
+     * @param {ReactiveController} controller
+     * @protected
+     */
+    addController(controller) {
+      this.__controllers.add(controller);
+      // Call hostConnected if a controller is added after the element is attached.
+      if (this.$ !== undefined && this.isConnected && controller.hostConnected) {
+        controller.hostConnected();
       }
-    },
-);
+    }
+
+    /**
+     * Removes a controller from the element.
+     *
+     * @param {ReactiveController} controller
+     * @protected
+     */
+    removeController(controller) {
+      this.__controllers.delete(controller);
+    }
+  };
+});

package/src/element-mixin.js

@@ -45,7 +45,7 @@ const registered = new Set();
 export const ElementMixin = (superClass) =>
   class VaadinElementMixin extends DirMixin(superClass) {
     static get version() {
-      return '24.2.0-alpha3';
+      return '24.2.0-alpha5';
     }
 
     /** @protected */