@noya-app/noya-designsystem 0.1.71 → 0.1.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noya-app/noya-designsystem",
-  "version": "0.1.71",
+  "version": "0.1.73",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -28,7 +28,7 @@
     "@noya-app/noya-geometry": "0.1.16",
     "@noya-app/noya-icons": "0.1.16",
     "@noya-app/noya-keymap": "0.1.4",
-    "@noya-app/noya-tailwind-config": "0.1.8",
+    "@noya-app/noya-tailwind-config": "0.1.9",
     "radix-ui": "1.4.2",
     "@radix-ui/react-compose-refs": "^1.0.0",
     "@radix-ui/primitive": "^1.0.1",
@@ -38,17 +38,13 @@
     "immer": "9.0.5",
     "kiwi.js": "^1.1.3",
     "react-resizable-panels": "3.0.3",
-    "react-window": "^1.8.8",
-    "vscode-fuzzy-scorer": "^0.0.4",
-    "react-virtualized": "9.22.6"
+    "vscode-fuzzy-scorer": "^0.0.4"
   },
   "devDependencies": {
     "@tailwindcss/container-queries": "^0.1.1",
     "@tailwindcss/typography": "^0.5.19",
     "@types/react": "*",
     "@types/react-dom": "*",
-    "@types/react-virtualized": "^9.21.30",
-    "@types/react-window": "^1.8.5",
     "tailwindcss": "^3.4.17",
     "postcss": "^8.5.3",
     "autoprefixer": "^10.4.21",

package/src/components/BaseToolbar.tsx

@@ -85,7 +85,7 @@ export function BaseToolbar({
       {children && (
         <div
           className={
-            "n-flex n-items-center n-justify-center n-text-text-muted n-pointer-events-none @2xl/toolbar:n-absolute n-inset-0"
+            "n-flex n-items-center n-justify-center n-text-text-muted n-pointer-events-none @xl/toolbar:!n-absolute n-inset-0"
           }
         >
           <div className="n-flex n-items-center n-justify-center n-pointer-events-auto">

package/src/components/Breadcrumbs.tsx

@@ -48,6 +48,7 @@ export const BreadcrumbSlash = () => {
       xmlns="http://www.w3.org/2000/svg"
       opacity={0.5}
       style={slashStyle}
+      className="n-flex-none"
     >
       <path
         d="M1 16L6 1"

package/src/components/Collection.tsx

@@ -1,6 +1,5 @@
 "use client";
 
-import { Size } from "@noya-app/noya-geometry";
 import { forwardRefGeneric } from "@noya-app/react-utils";
 import React, { CSSProperties } from "react";
 import { Grid } from "./Grid";
@@ -34,7 +33,7 @@ export type CollectionRenderActionProps<T> = {
 export interface CollectionProps<T, M extends string = string> {
   className?: string;
   items: T[];
-  virtualized?: Size;
+  virtualized?: number;
   getId: (item: T) => string;
   getName: (item: T) => string;
   getHref?: (item: T) => string;

package/src/components/ComboboxMenu.tsx

@@ -62,7 +62,7 @@ export const ComboboxMenu = memoGeneric(
           return item.value;
         }}
         data={items}
-        virtualized={listSize}
+        virtualized={listSize.height}
         {...(itemHeight ? { itemHeight } : {})}
         {...(getRowHeightForItem
           ? { getItemHeightForItem: getRowHeightForItem as any }

package/src/components/Message.tsx

@@ -23,7 +23,8 @@ export const Message = memo(
     ref: React.ForwardedRef<HTMLDivElement>
   ) {
     const randomId = uuid();
-    const userMessageBackgroundColor = colorFromString(user?.id ?? randomId);
+    const resolvedUserId = user?.authId ?? user?.connectionId ?? randomId;
+    const userMessageBackgroundColor = colorFromString(resolvedUserId);
     const styles = useMemo(
       () =>
         role === "user"
@@ -50,7 +51,7 @@ export const Message = memo(
           </Avatar>
         ) : (
           <Avatar
-            userId={!user ? randomId : user?.id}
+            userId={resolvedUserId}
             name={user?.name ?? "Anonymous"}
             image={user?.image}
             size={avatarSize}

package/src/components/ScrollArea2.tsx

@@ -17,21 +17,41 @@ const SCROLLBAR_THUMB_VERTICAL =
 const SCROLLBAR_THUMB_HORIZONTAL =
   "scroll-component n-h-full n-rounded n-bg-scrollbar";
 
+type ScrollAreaViewportProps = React.HTMLAttributes<HTMLDivElement> & {
+  ref?: React.Ref<HTMLDivElement>;
+};
+
 export function ScrollArea2({
   children,
   className,
   viewportClassName,
   orientation = "vertical",
+  style,
+  viewportProps,
 }: {
   children: React.ReactNode;
   className?: string;
   viewportClassName?: string;
   orientation?: "vertical" | "horizontal" | "both";
+  style?: React.CSSProperties;
+  viewportProps?: ScrollAreaViewportProps;
 }) {
+  const {
+    className: viewportPropsClassName,
+    ref: viewportRef,
+    ...viewportRest
+  } = viewportProps ?? {};
+
   return (
-    <ScrollArea.Root className={cx("n-relative", className)}>
+    <ScrollArea.Root className={cx("n-relative", className)} style={style}>
       <ScrollArea.Viewport
-        className={cx("n-h-full n-overscroll-contain", viewportClassName)}
+        ref={viewportRef}
+        className={cx(
+          "n-h-full n-overscroll-contain",
+          viewportClassName,
+          viewportPropsClassName
+        )}
+        {...viewportRest}
       >
         {children}
       </ScrollArea.Viewport>

package/src/components/Virtualized.tsx

@@ -0,0 +1,439 @@
+"use client";
+
+import React, {
+  CSSProperties,
+  ForwardedRef,
+  ReactNode,
+  UIEventHandler,
+  useCallback,
+  useImperativeHandle,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import { flushSync } from "react-dom";
+import { IVirtualizedList } from "./IVirtualizedList";
+import { ScrollArea2 } from "./ScrollArea2";
+
+export type ItemMeasurement = {
+  index: number;
+  size: number;
+  start: number;
+  end: number;
+};
+
+export type VirtualizedRenderItem = (index: number) => ReactNode;
+
+type VirtualizedPadding =
+  | number
+  | {
+      top?: number;
+      bottom?: number;
+    };
+
+type PaddingValues = {
+  top: number;
+  bottom: number;
+};
+
+type MeasurementResult = {
+  measurements: ItemMeasurement[];
+  totalHeight: number;
+};
+
+type VisibleRange = {
+  start: number;
+  end: number;
+};
+
+export function calculateScrollOffsetForIndex({
+  measurements,
+  height,
+  totalHeight,
+  targetIndex,
+  currentScrollTop,
+}: {
+  measurements: ItemMeasurement[];
+  height: number;
+  totalHeight: number;
+  targetIndex: number;
+  currentScrollTop: number;
+}): number | undefined {
+  if (!measurements.length) return;
+
+  const index = Math.min(Math.max(targetIndex, 0), measurements.length - 1);
+  const measurement = measurements[index];
+
+  if (!measurement) return;
+
+  const viewportTop = currentScrollTop;
+  const viewportBottom = viewportTop + height;
+  const itemTop = measurement.start;
+  const itemBottom = measurement.end;
+
+  let nextScrollTop = viewportTop;
+
+  if (itemTop < viewportTop) {
+    nextScrollTop = itemTop;
+  } else if (itemBottom > viewportBottom) {
+    const canAlignTop = height >= measurement.size;
+
+    nextScrollTop = canAlignTop ? itemTop : itemBottom - height;
+  } else {
+    return;
+  }
+
+  const maxScrollTop = Math.max(0, totalHeight - height);
+  nextScrollTop = Math.max(0, Math.min(nextScrollTop, maxScrollTop));
+
+  if (nextScrollTop === viewportTop) return;
+
+  return nextScrollTop;
+}
+
+export function resolvePaddingValues(
+  padding?: VirtualizedPadding
+): PaddingValues {
+  if (typeof padding === "number") {
+    return { top: padding, bottom: padding };
+  }
+
+  return {
+    top: padding?.top ?? 0,
+    bottom: padding?.bottom ?? 0,
+  };
+}
+
+export function clampGapValue(gap: number | undefined): number {
+  return Math.max(0, gap ?? 0);
+}
+
+export function buildMeasurements({
+  itemCount,
+  getItemHeight,
+  paddingTop,
+  paddingBottom,
+  gap,
+}: {
+  itemCount: number;
+  getItemHeight: (index: number) => number;
+  paddingTop: number;
+  paddingBottom: number;
+  gap: number;
+}): MeasurementResult {
+  const measurements: ItemMeasurement[] = [];
+  let offset = paddingTop;
+
+  for (let index = 0; index < itemCount; index += 1) {
+    const size = Math.max(0, getItemHeight(index));
+    const start = offset;
+    const end = start + size;
+    measurements.push({ index, size, start, end });
+    offset = end + gap;
+  }
+
+  const totalHeight = measurements.length
+    ? measurements[measurements.length - 1].end + paddingBottom
+    : paddingTop + paddingBottom;
+
+  return { measurements, totalHeight };
+}
+
+export function findFirstVisibleIndex(
+  measurements: ItemMeasurement[],
+  offset: number
+): number {
+  if (!measurements.length) return 0;
+
+  let low = 0;
+  let high = measurements.length - 1;
+  let match = measurements.length - 1;
+
+  while (low <= high) {
+    const middle = Math.floor((low + high) / 2);
+    const measurement = measurements[middle];
+
+    if (measurement.end > offset) {
+      match = middle;
+      high = middle - 1;
+    } else {
+      low = middle + 1;
+    }
+  }
+
+  return match;
+}
+
+export function calculateVisibleRange({
+  measurements,
+  scrollTop,
+  height,
+  overscan,
+}: {
+  measurements: ItemMeasurement[];
+  scrollTop: number;
+  height: number;
+  overscan: number;
+}): VisibleRange {
+  if (!measurements.length) {
+    return { start: 0, end: -1 };
+  }
+
+  const viewBottom = scrollTop + height;
+  const firstVisible = findFirstVisibleIndex(measurements, scrollTop);
+  let lastVisibleExclusive = firstVisible;
+
+  while (
+    lastVisibleExclusive < measurements.length &&
+    measurements[lastVisibleExclusive].start < viewBottom
+  ) {
+    lastVisibleExclusive += 1;
+  }
+
+  const lastVisible = Math.max(
+    firstVisible,
+    Math.min(measurements.length - 1, lastVisibleExclusive - 1)
+  );
+  const overscanCount = Math.max(0, Math.floor(overscan));
+
+  return {
+    start: Math.max(0, firstVisible - overscanCount),
+    end: Math.min(measurements.length - 1, lastVisible + overscanCount),
+  };
+}
+
+export type VirtualizedProps = {
+  height: number;
+  itemCount: number;
+  getItemHeight: (index: number) => number;
+  renderItem: VirtualizedRenderItem;
+  overscan?: number;
+  className?: string;
+  style?: CSSProperties;
+  innerClassName?: string;
+  innerStyle?: CSSProperties;
+  onScroll?: (scrollTop: number) => void;
+  itemKey?: (index: number) => string | number;
+  initialScrollOffset?: number;
+  /**
+   * When true (default) we flush scroll updates with `flushSync`
+   * to avoid visual gaps during fast scrolling.
+   */
+  syncScrollUpdates?: boolean;
+  /**
+   * Optional padding applied above and below the content. Numbers apply to both.
+   */
+  padding?: VirtualizedPadding;
+  /**
+   * Optional constant gap inserted between items.
+   */
+  gap?: number;
+  /**
+   * Render content inside ScrollArea2 instead of a plain div.
+   */
+  useScrollArea?: boolean;
+  /**
+   * Optional class applied to the ScrollArea viewport when `useScrollArea` is true.
+   */
+  scrollAreaViewportClassName?: string;
+};
+
+const DEFAULT_OVERSCAN = 2;
+
+const VirtualizedInner = React.forwardRef(function Virtualized(
+  {
+    height,
+    itemCount,
+    getItemHeight,
+    renderItem,
+    overscan = DEFAULT_OVERSCAN,
+    className,
+    style,
+    innerClassName,
+    innerStyle,
+    onScroll,
+    itemKey,
+    initialScrollOffset = 0,
+    syncScrollUpdates = true,
+    padding,
+    gap = 0,
+    useScrollArea = false,
+    scrollAreaViewportClassName,
+  }: VirtualizedProps,
+  forwardedRef: ForwardedRef<IVirtualizedList>
+) {
+  const containerRef = useRef<HTMLDivElement | null>(null);
+  const setScrollElement = useCallback((element: HTMLDivElement | null) => {
+    containerRef.current = element;
+  }, []);
+  const [scrollTop, setScrollTop] = useState(initialScrollOffset);
+  const pendingInitialOffset = useRef<number | null>(initialScrollOffset);
+
+  useLayoutEffect(() => {
+    if (pendingInitialOffset.current == null) return;
+    if (containerRef.current) {
+      containerRef.current.scrollTop = pendingInitialOffset.current;
+      setScrollTop(pendingInitialOffset.current);
+    }
+    pendingInitialOffset.current = null;
+  }, []);
+
+  const paddingValues = useMemo(() => resolvePaddingValues(padding), [padding]);
+
+  const gapValue = useMemo(() => clampGapValue(gap), [gap]);
+
+  const { measurements, totalHeight } = useMemo(
+    () =>
+      buildMeasurements({
+        itemCount,
+        getItemHeight,
+        paddingTop: paddingValues.top,
+        paddingBottom: paddingValues.bottom,
+        gap: gapValue,
+      }),
+    [
+      gapValue,
+      getItemHeight,
+      itemCount,
+      paddingValues.bottom,
+      paddingValues.top,
+    ]
+  );
+
+  const visibleRange = useMemo(
+    () =>
+      calculateVisibleRange({
+        measurements,
+        scrollTop,
+        height,
+        overscan,
+      }),
+    [height, measurements, overscan, scrollTop]
+  );
+
+  const handleScroll = useCallback<UIEventHandler<HTMLDivElement>>(
+    (event) => {
+      const nextOffset = event.currentTarget.scrollTop;
+
+      if (nextOffset === scrollTop) return;
+
+      if (syncScrollUpdates) {
+        flushSync(() => {
+          setScrollTop(nextOffset);
+        });
+      } else {
+        setScrollTop(nextOffset);
+      }
+      onScroll?.(nextOffset);
+    },
+    [onScroll, scrollTop, syncScrollUpdates]
+  );
+
+  useImperativeHandle(
+    forwardedRef,
+    () => ({
+      scrollToIndex(index: number) {
+        const container = containerRef.current;
+        if (!container) return;
+
+        const nextScrollTop = calculateScrollOffsetForIndex({
+          measurements,
+          height,
+          totalHeight,
+          targetIndex: index,
+          currentScrollTop: container.scrollTop,
+        });
+
+        if (nextScrollTop == null) return;
+
+        container.scrollTop = nextScrollTop;
+        setScrollTop(nextScrollTop);
+      },
+    }),
+    [height, measurements, totalHeight]
+  );
+
+  const containerStyle = useMemo<CSSProperties>(
+    () => ({
+      height,
+      overflowY: "auto",
+      overflowX: "hidden",
+      ...style,
+    }),
+    [height, style]
+  );
+
+  const scrollAreaStyle = useMemo<CSSProperties>(
+    () => ({
+      height,
+      ...style,
+    }),
+    [height, style]
+  );
+
+  const totalContent = (
+    <div
+      className={innerClassName}
+      style={{
+        position: "relative",
+        width: "100%",
+        height: totalHeight,
+        ...innerStyle,
+      }}
+    >
+      {visibleRange.end >= visibleRange.start &&
+        Array.from(
+          { length: visibleRange.end - visibleRange.start + 1 },
+          (_, offset) => {
+            const index = visibleRange.start + offset;
+            const measurement = measurements[index];
+            const key = itemKey ? itemKey(index) : index;
+
+            return (
+              <div
+                key={key}
+                style={{
+                  position: "absolute",
+                  top: measurement.start,
+                  height: measurement.size,
+                  width: "100%",
+                }}
+              >
+                {renderItem(index)}
+              </div>
+            );
+          }
+        )}
+    </div>
+  );
+
+  if (useScrollArea) {
+    return (
+      <ScrollArea2
+        className={className}
+        style={scrollAreaStyle}
+        viewportClassName={scrollAreaViewportClassName}
+        viewportProps={{
+          ref: setScrollElement,
+          onScroll: handleScroll,
+        }}
+      >
+        {totalContent}
+      </ScrollArea2>
+    );
+  }
+
+  return (
+    <div
+      ref={setScrollElement}
+      className={className}
+      style={containerStyle}
+      onScroll={handleScroll}
+    >
+      {totalContent}
+    </div>
+  );
+});
+
+export const Virtualized = React.memo(VirtualizedInner);