Compare commits

...

6 Commits

Author SHA1 Message Date
dc13ad997b 2.0.27 2023-09-04 16:31:56 +02:00
1c7c1c2432 fix(core): update 2023-09-04 16:31:56 +02:00
969cd12725 2.0.26 2023-09-04 14:56:58 +02:00
f2aa825f95 fix(core): update 2023-09-04 14:56:57 +02:00
9d072cde61 2.0.25 2023-08-07 19:34:45 +02:00
3b100a5b20 fix(core): update 2023-08-07 19:34:44 +02:00
5 changed files with 45 additions and 19 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "@design.estate/dees-element", "name": "@design.estate/dees-element",
"version": "2.0.24", "version": "2.0.27",
"private": false, "private": false,
"description": "a custom element class extending lit element class", "description": "a custom element class extending lit element class",
"main": "dist_ts/index.js", "main": "dist_ts/index.js",

View File

@ -3,6 +3,6 @@
*/ */
export const commitinfo = { export const commitinfo = {
name: '@design.estate/dees-element', name: '@design.estate/dees-element',
version: '2.0.24', version: '2.0.27',
description: 'a custom element class extending lit element class' description: 'a custom element class extending lit element class'
} }

View File

@ -1,37 +1,50 @@
import { noChange } from 'lit'; import { type TemplateResult, noChange } from 'lit';
import { AsyncDirective, directive } from 'lit/async-directive.js'; import { AsyncDirective, directive } from 'lit/async-directive.js';
import { rxjs } from '@push.rocks/smartrx';
class ResolveDirective extends AsyncDirective { class ResolveDirective extends AsyncDirective {
observable: rxjs.Observable<unknown> | undefined; promise: Promise<unknown> | undefined;
sub: rxjs.Subscription | null = null; hasPromiseSettled: boolean = false;
render(observable: rxjs.Observable<unknown>) { render(promise: Promise<unknown>) {
if (this.observable !== observable) { if (this.promise !== promise) {
this.sub?.unsubscribe(); this.promise = promise;
this.observable = observable;
if (this.isConnected) { if (this.isConnected) {
this.subscribe(observable); this.handlePromise(promise);
} }
} }
return noChange; return noChange;
} }
subscribe(observable: rxjs.Observable<unknown>) { handlePromise(promise: Promise<unknown>) {
this.sub = observable.subscribe((v: unknown) => { this.hasPromiseSettled = false;
this.setValue(v);
promise.then((value) => {
if (this.promise === promise && !this.hasPromiseSettled) {
this.setValue(value);
this.hasPromiseSettled = true;
}
}).catch((error) => {
if (this.promise === promise && !this.hasPromiseSettled) {
this.setValue(error);
this.hasPromiseSettled = true;
}
}); });
} }
disconnected() { disconnected() {
this.sub?.unsubscribe(); this.hasPromiseSettled = true; // prevent setting value if the promise settles after disconnection
} }
reconnected() { reconnected() {
this.subscribe(this.observable!); if (!this.hasPromiseSettled) {
this.handlePromise(this.promise!);
}
} }
} }
export const resolve = directive(ResolveDirective); export const resolve = directive(ResolveDirective);
export const resolveExec = (funcArg: () => Promise<TemplateResult | unknown>) => {
return resolve(funcArg());
}

View File

@ -1,7 +1,7 @@
import { CssManager } from './dees-element.classes.cssmanager.js'; import { CssManager } from './dees-element.classes.cssmanager.js';
// lit exports // lit exports
export { html, type TemplateResult, css, unsafeCSS, render } from 'lit'; export { html, type TemplateResult, css, unsafeCSS, render, type CSSResult } from 'lit';
export { unsafeHTML } from 'lit/directives/unsafe-html.js'; export { unsafeHTML } from 'lit/directives/unsafe-html.js';
export { customElement } from 'lit/decorators/custom-element.js'; export { customElement } from 'lit/decorators/custom-element.js';
@ -24,3 +24,12 @@ export * from './dees-element.classes.resolvedirective.js';
* a singleton instance of CssManager * a singleton instance of CssManager
*/ */
export const cssManager = new CssManager(); export const cssManager = new CssManager();
// better scoped exports
import { resolve } from './dees-element.classes.resolvedirective.js';
import { subscribe } from './dees-element.classes.subscribedirective.js';
export const directives = {
resolve,
subscribe,
}

View File

@ -5,6 +5,10 @@
"target": "ES2022", "target": "ES2022",
"module": "ES2022", "module": "ES2022",
"moduleResolution": "nodenext", "moduleResolution": "nodenext",
"esModuleInterop": true "esModuleInterop": true,
} "verbatimModuleSyntax": true
},
"exclude": [
"dist_*/**/*.d.ts"
]
} }