1.0.35

package.json

@@ -1,32 +1,34 @@
 {
   "name": "@designestate/dees-catalog",
-  "version": "1.0.29",
+  "version": "1.0.35",
   "private": false,
   "description": "website for lossless.com",
   "main": "dist_ts_web/index.js",
   "typings": "dist_ts_web/index.d.ts",
   "scripts": {
-    "test": "npm run build",
+    "test": "tstest test/ --web",
     "build": "tsbuild element && tsbundle element --production",
     "watch": "tswatch element"
   },
   "author": "Lossless GmbH",
   "license": "MIT",
   "dependencies": {
-    "@designestate/dees-domtools": "^1.0.84",
+    "@designestate/dees-domtools": "^1.0.88",
-    "@designestate/dees-element": "^1.0.10",
+    "@designestate/dees-element": "^1.0.19",
-    "@designestate/dees-wcctools": "^1.0.54",
+    "@designestate/dees-wcctools": "^1.0.57",
-    "@fortawesome/fontawesome-svg-core": "^1.2.34",
+    "@fortawesome/fontawesome-svg-core": "^1.2.36",
-    "@fortawesome/free-brands-svg-icons": "^5.15.2",
+    "@fortawesome/free-brands-svg-icons": "^5.15.4",
-    "@fortawesome/free-regular-svg-icons": "^5.15.2",
+    "@fortawesome/free-regular-svg-icons": "^5.15.4",
-    "@fortawesome/free-solid-svg-icons": "^5.15.2",
+    "@fortawesome/free-solid-svg-icons": "^5.15.4",
-    "typescript": "^4.1.5"
+    "typescript": "^4.3.5"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tsbuild": "^2.1.26",
-    "@gitzone/tsbundle": "^1.0.78",
+    "@gitzone/tsbundle": "^1.0.84",
-    "@gitzone/tswatch": "^1.0.50",
+    "@gitzone/tstest": "^1.0.54",
+    "@gitzone/tswatch": "^1.0.56",
     "@pushrocks/projectinfo": "^4.0.5",
+    "@pushrocks/tapbundle": "^3.2.14",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.17.0"
   },

test/test.browser.ts

@@ -0,0 +1,12 @@
+import { tap, expect, webhelpers } from '@pushrocks/tapbundle';
+
+import * as deesCatalog from '../ts_web';
+
+tap.test('should create a working button', async () => {
+  const button: deesCatalog.DeesButton = await webhelpers.fixture(
+    webhelpers.html`<dees-button></dees-button>`
+  );
+  expect(button).to.be.instanceOf(deesCatalog.DeesButton);
+});
+
+tap.start();

ts_web/elements/dees-button.ts

@@ -1,4 +1,13 @@
-import { customElement, html, DeesElement, property, TemplateResult } from '@designestate/dees-element';
+import {
+  customElement,
+  html,
+  DeesElement,
+  property,
+  TemplateResult,
+  cssManager,
+  css,
+  unsafeCSS,
+} from '@designestate/dees-element';
 
 import * as domtools from '@designestate/dees-domtools';
 
@@ -10,7 +19,7 @@ declare global {
 
 @customElement('dees-button')
 export class DeesButton extends DeesElement {
-  public static demo = () => html`<dees-button></dees-button>`
+  public static demo = () => html`<dees-button></dees-button>`;
 
   @property()
   text: string;
@@ -31,79 +40,87 @@ export class DeesButton extends DeesElement {
     super();
   }
 
+  public static styles = [
+    cssManager.defaultStyles,
+    css`
+      :host {
+        display: block;
+        box-sizing: border-box;
+      }
+      :host([hidden]) {
+        display: none;
+      }
+
+      .button {
+        transition: all 0.2s ease;
+        font-size: 14px;
+        display: block;
+        text-align: center;
+        background: ${cssManager.bdTheme('#eee', '#333')};
+        border-top: ${cssManager.bdTheme('1px solid #eee', '1px solid #444')};
+        border-radius: 2px;
+        line-height: 40px;
+        padding: 0px 10px;
+        min-width: 100px;
+        user-select: none;
+        color: ${cssManager.bdTheme('#333', ' #ccc')};
+      }
+
+      .button:hover {
+        cursor: pointer;
+        background: #039be5;
+        border-top: 1px solid #039be5;
+        color: #ffffff;
+      }
+
+      .button:active {
+        background: #0277bd;
+        border-top: 1px solid #0277bd;
+      }
+
+      .button.disabled {
+        background: #fff;
+        border: 1px solid #eeeff3;
+        color: #9b9b9e;
+        cursor: default;
+      }
+
+      .button.highlighted {
+        background: #e4002b;
+        color: #fff;
+      }
+
+      .button.discreet {
+        background: none;
+        border: 1px solid #9b9b9e;
+        color: #000;
+      }
+
+      .button.discreet:hover {
+        background: rgba(0, 0, 0, 0.1);
+      }
+      .hidden {
+        display: none;
+      }
+
+      .big {
+        display: inline-block;
+        line-height: 48px;
+        font-size: 16px;
+        padding: 0px 48px;
+        margin-top: 36px;
+      }
+    `,
+  ];
+
   public render(): TemplateResult {
     return html`
-      ${domtools.elementBasic.styles}
+      <div
-      <style>
+        class="button ${this.isHidden ? 'hidden' : 'block'}  ${this.type} ${this.disabled
-        :host {
+          ? 'disabled'
-          display: block;
+          : null}"
-          box-sizing: border-box;
+        @click="${this.dispatchClick}"
-        }
+      >
-        :host([hidden]) {
-          display: none;
-        }
-
-        .button {
-          transition: all 0.2s ease;
-          font-size: 14px;
-          display: block;
-          text-align: center;
-          background: ${this.goBright ? '#eee' : '#333'};
-          border-top: ${this.goBright ? '1px solid #eee' : '1px solid #444'};
-          border-radius: 2px;
-          line-height: 40px;
-          padding: 0px 10px;
-          min-width: 100px;
-          user-select: none;
-          color: ${this.goBright ? '#333' : ' #ccc'};
-        }
-
-        .button:hover {
-          cursor: pointer;
-          background: #039BE5;
-          border-top: 1px solid #039BE5;
-          color: #ffffff;
-        }
-
-        .button:active {
-          background: #0277BD;
-          border-top: 1px solid #0277BD;
-        }
-
-        .button.disabled {
-          background: #fff;
-          border: 1px solid #eeeff3;
-          color: #9b9b9e;
-          cursor: default;
-        }
-
-        .button.highlighted {
-          background: #e4002b;
-          color: #fff;
-        }
-
-        .button.discreet {
-          background: none;
-          border: 1px solid #9b9b9e;
-          color: #000;
-        }
-
-        .button.discreet:hover {
-          background: rgba(0,0,0,0.1)
-        }
-        .hidden {
-            display: none;
-        }
-
-        .big {
-          display: inline-block;
-          line-height: 48px;
-          font-size: 16px;
-          padding: 0px 48px;
-          margin-top: 36px;
-        }
-      </style>
-      <div class="button ${this.isHidden ? 'hidden' : 'block'}  ${this.type} ${this.disabled ? 'disabled' : null}" @click="${this.dispatchClick}">
         ${this.text ? this.text : this.textContent}
       </div>
     `;
@@ -111,19 +128,20 @@ export class DeesButton extends DeesElement {
 
   public async dispatchClick() {
     if (this.disabled) {
-
       return;
     }
 
-    this.dispatchEvent(new CustomEvent('clicked', {
+    this.dispatchEvent(
-      detail: {
+      new CustomEvent('clicked', {
-        data: this.eventDetailData
+        detail: {
-      },
+          data: this.eventDetailData,
-      bubbles: true
+        },
-    }));
+        bubbles: true,
+      })
+    );
   }
 
-  public async firstUpdated () {
+  public async firstUpdated() {
     if (!this.textContent) {
       this.textContent = 'Button';
       this.performUpdate();

ts_web/elements/dees-form-submit.ts

@@ -1,6 +1,5 @@
-import { customElement, html, LitElement } from 'lit-element';
+import { customElement, html, DeesElement, css, cssManager } from '@designestate/dees-element';
-
+import { DeesForm } from './dees-form';
-import {DeesForm} from './dees-form';
 
 declare global {
   interface HTMLElementTagNameMap {
@@ -9,13 +8,15 @@ declare global {
 }
 
 @customElement('dees-form-submit')
-export class DeesFormSubmit extends LitElement {
+export class DeesFormSubmit extends DeesElement {
+  constructor() {
+    super();
+  }
 
+  public static styles = [cssManager.defaultStyles, css``];
 
   public render() {
-    return html`
+    return html` <dees-button @click="${this.submit}">${this.textContent}</dees-button> `;
-      <dees-button @click="${this.submit}">${this.textContent}</dees-button>
-    `;
   }
 
   public async submit() {

ts_web/elements/dees-form.ts

@@ -1,9 +1,12 @@
-import { customElement, html, TemplateResult, LitElement } from 'lit-element';
+import { customElement, html, TemplateResult, DeesElement } from '@designestate/dees-element';
 
 import { DeesInputCheckbox } from './dees-input-checkbox';
 import { DeesInputText } from './dees-input-text';
 import { DeesInputQuantitySelector } from './dees-input-quantityselector';
 import { DeesInputRadio } from './dees-input-radio';
+import * as domtools from '@designestate/dees-domtools';
+
+export type TFormElement = Array<DeesInputCheckbox | DeesInputText | DeesInputQuantitySelector | DeesInputRadio>;
 
 declare global {
   interface HTMLElementTagNameMap {
@@ -12,7 +15,7 @@ declare global {
 }
 
 @customElement('dees-form')
-export class DeesForm extends LitElement {
+export class DeesForm extends DeesElement {
   public static demo = () => html`
     <dees-form style="display: block; margin:auto; max-width: 500px; padding: 20px">
       <dees-input-text key="hello1" label="a text"></dees-input-text>
@@ -23,6 +26,7 @@ export class DeesForm extends LitElement {
     `;
 
   public name: string = 'myform';
+  public changeSubject = new domtools.rxjs.Subject();
 
   public render(): TemplateResult {
     return html`
@@ -35,18 +39,40 @@ export class DeesForm extends LitElement {
     `;
   }
 
-  public async gatherAndDispatch() {
+  public firstUpdated() {
+    const formChildren = this.getFormChildren();
+    for (const child of formChildren) {
+      child.changeSubject.subscribe(async (elementArg: TFormElement) => {
+        const valueObject = await this.gatherData();
+        this.changeSubject.next(valueObject);
+        console.log(valueObject);
+      })
+    }
+  }
 
-    const children: Array<DeesInputCheckbox | DeesInputText | DeesInputQuantitySelector | DeesInputRadio> = this.children as any;
+  public getFormChildren() {
-    const valueObject: { [key: string]: string | number | boolean} = {};
+    const children: Array<DeesElement> = this.children as any;
+    const formChildren: TFormElement = [];
+    
     for (const child of children) {
       if (child instanceof DeesInputCheckbox || child instanceof DeesInputText || child instanceof DeesInputQuantitySelector) {
-        valueObject[child.key] = child.value;
+        formChildren.push(child);
       }
     }
+    return formChildren;
+  }
 
+  public async gatherData() {
+    const children = this.getFormChildren();
+    const valueObject: { [key: string]: string | number | boolean} = {};
+    for (const child of children) {
+      valueObject[child.key] = child.value;
+    }
+    return valueObject;
+  }
 
-    console.log(valueObject);
+  public async gatherAndDispatch() {
+    const valueObject = await this.gatherData();
     const formDataEvent = new CustomEvent('formData', {
       detail: {
         data: valueObject

ts_web/elements/dees-icon.ts

@@ -41,6 +41,12 @@ const faIcons: { [key: string]: IconDefinition } = {
   users: faUsers,
 };
 
+declare global {
+  interface HTMLElementTagNameMap {
+    'dees-icon': DeesIcon;
+  }
+}
+
 @customElement('dees-icon')
 export class DeesIcon extends LitElement {
   public static demo = () => html`

ts_web/elements/dees-input-checkbox.ts

@@ -1,9 +1,19 @@
 import { customElement, DeesElement, TemplateResult, property, html } from '@designestate/dees-element';
 import * as domtools from '@designestate/dees-domtools';
 
+declare global {
+  interface HTMLElementTagNameMap {
+    'dees-input-checkbox': DeesInputCheckbox;
+  }
+}
+
 @customElement('dees-input-checkbox')
 export class DeesInputCheckbox extends DeesElement {
+  // STATIC
   public static demo = () => html`<dees-input-checkbox></dees-input-checkbox>`;
+  
+  // INSTANCE
+  public changeSubject = new domtools.rxjs.Subject();
 
   @property()
   public key: string;
@@ -14,6 +24,7 @@ export class DeesInputCheckbox extends DeesElement {
   @property()
   public value: boolean = false;
 
+
   public render(): TemplateResult {
     return html`
       ${domtools.elementBasic.styles}
@@ -123,5 +134,6 @@ export class DeesInputCheckbox extends DeesElement {
         bubbles: true,
       })
     );
+    this.changeSubject.next(this);
   }
 }

ts_web/elements/dees-input-dropdown.ts

@@ -1,11 +1,19 @@
 import { customElement, LitElement, TemplateResult, property, html } from 'lit-element';
-
 import * as domtools from '@designestate/dees-domtools';
 
+declare global {
+  interface HTMLElementTagNameMap {
+    'dees-input-dropdown': DeesInputDropdown;
+  }
+}
+
 @customElement('dees-input-dropdown')
 export class DeesInputDropdown extends LitElement {
   public static demo = () => html`<dees-input-dropdown></dees-input-dropdown>`
 
+  // INSTANCE
+  public changeSubject = new domtools.rxjs.Subject();
+
   @property()
   public label: string = 'Label';
 
@@ -110,6 +118,7 @@ export class DeesInputDropdown extends LitElement {
       bubbles: true
     }));
     this.toggleSelectionBox();
+    this.changeSubject.next(this);
   }
 
   public toggleSelectionBox() {

ts_web/elements/dees-input-fileupload.ts

@@ -0,0 +1,130 @@
+import {
+  customElement,
+  DeesElement,
+  TemplateResult,
+  property,
+  html,
+  css,
+  unsafeCSS,
+  cssManager,
+} from '@designestate/dees-element';
+
+import * as domtools from '@designestate/dees-domtools';
+
+declare global {
+  interface HTMLElementTagNameMap {
+    'dees-input-fileupload': DeesInputFileupload;
+  }
+}
+
+@customElement('dees-input-fileupload')
+export class DeesInputFileupload extends DeesElement {
+  public static demo = () => html`<dees-input-fileupload></dees-input-fileupload>`;
+
+  // INSTANCE
+  public changeSubject = new domtools.rxjs.Subject();
+
+  @property({
+    type: String,
+  })
+  public label: string = null;
+
+  @property({
+    type: String,
+  })
+  public key: string;
+
+  @property({
+    attribute: false,
+  })
+  public value: File[] = [];
+
+  @property()
+  public state: 'idle' | 'dragOver' | 'dropped' | 'uploading' | 'completed' = 'idle';
+
+  public static styles = [
+    cssManager.defaultStyles,
+    css`
+      :host {
+        position: relative;
+        display: grid;
+        margin: 10px 0px;
+        margin-bottom: 24px;
+      }
+
+      .maincontainer {
+        color: ${cssManager.bdTheme('#333', '#ccc')};
+      }
+
+      .label {
+        font-size: 14px;
+        margin-bottom: 5px;
+      }
+
+      .uploadButton {
+        position: relative;
+        cursor: pointer;
+        padding: 20px 20px;
+        max-width: 200px;
+        background: ${cssManager.bdTheme('#fafafa', '#333333')};
+        border-radius: 3px;
+        text-align: center;
+      }
+      .uploadButton::after {
+        top: 7px;
+        right: 7px;
+        left: 7px;
+        bottom: 7px;
+        transform: scale3d(0.9, 0.9, 1);
+        position: absolute;
+        content: '';
+        display: block;
+        border: 4px dashed rgba(255, 255, 255, 0);
+        transition: all 0.2s;
+      }
+      .uploadButton.dragOver::after {
+        transform: scale3d(1, 1, 1);
+        border: 4px dashed rgba(255, 255, 255, 0.3);
+      }
+    `,
+  ];
+
+  public render(): TemplateResult {
+    return html`
+      <div class="maincontainer">
+        ${this.label ? html`<div class="label">${this.label}</div>` : null}
+        <div class="uploadButton ${this.state === 'dragOver' ? 'dragOver' : ''}">Upload File! (Drag/Drop enabled)</div>
+      </div>
+    `;
+  }
+
+  public async updateValue(eventArg: Event) {
+    const target: any = eventArg.target;
+    this.value = target.value;
+    this.changeSubject.next(this);
+  }
+
+  public firstUpdated() {
+    const dropArea = this.shadowRoot.querySelector('.uploadButton');
+    const handlerFunction = (eventArg: DragEvent) => {
+      eventArg.preventDefault();
+      switch(eventArg.type) {
+        case 'dragover':
+          this.state = 'dragOver';
+          break;
+        case 'dragleave':
+          this.state = 'idle';
+          break;
+      }
+      console.log(eventArg);
+      for (const file of Array.from(eventArg.dataTransfer.files)) {
+        this.value.push(file);
+      };
+      console.log(`Got ${this.value.length} files!`);
+    };
+    dropArea.addEventListener('dragenter', handlerFunction, false);
+    dropArea.addEventListener('dragleave', handlerFunction, false);
+    dropArea.addEventListener('dragover', handlerFunction, false);
+    dropArea.addEventListener('drop', handlerFunction, false);
+  }
+}

ts_web/elements/dees-input-quantityselector.ts

@@ -1,10 +1,19 @@
 import { customElement, property, html, TemplateResult, DeesElement } from '@designestate/dees-element';
 import * as domtools from '@designestate/dees-domtools';
 
+declare global {
+  interface HTMLElementTagNameMap {
+    'dees-input-quantityselector': DeesInputQuantitySelector;
+  }
+}
+
 @customElement('dees-input-quantityselector')
 export class DeesInputQuantitySelector extends DeesElement {
   public static demo = () => html`<dees-input-quantityselector></dees-input-quantityselector>`;
 
+  // INSTANCE
+  public changeSubject = new domtools.rxjs.Subject();
+
   @property()
   public key: string;
 
@@ -75,6 +84,7 @@ export class DeesInputQuantitySelector extends DeesElement {
 
   public increase () {
     this.value++;
+    this.changeSubject.next(this);
   }
 
   public decrease () {
@@ -83,5 +93,6 @@ export class DeesInputQuantitySelector extends DeesElement {
     } else {
       // nothing to do here
     }
+    this.changeSubject.next(this);
   }
 }

ts_web/elements/dees-input-radio.ts

@@ -1,9 +1,19 @@
 import {customElement, LitElement, TemplateResult, property, html} from 'lit-element';
+import * as domtools from '@designestate/dees-domtools';
+
+declare global {
+  interface HTMLElementTagNameMap {
+    'dees-input-radio': DeesInputRadio;
+  }
+}
 
 @customElement('dees-input-radio')
 export class DeesInputRadio extends LitElement {
   public static demo = () => html`<dees-input-radio></dees-input-radio>`;
 
+  // INSTANCE
+  public changeSubject = new domtools.rxjs.Subject();
+
   @property()
   public key: string;
 
@@ -96,5 +106,6 @@ export class DeesInputRadio extends LitElement {
       detail: this.value,
       bubbles: true
     }));
+    this.changeSubject.next(this);
   }
 }

ts_web/elements/dees-input-text.ts

@@ -1,9 +1,19 @@
 import {customElement, DeesElement, TemplateResult, property, html} from '@designestate/dees-element';
+import * as domtools from '@designestate/dees-domtools';
+
+declare global {
+  interface HTMLElementTagNameMap {
+    'dees-input-text': DeesInputText;
+  }
+}
 
 @customElement('dees-input-text')
 export class DeesInputText extends DeesElement {
   public static demo = () => html`<dees-input-text></dees-input-text>`;
 
+  // INSTANCE
+  public changeSubject = new domtools.rxjs.Subject();
+
   @property()
   public label: string = 'Label';
 
@@ -69,6 +79,6 @@ export class DeesInputText extends DeesElement {
   public async updateValue(eventArg: Event) {
     const target: any = eventArg.target;
     this.value = target.value;
-
+    this.changeSubject.next(this);
   }
 }

ts_web/elements/dees-toast.ts

@@ -2,6 +2,12 @@ import { customElement, LitElement, TemplateResult, html } from 'lit-element';
 
 import * as domtools from '@designestate/dees-domtools';
 
+declare global {
+  interface HTMLElementTagNameMap {
+    'dees-toast': DeesToast;
+  }
+}
+
 @customElement('dees-toast')
 export class DeesToast extends LitElement {
 

ts_web/elements/index.ts

@@ -4,6 +4,7 @@ export * from './dees-form-submit';
 export * from './dees-icon';
 export * from './dees-input-checkbox';
 export * from './dees-input-dropdown';
+export * from './dees-input-fileupload';
 export * from './dees-input-quantityselector';
 export * from './dees-input-radio';
 export * from './dees-input-text';

ts_web/themelogic/index.ts

@@ -1 +0,0 @@
-export {}