@htmlbricks/hb-layout-desktop 0.68.5 → 0.68.7

package/manifest.json

@@ -547,7 +547,7 @@
       }
     }
   },
-  "description": "Desktop layout with top navbar, optional left sidebar (sidebar-desktop) when navigation links are present, main page area, optional cookie-law banner, and footer. The host is fixed to the viewport height (100dvh) so tall slotted content cannot grow the shell or stretch the sidebar; the sidebar rail never exceeds that band. By default the page column scrolls and includes the cookie banner and footer after the slot (scroll down to see the footer). With onescreen, only the slot is in the scroll area: cookie and footer sit fixed below it, the page slot does not scroll vertically, and with footer.type auto the footer uses the compact (small) variant. The main row uses CSS Grid (sidebar track + page).",
+  "description": "Desktop layout with top navbar, optional left sidebar (sidebar-desktop) when navigation links are present, main page area, optional cookie-law banner, and footer. The host is fixed to the viewport height (100dvh) so tall slotted content cannot grow the shell or stretch the sidebar; the sidebar rail never exceeds that band. Without onescreen, the page column scrolls and includes the cookie banner and footer after the slot. With onescreen, cookie and footer sit fixed at the bottom of the main column (always visible) and only the page slot area scrolls; with footer.type auto the footer uses the compact (small) variant. The main row uses CSS Grid (sidebar track + page).",
   "storybookArgs": {
     "pageChange": {
       "action": "pageChange"
@@ -821,7 +821,7 @@
     },
     {
       "name": "onescreen",
-      "description": "Fills the viewport below the navbar: the footer stays at the bottom of the page area, the page slot does not scroll vertically (overflow hidden), and with footer.type auto the footer uses the compact (small) variant. Uses a long sidebar (26 links) to exercise internal sidebar scrolling.",
+      "description": "Viewport shell: cookie and footer stay at the bottom of the main column (always visible); only the page slot scrolls. With footer.type auto the footer uses the compact (small) variant. Long sidebar (26 links) exercises internal sidebar scrolling.",
       "data": {
         "company": {
           "logoUri": "https://upload.wikimedia.org/wikipedia/commons/8/80/Wikipedia-logo-v2.svg",
@@ -1254,7 +1254,7 @@
       }
     }
   ],
-  "iifeIntegrity": "sha384-S8u/ZAsfQBLpb6YQwmgful/c3j7Kh+pfjuuVf4CEOme28wajvaZQg5JqPou7oTBm",
+  "iifeIntegrity": "sha384-UKDL4d5raj08uvAU7cw5NDpX7jRD38u9mJUzdh+CCwOsZzj8AdfqIjvlmPr9/ZLw",
   "dependencies": [
     {
       "name": "hb-footer",
@@ -1328,5 +1328,5 @@
   },
   "iifePath": "main.iife.js",
   "repoName": "@htmlbricks/hb-layout-desktop",
-  "version": "0.68.5"
+  "version": "0.68.7"
 }

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@htmlbricks/hb-layout-desktop",
-  "version": "0.68.5",
+  "version": "0.68.7",
   "contributors": [],
-  "description": "Desktop layout with top navbar, optional left sidebar (sidebar-desktop) when navigation links are present, main page area, optional cookie-law banner, and footer. The host is fixed to the viewport height (100dvh) so tall slotted content cannot grow the shell or stretch the sidebar; the sidebar rail never exceeds that band. By default the page column scrolls and includes the cookie banner and footer after the slot (scroll down to see the footer). With onescreen, only the slot is in the scroll area: cookie and footer sit fixed below it, the page slot does not scroll vertically, and with footer.type auto the footer uses the compact (small) variant. The main row uses CSS Grid (sidebar track + page).",
+  "description": "Desktop layout with top navbar, optional left sidebar (sidebar-desktop) when navigation links are present, main page area, optional cookie-law banner, and footer. The host is fixed to the viewport height (100dvh) so tall slotted content cannot grow the shell or stretch the sidebar; the sidebar rail never exceeds that band. Without onescreen, the page column scrolls and includes the cookie banner and footer after the slot. With onescreen, cookie and footer sit fixed at the bottom of the main column (always visible) and only the page slot area scrolls; with footer.type auto the footer uses the compact (small) variant. The main row uses CSS Grid (sidebar track + page).",
   "licenses": [
     {
       "type": "Apache-2.0",

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 HbLayoutDesktopElement
-  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-layout-desktop": HTMLAttributes<HTMLElement> & HbSvelteAttrs & HbSvelteEventAttrs;
+    "hb-layout-desktop": HbSvelteHostAttributes;
   }
 }