18 Commits

Author SHA1 Message Date
1ab6e09c95 1.4.1 2025-01-16 02:59:10 +01:00
26fd75b8ae fix(consentsoftware-toggle): Fix issue in drag event handling logic for the toggle component. 2025-01-16 02:59:10 +01:00
48a5b96b2a 1.4.0 2025-01-16 01:23:13 +01:00
66a883d90e feat(toggle component): Enhanced consent toggle component with drag functionality 2025-01-16 01:23:13 +01:00
6e6f5273a2 1.3.5 2025-01-16 00:28:47 +01:00
1e091ec600 fix(elements): Improved styling consistency across several components 2025-01-16 00:28:47 +01:00
fb15f62189 1.3.4 2025-01-14 03:29:05 +01:00
f5d9f05bf2 fix(dependencies): Corrected build script and updated @consent.software/webclient dependency version 2025-01-14 03:29:04 +01:00
8bc25e1045 1.3.3 2025-01-14 03:14:14 +01:00
d3b74d5766 fix(package.json): Fixed incorrect main and typings fields, replacing with exports field 2025-01-14 03:14:14 +01:00
cdaaebde42 1.3.2 2025-01-14 03:11:33 +01:00
45f9f6f891 fix(core): No code changes detected, maintain current state. 2025-01-14 03:11:33 +01:00
37c48a6803 1.3.1 2025-01-14 03:09:02 +01:00
b4b01cc319 fix(package setup): Fix package metadata and dependency consistency 2025-01-14 03:09:02 +01:00
443122cff3 1.3.0 2025-01-14 03:08:00 +01:00
7d137c9dd5 feat(elements): Enhance consent management components with advanced styling and interaction 2025-01-14 03:08:00 +01:00
73428cbc36 1.2.0 2025-01-13 22:21:14 +01:00
1c558f3aa1 feat(pages): Add initial structure for pages with page1 component 2025-01-13 22:21:14 +01:00
12 changed files with 292 additions and 1311 deletions

3
.gitignore vendored
View File

@ -3,7 +3,6 @@
# artifacts # artifacts
coverage/ coverage/
public/ public/
pages/
# installs # installs
node_modules/ node_modules/
@ -17,4 +16,4 @@ node_modules/
dist/ dist/
dist_*/ dist_*/
# custom #------# custom

View File

@ -1,5 +1,59 @@
# Changelog # Changelog
## 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
- Increased box-shadow intensity for better visual separation
- Changed border-bottom styles to use dotted lines for consistency
- Adjusted line-height for better vertical spacing
- Fixed border-right gradient on itemBox for better styling
## 2025-01-14 - 1.3.4 - fix(dependencies)
Corrected build script and updated @consent.software/webclient dependency version
- Corrected the build script entry in package.json.
- Updated @consent.software/webclient dependency to version ^1.1.0.
## 2025-01-14 - 1.3.3 - fix(package.json)
Fixed incorrect main and typings fields, replacing with exports field
- Updated package.json to use the 'exports' field instead of 'main' and 'typings' for module entry points
## 2025-01-14 - 1.3.2 - fix(core)
No code changes detected, maintain current state.
## 2025-01-14 - 1.3.1 - fix(package setup)
Fix package metadata and dependency consistency
## 2025-01-14 - 1.3.0 - feat(elements)
Enhance consent management components with advanced styling and interaction
- Added delayed animation effect to 'consentsoftware-toggle' when required.
- Improved styling for better visual feedback on selections and requirements.
- Enhanced modal transition and visibility settings for the 'consentsoftware-cookieconsent'.
## 2025-01-13 - 1.2.0 - feat(pages)
Add initial structure for pages with page1 component
- Added page1 export module in ts_web/pages/index.ts
- Implemented page1 component returning an empty template using lit-html
## 2025-01-13 - 1.1.0 - feat(core) ## 2025-01-13 - 1.1.0 - feat(core)
Refactor and enhance consent management components Refactor and enhance consent management components

View File

