1.0.98

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@design.estate/dees-document",
-  "version": "1.0.95",
+  "version": "1.0.98",
   "private": false,
   "description": "a catalog for creating documents like invoices",
   "main": "dist_ts_web/index.js",
@@ -18,26 +18,26 @@
   "author": "Lossless GmbH",
   "license": "MIT",
   "dependencies": {
-    "@design.estate/dees-domtools": "^2.0.34",
+    "@design.estate/dees-domtools": "^2.0.55",
-    "@design.estate/dees-element": "^2.0.23",
+    "@design.estate/dees-element": "^2.0.33",
-    "@design.estate/dees-wcctools": "^1.0.76",
+    "@design.estate/dees-wcctools": "^1.0.85",
-    "@git.zone/tsrun": "^1.2.44",
+    "@git.zone/tsrun": "^1.2.46",
-    "@push.rocks/smartfile": "^10.0.26",
+    "@push.rocks/smartfile": "^11.0.4",
     "@push.rocks/smartjson": "^5.0.10",
-    "@push.rocks/smartpath": "^5.0.5",
+    "@push.rocks/smartpath": "^5.0.11",
     "@push.rocks/smartpdf": "^3.0.16",
-    "@push.rocks/smarttime": "^4.0.1",
+    "@push.rocks/smarttime": "^4.0.6",
     "@tsclass/tsclass": "^4.0.46",
-    "@types/qrcode": "^1.5.2",
+    "@types/qrcode": "^1.5.5",
     "qrcode": "^1.5.3"
   },
   "devDependencies": {
-    "@git.zone/tsbuild": "^2.1.66",
+    "@git.zone/tsbuild": "^2.1.72",
-    "@git.zone/tsbundle": "^2.0.8",
+    "@git.zone/tsbundle": "^2.0.15",
-    "@git.zone/tstest": "^1.0.77",
+    "@git.zone/tstest": "^1.0.84",
-    "@git.zone/tswatch": "^2.0.7",
+    "@git.zone/tswatch": "^2.0.21",
-    "@push.rocks/projectinfo": "^5.0.1",
+    "@push.rocks/projectinfo": "^5.0.2",
-    "@push.rocks/tapbundle": "^5.0.8"
+    "@push.rocks/tapbundle": "^5.0.15"
   },
   "files": [
     "ts/**/*",

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@design.estate/dees-document',
-  version: '1.0.95',
+  version: '1.0.98',
   description: 'a catalog for creating documents like invoices'
 }

ts_web/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@design.estate/dees-document',
-  version: '1.0.95',
+  version: '1.0.98',
   description: 'a catalog for creating documents like invoices'
 }

ts_web/elements/document.demo.ts

@@ -0,0 +1,6 @@
+import * as shared from './shared/index.js';
+import { html } from '@design.estate/dees-element';
+
+export const demoFunc = () => html`
+<dedocument-dedocument .format="${'a4'}" .letterData=${shared.demoLetter}></dedocument-dedocument>
+`;

ts_web/elements/document.ts

@@ -18,6 +18,7 @@ import { DePage } from './page.js';
 import { DeContentInvoice } from './contentinvoice.js';
 
 import * as shared from './shared/index.js';
