@terrafirmagreg-team/ui 1.2.2 → 1.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@terrafirmagreg-team/ui",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "type": "module",
   "description": "Shared UI kit",
   "license": "LGPL-3.0-only",
@@ -44,7 +44,7 @@
     "@react-three/drei": "10.7.9",
     "@react-three/fiber": "9.8.2",
     "@shadcn/react": "^0.3.1",
-    "@terrafirmagreg-team/translate": "1.2.3",
+    "@terrafirmagreg-team/translate": "1.2.4",
     "@xyflow/react": "12.12.0",
     "beautiful-mermaid": "^1.1.3",
     "class-variance-authority": "^0.7.1",
@@ -55,7 +55,7 @@
     "hast-util-to-jsx-runtime": "^2.3.6",
     "input-otp": "^1.5.0",
     "katex": "^0.19.1",
-    "lucide-react": "^0.577.0",
+    "lucide-react": "^1.63.0",
     "next-themes": "^0.4.6",
     "react-day-picker": "^10.0.2",
     "react-medium-image-zoom": "^5.4.9",

package/src/components/blocks/canvas/flow-viewport.tsx

@@ -3,6 +3,7 @@
 import { useEffect, useRef } from 'react';
 import {
   useReactFlow,
+  useStore,
   useStoreApi,
 } from '@terrafirmagreg-team/ui/lib/canvas/xyflow';
 import { readStoredViewport } from '@terrafirmagreg-team/ui/lib/canvas/viewport';