@ -1,21 +1,22 @@
{ {
"name": "@consent.software/catalog", "name": "@consent.software/catalog",
"version": "1.1.0", "version": "1.4.1",
"private": false, "private": false,
"description": "A library of web components designed to integrate robust consent management capabilities into web applications, ensuring compliance with privacy regulations.", "description": "A library of web components designed to integrate robust consent management capabilities into web applications, ensuring compliance with privacy regulations.",
"main": "dist_ts_web/index.js", "exports": {
"typings": "dist_ts_web/index.d.ts", ".": "./dist_ts_web/index.js"
},
"type": "module", "type": "module",
"scripts": { "scripts": {
"test": "npm run build", "test": "npm run build",
"build": "tsbuild element --allowimplicitany && tsbundle element --production", "build": "tsbuild tsfolders --allowimplicitany && tsbundle element --production",
"watch": "tswatch element" "watch": "tswatch element"
}, },
"author": "Lossless GmbH", "author": "Lossless GmbH",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@consent.software/interfaces": "^1.0.11", "@consent.software/interfaces": "^1.0.11",
"@consent.software/webclient": "^1.0.14", "@consent.software/webclient": "^1.1.0",
"@push.rocks/smartdelay": "^3.0.5", "@push.rocks/smartdelay": "^3.0.5",
"lit": "^3.2.1" "lit": "^3.2.1"
}, },

