@htmlbricks/hb-funnel 0.68.5 → 0.68.7

package/manifest.json

@@ -559,7 +559,7 @@
       }
     }
   ],
-  "iifeIntegrity": "sha384-LyjRZ6A9v+dL7lL2eVWmA0UYGXPYtLI6rSRsNsBSotJUbfsP5JSylMaix5R0NNXG",
+  "iifeIntegrity": "sha384-USIfmDNfwGBCaD+OJ1yf8ujSaxLsTKc6zPba5Qcx8aQRq72zCi6GUVCsA55+Aufj",
   "dependencies": [
     {
       "name": "hb-form",
@@ -708,5 +708,5 @@
   "size": {},
   "iifePath": "main.iife.js",
   "repoName": "@htmlbricks/hb-funnel",
-  "version": "0.68.5"
+  "version": "0.68.7"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@htmlbricks/hb-funnel",
-  "version": "0.68.5",
+  "version": "0.68.7",
   "contributors": [],
   "description": "Multi-step funnel over stacked `hb-form` instances: JSON `schemes` supplies one schema per step (or derive step count from `steps`), tracks per-step validity, merges values as the user advances, and optionally shows a final submit step when `submitstep` is `yes`. Dispatches step navigation and aggregated form updates for the active index.",
   "licenses": [

package/types/html-elements.d.ts

@@ -4,17 +4,30 @@
  */
 import type { Component, Events } from "./webcomponent.type";
 
+/**
+ * Host properties already on `HTMLElement` (no `svelte/elements` here — DOM typings stay
+ * usable without Svelte). Custom `Component` keys that collide stay on the native typing.
+ */
 type DomKeys = keyof HTMLElement;
 type HbComponentAttrs = {
   [K in keyof Component as K extends DomKeys ? never : K]?: string;
 };
 
+type HbHtmlElementWithoutListeners = Omit<
+  HTMLElement,
+  "addEventListener" | "removeEventListener"
+>;
+
 /**
  * Re-declare listener methods so custom `Events` overloads are compatible with
  * `HTMLElement` (subclass methods must remain assignable to the base signatures).
+ *
+ * Like `svelte-elements.d.ts`, we `Omit` keys we define on `HbComponentAttrs` from the DOM
+ * base, then add them back: avoids `extends A, B` merging the same key with incompatible types
+ * if a name slips past `DomKeys`.
  */
 export interface HbFunnelElement
-  extends Omit<HTMLElement, "addEventListener" | "removeEventListener">,
+  extends Omit<HbHtmlElementWithoutListeners, keyof HbComponentAttrs>,
     HbComponentAttrs {
   addEventListener<K extends keyof HTMLElementEventMap>(
     type: K,

package/types/svelte-elements.d.ts

@@ -8,9 +8,13 @@
 import type { HTMLAttributes } from "svelte/elements";
 import type { Component, Events } from "./webcomponent.type";
 
-type DomKeys = keyof HTMLElement;
+/**
+ * Keys already modeled on `HTMLAttributes` (global attrs + DOM listeners). Exclude these from
+ * `Component` so host props stay plain strings and are not merged with unrelated DOM typings.
+ */
+type HtmlReservedAttrKeys = keyof HTMLAttributes<HTMLElement>;
 type HbSvelteAttrs = {
-  [K in keyof Component as K extends DomKeys ? never : K]?: string;
+  [K in keyof Component as K extends HtmlReservedAttrKeys ? never : K]?: string;
 };
 
 /** `detail` matches `Events[K]`; `currentTarget` is the host element. */
@@ -26,9 +30,21 @@ type HbSvelteEventAttrs = {
   [K in keyof Events & string as `on:${K}`]?: HbSvelteCustomEventHandler<Events[K]>;
 };
 
+/**
+ * Strip keys we re-declare from Svelte’s base, then add them back: plain intersection would
+ * merge `on*` / attrs with conflicting DOM typings (`string & EventHandler` → errors or
+ * props treated like listeners).
+ */
+type HbSvelteHostAttributes = Omit<
+  HTMLAttributes<HTMLElement>,
+  keyof HbSvelteAttrs | keyof HbSvelteEventAttrs
+> &
+  HbSvelteAttrs &
+  HbSvelteEventAttrs;
+
 declare module "svelte/elements" {
   export interface SvelteHTMLElements {
-    "hb-funnel": HTMLAttributes<HTMLElement> & HbSvelteAttrs & HbSvelteEventAttrs;
+    "hb-funnel": HbSvelteHostAttributes;
   }
 }