Compare commits

...

18 Commits

Author SHA1 Message Date
a6f583b8c4 1.0.66 2021-11-26 19:18:14 +01:00
60e173b7be fix(core): update 2021-11-26 19:18:14 +01:00
d51027d4be 1.0.65 2021-11-26 19:16:09 +01:00
2efa465930 fix(core): update 2021-11-26 19:16:09 +01:00
19081caacd 1.0.64 2021-11-26 19:05:05 +01:00
c42e8b8bef fix(core): update 2021-11-26 19:05:04 +01:00
750e8cef32 1.0.63 2021-11-26 18:52:44 +01:00
c0d057949d fix(core): update 2021-11-26 18:52:44 +01:00
82a5283edd 1.0.62 2021-11-26 18:27:29 +01:00
abb20def4b fix(core): update 2021-11-26 18:27:29 +01:00
dd71751864 1.0.61 2021-11-26 17:53:05 +01:00
c4562c797e fix(core): update 2021-11-26 17:53:04 +01:00
643317811b 1.0.60 2021-11-26 17:47:09 +01:00
3667070094 fix(core): update 2021-11-26 17:47:08 +01:00
a86ef5bfce 1.0.59 2021-09-27 14:45:06 +02:00
77d058f403 fix(core): update 2021-09-27 14:45:05 +02:00
1639a57bd1 1.0.58 2021-09-27 13:30:03 +02:00
b546d1a2c5 fix(core): update 2021-09-27 13:30:02 +02:00
7 changed files with 19078 additions and 3558 deletions