1265
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -18,9 +18,6 @@ export class ConsentsoftwareCookieconsent extends LitElement {
@property({ type: String, reflect: true }) @property({ type: String, reflect: true })
public theme: 'light' | 'dark' = 'light'; public theme: 'light' | 'dark' = 'light';
@property({ type: Number })
public heightPixels = 60;
/** /**
* We bind `heightPixels` to a CSS variable (--cookieconsent-height). * We bind `heightPixels` to a CSS variable (--cookieconsent-height).
* Then we can do margin-bottom animations in CSS. * Then we can do margin-bottom animations in CSS.
@ -69,14 +66,18 @@ export class ConsentsoftwareCookieconsent extends LitElement {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
z-index: 1000; /* standard z-index for fixed elements */ z-index: 1000; /* standard z-index for fixed elements */
background: rgba(0, 0, 0, 0);
backdrop-filter: blur(0px);
transition: all 0.2s;
} }
.modalBox { .modalBox {
display: block; display: block;
color: var(--text-color); color: var(--text-color);
background: var(--background-color); background: var(--background-color);
box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.4); box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.6);
position: realtive; position: realtive;
border: 1px dotted rgba(255, 255, 255, 0.1);
border-top: 1px solid var(--accent-color); border-top: 1px solid var(--accent-color);
border-radius: 16px; border-radius: 16px;
max-width: 1100px; max-width: 1100px;
@ -88,7 +89,9 @@ export class ConsentsoftwareCookieconsent extends LitElement {
* The animation occurs when we toggle the gotIt/show attributes. * The animation occurs when we toggle the gotIt/show attributes.
*/ */
will-change: transform; /* ensure efficient rendering */ will-change: transform; /* ensure efficient rendering */
transition: all 0.2s; transition: all 0.3s;
transform: scale(0.95);
opacity: 0;
} }
/* /*
@ -140,9 +143,9 @@ export class ConsentsoftwareCookieconsent extends LitElement {
.info-container { .info-container {
color: var(--text-color); color: var(--text-color);
text-align: center; text-align: center;
line-height: 2em; line-height: 3em;
background: rgba(0, 0, 0, 0.1); background: rgba(0, 0, 0, 0.1);
border-top: 1px solid rgba(255, 255, 255, 0.1); border-top: 1px dotted rgba(255, 255, 255, 0.1);
font-size: 0.8em; font-size: 0.8em;
color: rgba(255, 255, 255, 0.5); color: rgba(255, 255, 255, 0.5);
} }
@ -208,14 +211,14 @@ export class ConsentsoftwareCookieconsent extends LitElement {
<div <div
class="consent-button" class="consent-button"
@click=${(event: MouseEvent) => @click=${(event: MouseEvent) =>
this.setLevel(event, ['functional', 'analytics', 'marketing'])} this.setLevel(event, ['functional', 'analytics', 'marketing'])}
> >
Marketing cookies Marketing cookies
</div> </div>
<div <div
class="consent-button" class="consent-button"
@click=${(event: MouseEvent) => @click=${(event: MouseEvent) =>
this.setLevel(event, ['functional', 'analytics', 'marketing', 'all'])} this.setLevel(event, ['functional', 'analytics', 'marketing', 'all'])}
> >
All cookies All cookies
</div> </div>
@ -261,9 +264,20 @@ export class ConsentsoftwareCookieconsent extends LitElement {
const cookieLevel = await this.csWebclientInstance.getCookieLevels(); const cookieLevel = await this.csWebclientInstance.getCookieLevels();
if (!cookieLevel) { if (!cookieLevel) {
delayFor(300).then(() => { this.setAttribute('show', 'true');
this.setAttribute('show', 'true'); this.setAttribute('gotIt', 'false');
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.backdropFilter = 'blur(2px)';
}
const modalBox: HTMLDivElement = this.shadowRoot?.querySelector('.modalBox');
if (modalBox) {
modalBox.style.transform = `scale(1)`;
modalBox.style.opacity = '1';
}
}); });
} else { } else {
this.setAttribute('show', 'false'); this.setAttribute('show', 'false');
@ -275,7 +289,7 @@ export class ConsentsoftwareCookieconsent extends LitElement {
* Called after the first render of the component. * Called after the first render of the component.
* We measure the actual height of the banner and update the CSS variable. * We measure the actual height of the banner and update the CSS variable.
*/ */
public firstUpdated() {} public async firstUpdated() {}
/** /**
* Called whenever the element is updated or re-rendered. * Called whenever the element is updated or re-rendered.

View File

@ -11,10 +11,10 @@ export class ConsentsoftwareHeader extends LitElement {
public static styles = css` public static styles = css`
:host { :host {
display: block; display: block;
line-height: 2em; line-height: 3em;
text-align: center; text-align: center;
font-family: ${shared.fontStack}; font-family: ${shared.fontStack};
border-bottom: 1px solid rgba(255, 255, 255, 0.1); border-bottom: 1px dotted rgba(255, 255, 255, 0.1);
} }
.heading { .heading {

View File

@ -16,8 +16,6 @@ export class ConsentsoftwareMainSelection extends LitElement {
:host { :host {
display: block; display: block;
position: relative; position: relative;
border-top: 1px solid rgba(255, 255, 255, 0.1);
border-bottom: 1px solid rgba(255, 255, 255, 0.1);
} }
.maincontainer { .maincontainer {
@ -28,7 +26,8 @@ export class ConsentsoftwareMainSelection extends LitElement {
.itemBox { .itemBox {
padding: 16px; padding: 16px;
text-align: center; text-align: center;
border-right: 1px solid rgba(255, 255, 255, 0.1); border-right: 1px solid;
border-image: radial-gradient(circle, rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%) 1;
} }
.itemBox:last-child { .itemBox:last-child {
border-right: none; border-right: none;
@ -43,7 +42,7 @@ export class ConsentsoftwareMainSelection extends LitElement {
return html` return html`
<div class="maincontainer"> <div class="maincontainer">
<div class="itemBox"> <div class="itemBox">
<consentsoftware-toggle>Required</consentsoftware-toggle> <consentsoftware-toggle required>Required</consentsoftware-toggle>
</div> </div>
<div class="itemBox"> <div class="itemBox">
<consentsoftware-toggle>Preferences</consentsoftware-toggle> <consentsoftware-toggle>Preferences</consentsoftware-toggle>

View File

@ -44,7 +44,7 @@ export class ConsentsoftwareTabs extends LitElement {
<div class="tabs"> <div class="tabs">
<div class="tab" @click=${this.handleClick}>Consent</div> <div class="tab" @click=${this.handleClick}>Consent</div>
<div class="tab" @click=${this.handleClick}>Details</div> <div class="tab" @click=${this.handleClick}>Details</div>
<div class="tab" @click=${this.handleClick}>About Cookies</div> <div class="tab" @click=${this.handleClick}>Cookie Policy + Legal Info</div>
</div> </div>
<div class="selector"></div> <div class="selector"></div>
`; `;

View File

@ -1,17 +1,32 @@
import { LitElement, html, css, type TemplateResult } from 'lit'; import { LitElement, html, css, type TemplateResult } from 'lit';
import { customElement } from 'lit/decorators.js'; import { customElement } from 'lit/decorators.js';
import { property } from 'lit/decorators/property.js'; import { property } from 'lit/decorators/property.js';
import { delayFor } from '@push.rocks/smartdelay';
@customElement('consentsoftware-toggle') @customElement('consentsoftware-toggle')
export class ConsentsoftwareToggle extends LitElement { export class ConsentsoftwareToggle extends LitElement {
public static demo = () => html`<consentsoftware-toggle></consentsoftware-toggle>`;
@property({ type: Boolean }) @property({ type: Boolean })
public required = false; public required = false;
@property({ type: Boolean, reflect: true }) @property({ type: Boolean, reflect: true })
public selected = false; public selected = false;
/**
* We always track the knobs 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` public static styles = css`
:host { :host {
display: block; display: block;
@ -22,41 +37,63 @@ export class ConsentsoftwareToggle extends LitElement {
margin-bottom: 16px; margin-bottom: 16px;
} }
.toggle {
user-select: none; /* helps avoid text selection on drag */
}
.toggleKnobArea { .toggleKnobArea {
cursor: pointer; position: relative;
margin: auto; margin: auto;
height: 30px; height: 30px;
width: 60px; width: 60px;
border-radius: 15px; border-radius: 20px;
background: rgba(255, 255, 255, 0.1); background: rgba(255, 255, 255, 0.1);
position: relative; border: 1px solid rgba(255, 255, 255, 0);
overflow: hidden; overflow: hidden;
transition: all 0.2s; transition: background 0.2s ease;
cursor: pointer;
} }
:host([selected]) .toggleKnobArea { :host([selected]) .toggleKnobArea {
background: blue; background: green;
} }
.toggleKnobMover { .toggleKnobMover {
transition: all 0.2s; position: relative;
height: 100%;
width: 100%;
} }
.toggleKnobInner { .toggleKnobInner {
height: 30px;
width: 30px;
border-radius: 15px;
background: rgba(255, 255, 255, 0.5);
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
transition: all 0.2s; width: 30px;
transform: scale(0.8); 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 { :host([selected]) .toggleKnobInner {
background: white; background: white;
} }
:host([required]) .toggleKnobArea {
background: none;
border: 1px solid rgba(255, 255, 255, 0.1);
}
:host([required]) .toggleKnobInner {
background: rgba(255, 255, 255, 0.1);
}
`; `;
constructor() { constructor() {
@ -66,31 +103,153 @@ export class ConsentsoftwareToggle extends LitElement {
public render(): TemplateResult { public render(): TemplateResult {
return html` return html`
<div class="label">${this.getText()}</div> <div class="label">${this.getText()}</div>
<!-- A user can click anywhere in this toggle area. -->
<div class="toggle" @click=${this.handleClick}> <div class="toggle" @click=${this.handleClick}>
<div class="toggleKnobArea"> <div class="toggleKnobArea">
<div class="toggleKnobMover"> <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> </div>
</div> </div>
`; `;
} }
public async handleClick(mouseEvent) { /**
this.selected = !this.selected; * If required = true on first render, auto-select and set the knob to the right.
mouseEvent.stopPropagation(); */
mouseEvent.preventDefault(); public async firstUpdated() {
this.dispatchEvent(new CustomEvent('toggle', { detail: { selected: this.selected } })); if (this.required) {
console.log(`Selected ${this.selected}`); // If "required" => always selected
const moverElement: HTMLDivElement = this.shadowRoot.querySelector('.toggleKnobMover'); this.selected = true;
if (this.selected) { this.currentX = this.knobWidth; // 30
moverElement.style.transform = 'translateX(30px)'; this.requestUpdate();
} else { } else {
moverElement.style.transform = 'translateX(0px)'; // If not required, set knob to 0 or 30 depending on `selected`
this.currentX = this.selected ? this.knobWidth : 0;
this.requestUpdate();
} }
} }
public getText() { /**
* CLICK HANDLER
*/
public async handleClick(event: MouseEvent) {
// If the user truly dragged the knob, skip the normal click toggle.
if (this.isDragging || this.hasDragged) {
event.stopPropagation();
event.preventDefault();
return;
}
if (this.required) {
// small bounce from 30 -> 20 -> 30
this.currentX = this.knobWidth; // ensure at 30
this.requestUpdate();
await new Promise((r) => setTimeout(r, 10));
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;
});
}
/**
* 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 pointers X and the knobs 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 didnt 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; return this.textContent;
} }
} }

1
ts_web/pages/index.ts Normal file
View File

@ -0,0 +1 @@
export * from './page1.js';

3
ts_web/pages/page1.ts Normal file
View File

@ -0,0 +1,3 @@
import { html } from 'lit';
export const page1 = () => html``;