+import { demoFunc } from './document.demo.js';
 
 declare global {
   interface HTMLElementTagNameMap {
@@ -27,9 +28,7 @@ declare global {
 
 @customElement('dedocument-dedocument')
 export class DeDocument extends DeesElement {
-  public static demo = () => html`
+  public static demo = demoFunc;
-    <dedocument-dedocument .format="${'a4'}" .letterData=${shared.demoLetter}></dedocument-dedocument>
-  `;
 
   @property({
     type: String,
@@ -86,7 +85,7 @@ export class DeDocument extends DeesElement {
       }
 
       .betweenPagesSpacer {
-        height: 20px;
+        height: 16px;
       }
     `,
   ];
@@ -107,6 +106,10 @@ export class DeDocument extends DeesElement {
       }
     });
     resizeObserver.observe(this);
+    this.registerGarbageFunction(() => {
+      resizeObserver.disconnect();
+    })
+    
     if (this.letterDataUrl) {
       const response = await fetch(this.letterDataUrl);
       this.letterData = await response.json();

ts_web/elements/index.ts

@@ -6,5 +6,6 @@ export * from './pagecontainer.js';
 export * from './pagecontent.js';
 export * from './pagefooter.js';
 export * from './pageheader.js';
+export * from './viewer.js';
 
 export * from './shared/index.js';

ts_web/elements/page.ts

@@ -47,7 +47,7 @@ export class DePage extends DeesElement {
   @property({
     type: Object,
   })
-  public letterData: tsclass.business.ILetter = shared.demoLetter;
+  public letterData: tsclass.business.ILetter = null;
 
   @property({
     type: Boolean,
@@ -64,6 +64,9 @@ export class DePage extends DeesElement {
     domtools.elementBasic.staticStyles,
     css`
       :host {
+        display: block;
+        max-height: ${shared.a4Height}px;
+        max-width: ${shared.a4Width}px;
       }
 
       #scaleWrapper {
@@ -106,42 +109,48 @@ export class DePage extends DeesElement {
     return html`
       <div id="scaleWrapper">
         <dedocument-pagecontainer .printMode=${this.printMode}>
-          <dedocument-pageheader
+          ${this.letterData
-            .letterData=${this.letterData}
-            .pageNumber="${this.pageNumber}"
-            .pageTotalNumber="${this.pageTotalNumber}"
-          ></dedocument-pageheader>
-          ${this.pageNumber === 1
             ? html`
-                <dedocument-letterheader
+                <dedocument-pageheader
-                  .pageNumber="${this.pageNumber}"
                   .letterData=${this.letterData}
+                  .pageNumber="${this.pageNumber}"
                   .pageTotalNumber="${this.pageTotalNumber}"
-                ></dedocument-letterheader>
+                ></dedocument-pageheader>
+                ${this.pageNumber === 1
+                  ? html`
+                      <dedocument-letterheader
+                        .pageNumber="${this.pageNumber}"
+                        .letterData=${this.letterData}
+                        .pageTotalNumber="${this.pageTotalNumber}"
+                      ></dedocument-letterheader>
+                    `
+                  : html``}
+                <dedocument-pagecontent
+                  .pageNumber="${this.pageNumber}"
+                  .pageTotalNumber="${this.pageTotalNumber}"
+                  .letterData=${this.letterData}
+                  ><slot></slot
+                ></dedocument-pagecontent>
+                <dedocument-pagefooter
+                  .letterData=${this.letterData}
+                  .pageNumber="${this.pageNumber}"
+                  .pageTotalNumber="${this.pageTotalNumber}"
+                ></dedocument-pagefooter>
+                <div class="versionOverlay">
+                  ${this.letterData.versionInfo.type === 'draft'
+                    ? html`
+                        <div class="topInfo">
+                          Please note: THIS IS A DRAFT ONLY. NO RIGHTS CAN BE DERIVED FROM THIS.<br />
+                          -> Revision/Document version: ${this.letterData.versionInfo.version}
+                        </div>
+                        <div class="bigDraftText">DRAFT</div>
+                      `
+                    : html``}
+                </div>
               `
-            : html``}
+            : html`
-          <dedocument-pagecontent
+              <slot></slot>
-            .pageNumber="${this.pageNumber}"
+            `}
-            .pageTotalNumber="${this.pageTotalNumber}"
-            .letterData=${this.letterData}
-            ><slot></slot
-          ></dedocument-pagecontent>
-          <dedocument-pagefooter
-            .letterData=${this.letterData}
-            .pageNumber="${this.pageNumber}"
-            .pageTotalNumber="${this.pageTotalNumber}"
-          ></dedocument-pagefooter>
-          <div class="versionOverlay">
-            ${this.letterData.versionInfo.type === 'draft'
-              ? html`
-                  <div class="topInfo">
-                    Please note: THIS IS A DRAFT ONLY. NO RIGHTS CAN BE DERIVED FROM THIS.<br />
-                    -> Revision/Document version: ${this.letterData.versionInfo.version}
-                  </div>
-                  <div class="bigDraftText">DRAFT</div>
-                `
-              : html``}
-          </div>
         </dedocument-pagecontainer>
       </div>
     `;
@@ -155,17 +164,17 @@ export class DePage extends DeesElement {
 
   updated(changedProperties: Map<string | number | symbol, unknown>): void {
     super.updated(changedProperties);
-    if (changedProperties.has("viewHeight") || changedProperties.has("viewWidth")) {
+    if (changedProperties.has('viewHeight') || changedProperties.has('viewWidth')) {
       this.adjustScaling();
     }
   }
-  
+
   private adjustScaling() {
-    console.log('page scale adjustment triggered.')
+    console.log('page scale adjustment triggered.');
-    const scaleWrapper: HTMLDivElement = this.shadowRoot.querySelector("#scaleWrapper");
+    const scaleWrapper: HTMLDivElement = this.shadowRoot.querySelector('#scaleWrapper');
-  
+
     if (!scaleWrapper) return;
-  
+
     let scale = 1;
     if (this.viewHeight) {
       scale = this.viewHeight / shared.a4Height;
@@ -174,10 +183,10 @@ export class DePage extends DeesElement {
     }
     console.log(`new scale is ${scale}`);
     scaleWrapper.style.transform = `scale(${scale})`;
-  
+
     // Adjust the outer dimensions so they match the scaled content
-    
+
-    scaleWrapper.style.width = `${shared.a4Width * scale}px`;
+    // this.style.width = `${shared.a4Width * scale}px`;
-    scaleWrapper.style.height = `${shared.a4Height * scale}px`;
+    this.style.height = `${shared.a4Height * scale}px`;
   }
 }

ts_web/elements/viewer.demo.ts

@@ -0,0 +1,6 @@
+import { html } from '@design.estate/dees-element';
+import * as shared from './shared/index.js';
+
+export const demoFunc = () => html`
+  <dedocument-viewer .letterData=${shared.demoLetter}></dedocument-viewer>
+`;

ts_web/elements/viewer.ts

@@ -0,0 +1,83 @@
+import * as plugins from '../plugins.js';
+
+import { DeesElement, css, cssManager, customElement, html } from '@design.estate/dees-element';
+import { demoFunc } from './viewer.demo.js';
+
+declare global {
+  interface HTMLElementTagNameMap {
+    'dedocument-viewer': DeDocumentViewer;
+  }
+}
+
+@customElement('dedocument-viewer')
+export class DeDocumentViewer extends DeesElement {
+  // DEMO
+  public static demo = demoFunc;
+
+  // INSTANCE
+  public letterData: plugins.tsclass.business.ILetter = null;
+
+  public static styles = [
+    cssManager.defaultStyles,
+    css`
+      .maincontainer {
+        position: relative;
+        height: 100%;
+        width: 100%;
+        background: ${cssManager.bdTheme('#eeeeeb', '#111')};
+      }
+      .controls {
+        top: 0px;
+        right: 0px;
+        left: 0px;
+        position: absolute;
+        height: 32px;
+        width: 100%;
+        background: ${cssManager.bdTheme('#eeeeeb', '#111111ee')};
+        box-shadow: 0px 2px 8px 0px #000000;
+      }
+      .controlsShadow {
+        position: absolute;
+        top: 32px;
+        right: 0px;
+        left: 0px;
+        height: 16px;
+        width: 100%;
+        position: absolute;
+        background: linear-gradient(to bottom, #111111cc 0%, #11111100 100%);
+      }
+
+      .viewport {
+        position: absolute;
+        padding: 16px;
+        padding-top: 48px;
+        padding-bottom: 0px;
+        top: 0px;
+        left: 0px;
+        right: 0px;
+        bottom: 0px;
+        overflow-y: scroll;
+        overscroll-behavior: contain;
+      }
+    `,
+  ];
+
+  public render = () => {
+    return html`
+      <div class="maincontainer">
+        <div class="viewport">
+          ${this.letterData
+            ? html` <dedocument-dedocument .letterData=${this.letterData}></dedocument-dedocument> `
+            : html``}
+        </div>
+        <div class="controls"></div>
+      </div>
+    `;
+  };
+
+  public updated = (changedProperties: Map<string | number | symbol, unknown>) => {
+    super.updated(changedProperties);
+    if (changedProperties.has('letterData')) {
+    }
+  };
+}