@lightningtv/solid 3.0.0-2 → 3.0.0-21

package/src/solidOpts.ts

@@ -6,35 +6,38 @@ import {
   log,
   type ElementText,
   type TextNode,
-} from '@lightningtv/core';
+} from './core/index.js';
 import type { SolidNode, SolidRendererOptions } from './types.js';
 
-declare module '@lightningtv/core' {
-  interface ElementNode {
-    _queueInsert?: true;
-    _queueRemove?: true;
-  }
-}
+Object.defineProperty(ElementNode.prototype, 'preserve', {
+  get(): boolean | undefined {
+    return this._queueDelete === 0;
+  },
+  set(v: boolean) {
+    this._queueDelete = v ? 0 : undefined;
+  },
+});
 
-let elementQueue: ElementNode[] = [];
+let elementDeleteQueue: ElementNode[] = [];
 
-function flushQueue(): void {
-  for (let el of elementQueue) {
-    if (el._queueRemove && !el._queueInsert) {
+function flushDeleteQueue(): void {
+  for (let el of elementDeleteQueue) {
+    if (Number(el._queueDelete) < 0) {
       el.destroy();
     }
-    el._queueInsert = el._queueRemove = undefined;
+    el._queueDelete = undefined;
   }
-  elementQueue.length = 0;
+  elementDeleteQueue.length = 0;
 }
 
-function addToQueue(node: ElementNode): void {
-  if (node._queueInsert && node._queueRemove) {
-    return; // Already in the queue
-  }
-
-  if (elementQueue.push(node) === 1) {
-    queueMicrotask(flushQueue);
+function pushDeleteQueue(node: ElementNode, n: number): void {
+  if (node._queueDelete === undefined) {
+    node._queueDelete = n;
+    if (elementDeleteQueue.push(node) === 1) {
+      queueMicrotask(flushDeleteQueue);
+    }
+  } else {
+    node._queueDelete += n;
   }
 }
 
@@ -59,12 +62,14 @@ export default {
   insertNode(parent: ElementNode, node: SolidNode, anchor: SolidNode): void {
     log('INSERT: ', parent, node, anchor);
 
+    let prevParent = node.parent;
     parent.insertChild(node, anchor);
 
     if (node instanceof ElementNode) {
-      node._queueInsert = true;
       node.parent!.rendered && node.render(true);
-      addToQueue(node);
+      if (prevParent !== undefined) {
+        pushDeleteQueue(node, 1);
+      }
     } else if (isElementText(parent)) {
       // TextNodes can be placed outside of <text> nodes when <Show> is used as placeholder
       parent.text = parent.getText();
@@ -79,8 +84,10 @@ export default {
     parent.removeChild(node);
 
     if (node instanceof ElementNode) {
-      node._queueRemove = true;
-      addToQueue(node);
+      pushDeleteQueue(node, -1);
+    } else if (isElementText(parent)) {
+      // TextNodes can be placed outside of <text> nodes when <Show> is used as placeholder
+      parent.text = parent.getText();
     }
   },
   getParentNode(node: SolidNode): ElementNode | ElementText | undefined {

package/src/types.ts

@@ -3,7 +3,7 @@ import {
   type Styles,
   type ElementText,
   type TextNode,
-} from '@lightningtv/core';
+} from './core/index.js';
 import type { JSXElement } from 'solid-js';
 import { createRenderer } from 'solid-js/universal';
 
@@ -20,17 +20,3 @@ export interface RenderedNode extends ElementNode {
 export type SolidNode = ElementNode | ElementText | TextNode;
 
 export type SolidStyles = Styles;
-
-declare module '@lightningtv/core' {
-  interface NodeProps {
-    children?: JSXElement | undefined;
-  }
-
-  interface TextProps {
-    children?: string | string[] | undefined;
-  }
-
-  interface Config {
-    taskDelay?: number;
-  }
-}

package/src/utils.ts

@@ -1,4 +1,4 @@
-import { isInteger, type Styles } from '@lightningtv/core';
+import { isInteger, type Styles } from './core/index.js';
 import { Accessor, createMemo } from 'solid-js';
 
 /**
@@ -61,3 +61,13 @@ export function combineStylesMemo<T extends Styles>(
     ...style1,
   }));
 }
+
+export const clamp = (value: number, min: number, max: number) =>
+  min < max
+    ? Math.min(Math.max(value, min), max)
+    : Math.min(Math.max(value, max), min);
+
+export function mod(n: number, m: number): number {
+  if (m === 0) return 0;
+  return ((n % m) + m) % m;
+}