@consent.software/catalog 1.6.1 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@consent.software/catalog",
-  "version": "1.6.1",
+  "version": "2.0.1",
   "private": false,
   "description": "A library of web components designed to integrate robust consent management capabilities into web applications, ensuring compliance with privacy regulations.",
   "exports": {
@@ -12,8 +12,8 @@
   "dependencies": {
     "@consent.software/interfaces": "^1.0.14",
     "@consent.software/webclient": "^1.1.0",
-    "@push.rocks/smartdelay": "^3.0.5",
-    "lit": "^3.3.1"
+    "@design.estate/dees-element": "^2.1.3",
+    "@push.rocks/smartdelay": "^3.0.5"
   },
   "devDependencies": {
     "@design.estate/dees-wcctools": "^1.2.1",

package/ts_web/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@consent.software/catalog',
-  version: '1.6.1',
+  version: '2.0.1',
   description: 'A library of web components designed to integrate robust consent management capabilities into web applications, ensuring compliance with privacy regulations.'
 }

package/ts_web/elements/consentsoftware-cookieconsent.ts

@@ -1,8 +1,12 @@
-import * as shared from './shared.js';
+import { cssManager, colors } from './shared.js';
 
-import { LitElement, html, css, type TemplateResult } from 'lit';
-import { customElement } from 'lit/decorators.js';
-import { property } from 'lit/decorators/property.js';
+import {
+  DeesElement,
+  customElement,
+  html,
+  css,
+  type TemplateResult,
+} from '@design.estate/dees-element';
 
 import * as csInterfaces from '@consent.software/interfaces';
 import * as csWebclient from '@consent.software/webclient';
@@ -15,215 +19,191 @@ declare global {
 }
 
 @customElement('consentsoftware-cookieconsent')
-export class ConsentsoftwareCookieconsent extends LitElement {
+export class ConsentsoftwareCookieconsent extends DeesElement {
   public static demo = () => html`<consentsoftware-cookieconsent></consentsoftware-cookieconsent>`;
 
   public csWebclientInstance = new csWebclient.CsWebclient();
   public csWebclientRan = false;
+  private isMobile = false;
+
+  public static styles = [
+    cssManager.defaultStyles,
+    css`
+      :host {
+        font-size: 14px;
+        user-select: none;
+      }
 
-  // Reflects the current theme ('light' or 'dark')
-  @property({ type: String, reflect: true })
-  public accessor theme: 'light' | 'dark' = 'light';
+      .pageOverlay {
+        position: fixed;
+        inset: 0;
+        display: grid;
+        align-items: center;
+        justify-content: center;
+        z-index: 1000;
+        background: rgba(0, 0, 0, 0);
+        backdrop-filter: blur(0px);
+        transition: background 0.3s ease, backdrop-filter 0.3s ease;
+      }
 
-  /**
-   * Define component styles with CSS variables that adjust based on theme.
-   * The default variables serve as baseline for the light theme.
-   * Theme-specific overrides modify these for dark mode.
-   */
-  public static styles = css`
-    :host {
-      font-family: ${shared.fontStack};
-      user-select: none;
-      /* Default variables for Light Theme */
-      --text-color: #333;
-      --background-color: #eeeeee;
-      --accent-color: #333333;
-      --button-bg: #ffffff;
-      --button-hover-bg: #f2f2f2;
-      --icon-color: #4496f5;
-      --link-color: #333;
-      --padding-sides: 16px;
-      /* Additional variables for modal and info container styling */
-      --info-bg: rgba(0, 0, 0, 0.1);
-      --info-text: rgba(255, 255, 255, 0.5);
-      --modal-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.2);
-    }
+      .pageOverlay.shake {
+        background: rgba(0, 0, 0, 0.6) !important;
+      }
 
-    /* Dark Theme Overrides:
-       When theme attribute is 'dark', override variables accordingly. */
-    :host([theme='dark']) {
-      --text-color: #fff;
-      --background-color: #111;
-      --accent-color: #333333;
-      --button-bg: #252525;
-      --button-hover-bg: #222222;
-      --icon-color: #4496f5;
-      --link-color: #fff;
-      --info-bg: rgba(0, 0, 0, 0.1);
-      --info-text: rgba(255, 255, 255, 0.5);
-      --modal-box-shadow: 0px 0px 8px rgba(255, 255, 255, 0.6);
-    }
+      .modalBox {
+        display: block;
+        color: ${cssManager.bdTheme(colors.light.foreground, colors.dark.foreground)};
+        background: ${cssManager.bdTheme(colors.light.background, colors.dark.background)};
+        box-shadow:
+          0 0 0 1px ${cssManager.bdTheme(colors.light.border, colors.dark.border)},
+          0 16px 70px ${cssManager.bdTheme('rgba(0, 0, 0, 0.15)', 'rgba(0, 0, 0, 0.35)')};
+        position: relative;
+        border-radius: 8px;
+        max-width: 520px;
+        min-width: 320px;
+        box-sizing: border-box;
+        overflow: hidden;
+        will-change: transform, opacity;
+        transition: transform 0.35s cubic-bezier(0.4, 0, 0.2, 1), opacity 0.3s ease;
+        transform: scale(0.92) translateY(20px);
+        opacity: 0;
+      }
 
-    /* Light Theme Overrides:
-       Explicit light theme settings, currently matching defaults.
-       Can be customized independently if desired. */
-    :host([theme='light']) {
-      --text-color: #333;
-      --background-color: #eeeeee;
-      --accent-color: #333333;
-      --button-bg: #ffffff;
-      --button-hover-bg: #f2f2f2;
-      --icon-color: #4496f5;
-      --link-color: #333;
-      --info-bg: rgba(0, 0, 0, 0.1);
-      --info-text: rgba(0, 0, 0, 0.5);
-      --modal-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.2);
-    }
+      .modalBox.visible {
+        transform: scale(1) translateY(0);
+        opacity: 1;
+      }
 
-    /* Overlay covering the page behind the modal */
-    .pageOverlay {
-      position: fixed;
-      top: 0;
-      bottom: 0;
-      right: 0;
-      left: 0;
-      display: grid;
-      align-items: center;
-      justify-content: center;
-      z-index: 1000; /* Ensures the overlay is on top of other elements */
-      background: rgba(255, 255, 255, 0);
-      backdrop-filter: blur(0px);
-      transition: all 0.2s;
-    }
+      .modalBox.hiding {
+        transform: scale(0.95) translateY(10px);
+        opacity: 0;
+      }
 
-    /* Shake animation for overlay when clicked */
-    .pageOverlay.shake {
-      background: rgba(0, 0, 0, 0.5) !important;
-    }
+      /* Mobile: slide up from bottom */
+      @media (max-width: 560px) {
+        .pageOverlay {
+          align-items: flex-end;
+        }
 
-    /* Modal box styling using theme variables for colors and shadows */
-    .modalBox {
-      display: block;
-      color: var(--text-color);
-      background: var(--background-color);
-      box-shadow: var(--modal-box-shadow);
-      position: relative;
-      border: 1px dotted rgba(255, 255, 255, 0.1);
-      border-top: 1px solid var(--accent-color);
-      border-radius: 16px;
-      max-width: 1100px;
-      min-width: calc(100vw / 3);
-      box-sizing: border-box;
-      overflow: hidden;
-      will-change: transform;
-      transition: all 0.3s;
-      transform: scale(0.95);
-      opacity: 0;
-    }
+        .modalBox {
+          max-width: 100%;
+          min-width: 100%;
+          border-radius: 16px 16px 0 0;
+          transform: translateY(100%);
+          opacity: 1;
+        }
 
-    /* Media query for mobile devices: stack buttons vertically */
-    @media (max-width: 600px) {
-      .modalBox {
-        height: 100vh;
-        box-shadow: none;
-        border-radius: 0px;
+        .modalBox.visible {
+          transform: translateY(0);
+        }
+
+        .modalBox.hiding {
+          transform: translateY(100%);
+        }
       }
-    }
 
-    /* Shake animation for modal box */
-    .modalBox.shake {
-      animation: shake 150ms 2 linear;
-    }
+      .modalBox.shake {
+        animation: shake 120ms 2 linear;
+      }
 
-    @keyframes shake {
-      0% {
-        transform: translate(3px, 0);
+      @keyframes shake {
+        0% { transform: translateX(3px); }
+        50% { transform: translateX(-3px); }
+        100% { transform: translateX(0); }
       }
-      50% {
-        transform: translate(-3px, 0);
+
+      :host([show='false']) { display: none; }
+      :host([show='true']) { display: block; }
+
+      .content {
+        margin: auto;
       }
-      100% {
-        transform: translate(0, 0);
+
+      .text-container {
+        padding: 12px 16px;
+        font-size: 0.9em;
+        line-height: 1.5;
+        color: ${cssManager.bdTheme(colors.light.mutedForeground, colors.dark.mutedForeground)};
       }
-    }
 
-    /* Toggle display based on [show] attribute */
-    :host([show='false']) {
-      display: none;
-    }
-    :host([show='true']) {
-      display: block;
-    }
+      .text-container a {
+        color: ${cssManager.bdTheme(colors.light.foreground, colors.dark.foreground)};
+        text-decoration: underline;
+        text-underline-offset: 2px;
+      }
 
-    .content {
-      margin: auto;
-    }
+      .text-container a:hover {
+        opacity: 0.8;
+      }
 
-    .text-container {
-      padding-left: var(--padding-sides);
-      padding-right: var(--padding-sides);
-      display: grid;
-      grid-template-columns: auto;
-    }
+      .button-container {
+        padding: 12px 16px 16px;
+        display: grid;
+        grid-template-columns: repeat(3, 1fr);
+        gap: 8px;
+      }
 
-    .text-container a {
-      color: var(--link-color);
-      text-decoration: none;
-    }
+      @media (max-width: 560px) {
+        .button-container {
+          grid-template-columns: 1fr;
+          padding-bottom: max(16px, env(safe-area-inset-bottom));
+        }
+      }
 
-    .button-container {
-      padding: var(--padding-sides);
-      display: grid;
-      grid-template-columns: repeat(3, 1fr);
-      gap: 16px;
-    }
+      .consent-button {
+        border-radius: 6px;
+        background: ${cssManager.bdTheme(colors.light.secondary, colors.dark.secondary)};
+        border: 1px solid ${cssManager.bdTheme(colors.light.border, colors.dark.border)};
+        padding: 8px 16px;
+        font-size: 0.85em;
+        font-weight: 500;
+        text-align: center;
+        cursor: pointer;
+        transition: all 0.15s ease;
+        color: ${cssManager.bdTheme(colors.light.secondaryForeground, colors.dark.secondaryForeground)};
+      }
 
-    /* Media query for mobile devices: stack buttons vertically */
-    @media (max-width: 600px) {
-      .button-container {
-        grid-template-columns: 1fr;
+      .consent-button:hover {
+        background: ${cssManager.bdTheme(colors.light.accent, colors.dark.accent)};
+        border-color: ${cssManager.bdTheme(colors.light.ring, colors.dark.ring)};
       }
-    }
 
-    /* Consent button styling using theme variables */
-    .consent-button {
-      border-radius: 3px;
-      background: var(--button-bg);
-      box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.2);
-      padding: 10px;
-      line-height: 30px;
-      text-align: center;
-      cursor: pointer;
-      transition: all 0.2s;
-    }
+      .consent-button:active {
+        transform: scale(0.98);
+      }
 
-    .consent-button:hover {
-      background: var(--button-hover-bg);
-    }
+      .consent-button:last-child {
+        background: ${cssManager.bdTheme(colors.light.primary, colors.dark.primary)};
+        color: ${cssManager.bdTheme(colors.light.primaryForeground, colors.dark.primaryForeground)};
+        border-color: ${cssManager.bdTheme(colors.light.primary, colors.dark.primary)};
+      }
 
-    /* Use theme variables for info container background and text */
-    .info-container {
-      text-align: center;
-      line-height: 3em;
-      background: var(--info-bg);
-      border-top: 1px dotted rgba(255, 255, 255, 0.1);
-      font-size: 0.8em;
-      color: var(--info-text);
-    }
+      .consent-button:last-child:hover {
+        opacity: 0.9;
+      }
 
-    .info-container a {
-      text-decoration: underline;
-      color: var(--link-color);
-      transition: color 0.2s;
-    }
-    .info-container a:hover {
-      color: #ffffff;
-    }
-  `;
+      .info-container {
+        text-align: center;
+        padding: 10px 16px;
+        background: ${cssManager.bdTheme(colors.light.muted, colors.dark.muted)};
+        border-top: 1px solid ${cssManager.bdTheme(colors.light.border, colors.dark.border)};
+        font-size: 0.75em;
+        color: ${cssManager.bdTheme(colors.light.mutedForeground, colors.dark.mutedForeground)};
+      }
+
+      .info-container a {
+        color: ${cssManager.bdTheme(colors.light.foreground, colors.dark.foreground)};
+        text-decoration: none;
+      }
+
+      .info-container a:hover {
+        text-decoration: underline;
+      }
+    `,
+  ];
 
   constructor() {
     super();
-    // Initially hide the consent banner until needed
     this.setAttribute('show', 'false');
   }
 
@@ -234,11 +214,11 @@ export class ConsentsoftwareCookieconsent extends LitElement {
           <div class="content">
             <consentsoftware-header></consentsoftware-header>
             <consentsoftware-tabs></consentsoftware-tabs>
-            <div class="text-container" style="padding: 16px;">
+            <div class="text-container">
               <div class="toptext">
-                This page uses cookies. Please review our
+                We use cookies to enhance your experience. Review our
                 <a href="https://lossless.gmbh/cookie" target="_blank">cookie policy</a>
-                and choose which cookie level you are willing to accept.
+                and select your preferences.
               </div>
             </div>
             <consentsoftware-mainselection></consentsoftware-mainselection>
@@ -277,46 +257,26 @@ export class ConsentsoftwareCookieconsent extends LitElement {
 
   /**
    * Lifecycle method called when the element is connected to the DOM.
-   * It sets up the theme and displays the consent banner if no cookie levels are set.
+   * Displays the consent banner if no cookie levels are set.
    */
   public async connectedCallback() {
-    super.connectedCallback();
-    this.updateTheme(); // Initialize theme based on system preference
+    await super.connectedCallback();
+
+    // Check if mobile
+    this.isMobile = window.matchMedia('(max-width: 560px)').matches;
 
     const cookieLevel = await this.csWebclientInstance.getCookieLevels();
     if (!cookieLevel) {
-      // Show consent banner if cookie levels haven't been set yet
       this.setAttribute('show', 'true');
-      requestAnimationFrame(async () => {
-        await this.updated();
-        const pageOverlay: HTMLDivElement = this.shadowRoot?.querySelector('.pageOverlay');
-        if (pageOverlay) {
-          // Apply dark overlay styling when modal appears
-          pageOverlay.style.background = 'rgba(0,0,0, 0.5)';
-          pageOverlay.style.backdropFilter = 'blur(20px)';
-        }
-        const modalBox: HTMLDivElement = this.shadowRoot?.querySelector('.modalBox');
-        if (modalBox) {
-          // Animate modal box appearance
-          modalBox.style.transform = `scale(1)`;
-          modalBox.style.opacity = '1';
-        }
-      });
+      // Small delay to ensure DOM is ready, then animate in
+      await delayFor(50);
+      this.animateIn();
     } else {
-      // Hide banner if cookie levels are already set
       this.setAttribute('show', 'false');
     }
   }
 
   public async firstUpdated() {
-    // Placeholder for any logic needed after first render
-  }
-
-  /**
-   * Called after updates. Logs banner height and runs consent scripts if necessary.
-   */
-  public async updated() {
-    console.log(`The height of the cookie banner is ${this.shadowRoot?.host?.clientHeight}px`);
     const acceptedCookieLevels = await this.csWebclientInstance.getCookieLevels();
     if (!this.csWebclientRan && acceptedCookieLevels) {
       this.csWebclientRan = true;
@@ -324,32 +284,58 @@ export class ConsentsoftwareCookieconsent extends LitElement {
     }
   }
 
+  private animateIn() {
+    const pageOverlay = this.shadowRoot?.querySelector('.pageOverlay') as HTMLDivElement;
+    const modalBox = this.shadowRoot?.querySelector('.modalBox') as HTMLDivElement;
+
+    if (pageOverlay) {
+      pageOverlay.style.background = 'rgba(0, 0, 0, 0.5)';
+      pageOverlay.style.backdropFilter = 'blur(4px)';
+    }
+
+    if (modalBox) {
+      modalBox.classList.remove('hiding');
+      modalBox.classList.add('visible');
+    }
+  }
+
+  private async animateOut() {
+    const pageOverlay = this.shadowRoot?.querySelector('.pageOverlay') as HTMLDivElement;
+    const modalBox = this.shadowRoot?.querySelector('.modalBox') as HTMLDivElement;
+
+    if (pageOverlay) {
+      pageOverlay.style.background = 'rgba(0, 0, 0, 0)';
+      pageOverlay.style.backdropFilter = 'blur(0px)';
+    }
+
+    if (modalBox) {
+      modalBox.classList.remove('visible');
+      modalBox.classList.add('hiding');
+    }
+
+    await delayFor(350);
+  }
+
   /**
    * Handles consent button clicks, sets cookie levels, and hides the banner.
-   * Uses theme variables for styling transitions.
    */
   private async handleConsentButtonClick(
-    event: MouseEvent,
+    _event: MouseEvent,
     levelsArg: csInterfaces.TCookieLevel[]
   ) {
     console.log(`Set level to ${levelsArg}`);
-    const pageOverlay: HTMLDivElement = this.shadowRoot?.querySelector('.pageOverlay');
-    if (pageOverlay) {
-      // Fade out overlay effect using inline styles for transition
-      pageOverlay.style.background = 'rgba(255,255,255, 0)';
-      pageOverlay.style.backdropFilter = 'blur(0px)';
-    }
-    const modalBox: HTMLDivElement = this.shadowRoot?.querySelector('.modalBox');
-    if (modalBox) {
-      // Scale down and fade out modal box before hiding
-      modalBox.style.transform = `scale(0.95)`;
-      modalBox.style.opacity = '0';
-    }
+
+    await this.animateOut();
+
     // Save user consent preferences
     await this.csWebclientInstance.setCookieLevels(levelsArg);
-    await delayFor(300);
-    this.setAttribute('show', 'false'); // Hide the consent banner
-    this.updated(); // Trigger any post-consent actions
+    this.setAttribute('show', 'false');
+
+    // Run consent scripts
+    if (!this.csWebclientRan) {
+      this.csWebclientRan = true;
+      await this.csWebclientInstance.getAndRunConsentTuples();
+    }
   }
 
   /**
@@ -358,30 +344,12 @@ export class ConsentsoftwareCookieconsent extends LitElement {
    */
   private async pageOverlayClick(e: MouseEvent) {
     if (e.target === e.currentTarget) {
-      const pageOverlay: HTMLDivElement = this.shadowRoot?.querySelector('.pageOverlay');
-      const modalBox: HTMLDivElement = this.shadowRoot?.querySelector('.modalBox');
-      if (pageOverlay && modalBox) {
-        pageOverlay.classList.add('shake');
+      const modalBox = this.shadowRoot?.querySelector('.modalBox') as HTMLDivElement;
+      if (modalBox) {
         modalBox.classList.add('shake');
-        await delayFor(2000);
-        pageOverlay.classList.remove('shake');
+        await delayFor(300);
         modalBox.classList.remove('shake');
       }
     }
   }
-
-  /**
-   * Dynamically switches the theme between light and dark.
-   * Listens for system theme changes to update the component's theme.
-   */
-  private updateTheme() {
-    // Check the initial system preference for dark mode
-    const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
-    this.theme = prefersDark ? 'dark' : 'light';
-
-    // Listen for changes in the system color scheme preference
-    window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', (e) => {
-      this.theme = e.matches ? 'dark' : 'light';
-    });
-  }
 }

package/ts_web/elements/consentsoftware-header.ts

@@ -1,36 +1,53 @@
-import * as shared from './shared.js';
+import { cssManager, colors } from './shared.js';
 
-import { LitElement, html, css, type TemplateResult } from 'lit';
-import { customElement } from 'lit/decorators.js';
-import { property } from 'lit/decorators/property.js';
+import {
+  DeesElement,
+  customElement,
+  html,
+  css,
+  type TemplateResult,
+} from '@design.estate/dees-element';
 
 @customElement('consentsoftware-header')
-export class ConsentsoftwareHeader extends LitElement {
-  public static demo = () => html`<consentsoftware-tabs></consentsoftware-tabs>`;
+export class ConsentsoftwareHeader extends DeesElement {
+  public static demo = () => html`<consentsoftware-header></consentsoftware-header>`;
 
-  public static styles = css`
-    :host {
-      display: block;
-      line-height: 3em;
-      text-align: center;
-      font-family: ${shared.fontStack};
-      border-bottom: 1px dotted rgba(255, 255, 255, 0.1);
-    }
+  public static styles = [
+    cssManager.defaultStyles,
+    css`
+      :host {
+        display: block;
+        padding: 14px 16px;
+        border-bottom: 1px solid ${cssManager.bdTheme(colors.light.border, colors.dark.border)};
+      }
 
-    .heading {
-      
-    }
-  `;
+      .heading {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        font-size: 0.95em;
+        font-weight: 600;
+        color: ${cssManager.bdTheme(colors.light.foreground, colors.dark.foreground)};
+      }
 
-  constructor() {
-    super();
-  }
+      .icon {
+        width: 18px;
+        height: 18px;
+        opacity: 0.7;
+      }
+    `,
+  ];
 
   public render(): TemplateResult {
     return html`
       <div class="heading">
-        What about cookies?
+        <svg class="icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+          <circle cx="12" cy="12" r="10"/>
+          <path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"/>
+          <path d="M12 17h.01"/>
+        </svg>
+        Cookie Preferences
       </div>
     `;
   }
-}
+}