22403
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{ {
"name": "@designestate/dees-wcctools", "name": "@designestate/dees-wcctools",
"version": "1.0.57", "version": "1.0.66",
"private": false, "private": false,
"description": "wcc tools for creating element catalogues", "description": "wcc tools for creating element catalogues",
"main": "dist_ts_web/index.js", "main": "dist_ts_web/index.js",
@ -13,19 +13,19 @@
"author": "Lossless GmbH", "author": "Lossless GmbH",
"license": "UNLICENSED", "license": "UNLICENSED",
"dependencies": { "dependencies": {
"@designestate/dees-domtools": "^1.0.87", "@designestate/dees-domtools": "^1.0.102",
"@designestate/dees-element": "^1.0.19", "@designestate/dees-element": "^1.0.26",
"@gitzone/tsrun": "^1.2.12", "@gitzone/tsrun": "^1.2.18",
"@pushrocks/smartdelay": "^2.0.10", "@pushrocks/smartdelay": "^2.0.13",
"@pushrocks/smartexpress": "^3.0.100", "@pushrocks/smartexpress": "^3.0.108",
"lit-element": "^2.4.0", "lit-element": "^3.0.2",
"lit-html": "^1.3.0", "lit-html": "^2.0.2",
"typescript": "^4.2.3" "typescript": "^4.5.2"
}, },
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.1.25", "@gitzone/tsbuild": "^2.1.28",
"@gitzone/tsbundle": "^1.0.80", "@gitzone/tsbundle": "^1.0.88",
"@gitzone/tswatch": "^1.0.52", "@gitzone/tswatch": "^1.0.56",
"@pushrocks/projectinfo": "^4.0.5", "@pushrocks/projectinfo": "^4.0.5",
"tslint": "^6.1.3", "tslint": "^6.1.3",
"tslint-config-prettier": "^1.17.0" "tslint-config-prettier": "^1.17.0"

View File

@ -4,6 +4,8 @@ import {
TemplateResult, TemplateResult,
html, html,
property, property,
css,
cssManager,
} from '@designestate/dees-element'; } from '@designestate/dees-element';
import * as domtools from '@designestate/dees-domtools'; import * as domtools from '@designestate/dees-domtools';
@ -16,7 +18,18 @@ enum ETestEnum {
@customElement('test-demoelement') @customElement('test-demoelement')
export class TestDemoelement extends DeesElement { export class TestDemoelement extends DeesElement {
public static demo = () => html`<test-demoelement></test-demoelement>`; public static demo = () => html`<test-demoelement>This is a slot text</test-demoelement>`;
@property()
public notTyped = 'hello';
@property({
type: String,
})
public typedAndNotInitizalized: string;
@property()
public notTypedAndNotInitizalized: string;
@property({ @property({
type: Boolean, type: Boolean,
@ -38,10 +51,14 @@ export class TestDemoelement extends DeesElement {
}) })
public demoENum: ETestEnum = ETestEnum.first; public demoENum: ETestEnum = ETestEnum.first;
public render() { constructor() {
return html` super();
<style> }
.maincontainer, .themeindicator {
public static styles = [
css`
.maincontainer,
.themeindicator {
display: block; display: block;
padding: 10px; padding: 10px;
border-radius: 10px; border-radius: 10px;
@ -52,18 +69,24 @@ export class TestDemoelement extends DeesElement {
background: #000; background: #000;
} }
.themeindicator { .themeindicator {
color: ${this.goBright ? '#000' : '#fff'}; color: ${cssManager.bdTheme('#000', '#fff')};
background: ${this.goBright ? '#fff' : '#000'}; background: ${cssManager.bdTheme('#fff', '#000')};
} }
${domtools.breakpoints.cssForPhablet(` ${domtools.breakpoints.cssForPhablet(css`
.maincontainer, .themeindicator { .maincontainer,
.themeindicator {
border-radius: 50px; border-radius: 50px;
} }
`)} `)}
pre b { pre b {
color: green; color: green;
} }
</style> `,
];
public render() {
return html`
<style></style>
<div class="maincontainer"><slot>This is a demo element</slot></div> <div class="maincontainer"><slot>This is a demo element</slot></div>
<div class="themeindicator"> <div class="themeindicator">
You have selected the ${this.goBright ? 'bright' : 'dark'} theme. You have selected the ${this.goBright ? 'bright' : 'dark'} theme.
@ -72,7 +95,8 @@ export class TestDemoelement extends DeesElement {
demoString is <b>"${this.demoString}"</b> demoString is <b>"${this.demoString}"</b>
demoNumber is <b>${this.demoNumber}</b> demoNumber is <b>${this.demoNumber}</b>
demoEnum is <b>"${this.demoENum}"</b> demoEnum is <b>"${this.demoENum}"</b>
</pre> </pre
>
</div> </div>
`; `;
} }

View File

@ -8,7 +8,7 @@ import './wcc-sidebar';
import './wcc-properties'; import './wcc-properties';
import { TTheme } from './wcc-properties'; import { TTheme } from './wcc-properties';
import { TElementType } from './wcc-sidebar'; import { TElementType } from './wcc-sidebar';
import { TViewport } from '@designestate/dees-domtools/dist_ts/domtools.breakpoints'; import { breakpoints } from '@designestate/dees-domtools';
import { WccFrame } from './wcc-frame'; import { WccFrame } from './wcc-frame';
@customElement('wcc-dashboard') @customElement('wcc-dashboard')
@ -92,7 +92,7 @@ export class WccDashboard extends LitElement {
.selectedTheme=${this.selectedTheme} .selectedTheme=${this.selectedTheme}
@selectedViewport=${(eventArg) => { @selectedViewport=${(eventArg) => {
this.selectedViewport = eventArg.detail; this.selectedViewport = eventArg.detail;
this.performUpdate(); this.scheduleUpdate();
}} }}
@selectedTheme=${(eventArg) => { @selectedTheme=${(eventArg) => {
this.selectedTheme = eventArg.detail; this.selectedTheme = eventArg.detail;
@ -133,7 +133,7 @@ export class WccDashboard extends LitElement {
console.log(warningTextArg); console.log(warningTextArg);
this.warning = warningTextArg; this.warning = warningTextArg;
setTimeout(() => { setTimeout(() => {
super.performUpdate(); this.scheduleUpdate();
}, 0); }, 0);
} }
} }
@ -145,7 +145,7 @@ export class WccDashboard extends LitElement {
async (routeInfo) => { async (routeInfo) => {
this.selectedType = routeInfo.params.itemType as TElementType; this.selectedType = routeInfo.params.itemType as TElementType;
this.selectedItemName = routeInfo.params.itemName; this.selectedItemName = routeInfo.params.itemName;
this.selectedViewport = routeInfo.params.viewport as TViewport; this.selectedViewport = routeInfo.params.viewport as breakpoints.TViewport;
this.selectedTheme = routeInfo.params.theme as TTheme; this.selectedTheme = routeInfo.params.theme as TTheme;
if (routeInfo.params.itemType === 'element') { if (routeInfo.params.itemType === 'element') {
this.selectedItem = this.elements[routeInfo.params.itemName]; this.selectedItem = this.elements[routeInfo.params.itemName];
@ -153,7 +153,6 @@ export class WccDashboard extends LitElement {
this.selectedItem = this.pages[routeInfo.params.itemName]; this.selectedItem = this.pages[routeInfo.params.itemName];
} }
const domtoolsInstance = await plugins.deesDomtools.elementBasic.setup(); const domtoolsInstance = await plugins.deesDomtools.elementBasic.setup();
domtoolsInstance.setVirtualViewport(routeInfo.params.viewport as TViewport);
this.selectedTheme === 'bright' this.selectedTheme === 'bright'
? domtoolsInstance.themeManager.goBright() ? domtoolsInstance.themeManager.goBright()
: domtoolsInstance.themeManager.goDark(); : domtoolsInstance.themeManager.goDark();

View File

@ -49,6 +49,8 @@ export class WccFrame extends DeesElement {
} }
.viewport { .viewport {
container-type: inline-size;
container-name: wccToolsViewport;
position: relative; position: relative;
${this.viewport !== 'desktop' ${this.viewport !== 'desktop'
? html` border-right: 1px dotted #444; border-left: 1px dotted #444; ` ? html` border-right: 1px dotted #444; border-left: 1px dotted #444; `

View File

@ -1,11 +1,4 @@
import { import { LitElement, property, html, customElement, TemplateResult, state } from 'lit-element';
LitElement,
property,
html,
customElement,
TemplateResult,
internalProperty,
} from 'lit-element';
import { WccDashboard } from './wcc-dashboard'; import { WccDashboard } from './wcc-dashboard';
export type TPropertyType = 'String' | 'Number' | 'Boolean' | 'Object' | 'Enum' | 'Array'; export type TPropertyType = 'String' | 'Number' | 'Boolean' | 'Object' | 'Enum' | 'Array';
@ -25,7 +18,7 @@ export class WccProperties extends LitElement {
dashboardRef: WccDashboard; dashboardRef: WccDashboard;
@property() @property()
public selectedItem: TemplateResult | LitElement; public selectedItem: (() => TemplateResult) | LitElement;
@property() @property()
public selectedViewport: TEnvironment = 'native'; public selectedViewport: TEnvironment = 'native';
@ -36,7 +29,7 @@ export class WccProperties extends LitElement {
@property() @property()
public warning: string = null; public warning: string = null;
@internalProperty() @state()
propertyContent: TemplateResult[] = []; propertyContent: TemplateResult[] = [];
public render(): TemplateResult { public render(): TemplateResult {
@ -73,7 +66,8 @@ export class WccProperties extends LitElement {
border: 1px solid #000; border: 1px solid #000;
} }
.properties input, .properties select { .properties input,
.properties select {
display: block; display: block;
width: 100%; width: 100%;
background: #333; background: #333;
@ -81,7 +75,6 @@ export class WccProperties extends LitElement {
color: #fff; color: #fff;
} }
.viewportSelector, .viewportSelector,
.themeSelector { .themeSelector {
user-select: none; user-select: none;
@ -137,13 +130,14 @@ export class WccProperties extends LitElement {
.warning { .warning {
position: absolute; position: absolute;
background: #800000; background: #222;
color: #CCC;
top: 0px; top: 0px;
bottom: 0px; bottom: 0px;
left: 0px; left: 0px;
right: 0px; right: 520px;
text-align: center; text-align: center;
padding: 20px; padding: 35px;
font-size: 25px; font-size: 25px;
} }
</style> </style>
@ -220,7 +214,8 @@ export class WccProperties extends LitElement {
} }
public async createProperties() { public async createProperties() {
console.log('creating properties'); console.log('creating properties for:');
console.log(this.selectedItem);
const isEnumeration = (propertyArg): boolean => { const isEnumeration = (propertyArg): boolean => {
const keys = Object.keys(propertyArg.type); const keys = Object.keys(propertyArg.type);
const values = []; const values = [];
@ -240,7 +235,7 @@ export class WccProperties extends LitElement {
}; };
const getEnumValues = (propertyArg): any[] => { const getEnumValues = (propertyArg): any[] => {
console.log(JSON.stringify(propertyArg)); console.log(JSON.stringify(propertyArg));
const enumValues : any[] = []; const enumValues: any[] = [];
Object.keys(propertyArg.type).forEach((valueArg: string) => { Object.keys(propertyArg.type).forEach((valueArg: string) => {
enumValues.push(valueArg); enumValues.push(valueArg);
}); });
@ -258,24 +253,35 @@ export class WccProperties extends LitElement {
: 'Object'; : 'Object';
} }
}; };
if (this.selectedItem && !(this.selectedItem instanceof TemplateResult)) { if (this.selectedItem && (this.selectedItem as any).demo) {
console.log(`Got Dees-Element for property evaluation.`);
const anonItem: any = this.selectedItem; const anonItem: any = this.selectedItem;
if (!anonItem._classProperties) { if (!anonItem) {
return html`You have selected a page!`; this.warning = 'no element selected';
return;
} }
console.log(anonItem.elementProperties);
const wccFrame = await this.dashboardRef.wccFrame; const wccFrame = await this.dashboardRef.wccFrame;
let selectedElement: HTMLElement; let firstFoundInstantiatedElement: HTMLElement;
for (const element of Array.from(wccFrame.children)) { for (const element of Array.from(wccFrame.children)) {
if (element instanceof (this.selectedItem as any)) { if (element instanceof (this.selectedItem as any)) {
selectedElement = element as HTMLElement; firstFoundInstantiatedElement = element as HTMLElement;
break; break;
} }
} }
console.log(selectedElement); if (!firstFoundInstantiatedElement) {
const classProperties: Map<string, any> = anonItem._classProperties; this.warning = `no first instantiated element found for >>${anonItem.name}<<`;
return;
}
const classProperties: Map<string, any> = anonItem.elementProperties;
if (!classProperties) {
this.warning = `selected element >>${anonItem.name}<< does not expose element properties`;
return;
}
this.warning = null;
const propertyArray: TemplateResult[] = []; const propertyArray: TemplateResult[] = [];
for (const key of classProperties.keys()) { for (const key of classProperties.keys()) {
if (key === 'goBright' || key === 'domtools') { if (key === 'goBright' || key === 'domtools') {
continue; continue;
} }
const property = classProperties.get(key); const property = classProperties.get(key);
@ -283,42 +289,48 @@ export class WccProperties extends LitElement {
propertyArray.push( propertyArray.push(
html` html`
<div class="property"> <div class="property">
${key} / ${propertyTypeString}<br> ${key} / ${propertyTypeString}<br />
${(() => { ${(() => {
switch (propertyTypeString) { switch (propertyTypeString) {
case 'Boolean': case 'Boolean':
return html`<input return html`<input
type="checkbox" type="checkbox"
?checked=${selectedElement[key]} ?checked=${firstFoundInstantiatedElement[key]}
@input="${(eventArg: any) => { @input="${(eventArg: any) => {
selectedElement[key] = eventArg.target.checked; firstFoundInstantiatedElement[key] = eventArg.target.checked;
}}" }}"
/>`; />`;
case 'String': case 'String':
return html`<input return html`<input
type="text" type="text"
value=${selectedElement[key]} value=${firstFoundInstantiatedElement[key]}
@input="${(eventArg: any) => { @input="${(eventArg: any) => {
selectedElement[key] = eventArg.target.value; firstFoundInstantiatedElement[key] = eventArg.target.value;
}}" }}"
/>`; />`;
case 'Number': case 'Number':
return html`<input return html`<input
type="number" type="number"
value=${selectedElement[key]} value=${firstFoundInstantiatedElement[key]}
@input="${(eventArg: any) => { @input="${(eventArg: any) => {
selectedElement[key] = eventArg.target.value; firstFoundInstantiatedElement[key] = eventArg.target.value;
}}" }}"
/>`; />`;
case 'Enum': case 'Enum':
const enumValues: any[] = getEnumValues(property); const enumValues: any[] = getEnumValues(property);
return html`<select return html`<select
@change="${(eventArg:any)=>{ @change="${(eventArg: any) => {
selectedElement[key]=eventArg.target.value; firstFoundInstantiatedElement[key] = eventArg.target.value;
}}"> }}"
${enumValues.map(valueArg => { >
${enumValues.map((valueArg) => {
return html` return html`
<option ?selected=${valueArg === selectedElement[key] ? true : false} name="${valueArg}">${valueArg}</option> <option
?selected=${valueArg === firstFoundInstantiatedElement[key] ? true : false}
name="${valueArg}"
>
${valueArg}
</option>
`; `;
})} })}
</select>`; </select>`;
@ -330,6 +342,8 @@ export class WccProperties extends LitElement {
} }
this.propertyContent = propertyArray; this.propertyContent = propertyArray;
} else { } else {
console.log(`Cannot extract properties of ${(this.selectedItem as any)?.name}`);
this.warning = `You selected a page.`;
return null; return null;
} }
} }
@ -345,9 +359,9 @@ export class WccProperties extends LitElement {
this.dashboardRef.buildUrl(); this.dashboardRef.buildUrl();
} }
public async performUpdate() { public async scheduleUpdate() {
await this.createProperties(); await this.createProperties();
super.performUpdate(); super.scheduleUpdate();
} }
public selectViewport(viewport: TEnvironment) { public selectViewport(viewport: TEnvironment) {