@@ -46,6 +47,7 @@ export function FlowViewport({
 }) {
   const { setCenter, setViewport, getZoom } = useReactFlow();
   const storeApi = useStoreApi();
+  const paneReady = useStore((s) => s.width > 0 && s.height > 0);
   const initRef = useRef<string | null>(null);
   const preInitRef = useRef<string | null>(null);
   const nodesRef = useRef(nodes);
@@ -66,6 +68,7 @@ export function FlowViewport({
 
   useEffect(() => {
     if (viewSize.w < 1 || viewSize.h < 1) return;
+    if (!paneReady) return;
     if (!ready) {
 
       initRef.current = null;
@@ -170,6 +173,7 @@ export function FlowViewport({
     initFocusId,
     nodes,
     onReady,
+    paneReady,
     ready,
     resetKey,
     restoreViewport,
@@ -229,7 +233,7 @@ export function FlowViewport({
   useEffect(() => {
     if (selectedId === lastSelectedRef.current) return;
     lastSelectedRef.current = selectedId ?? null;
-    if (initRef.current !== resetKey || !selectedId) return;
+    if (initRef.current !== initKey || !selectedId) return;
     if (selectedId === suppressPanRef?.current) return;
     const node = nodesRef.current.find((entry) => entry.id === selectedId);
     if (!node) return;
@@ -237,7 +241,7 @@ export function FlowViewport({
       zoom: getZoom() || focusZoom,
       duration: 300,
     });
-  }, [focusZoom, getZoom, resetKey, selectedId, suppressPanRef, setCenter]);
+  }, [focusZoom, getZoom, initKey, selectedId, suppressPanRef, setCenter]);
 
   return null;
 }

package/src/components/blocks/lang/untranslated-chip.tsx

@@ -2,28 +2,7 @@
 import { Hint } from '@terrafirmagreg-team/ui/components/blocks/tooltip/hint';
 import { cn } from '@terrafirmagreg-team/ui/lib/utils/cn';
 import { useTranslations } from '@terrafirmagreg-team/translate/hooks/use-translations';
-
-function LanguagesIcon({ className }: { className?: string }) {
-  return (
-    <svg
-      viewBox="0 0 24 24"
-      fill="none"
-      stroke="currentColor"
-      strokeWidth="2"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-      className={className}
-      aria-hidden
-    >
-      <path d="m5 8 6 6" />
-      <path d="m4 14 6-6 2-3" />
-      <path d="M2 5h12" />
-      <path d="M7 2h1" />
-      <path d="m22 22-5-10-5 10" />
-      <path d="M14 18h6" />
-    </svg>
-  );
-}
+import { Languages } from 'lucide-react';
 
 export function UntranslatedChip({ className }: { className?: string }) {
   const t = useTranslations();
@@ -45,7 +24,7 @@ export function UntranslatedChip({ className }: { className?: string }) {
           className,
         )}
       >
-        <LanguagesIcon className="size-3" />
+        <Languages className="size-3" aria-hidden />
         {t('Untranslated', { note: 'untranslated.chip' })}
       </span>
     </Hint>

package/src/components/blocks/media/glb/scene.tsx

@@ -257,7 +257,7 @@ export function GlbScene({
               label: t('Viewer settings', { note: 'ui.viewer.settings' }),
               sliders: [
                 {
-                  icon: <MoveHorizontal />,
+                  icon: <MoveHorizontal className="size-3.5" />,
                   label: t('Width', { note: 'ui.viewer.width' }),
                   min: SCENE_WIDTH_MIN,
                   max: SCENE_WIDTH_MAX,
@@ -267,7 +267,7 @@ export function GlbScene({
                   onChange: setSceneWidth,
                 },
                 {
-                  icon: <MoveVertical />,
+                  icon: <MoveVertical className="size-3.5" />,
                   label: t('Height', { note: 'ui.viewer.height' }),
                   min: SCENE_HEIGHT_MIN,
                   max: SCENE_HEIGHT_MAX,
@@ -277,7 +277,7 @@ export function GlbScene({
                   onChange: setSceneHeight,
                 },
                 {
-                  icon: <Gauge />,
+                  icon: <Gauge className="size-3.5" />,
                   label: t('Rotate speed', { note: 'ui.viewer.rotate_speed' }),
                   min: ROTATE_MIN,
                   max: ROTATE_MAX,
@@ -289,7 +289,7 @@ export function GlbScene({
                 ...(multi
                   ? [
                       {
-                        icon: <Timer />,
+                        icon: <Timer className="size-3.5" />,
                         label: t('Autoplay speed', { note: 'ui.viewer.autoplay_speed' }),
                         min: AUTOPLAY_SPEED_MIN,
                         max: AUTOPLAY_SPEED_MAX,
@@ -304,7 +304,7 @@ export function GlbScene({
               ],
               toggles: [
                 {
-                  icon: <RotateCw />,
+                  icon: <RotateCw className="size-4" />,
                   label: t('Spin', { note: 'ui.viewer.spin' }),
                   checked: autoRotate,
                   onChange: setAutoRotate,
@@ -312,7 +312,7 @@ export function GlbScene({
                 ...(multi
                   ? [
                       {
-                        icon: <Play />,
+                        icon: <Play className="size-4" />,
                         label: t('Autoplay', { note: 'ui.viewer.autoplay' }),
                         checked: autoplay,
                         onChange: setAutoplay,
@@ -320,7 +320,7 @@ export function GlbScene({
                     ]
                   : []),
                 {
-                  icon: <Grid3x3 />,
+                  icon: <Grid3x3 className="size-4" />,
                   label: t('Grid', { note: 'ui.viewer.grid' }),
                   checked: dotGrid,
                   onChange: setDotGrid,

package/src/components/blocks/media/slideshow.tsx

@@ -141,7 +141,7 @@ export function Slideshow({
               sliders: multi
                 ? [
                     {
-                      icon: <Timer />,
+                      icon: <Timer className="size-3.5" />,
                       label: t('Autoplay speed', { note: 'ui.viewer.autoplay_speed' }),
                       min: AUTOPLAY_SPEED_MIN,
                       max: AUTOPLAY_SPEED_MAX,
@@ -156,7 +156,7 @@ export function Slideshow({
               toggles: multi
                 ? [
                     {
-                      icon: <Play />,
+                      icon: <Play className="size-4" />,
                       label: t('Autoplay', { note: 'ui.viewer.autoplay' }),
                       checked: autoplay,
                       onChange: setAutoplay,

package/src/components/blocks/page/heading.tsx

@@ -25,14 +25,19 @@ export function Heading({
   return (
     <As
       {...props}
+      onClick={(event) => {
+        props.onClick?.(event);
+        if (event.defaultPrevented) return;
+        if ((event.target as HTMLElement).closest('a,button,input,select,textarea,[role="button"],[role="link"]'))
+          return;
+        window.location.hash = props.id!;
+      }}
       className={cn(
-        'group/heading flex scroll-m-28 flex-row items-center gap-1',
+        'group/heading flex cursor-pointer scroll-m-28 flex-row items-center gap-1',
         props.className,
       )}
     >
-      <a data-card href={`#${props.id}`}>
-        {props.children}
-      </a>
+      {props.children}
       <button
         aria-live="polite"
         className={cn(

package/src/components/layouts/workspace/content.tsx

@@ -0,0 +1,53 @@
+'use client';
+import { cn } from '@terrafirmagreg-team/ui/lib/utils/cn';
+import type { ComponentProps } from 'react';
+
+export function WorkspaceBody({ className, ...props }: ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot="workspace-body"
+      {...props}
+      className={cn('prose flex-1', className)}
+    />
+  );
+}
+
+export function WorkspaceDescription({
+  children,
+  className,
+  ...props
+}: ComponentProps<'p'>) {
+  if (children === undefined) return null;
+  return (
+    <p
+      data-slot="workspace-description"
+      {...props}
+      className={cn('mb-8 text-lg text-muted-foreground', className)}
+    >
+      {children}
+    </p>
+  );
+}
+
+export function WorkspaceTitle({ className, ...props }: ComponentProps<'h1'>) {
+  return (
+    <h1
+      data-slot="workspace-title"
+      {...props}
+      className={cn('text-[1.75em] font-semibold', className)}
+    />
+  );
+}
+
+export function WorkspaceFooter({
+  className,
+  ...props
+}: ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot="workspace-footer"
+      className={cn('mt-auto empty:hidden', className)}
+      {...props}
+    />
+  );
+}

package/src/components/layouts/workspace/index.ts

@@ -0,0 +1,12 @@
+export type {
+  WorkspacePaginationItems,
+  WorkspaceProps,
+} from './workspace';
+export { Workspace } from './workspace';
+export {
+  WorkspaceBody,
+  WorkspaceDescription,
+  WorkspaceTitle,
+  WorkspaceFooter,
+} from './content';
+export { WorkspacePagination } from './pagination';

package/src/components/layouts/workspace/pagination.tsx

@@ -0,0 +1,73 @@
+'use client';
+import { type ComponentProps, useMemo } from 'react';
+import { usePathname } from 'next/navigation';
+import Link from '@terrafirmagreg-team/ui/components/blocks/nav/link';
+import { ArrowLeftIcon, ArrowRightIcon } from 'lucide-react';
+import { useFooterItems } from '@terrafirmagreg-team/ui/hooks/use-tree';
+import { useLocationSearch } from '@terrafirmagreg-team/ui/hooks/page/use-location-search';
+import { useTranslations } from '@terrafirmagreg-team/translate/hooks/use-translations';
+import { cn } from '@terrafirmagreg-team/ui/lib/utils/cn';
+import { isNavItemActive } from '@terrafirmagreg-team/ui/lib/utils/nav-active';
+import type { WorkspacePaginationItems } from './workspace';
+
+export function WorkspacePagination({
+  items,
+  className,
+  ...props
+}: ComponentProps<'nav'> & { items?: WorkspacePaginationItems }) {
+  const footerList = useFooterItems();
+  const pathname = usePathname();
+  const search = useLocationSearch();
+  const { previous, next } = useMemo(() => {
+    if (items && (items.previous || items.next)) return items;
+    const idx = footerList.findIndex((item) =>
+      isNavItemActive(item.url, pathname, search),
+    );
+    if (idx === -1) return {};
+    return { previous: footerList[idx - 1], next: footerList[idx + 1] };
+  }, [footerList, items, pathname, search]);
+
+  if (!previous && !next) return null;
+  return (
+    <nav
+      data-slot="workspace-pagination"
+      className={cn('@container grid grid-cols-2 gap-3 mt-8', className)}
+      {...props}
+    >
+      {previous && <WorkspacePaginationItem item={previous} next={false} />}
+      {next && <WorkspacePaginationItem item={next} next />}
+    </nav>
+  );
+}
+
+function WorkspacePaginationItem({
+  item,
+  next,
+}: {
+  item: NonNullable<WorkspacePaginationItems['previous']>;
+  next: boolean;
+}) {
+  const t = useTranslations();
+  const Icon = next ? ArrowRightIcon : ArrowLeftIcon;
+
+  return (
+    <Link
+      href={item.url}
+      className={cn(
+        'group flex flex-col gap-1 rounded-2xl border p-4 text-sm transition-colors hover:bg-accent/40 @max-md:col-span-full',
+        next && 'col-start-2 items-end text-end',
+      )}
+    >
+      <span className="inline-flex items-center gap-1.5 text-muted-foreground">
+        {!next && (
+          <Icon className="size-3.5 transition-transform group-hover:-translate-x-0.5 rtl:rotate-180" />
+        )}
+        {next ? t('Next Page', { note: 'ui.next_page' }) : t('Previous Page', { note: 'ui.prev_page' })}
+        {next && (
+          <Icon className="size-3.5 transition-transform group-hover:translate-x-0.5 rtl:rotate-180" />
+        )}
+      </span>
+      <span className="font-medium">{item.name}</span>
+    </Link>
+  );
+}

package/src/components/layouts/workspace/workspace.tsx

@@ -0,0 +1,101 @@
+'use client';
+import type { ComponentProps, ReactNode } from 'react';
+import { usePathname } from 'next/navigation';
+import type * as PageTree from '@terrafirmagreg-team/translate/types/tree';
+import { cn } from '@terrafirmagreg-team/ui/lib/utils/cn';
+import type { PagePreviewData } from '@terrafirmagreg-team/ui/types/preview';
+import { LeftSidebarExpand } from '@terrafirmagreg-team/ui/components/layouts/left-sidebar';
+import { Breadcrumb } from '@terrafirmagreg-team/ui/components/blocks/nav/breadcrumb';
+import { WorkspaceFooter } from './content';
+import { WorkspacePagination } from './pagination';
+
+export type WorkspacePaginationItems = {
+  previous?: Pick<PageTree.Item, 'name' | 'description' | 'url'>;
+  next?: Pick<PageTree.Item, 'name' | 'description' | 'url'>;
+};
+
+export type WorkspaceProps = ComponentProps<'article'> & {
+  full?: boolean;
+  outlineDropdown?: ReactNode;
+  breadcrumb?: {
+    items?: { name: string; url?: string }[];
+    previews?: Record<string, PagePreviewData>;
+  };
+  pagination?: { items?: WorkspacePaginationItems } | false;
+  actions?: ReactNode;
+  footer?: ReactNode;
+};
+
+export function Workspace({
+  full = false,
+  outlineDropdown,
+  breadcrumb,
+  pagination = {},
+  actions,
+  footer,
+  className,
+  children,
+  ...props
+}: WorkspaceProps) {
+  const crumbs = breadcrumb?.items ?? [];
+  const hasCrumbs = crumbs.length > 0;
+  const pathname = usePathname();
+
+  return (
+    <div
+      key={pathname}
+      id="page-panel"
+      data-slot="workspace-panel"
+      className="@container relative flex flex-col min-w-0 min-h-0 [grid-area:main] mx-2 bg-background md:ms-0 md:my-2 md:overflow-clip md:rounded-2xl md:border md:shadow-sm print:overflow-visible"
+    >
+      <header
+        data-slot="workspace-header"
+        className={cn(
+          'absolute inset-x-0 top-0 z-10 flex items-center gap-1.5 h-(--header-height) ps-6 pe-4 bg-linear-to-b from-background to-transparent pointer-events-none *:pointer-events-auto max-md:hidden',
+          hasCrumbs || outlineDropdown ? 'from-50%' : 'to-40%',
+        )}
+      >
+        <LeftSidebarExpand />
+        {hasCrumbs && (
+          <Breadcrumb items={crumbs} previews={breadcrumb?.previews} />
+        )}
+        {outlineDropdown}
+        <div data-slot="workspace-actions" className="ms-auto">
+          {actions}
+        </div>
+      </header>
+      <div
+        data-slot="workspace-scroll"
+        className="flex flex-1 items-start px-4 md:min-h-0 md:pt-(--header-height) md:px-[max(--spacing(6),calc((100%_-_var(--page-width)_-_var(--toc-width))/2))] md:overflow-y-auto md:overscroll-y-contain md:scrollbar-thin md:scrollbar-gutter-stable md:[--docs-height:calc(var(--layout-height)_-_var(--spacing)*4_-_2px_-_var(--header-height))]"
+      >
+        <article
+          id="page"
+          data-slot="workspace"
+          data-full={full}
+          className={cn(
+            'flex flex-col gap-4 w-full min-w-0 max-w-(--page-width) pt-6 pb-8 md:min-h-(--docs-height)',
+            className,
+          )}
+          {...props}
+        >
+          {hasCrumbs && (
+            <Breadcrumb
+              items={crumbs}
+              previews={breadcrumb?.previews}
+              className="md:hidden"
+            />
+          )}
+          {children}
+          {pagination !== false || footer ? (
+            <WorkspaceFooter>
+              {pagination !== false && (
+                <WorkspacePagination items={pagination.items} />
+              )}
+              {footer}
+            </WorkspaceFooter>
+          ) : null}
+        </article>
+      </div>
+    </div>
+  );
+}

package/styles/workspace.css

@@ -12,6 +12,7 @@
 
 .viewport-body {
   display: flex;
+  flex-direction: column;
   flex: 1;
   max-width: none;
   min-height: 0;