fix(core): update

2023-09-13 13:41:56 +02:00 · 2023-09-13 13:41:56 +02:00 · 82ead7bd1a
commit 82ead7bd1a
parent f8f9b150b8
6 changed files with 57 additions and 23 deletions
--- a/package.json
+++ b/package.json
@ -24,7 +24,7 @@
    "@fortawesome/free-solid-svg-icons": "^6.4.2",
    "@push.rocks/smartpromise": "^4.0.3",
    "@push.rocks/smartstring": "^4.0.9",
-    "@tsclass/tsclass": "^4.0.42",
+    "@tsclass/tsclass": "^4.0.43",
    "highlight.js": "11.8.0",
    "pdfjs-dist": "^3.10.111"
  },
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -33,8 +33,8 @@ dependencies:
    specifier: ^4.0.9
    version: 4.0.9
  '@tsclass/tsclass':
-    specifier: ^4.0.42
-    version: 4.0.42
+    specifier: ^4.0.43
+    version: 4.0.43
  highlight.js:
    specifier: 11.8.0
    version: 11.8.0
@ -139,7 +139,7 @@ packages:
      '@pushrocks/smartsitemap': 2.0.1
      '@pushrocks/smarttime': 4.0.1
      '@pushrocks/webstore': 2.0.8
-      '@tsclass/tsclass': 4.0.42
+      '@tsclass/tsclass': 4.0.43
      '@types/express': 4.17.17
      body-parser: 1.20.2
      cors: 2.8.5
@ -994,7 +994,7 @@ packages:
    dependencies:
      '@pushrocks/smartdelay': 3.0.1
      '@pushrocks/smartpromise': 4.0.2
-      '@tsclass/tsclass': 4.0.42
+      '@tsclass/tsclass': 4.0.43
    dev: false

  /@push.rocks/webstore@2.0.9:
@ -1174,7 +1174,7 @@ packages:
      '@pushrocks/smartrequest': 2.0.15
      '@pushrocks/smartsitemap': 2.0.1
      '@pushrocks/smarttime': 4.0.1
-      '@tsclass/tsclass': 4.0.42
+      '@tsclass/tsclass': 4.0.43
      '@types/compression': 1.7.2
      '@types/cors': 2.8.13
      '@types/express': 4.17.17
@ -1356,7 +1356,7 @@ packages:
      '@pushrocks/smartpromise': 3.1.10
      '@pushrocks/smartpuppeteer': 2.0.2
      '@pushrocks/smartunique': 3.0.3
-      '@tsclass/tsclass': 4.0.42
+      '@tsclass/tsclass': 4.0.43
      '@types/express': 4.17.17
      express: 4.18.2
      pdf-merger-js: 3.4.0
@ -1682,10 +1682,10 @@ packages:
      type-fest: 2.19.0
    dev: true

-  /@tsclass/tsclass@4.0.42:
-    resolution: {integrity: sha512-mWZ8k3G7VL/dSNaJCv7mjbad6movf2rTE+1MdsXMoCxblZpJ3YzqlRsKm/JUQkxqF1H28q6m/L5BV42LfNZsiA==}
+  /@tsclass/tsclass@4.0.43:
+    resolution: {integrity: sha512-BGihF65KjD/pqQIrTUemff7OMvQi22FBZCti+7NHWIb7ZxtFrJsciEyAFQrx0de5GQWOFTwQx6HNKqwgkP2Mhg==}
    dependencies:
-      type-fest: 3.13.1
+      type-fest: 4.3.1

  /@tsconfig/node10@1.0.9:
    resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==}
@ -5731,9 +5731,9 @@ packages:
    resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==}
    engines: {node: '>=12.20'}

-  /type-fest@3.13.1:
-    resolution: {integrity: sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==}
-    engines: {node: '>=14.16'}
+  /type-fest@4.3.1:
+    resolution: {integrity: sha512-pphNW/msgOUSkJbH58x8sqpq8uQj6b0ZKGxEsLKMUnGorRcDjrUaLS+39+/ub41JNTwrrMyJcUB8+YZs3mbwqw==}
+    engines: {node: '>=16'}

  /type-is@1.6.18:
    resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
--- a/ts_web/00_commitinfo_data.ts
+++ b/ts_web/00_commitinfo_data.ts
@ -3,6 +3,6 @@
 */
 export const commitinfo = {
  name: '@design.estate/dees-catalog',
-  version: '1.0.192',
+  version: '1.0.193',
  description: 'website for lossless.com'
 }
