@lightningtv/solid 3.1.8 → 3.1.10

package/src/core/dom-renderer/domRendererUtils.ts

@@ -43,7 +43,7 @@ export function getNodeLineHeight(props: {
   fontSize: number;
 }): number {
   return (
-    props.lineHeight ?? Config.fontSettings.lineHeight ?? 1.2 * props.fontSize
+    props.lineHeight || Config.fontSettings.lineHeight || 1.2 * props.fontSize
   );
 }
 
@@ -184,10 +184,11 @@ function interpolate(start: number, end: number, t: number): number {
 
 function interpolateColor(start: number, end: number, t: number): number {
   return (
-    (interpolate((start >> 24) & 0xff, (end >> 24) & 0xff, t) << 24) |
-    (interpolate((start >> 16) & 0xff, (end >> 16) & 0xff, t) << 16) |
-    (interpolate((start >> 8) & 0xff, (end >> 8) & 0xff, t) << 8) |
-    interpolate(start & 0xff, end & 0xff, t)
+    ((interpolate((start >> 24) & 0xff, (end >> 24) & 0xff, t) << 24) |
+      (interpolate((start >> 16) & 0xff, (end >> 16) & 0xff, t) << 16) |
+      (interpolate((start >> 8) & 0xff, (end >> 8) & 0xff, t) << 8) |
+      interpolate(start & 0xff, end & 0xff, t)) >>>
+    0
   );
 }
 

package/src/core/elementNode.ts

@@ -786,7 +786,8 @@ export class ElementNode extends Object {
       (Config.fontWeightAlias &&
         (Config.fontWeightAlias[v as string] as number | string)) ??
       v;
-    (this.lng as any).fontFamily = `${this.fontFamily}${weight}`;
+    (this.lng as any).fontFamily =
+      `${this.fontFamily || Config.fontSettings?.fontFamily}${weight}`;
   }
 
   get fontWeight() {
@@ -799,7 +800,7 @@ export class ElementNode extends Object {
   }
 
   get fontFamily() {
-    return this._fontFamily || Config.fontSettings?.fontFamily;
+    return this._fontFamily;
   }
 
   insertChild(

package/src/core/intrinsicTypes.ts

@@ -23,13 +23,19 @@ export type AddColorString<T> = {
   [K in keyof T]: K extends `color${string}` ? string | number : T[K];
 };
 
-export interface BorderStyleObject extends Partial<lngr.BorderProps> {
+export interface BorderStyleObject
+  extends AddColorString<Partial<lngr.BorderProps>> {
   width?: number | [number, number, number, number];
+  gap?: number;
+  align?: 'inside' | 'outside' | 'center';
 }
 
-export interface SingleBorderStyleObject extends Partial<lngr.BorderProps> {
+export interface SingleBorderStyleObject
+  extends AddColorString<Partial<lngr.BorderProps>> {
   width?: number;
   w?: number;
+  gap?: number;
+  align?: 'inside' | 'outside' | 'center';
 }
 
 export type DollarString = `$${string}`;

package/src/primitives/Virtual.tsx

@@ -39,10 +39,13 @@ function createVirtual<T>(
   const scrollType = s.createMemo(() => props.scroll || 'auto');
 
   const selected = () => {
+    if (itemCount() <= props.displaySize) {
+      return utils.clamp(props.selected || 0, 0, Math.max(0, itemCount() - 1));
+    }
     if (props.wrap) {
       return Math.max(bufferSize(), scrollIndex());
     }
-    return props.selected || 0;
+    return utils.clamp(props.selected || 0, 0, Math.max(0, itemCount() - 1));
   };
 
   let cachedScaledSize: number | undefined;
@@ -116,6 +119,18 @@ function createVirtual<T>(
         cursor: 0,
       };
 
+    if (total <= props.displaySize) {
+      return {
+        start: 0,
+        slice: items() as T[],
+        selected: utils.clamp(c, 0, total - 1),
+        delta,
+        shiftBy: 0,
+        atStart: c <= 0,
+        cursor: utils.clamp(c, 0, total - 1),
+      };
+    }
+
     const length = props.displaySize + bufferSize();
     let start = prev.start;
     let selected = prev.selected;
@@ -457,9 +472,10 @@ function createVirtual<T>(
 
   const updateSelected = ([sel, _items]: [number?, any?]) => {
     if (!viewRef || sel === undefined || itemCount() === 0) return;
-    const item = items()[sel];
-    setCursor(sel);
-    const newState = computeSlice(cursor(), 0, slice());
+    const safeSel = utils.clamp(sel, 0, itemCount() - 1);
+    const item = items()[safeSel];
+    setCursor(safeSel);
+    const newState = computeSlice(safeSel, 0, slice());
     setSlice(newState);
 
     queueMicrotask(() => {
@@ -487,6 +503,13 @@ function createVirtual<T>(
     s.on([() => props.wrap, items], () => {
       if (!viewRef || itemCount() === 0 || !props.wrap || doOnce) return;
       doOnce = true;
+      if (itemCount() <= props.displaySize) {
+        queueMicrotask(() => {
+          originalPosition = viewRef.lng[axis];
+          targetPosition = viewRef.lng[axis];
+        });
+        return;
+      }
       // offset just for wrap so we keep one item before
       queueMicrotask(() => {
         const childSize = computeSize(slice().selected);
@@ -503,10 +526,12 @@ function createVirtual<T>(
   s.createEffect(
     s.on(items, () => {
       if (!viewRef) return;
-      if (cursor() >= itemCount()) {
-        setCursor(Math.max(0, itemCount() - 1));
+      let c = cursor();
+      if (c >= itemCount()) {
+        c = Math.max(0, itemCount() - 1);
+        setCursor(c);
       }
-      const newState = computeSlice(cursor(), 0, slice());
+      const newState = computeSlice(c, 0, slice());
       setSlice(newState);
       viewRef.selected = newState.selected;
     }),