1.5.0

changelog.md

@@ -1,5 +1,49 @@
 # Changelog
 
+## 2025-01-20 - 1.5.0 - feat(consentsoftware-cookieconsent)
+Enhance consent modal with shake animation on overlay click
+
+- Added shake animation to the modal and overlay when clicked outside the modal.
+- Updated dependency @consent.software/interfaces to version ^1.0.14.
+
+## 2025-01-17 - 1.4.5 - fix(elements)
+Fix issues in consentsoftware-cookieconsent component
+
+- Removed unused attribute handling for 'gotIt'.
+- Fixed background and backdrop-filter transitions to ensure proper UI behavior.
+- Consolidated consent button click handling into handleConsentButtonClick.
+- Improved modal visibility toggling and acceptance flow.
+
+## 2025-01-17 - 1.4.4 - fix(core)
+Update LitElement properties to use accessors
+
+- Changes made in ts_web/elements/consentsoftware-toggle.ts
+- Updated properties 'required' and 'selected' to use accessors
+
+## 2025-01-17 - 1.4.3 - fix(consentsoftware-cookieconsent)
+Fix transition property in consent button styles and add HTMLElementTagNameMap declaration for global interface.
+
+- Updated the transition property for consent buttons to transition all properties instead of just the background.
+- Added global interface HTMLElementTagNameMap for custom element type support.
+
+## 2025-01-16 - 1.4.2 - fix(cookieconsent)
+Fix user-select property in consentsoftware-cookieconsent component for consistency in interaction.
+
+
+## 2025-01-16 - 1.4.1 - fix(consentsoftware-toggle)
+Fix issue in drag event handling logic for the toggle component.
+
+- Corrected dragging functionality to accurately track dragging state.
+- Included logic to delay the reset of the dragging state after toggling.
+
+## 2025-01-16 - 1.4.0 - feat(toggle component)
+Enhanced consent toggle component with drag functionality
+
+- Implemented drag functionality for the toggle knob.
+- Added smooth transitions for the toggle knob movement.
+- Handled drag state management to differentiate between actual click and drag.
+- Improved user interaction by allowing click anywhere in the toggle area.
+
 ## 2025-01-16 - 1.3.5 - fix(elements)
 Improved styling consistency across several components
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@consent.software/catalog",
-  "version": "1.3.5",
+  "version": "1.5.0",
   "private": false,
   "description": "A library of web components designed to integrate robust consent management capabilities into web applications, ensuring compliance with privacy regulations.",
   "exports": {
@@ -15,7 +15,7 @@
   "author": "Lossless GmbH",
   "license": "MIT",
   "dependencies": {
-    "@consent.software/interfaces": "^1.0.11",
+    "@consent.software/interfaces": "^1.0.14",
     "@consent.software/webclient": "^1.1.0",
     "@push.rocks/smartdelay": "^3.0.5",
     "lit": "^3.2.1"

pnpm-lock.yaml

@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@consent.software/interfaces':
-        specifier: ^1.0.11
+        specifier: ^1.0.14
-        version: 1.0.13
+        version: 1.0.14
       '@consent.software/webclient':
         specifier: ^1.1.0
         version: 1.1.0
@@ -42,9 +42,6 @@ packages:
   '@api.global/typedrequest-interfaces@2.0.2':
     resolution: {integrity: sha512-D+mkr4IiUZ/eUgrdp5jXjBKOW/iuMcl0z2ZLQsLLypKX/psFGD3viZJ58FNRa+/1OSM38JS5wFyoWl8oPEFLrw==}
 
-  '@api.global/typedrequest-interfaces@3.0.1':
-    resolution: {integrity: sha512-eR2Cr01BYRwIq/X2ajOenWhm8l+/YE4A5kK/9V6I8ZnhtEBMFHG6YjF6Fg8npLJWbvhZXhOms+axZ6JKI71o8g==}
-
   '@api.global/typedrequest-interfaces@3.0.19':
     resolution: {integrity: sha512-uuHUXJeOy/inWSDrwD0Cwax2rovpxYllDhM2RWh+6mVpQuNmZ3uw6IVg6dA2G1rOe24Ebs+Y9SzEogo+jYN7vw==}
 
@@ -227,8 +224,8 @@ packages:
   '@cloudflare/workers-types@4.20241230.0':
     resolution: {integrity: sha512-dtLD4jY35Lb750cCVyO1i/eIfdZJg2Z0i+B1RYX6BVeRPlgaHx/H18ImKAkYmy0g09Ow8R2jZy3hIxMgXun0WQ==}
 
-  '@consent.software/interfaces@1.0.13':
+  '@consent.software/interfaces@1.0.14':
-    resolution: {integrity: sha512-xB1h5n5vltRLBrvQhrKz4K6tz+TN5RHHvcbQbTIphxetiWOJJq/RwyEN2iH8TtwWIGBSqHRtoljBQqY8t8Oanw==}
+    resolution: {integrity: sha512-xfOhDuj4ECEMyutJCSwEOX1SPN/MlReR40D/x7CsKg1mSauoq0pZbZEUb9m4z5EoPfywZl8gkLVzFoiGyg1IcA==}
 
   '@consent.software/webclient@1.1.0':
     resolution: {integrity: sha512-VX7e8ygZwgU8WEzn22fdvvEytLYl4kfp/u40GusaBU4iFtjrCY2hxDy9Z1FTKicpGcRxf3t13lM0Jaugq7Jj/w==}
@@ -2981,8 +2978,6 @@ snapshots:
 
   '@api.global/typedrequest-interfaces@2.0.2': {}
 
-  '@api.global/typedrequest-interfaces@3.0.1': {}
-
   '@api.global/typedrequest-interfaces@3.0.19': {}
 
   '@api.global/typedrequest@3.1.10':
@@ -3569,14 +3564,14 @@ snapshots:
 
   '@cloudflare/workers-types@4.20241230.0': {}
 
-  '@consent.software/interfaces@1.0.13':
+  '@consent.software/interfaces@1.0.14':
     dependencies:
-      '@api.global/typedrequest-interfaces': 3.0.1
+      '@api.global/typedrequest-interfaces': 3.0.19
 
   '@consent.software/webclient@1.1.0':
     dependencies:
       '@api.global/typedrequest': 3.1.10
-      '@consent.software/interfaces': 1.0.13
+      '@consent.software/interfaces': 1.0.14
       '@push.rocks/smarttime': 4.1.1
       '@push.rocks/webstore': 2.0.20
 

ts_web/00_commitinfo_data.ts

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

ts_web/elements/consentsoftware-cookieconsent.ts

@@ -8,6 +8,12 @@ import * as csInterfaces from '@consent.software/interfaces';
 import * as csWebclient from '@consent.software/webclient';
 import { delayFor } from '@push.rocks/smartdelay';
 
+declare global {
+  interface HTMLElementTagNameMap {
+    'consentsoftware-cookieconsent': ConsentsoftwareCookieconsent;
+  }
+}
+
 @customElement('consentsoftware-cookieconsent')
 export class ConsentsoftwareCookieconsent extends LitElement {
   public static demo = () => html`<consentsoftware-cookieconsent></consentsoftware-cookieconsent>`;
@@ -25,6 +31,7 @@ export class ConsentsoftwareCookieconsent extends LitElement {
   public static styles = css`
     :host {
       font-family: ${shared.fontStack};
+      user-select: none;
       /* Default theme variables */
       --text-color: #333;
       --background-color: #eeeeee;
@@ -66,11 +73,16 @@ export class ConsentsoftwareCookieconsent extends LitElement {
       align-items: center;
       justify-content: center;
       z-index: 1000; /* standard z-index for fixed elements */
-      background: rgba(0, 0, 0, 0);
+      background: rgba(255, 255, 255, 0);
       backdrop-filter: blur(0px);
       transition: all 0.2s;
     }
 
+    .pageOverlay.shake {
+      background: rgba(0, 0, 0, 0.5) !important;
+      backdrop-filter: blur(20px) !important;
+    }
+
     .modalBox {
       display: block;
       color: var(--text-color);
@@ -84,16 +96,29 @@ export class ConsentsoftwareCookieconsent extends LitElement {
       min-width: calc(100vw / 3);
       box-sizing: border-box;
       overflow: hidden;
-      /* 
-       * We start with margin-bottom as negative to hide the banner.
-       * The animation occurs when we toggle the gotIt/show attributes.
-       */
       will-change: transform; /* ensure efficient rendering */
       transition: all 0.3s;
       transform: scale(0.95);
       opacity: 0;
     }
 
+    .modalBox.shake {
+      animation: shake 150ms 2 linear;
+      box-shadow: 0px 0px 15px rgba(255, 255, 255, 0.6);
+    }
+
+    @keyframes shake {
+      0% {
+        transform: translate(3px, 0);
+      }
+      50% {
+        transform: translate(-3px, 0);
+      }
+      100% {
+        transform: translate(0, 0);
+      }
+    }
+
     /* 
      * Toggle display based on [show] attribute 
      * (so if show=false, the banner doesn't show at all).
@@ -105,18 +130,6 @@ export class ConsentsoftwareCookieconsent extends LitElement {
       display: block;
     }
 
-    /* 
-     * Animate margin-bottom when [gotIt] toggles.
-     * If gotIt=true, push the banner down off-screen.
-     * If gotIt=false, pull the banner into view.
-     */
-    :host([gotIt='true']) {
-      background: blue;
-    }
-    :host([gotIt='false']) {
-      background: red;
-    }
-
     .content {
       margin: auto;
     }
@@ -167,7 +180,7 @@ export class ConsentsoftwareCookieconsent extends LitElement {
       line-height: 30px;
       text-align: center;
       cursor: pointer;
-      transition: background 0.2s;
+      transition: all 0.2s;
     }
 
     .consent-button:hover {
@@ -177,13 +190,12 @@ export class ConsentsoftwareCookieconsent extends LitElement {
 
   constructor() {
     super();
-    this.setAttribute('gotIt', 'true');
     this.setAttribute('show', 'false');
   }
 
   public render(): TemplateResult {
     return html`
-      <div class="pageOverlay">
+      <div class="pageOverlay" @click=${this.pageOverlayClick}>
         <div class="modalBox">
           <div class="content">
             <consentsoftware-header></consentsoftware-header>
@@ -198,27 +210,29 @@ export class ConsentsoftwareCookieconsent extends LitElement {
             <!-- <div class="button-container">
               <div
                 class="consent-button"
-                @click=${(event: MouseEvent) => this.setLevel(event, ['functional'])}
+                @click=${(event: MouseEvent) =>
+              this.handleConsentButtonClick(event, ['functional'])}
               >
                 Functional cookies
               </div>
               <div
                 class="consent-button"
-                @click=${(event: MouseEvent) => this.setLevel(event, ['functional', 'analytics'])}
+                @click=${(event: MouseEvent) =>
+              this.handleConsentButtonClick(event, ['functional', 'analytics'])}
               >
                 Analytics cookies
               </div>
               <div
                 class="consent-button"
                 @click=${(event: MouseEvent) =>
-              this.setLevel(event, ['functional', 'analytics', 'marketing'])}
+              this.handleConsentButtonClick(event, ['functional', 'analytics', 'marketing'])}
               >
                 Marketing cookies
               </div>
               <div
                 class="consent-button"
                 @click=${(event: MouseEvent) =>
-              this.setLevel(event, ['functional', 'analytics', 'marketing', 'all'])}
+              this.handleConsentButtonClick(event, ['functional', 'analytics', 'marketing', 'all'])}
               >
                 All cookies
               </div>
@@ -227,20 +241,22 @@ export class ConsentsoftwareCookieconsent extends LitElement {
             <div class="button-container">
               <div
                 class="consent-button"
-                @click=${(event: MouseEvent) => this.setLevel(event, ['functional'])}
+                @click=${(event: MouseEvent) =>
+                  this.handleConsentButtonClick(event, ['functional'])}
               >
                 Deny
               </div>
               <div
                 class="consent-button"
-                @click=${(event: MouseEvent) => this.setLevel(event, ['functional', 'analytics'])}
+                @click=${(event: MouseEvent) =>
+                  this.handleConsentButtonClick(event, ['functional', 'analytics'])}
               >
                 Accept selection
               </div>
               <div
                 class="consent-button"
                 @click=${(event: MouseEvent) =>
-                  this.setLevel(event, ['functional', 'analytics', 'marketing'])}
+                  this.handleConsentButtonClick(event, ['functional', 'analytics', 'marketing'])}
               >
                 Accept all cookies
               </div>
@@ -248,6 +264,7 @@ export class ConsentsoftwareCookieconsent extends LitElement {
             <div class="info-container">
               consent management powered by
               <a href="https://consent.software">consent.software</a>
+              (Open Source)
             </div>
           </div>
         </div>
@@ -265,13 +282,12 @@ export class ConsentsoftwareCookieconsent extends LitElement {
     const cookieLevel = await this.csWebclientInstance.getCookieLevels();
     if (!cookieLevel) {
       this.setAttribute('show', 'true');
-      this.setAttribute('gotIt', 'false');
       requestAnimationFrame(async () => {
         await this.updated();
         const pageOverlay: HTMLDivElement = this.shadowRoot?.querySelector('.pageOverlay');
         if (pageOverlay) {
-          pageOverlay.style.background = 'rgba(0, 0, 0, 0.1)';
+          pageOverlay.style.background = 'rgba(255,255,255, 0.1)';
-          pageOverlay.style.backdropFilter = 'blur(2px)';
+          pageOverlay.style.backdropFilter = 'blur(0px)';
         }
         const modalBox: HTMLDivElement = this.shadowRoot?.querySelector('.modalBox');
         if (modalBox) {
@@ -281,7 +297,6 @@ export class ConsentsoftwareCookieconsent extends LitElement {
       });
     } else {
       this.setAttribute('show', 'false');
-      this.setAttribute('gotIt', 'true');
     }
   }
 
@@ -306,16 +321,42 @@ export class ConsentsoftwareCookieconsent extends LitElement {
   /**
    * Sets the user’s chosen cookie level(s) and hides the banner.
    */
-  private async setLevel(event: MouseEvent, levelsArg: csInterfaces.TCookieLevel[]) {
+  private async handleConsentButtonClick(
+    event: MouseEvent,
+    levelsArg: csInterfaces.TCookieLevel[]
+  ) {
     console.log(`Set level to ${levelsArg}`);
+    const pageOverlay: HTMLDivElement = this.shadowRoot?.querySelector('.pageOverlay');
+    if (pageOverlay) {
+      pageOverlay.style.background = 'rgba(255,255,255, 0)';
+      pageOverlay.style.backdropFilter = 'blur(0px)';
+    }
+    const modalBox: HTMLDivElement = this.shadowRoot?.querySelector('.modalBox');
+    if (modalBox) {
+      modalBox.style.transform = `scale(0.95)`;
+      modalBox.style.opacity = '0';
+    }
     await this.csWebclientInstance.setCookieLevels(levelsArg);
-    this.setAttribute('gotIt', 'true');
     await delayFor(300);
     this.setAttribute('show', 'false');
     // After user selection, re-check for any required scripts to run
     this.updated();
   }
 
+  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');
+        modalBox.classList.add('shake');
+        await delayFor(300);
+        pageOverlay.classList.remove('shake');
+        modalBox.classList.remove('shake');
+      }
+    }
+  }
+
   /**
    * Dynamically switches the theme between light/dark,
    * respecting `prefers-color-scheme` by default.

ts_web/elements/consentsoftware-toggle.ts

@@ -1,18 +1,31 @@
 import { LitElement, html, css, type TemplateResult } from 'lit';
 import { customElement } from 'lit/decorators.js';
 import { property } from 'lit/decorators/property.js';
-
 import { delayFor } from '@push.rocks/smartdelay';
 
 @customElement('consentsoftware-toggle')
 export class ConsentsoftwareToggle extends LitElement {
-  public static demo = () => html`<consentsoftware-toggle></consentsoftware-toggle>`;
-
   @property({ type: Boolean })
-  public required = false;
+  public accessor required = false;
 
   @property({ type: Boolean, reflect: true })
-  public selected = false;
+  public accessor selected = false;
+
+  /**
+   * We always track the knob’s left offset in `currentX`.
+   * - 0 => fully left
+   * - 30 => fully right
+   */
+  private currentX = 0;
+
+  /**
+   * Drag state
+   */
+  private isDragging = false;
+  private hasDragged = false;
+  private startX = 0; // pointerdown offset
+  private readonly knobWidth = 30;
+  private readonly trackWidth = 60;
 
   public static styles = css`
     :host {
@@ -24,17 +37,21 @@ export class ConsentsoftwareToggle extends LitElement {
       margin-bottom: 16px;
     }
 
+    .toggle {
+      user-select: none; /* helps avoid text selection on drag */
+    }
+
     .toggleKnobArea {
-      cursor: pointer;
+      position: relative;
       margin: auto;
       height: 30px;
       width: 60px;
       border-radius: 20px;
       background: rgba(255, 255, 255, 0.1);
-      position: relative;
-      overflow: hidden;
-      transition: all 0.2s;
       border: 1px solid rgba(255, 255, 255, 0);
+      overflow: hidden;
+      transition: background 0.2s ease;
+      cursor: pointer;
     }
 
     :host([selected]) .toggleKnobArea {
@@ -42,19 +59,27 @@ export class ConsentsoftwareToggle extends LitElement {
     }
 
     .toggleKnobMover {
-      transition: all 0.2s;
+      position: relative;
+      height: 100%;
+      width: 100%;
     }
 
     .toggleKnobInner {
-      height: 30px;
-      width: 30px;
-      border-radius: 15px;
-      background: rgba(255, 255, 255, 0.5);
       position: absolute;
       top: 0;
       left: 0;
-      transition: all 0.2s;
+      width: 30px;
+      height: 30px;
+      border-radius: 15px;
+      background: rgba(255, 255, 255, 0.5);
+      transition: left 0.2s ease, background 0.2s ease;
       transform: scale(0.7);
+      /* Prevent scroll gestures on mobile */
+      touch-action: none;
+    }
+
+    .toggleKnobInner.dragging {
+      transition: background 0.2s ease;
     }
 
     :host([selected]) .toggleKnobInner {
@@ -78,50 +103,153 @@ export class ConsentsoftwareToggle extends LitElement {
   public render(): TemplateResult {
     return html`
       <div class="label">${this.getText()}</div>
+      <!-- A user can click anywhere in this toggle area. -->
       <div class="toggle" @click=${this.handleClick}>
         <div class="toggleKnobArea">
           <div class="toggleKnobMover">
-            <div class="toggleKnobInner"></div>
+            <!-- The knob itself, with pointer events for dragging. -->
+            <div
+              class="toggleKnobInner"
+              style="left: ${this.currentX}px;"
+              @pointerdown=${this.onPointerDown}
+              @pointermove=${this.onPointerMove}
+              @pointerup=${this.onPointerUp}
+              @pointercancel=${this.onPointerUp}
+            ></div>
           </div>
         </div>
       </div>
     `;
   }
 
-  public async firstUpdated(_changedProperties: Map<string | number | symbol, unknown>) {
+  /**
-    super.firstUpdated(_changedProperties);
+   * If required = true on first render, auto-select and set the knob to the right.
+   */
+  public async firstUpdated() {
     if (this.required) {
+      // If "required" => always selected
       this.selected = true;
-      this.syncSelection();
+      this.currentX = this.knobWidth; // 30
+      this.requestUpdate();
+    } else {
+      // If not required, set knob to 0 or 30 depending on `selected`
+      this.currentX = this.selected ? this.knobWidth : 0;
+      this.requestUpdate();
     }
   }
 
-  public async handleClick(mouseEvent) {
+  /**
-    if (this.required) {
+   * CLICK HANDLER
-      const moverElement: HTMLDivElement = this.shadowRoot.querySelector('.toggleKnobMover');
+   */
-      moverElement.style.transform = 'translateX(20px)';
+  public async handleClick(event: MouseEvent) {
-      await delayFor(250);
+    // If the user truly dragged the knob, skip the normal click toggle.
-      moverElement.style.transform = 'translateX(30px)';
+    if (this.isDragging || this.hasDragged) {
+      event.stopPropagation();
+      event.preventDefault();
       return;
     }
-    this.selected = !this.selected;
-    mouseEvent.stopPropagation();
-    mouseEvent.preventDefault();
-    this.syncSelection();
-    this.dispatchEvent(new CustomEvent('toggle', { detail: { selected: this.selected } }));
-  }
 
-  public async syncSelection() {
+    if (this.required) {
-    console.log(`Selected ${this.selected}`);
+      // small bounce from 30 -> 20 -> 30
-    const moverElement: HTMLDivElement = this.shadowRoot.querySelector('.toggleKnobMover');
+      this.currentX = this.knobWidth; // ensure at 30
-    if (this.selected) {
+      this.requestUpdate();
-      moverElement.style.transform = 'translateX(30px)';
+      await new Promise((r) => setTimeout(r, 10));
-    } else {
+
-      moverElement.style.transform = 'translateX(0px)';
+      this.currentX = 20; // small bounce left
+      this.requestUpdate();
+      await delayFor(200);
+
+      this.currentX = this.knobWidth; // back to 30
+      this.requestUpdate();
+      return;
     }
+
+    // Normal toggle if no drag & not required
+    event.stopPropagation();
+    event.preventDefault();
+
+    this.selected = !this.selected;
+    this.currentX = this.selected ? this.knobWidth : 0; // snap knob left(0) or right(30)
+    this.requestUpdate();
+
+    this.dispatchEvent(new CustomEvent('toggle', { detail: { selected: this.selected } }));
+    delayFor(0).then(() => {
+      this.hasDragged = false;
+    });
   }
 
-  public getText() {
+  /**
+   * DRAG HANDLERS (pointer events)
+   */
+  private onPointerDown(event: PointerEvent) {
+    if (this.required) {
+      // If "required", disallow manual dragging
+      return;
+    }
+
+    // Start dragging
+    this.isDragging = true;
+    // The difference between the pointer’s X and the knob’s current position
+    this.startX = event.clientX - this.currentX;
+
+    // capture pointer so we keep receiving pointermove/pointerup
+    (event.target as HTMLElement).setPointerCapture(event.pointerId);
+  }
+
+  private onPointerMove(event: PointerEvent) {
+    if (!this.isDragging) return;
+    const newX = event.clientX - this.startX;
+    this.hasDragged = true;
+    const toggleKnobInner: HTMLDivElement = this.shadowRoot.querySelector('.toggleKnobInner');
+    toggleKnobInner.classList.add('dragging');
+
+    // Clamp
+    this.currentX = Math.max(0, Math.min(newX, this.trackWidth - this.knobWidth));
+    this.requestUpdate();
+  }
+
+  private onPointerUp(event: PointerEvent) {
+    if (!this.isDragging) return;
+    (event.target as HTMLElement).releasePointerCapture(event.pointerId);
+    this.isDragging = false;
+
+    // If we didn’t truly drag, pointerup does nothing; click handler handles toggling.
+    if (!this.hasDragged) {
+      return;
+    }
+    const toggleKnobInner: HTMLDivElement = this.shadowRoot.querySelector('.toggleKnobInner');
+    toggleKnobInner.classList.remove('dragging');
+
+    // Real drag => decide final side
+    const midpoint = (this.trackWidth - this.knobWidth) / 2; // 15
+    this.selected = this.currentX > midpoint;
+    this.currentX = this.selected ? this.knobWidth : 0; // snap to edge
+    this.requestUpdate();
+
+    // Dispatch toggle event
+    this.dispatchEvent(new CustomEvent('toggle', { detail: { selected: this.selected } }));
+    delayFor(0).then(() => {
+      this.hasDragged = false;
+    });
+  }
+
+  /**
+   * If external code sets `selected = true/false`, we also sync the knob position
+   */
+  protected updated(changedProperties: Map<PropertyKey, unknown>): void {
+    if (
+      changedProperties.has('selected') &&
+      !this.isDragging &&
+      !this.hasDragged &&
+      !this.required
+    ) {
+      this.currentX = this.selected ? this.knobWidth : 0;
+      this.requestUpdate();
+    }
+    super.updated(changedProperties);
+  }
+
+  public getText(): string | null {
     return this.textContent;
   }
 }