--- a/ts_web/elements/dees-mobilenavigation.ts
+++ b/ts_web/elements/dees-mobilenavigation.ts
@ -16,11 +16,12 @@ export class DeesMobilenavigation extends DeesElement {
  // STATIC
  public static demo = () => html`
    <dees-button @click=${() => {
-      DeesMobilenavigation.createAndInit([
+      DeesMobilenavigation.createAndShow([
        {
          name: 'Test',
-          action: () => {
+          action: async (deesMobileNav) => {
            alert('test');
+            return null;
          },
        },
      ]);
@ -28,7 +29,7 @@ export class DeesMobilenavigation extends DeesElement {
  `;

  private static singletonRef: DeesMobilenavigation;
-  public static async createAndInit(menuItemsArg: plugins.tsclass.website.IMenuItem[]) {
+  public static async createAndShow(menuItemsArg: plugins.tsclass.website.IMenuItem<DeesMobilenavigation>[]) {
    if (!this.singletonRef) {
      this.singletonRef = new DeesMobilenavigation();
      document.body.append(this.singletonRef);
@ -134,7 +135,7 @@ export class DeesMobilenavigation extends DeesElement {
              class="menuItem"
              @click="${() => {
                this.hide();
-                menuItem.action();
+                menuItem.action(this);
              }}"
            >
              ${menuItem.name}
--- a/ts_web/elements/dees-modal.demo.ts
+++ b/ts_web/elements/dees-modal.demo.ts
@ -16,7 +16,22 @@ export const demoFunc = () => html`
          >
          </dees-input-text>
        </dees-form>
-      `
+      `,
+      menuOptions: [{
+        name: 'Cancel',
+        iconName: null,
+        action: async (deesModalArg) => {
+          deesModalArg.destroy();
+          return null;
+        }
+      }, {
+        name: 'Ok',
+        iconName: null,
+        action: async (deesModalArg) => {
+          deesModalArg.destroy();
+          return null;
+        }
+      }],
    });
  }}>open modal</dees-button>
 `
--- a/ts_web/elements/dees-modal.ts
+++ b/ts_web/elements/dees-modal.ts
@ -1,3 +1,4 @@
+import * as plugins from './plugins.js';
 import { demoFunc } from './dees-modal.demo.js';
 import {
  customElement,
@ -27,11 +28,16 @@ export class DeesModal extends DeesElement {
  // STATIC
  public static demo = demoFunc;

-  public static async createAndShow(optionsArg: { heading: string; content: TemplateResult }) {
+  public static async createAndShow(optionsArg: {
+    heading: string;
+    content: TemplateResult;
+    menuOptions: plugins.tsclass.website.IMenuItem<DeesModal>[];
+  }) {
    const body = document.body;
    const modal = new DeesModal();
    modal.heading = optionsArg.heading;
    modal.content = optionsArg.content;
+    modal.menuOptions = optionsArg.menuOptions;
    modal.windowLayer = await DeesWindowLayer.createAndShow();
    modal.windowLayer.addEventListener('click', async () => {
      await modal.destroy();
@ -50,6 +56,9 @@ export class DeesModal extends DeesElement {
  @state({})
  public content: TemplateResult;

+  @state({})
+  public menuOptions: plugins.tsclass.website.IMenuItem<DeesModal>[] = [];
+
  constructor() {
    super();
  }
@ -104,7 +113,6 @@ export class DeesModal extends DeesElement {
      }
      .modal .bottomButtons {
        display: grid;
-        grid-template-columns: 1fr 1fr;
        border-top: 1px solid #222;
      }

@ -127,13 +135,23 @@ export class DeesModal extends DeesElement {

  public render(): TemplateResult {
    return html`
+      <style>
+        .modal .bottomButtons {
+          grid-template-columns: ${cssManager.cssGridColumns(this.menuOptions.length, 0)};
+        }
+      </style>
      <div class="modalContainer" @click=${this.handleOutsideClick}>
        <div class="modal">
          <div class="heading">${this.heading}</div>
          <div class="content">${this.content}</div>
          <div class="bottomButtons">
-            <div class="bottomButton">Cancel</div>
-            <div class="bottomButton">OK</div>
+            ${this.menuOptions.map(
+              (actionArg) => html`
+                <div class="bottomButton" @click=${() => {
+                  actionArg.action(this);
+                }}>${actionArg.name}</div>
+              `
+            )}
          </div>
        </div>
      </div>