@vaadin/vaadin-themable-mixin 22.0.0-beta1 → 22.0.0-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/vaadin-themable-mixin",
-  "version": "22.0.0-beta1",
+  "version": "22.0.0-beta2",
   "publishConfig": {
     "access": "public"
   },
@@ -30,6 +30,7 @@
     "polymer"
   ],
   "dependencies": {
+    "@open-wc/dedupe-mixin": "^1.3.0",
     "lit": "^2.0.0"
   },
   "devDependencies": {
@@ -38,5 +39,5 @@
     "@vaadin/testing-helpers": "^0.3.0",
     "sinon": "^9.2.4"
   },
-  "gitHead": "4cf8a9d0504994200c610e44b3676114fef49c1e"
+  "gitHead": "f13833683e6667f6ca6678452db14aa6b7eac4a4"
 }

package/vaadin-themable-mixin.d.ts

@@ -3,19 +3,22 @@
  * Copyright (c) 2021 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
+import { Constructor } from '@open-wc/dedupe-mixin';
 import { CSSResult, CSSResultGroup } from 'lit';
-import { ThemePropertyMixin, ThemePropertyMixinConstructor } from './vaadin-theme-property-mixin.js';
+import { ThemePropertyMixinClass } from './vaadin-theme-property-mixin.js';
 
-declare function ThemableMixin<T extends new (...args: any[]) => {}>(
+/**
+ * A mixin for `nav` elements, facilitating navigation and selection of childNodes.
+ */
+export declare function ThemableMixin<T extends Constructor<HTMLElement>>(
   base: T
-): T & ThemableMixinConstructor & ThemePropertyMixinConstructor;
+): T & Constructor<ThemableMixinClass> & Constructor<ThemePropertyMixinClass>;
 
-interface ThemableMixinConstructor {
-  new (...args: any[]): ThemableMixin;
-  finalize(): void;
-}
+export declare class ThemableMixinClass {
+  protected static finalize(): void;
 
-interface ThemableMixin extends ThemePropertyMixin {}
+  protected static finalizeStyles(styles?: CSSResultGroup): CSSResult[];
+}
 
 /**
  * Registers CSS styles for a component type. Make sure to register the styles before
@@ -37,4 +40,4 @@ declare const __themeRegistry: Theme[];
 
 export { css, unsafeCSS } from 'lit';
 
-export { ThemableMixin, ThemableMixinConstructor, registerStyles, __themeRegistry };
+export { registerStyles, __themeRegistry };

package/vaadin-themable-mixin.js

@@ -3,7 +3,7 @@
  * Copyright (c) 2021 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { CSSResult, css, unsafeCSS } from 'lit';
+import { css, CSSResult, unsafeCSS } from 'lit';
 import { ThemePropertyMixin } from './vaadin-theme-property-mixin.js';
 
 export { css, unsafeCSS };

package/vaadin-theme-property-mixin.d.ts

@@ -3,13 +3,13 @@
  * Copyright (c) 2021 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-declare function ThemePropertyMixin<T extends new (...args: any[]) => {}>(base: T): T & ThemePropertyMixinConstructor;
+import { Constructor } from '@open-wc/dedupe-mixin';
 
-interface ThemePropertyMixinConstructor {
-  new (...args: any[]): ThemePropertyMixin;
-}
+export declare function ThemePropertyMixin<T extends Constructor<HTMLElement>>(
+  base: T
+): T & Constructor<ThemePropertyMixinClass>;
 
-interface ThemePropertyMixin {
+export declare class ThemePropertyMixinClass {
   /**
    * Helper property with theme attribute value facilitating propagation
    * in shadow DOM.
@@ -27,5 +27,3 @@ interface ThemePropertyMixin {
    */
   readonly theme: string | null | undefined;
 }
-
-export { ThemePropertyMixin, ThemePropertyMixinConstructor };