diff --git a/package.json b/package.json index 63bbd04..b82fb1c 100644 --- 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" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c9e34f3..4aac33a 100644 --- 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==} diff --git a/ts_web/00_commitinfo_data.ts b/ts_web/00_commitinfo_data.ts index 4beed21..d99181e 100644 --- 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' } diff --git a/ts_web/elements/dees-mobilenavigation.ts b/ts_web/elements/dees-mobilenavigation.ts index aa37826..34d512b 100644 --- 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` { - 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[]) { 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} diff --git a/ts_web/elements/dees-modal.demo.ts b/ts_web/elements/dees-modal.demo.ts index c17edbd..d16a332 100644 --- a/ts_web/elements/dees-modal.demo.ts +++ b/ts_web/elements/dees-modal.demo.ts @@ -16,7 +16,22 @@ export const demoFunc = () => html` > - ` + `, + 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 ` \ No newline at end of file diff --git a/ts_web/elements/dees-modal.ts b/ts_web/elements/dees-modal.ts index b577bae..3b55642 100644 --- 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[]; + }) { 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[] = []; + 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` +
${this.heading}
${this.content}
-
Cancel
-
OK
+ ${this.menuOptions.map( + (actionArg) => html` +
{ + actionArg.action(this); + }}>${actionArg.name}
+ ` + )}