Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
6cfda1ebf3 | |||
8e0062fdd5 | |||
844cc30551 | |||
64074e37fc |
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@design.estate/dees-catalog",
|
"name": "@design.estate/dees-catalog",
|
||||||
"version": "1.0.228",
|
"version": "1.0.230",
|
||||||
"private": false,
|
"private": false,
|
||||||
"description": "website for lossless.com",
|
"description": "website for lossless.com",
|
||||||
"main": "dist_ts_web/index.js",
|
"main": "dist_ts_web/index.js",
|
||||||
|
@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@design.estate/dees-catalog',
|
name: '@design.estate/dees-catalog',
|
||||||
version: '1.0.228',
|
version: '1.0.230',
|
||||||
description: 'website for lossless.com'
|
description: 'website for lossless.com'
|
||||||
}
|
}
|
||||||
|
@ -1,28 +1,41 @@
|
|||||||
import { html } from '@design.estate/dees-element';
|
import { html } from '@design.estate/dees-element';
|
||||||
|
|
||||||
export const demoFunc = () => html`
|
export const demoFunc = () => html`
|
||||||
<dees-chips
|
<style>
|
||||||
selectionMode="none"
|
.demoContainer {
|
||||||
.selectableChips=${[
|
display: flex;
|
||||||
{ key: 'account1', value: 'Payment Account 1' },
|
flex-direction: column;
|
||||||
{ key: 'account2', value: 'PaymentAccount2' },
|
align-items: center;
|
||||||
{ key: 'account3', value: 'Payment Account 3' }
|
justify-content: center;
|
||||||
]}
|
height: 100%;
|
||||||
></dees-chips>
|
background: #222;
|
||||||
<dees-chips
|
}
|
||||||
selectionMode="single"
|
</style>
|
||||||
.selectableChips=${[
|
<div class="demoContainer">
|
||||||
{ key: 'account1', value: 'Payment Account 1' },
|
<dees-chips
|
||||||
{ key: 'account2', value: 'PaymentAccount2' },
|
selectionMode="none"
|
||||||
{ key: 'account3', value: 'Payment Account 3' }
|
.selectableChips=${[
|
||||||
]}
|
{ key: 'account1', value: 'Payment Account 1' },
|
||||||
></dees-chips>
|
{ key: 'account2', value: 'PaymentAccount2' },
|
||||||
<dees-chips
|
{ key: 'account3', value: 'Payment Account 3' },
|
||||||
selectionMode="multiple"
|
]}
|
||||||
.selectableChips=${[
|
></dees-chips>
|
||||||
{ key: 'account1', value: 'Payment Account 1' },
|
<dees-chips
|
||||||
{ key: 'account2', value: 'PaymentAccount2' },
|
selectionMode="single"
|
||||||
{ key: 'account3', value: 'Payment Account 3' }
|
chipsAreRemovable
|
||||||
]}
|
.selectableChips=${[
|
||||||
></dees-chips>
|
{ key: 'account1', value: 'Payment Account 1' },
|
||||||
|
{ key: 'account2', value: 'PaymentAccount2' },
|
||||||
|
{ key: 'account3', value: 'Payment Account 3' },
|
||||||
|
]}
|
||||||
|
></dees-chips>
|
||||||
|
<dees-chips
|
||||||
|
selectionMode="multiple"
|
||||||
|
.selectableChips=${[
|
||||||
|
{ key: 'account1', value: 'Payment Account 1' },
|
||||||
|
{ key: 'account2', value: 'PaymentAccount2' },
|
||||||
|
{ key: 'account3', value: 'Payment Account 3' },
|
||||||
|
]}
|
||||||
|
></dees-chips>
|
||||||
|
</div>
|
||||||
`;
|
`;
|
||||||
|
@ -19,7 +19,7 @@ declare global {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
type Tag = { key: string, value: string };
|
type Tag = { key: string; value: string };
|
||||||
|
|
||||||
@customElement('dees-chips')
|
@customElement('dees-chips')
|
||||||
export class DeesChips extends DeesElement {
|
export class DeesChips extends DeesElement {
|
||||||
@ -29,7 +29,12 @@ export class DeesChips extends DeesElement {
|
|||||||
public selectionMode: 'none' | 'single' | 'multiple' = 'single';
|
public selectionMode: 'none' | 'single' | 'multiple' = 'single';
|
||||||
|
|
||||||
@property({
|
@property({
|
||||||
type: Array
|
type: Boolean,
|
||||||
|
})
|
||||||
|
public chipsAreRemovable: boolean = false;
|
||||||
|
|
||||||
|
@property({
|
||||||
|
type: Array,
|
||||||
})
|
})
|
||||||
public selectableChips: Tag[] = [];
|
public selectableChips: Tag[] = [];
|
||||||
|
|
||||||
@ -37,11 +42,10 @@ export class DeesChips extends DeesElement {
|
|||||||
public selectedChip: Tag = null;
|
public selectedChip: Tag = null;
|
||||||
|
|
||||||
@property({
|
@property({
|
||||||
type: Array
|
type: Array,
|
||||||
})
|
})
|
||||||
public selectedChips: Tag[] = [];
|
public selectedChips: Tag[] = [];
|
||||||
|
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
@ -49,7 +53,6 @@ export class DeesChips extends DeesElement {
|
|||||||
public static styles = [
|
public static styles = [
|
||||||
cssManager.defaultStyles,
|
cssManager.defaultStyles,
|
||||||
css`
|
css`
|
||||||
|
|
||||||
:host {
|
:host {
|
||||||
display: block;
|
display: block;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
@ -70,9 +73,10 @@ export class DeesChips extends DeesElement {
|
|||||||
color: #fff;
|
color: #fff;
|
||||||
border-radius: 40px;
|
border-radius: 40px;
|
||||||
margin-right: 4px;
|
margin-right: 4px;
|
||||||
margin-bottom: 8px;
|
margin-bottom: 4px;
|
||||||
position: relative;
|
position: relative;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3);
|
||||||
}
|
}
|
||||||
|
|
||||||
.chip:hover {
|
.chip:hover {
|
||||||
@ -81,11 +85,11 @@ export class DeesChips extends DeesElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.chip.selected {
|
.chip.selected {
|
||||||
background: #00A3FF;
|
background: #00a3ff;
|
||||||
}
|
}
|
||||||
|
|
||||||
.chipKey {
|
.chipKey {
|
||||||
background: rgba(0,0,0,0.3);
|
background: rgba(0, 0, 0, 0.3);
|
||||||
height: 100%;
|
height: 100%;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
margin-left: -8px;
|
margin-left: -8px;
|
||||||
@ -94,17 +98,43 @@ export class DeesChips extends DeesElement {
|
|||||||
margin-right: 8px;
|
margin-right: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dees-icon {
|
||||||
|
padding: 0px 6px 0px 4px;
|
||||||
|
margin-left: 4px;
|
||||||
|
margin-right: -8px;
|
||||||
|
background: rgba(0, 0, 0, 0.3);
|
||||||
|
}
|
||||||
|
|
||||||
|
dees-icon:hover {
|
||||||
|
background: #e4002b;
|
||||||
|
}
|
||||||
`,
|
`,
|
||||||
];
|
];
|
||||||
|
|
||||||
public render(): TemplateResult {
|
public render(): TemplateResult {
|
||||||
return html`
|
return html`
|
||||||
<div class="mainbox">
|
<div class="mainbox">
|
||||||
${this.selectableChips.map(chip => html`
|
${this.selectableChips.map(
|
||||||
<div @click=${() => this.selectChip(chip)} class="chip ${this.isSelected(chip) ? 'selected' : ''}">
|
(chip) => html`
|
||||||
${chip.key ? html`<div class="chipKey">${chip.key}</div>` : html``}${chip.value}
|
<div
|
||||||
</div>
|
@click=${() => this.selectChip(chip)}
|
||||||
`)}
|
class="chip ${this.isSelected(chip) ? 'selected' : ''}"
|
||||||
|
>
|
||||||
|
${chip.key ? html`<div class="chipKey">${chip.key}</div>` : html``} ${chip.value}
|
||||||
|
${this.chipsAreRemovable
|
||||||
|
? html`
|
||||||
|
<dees-icon
|
||||||
|
@click=${(event: Event) => {
|
||||||
|
event.stopPropagation(); // prevent the selectChip event from being triggered
|
||||||
|
this.removeChip(chip);
|
||||||
|
}}
|
||||||
|
.iconFA=${'xmark'}
|
||||||
|
></dees-icon>
|
||||||
|
`
|
||||||
|
: html``}
|
||||||
|
</div>
|
||||||
|
`
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
@ -120,7 +150,7 @@ export class DeesChips extends DeesElement {
|
|||||||
if (this.selectionMode === 'single') {
|
if (this.selectionMode === 'single') {
|
||||||
return this.selectedChip?.key === chip.key;
|
return this.selectedChip?.key === chip.key;
|
||||||
} else {
|
} else {
|
||||||
return this.selectedChips.some(selected => selected.key === chip.key);
|
return this.selectedChips.some((selected) => selected.key === chip.key);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -137,9 +167,9 @@ export class DeesChips extends DeesElement {
|
|||||||
this.selectedChip = chip;
|
this.selectedChip = chip;
|
||||||
this.selectedChips = [chip];
|
this.selectedChips = [chip];
|
||||||
}
|
}
|
||||||
} else if(this.selectionMode === 'multiple') {
|
} else if (this.selectionMode === 'multiple') {
|
||||||
if (this.isSelected(chip)) {
|
if (this.isSelected(chip)) {
|
||||||
this.selectedChips = this.selectedChips.filter(selected => selected.key !== chip.key);
|
this.selectedChips = this.selectedChips.filter((selected) => selected.key !== chip.key);
|
||||||
} else {
|
} else {
|
||||||
this.selectedChips = [...this.selectedChips, chip];
|
this.selectedChips = [...this.selectedChips, chip];
|
||||||
}
|
}
|
||||||
@ -147,4 +177,20 @@ export class DeesChips extends DeesElement {
|
|||||||
}
|
}
|
||||||
console.log(this.selectedChips);
|
console.log(this.selectedChips);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public removeChip(chipToRemove: Tag): void {
|
||||||
|
// Remove the chip from selectableChips
|
||||||
|
this.selectableChips = this.selectableChips.filter((chip) => chip.key !== chipToRemove.key);
|
||||||
|
|
||||||
|
// Remove the chip from selectedChips if present
|
||||||
|
this.selectedChips = this.selectedChips.filter((chip) => chip.key !== chipToRemove.key);
|
||||||
|
|
||||||
|
// If the removed chip was the selectedChip, set selectedChip to null
|
||||||
|
if (this.selectedChip && this.selectedChip.key === chipToRemove.key) {
|
||||||
|
this.selectedChip = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Trigger an update to re-render the component
|
||||||
|
this.requestUpdate();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -27,7 +27,42 @@ export class DeesContextmenu extends DeesElement {
|
|||||||
public static demo = demoFunc
|
public static demo = demoFunc
|
||||||
|
|
||||||
// STATIC
|
// STATIC
|
||||||
|
// This will store all the accumulated menu items
|
||||||
|
public static contextMenuDeactivated = false;
|
||||||
|
public static accumulatedMenuItems: plugins.tsclass.website.IMenuItem[] = [];
|
||||||
|
|
||||||
|
// Add a global event listener for the right-click context menu
|
||||||
|
public static initializeGlobalListener() {
|
||||||
|
document.addEventListener('contextmenu', (event: MouseEvent) => {
|
||||||
|
if (this.contextMenuDeactivated) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
event.preventDefault();
|
||||||
|
|
||||||
|
// Get the target element of the right-click
|
||||||
|
let target: EventTarget | null = event.target;
|
||||||
|
|
||||||
|
// Clear previously accumulated items
|
||||||
|
DeesContextmenu.accumulatedMenuItems = [];
|
||||||
|
|
||||||
|
// Traverse up the DOM tree to accumulate menu items
|
||||||
|
while (target) {
|
||||||
|
if ((target as any).getContextMenuItems) {
|
||||||
|
DeesContextmenu.accumulatedMenuItems.push(...(target as any).getContextMenuItems());
|
||||||
|
}
|
||||||
|
target = (target as Node).parentNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Open the context menu with the accumulated items
|
||||||
|
DeesContextmenu.openContextMenuWithOptions(event, DeesContextmenu.accumulatedMenuItems);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// allows opening of a contextmenu with options
|
||||||
public static async openContextMenuWithOptions(eventArg: MouseEvent, menuItemsArg: plugins.tsclass.website.IMenuItem[]) {
|
public static async openContextMenuWithOptions(eventArg: MouseEvent, menuItemsArg: plugins.tsclass.website.IMenuItem[]) {
|
||||||
|
if (this.contextMenuDeactivated) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
eventArg.preventDefault();
|
eventArg.preventDefault();
|
||||||
eventArg.stopPropagation();
|
eventArg.stopPropagation();
|
||||||
const contextMenu = new DeesContextmenu();
|
const contextMenu = new DeesContextmenu();
|
||||||
@ -49,6 +84,7 @@ export class DeesContextmenu extends DeesElement {
|
|||||||
contextMenu.style.transform = 'scale(1,1)';
|
contextMenu.style.transform = 'scale(1,1)';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// INSTANCE
|
||||||
@property({
|
@property({
|
||||||
type: Array,
|
type: Array,
|
||||||
})
|
})
|
||||||
@ -59,6 +95,9 @@ export class DeesContextmenu extends DeesElement {
|
|||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* STATIC STYLES
|
||||||
|
*/
|
||||||
public static styles = [
|
public static styles = [
|
||||||
cssManager.defaultStyles,
|
cssManager.defaultStyles,
|
||||||
css`
|
css`
|
||||||
@ -115,10 +154,11 @@ export class DeesContextmenu extends DeesElement {
|
|||||||
})}
|
})}
|
||||||
${this.menuItems.length === 0 ? html`
|
${this.menuItems.length === 0 ? html`
|
||||||
<div class="menuitem" @click=${() => {
|
<div class="menuitem" @click=${() => {
|
||||||
alert('No menu items...')
|
DeesContextmenu.contextMenuDeactivated = true;
|
||||||
|
this.destroy();
|
||||||
}}>
|
}}>
|
||||||
<dees-icon .iconFA=${'xmark'}></dees-icon
|
<dees-icon .iconFA=${'xmark'}></dees-icon
|
||||||
>No menu item present...
|
>Deactivate Contextmenu globally.
|
||||||
</div>
|
</div>
|
||||||
` : html``}
|
` : html``}
|
||||||
</div>
|
</div>
|
||||||
@ -144,3 +184,5 @@ export class DeesContextmenu extends DeesElement {
|
|||||||
this.parentElement.removeChild(this);
|
this.parentElement.removeChild(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
DeesContextmenu.initializeGlobalListener();
|
||||||
|
@ -61,8 +61,8 @@ export interface ITableAction<T = any> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export interface ITableActionDataArg<T> {
|
export interface ITableActionDataArg<T> {
|
||||||
item: T,
|
item: T;
|
||||||
table: DeesTable<T>,
|
table: DeesTable<T>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export type TDisplayFunction<T = any> = (itemArg: T) => object;
|
export type TDisplayFunction<T = any> = (itemArg: T) => object;
|
||||||
@ -396,6 +396,8 @@ export class DeesTable<T> extends DeesElement {
|
|||||||
</div>
|
</div>
|
||||||
<div class="headingSeparation"></div>
|
<div class="headingSeparation"></div>
|
||||||
|
|
||||||
|
<dees-input-text></dees-input-text>
|
||||||
|
|
||||||
<!-- the actual table -->
|
<!-- the actual table -->
|
||||||
<style></style>
|
<style></style>
|
||||||
${this.data.length > 0
|
${this.data.length > 0
|
||||||
@ -524,10 +526,11 @@ export class DeesTable<T> extends DeesElement {
|
|||||||
${this.getActionsForType('inRow').map(
|
${this.getActionsForType('inRow').map(
|
||||||
(actionArg) => html`<div
|
(actionArg) => html`<div
|
||||||
class="action"
|
class="action"
|
||||||
@click=${() => actionArg.actionFunc({
|
@click=${() =>
|
||||||
item: itemArg,
|
actionArg.actionFunc({
|
||||||
table: this,
|
item: itemArg,
|
||||||
})}
|
table: this,
|
||||||
|
})}
|
||||||
>
|
>
|
||||||
${actionArg.iconName
|
${actionArg.iconName
|
||||||
? html`
|
? html`
|
||||||
@ -584,8 +587,7 @@ export class DeesTable<T> extends DeesElement {
|
|||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async firstUpdated() {
|
public async firstUpdated() {}
|
||||||
}
|
|
||||||
|
|
||||||
public async updated(changedProperties: Map<string | number | symbol, unknown>): Promise<void> {
|
public async updated(changedProperties: Map<string | number | symbol, unknown>): Promise<void> {
|
||||||
super.updated(changedProperties);
|
super.updated(changedProperties);
|
||||||
@ -609,7 +611,8 @@ export class DeesTable<T> extends DeesElement {
|
|||||||
// Get computed width
|
// Get computed width
|
||||||
const width = window.getComputedStyle(cell).width;
|
const width = window.getComputedStyle(cell).width;
|
||||||
if (cell.textContent.includes('Actions')) {
|
if (cell.textContent.includes('Actions')) {
|
||||||
const neededWidth = this.dataActions.filter(actionArg => actionArg.type.includes('inRow')).length * 35;
|
const neededWidth =
|
||||||
|
this.dataActions.filter((actionArg) => actionArg.type.includes('inRow')).length * 35;
|
||||||
cell.style.width = `${Math.max(neededWidth, 68)}px`;
|
cell.style.width = `${Math.max(neededWidth, 68)}px`;
|
||||||
} else {
|
} else {
|
||||||
cell.style.width = width;
|
cell.style.width = width;
|
||||||
@ -620,7 +623,7 @@ export class DeesTable<T> extends DeesElement {
|
|||||||
});
|
});
|
||||||
await done.promise;
|
await done.promise;
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
if (cells[cells.length - 1].textContent.includes('Actions')) {
|
if (cells[cells.length - 1].textContent.includes('Actions')) {
|
||||||
await handleColumnByIndex(cells.length - 1, true);
|
await handleColumnByIndex(cells.length - 1, true);
|
||||||
|
Reference in New Issue
Block a user