@proyecto-viviana/ui 0.3.5 → 0.4.0

package/src/custom/calendar-card/index.tsx

@@ -1,66 +1,115 @@
-import { Show, For } from 'solid-js'
-import { Chip } from '../chip'
+import { Show, For } from "solid-js";
+import { Chip } from "../chip";
+// Styled via the S2 style() macro through viviana's own seam (../../style →
+// src/style.ts). A horizontal "followed calendar" card: square thumbnail +
+// title + followers line + tag chips, on the S2 ramps in Silapse colors.
+import { style } from "../../style" with { type: "macro" };
 
 export interface CalendarCardProps {
-  title: string
-  image?: string
-  tags?: string[]
-  followers?: { name: string }[]
-  followerCount?: number
-  class?: string
+  title: string;
+  image?: string;
+  tags?: string[];
+  followers?: { name: string }[];
+  followerCount?: number;
+  class?: string;
 }
 
+const card = style({
+  display: "flex",
+  alignItems: "center",
+  gap: 12,
+  width: "full",
+  maxWidth: 500,
+  padding: 12,
+  borderRadius: "xl",
+  borderWidth: 2,
+  borderStyle: "solid",
+  borderColor: "[var(--color-primary-600)]",
+  backgroundColor: "[var(--color-bg-300)]",
+  boxShadow: "elevated",
+});
+
+const thumb = style({
+  width: 80,
+  height: 80,
+  flexShrink: 0,
+  objectFit: "cover",
+  borderRadius: "lg",
+  borderWidth: 2,
+  borderStyle: "solid",
+  borderColor: "[var(--color-accent)]",
+});
+
+const body = style({
+  display: "flex",
+  flexDirection: "column",
+  gap: 8,
+  flexGrow: 1,
+  minWidth: 0,
+});
+
+const title = style({
+  font: "heading-sm",
+  color: "[var(--color-primary-100)]",
+  overflow: "hidden",
+  textOverflow: "ellipsis",
+  whiteSpace: "nowrap",
+});
+
+const followers = style({
+  font: "ui-sm",
+  color: "[var(--color-text-secondary)]",
+});
+
+const followerName = style({
+  fontWeight: "bold",
+  color: "[var(--color-accent)]",
+});
+
+const tags = style({
+  display: "flex",
+  flexWrap: "wrap",
+  gap: 4,
+});
+
 export function CalendarCard(props: CalendarCardProps) {
-  const displayedFollowers = () => props.followers?.slice(0, 2) ?? []
+  const displayedFollowers = () => props.followers?.slice(0, 2) ?? [];
   const remainingCount = () => {
-    const total = props.followerCount ?? props.followers?.length ?? 0
-    const displayed = displayedFollowers().length
-    return total - displayed
-  }
+    const total = props.followerCount ?? props.followers?.length ?? 0;
+    const displayed = displayedFollowers().length;
+    return total - displayed;
+  };
 
   return (
-    <div class={`flex h-[100px] w-full max-w-[500px] items-center rounded-xl border border-primary-600 border-b-accent-500 bg-bg-300 p-2 ${props.class ?? ''}`}>
+    <div class={`${card} ${props.class ?? ""}`}>
       <Show when={props.image}>
-        <div class="relative h-[80px] w-[80px] flex-shrink-0 overflow-hidden rounded-xl border-2 border-accent-200">
-          <img src={props.image} alt={props.title} class="h-full w-full object-cover" />
-        </div>
+        <img class={thumb} src={props.image} alt={props.title} />
       </Show>
-      <div class="relative h-full flex-1 flex-col pl-3">
+      <div class={body}>
+        <span class={title}>{props.title}</span>
+        <Show when={displayedFollowers().length > 0}>
+          <span class={followers}>
+            seguida por{" "}
+            <For each={displayedFollowers()}>
+              {(follower, index) => (
+                <>
+                  <span class={followerName}>{follower.name}</span>
+                  {index() < displayedFollowers().length - 1 && ", "}
+                </>
+              )}
+            </For>
+            <Show when={remainingCount() > 0}>
+              {" "}
+              y <span class={followerName}>{remainingCount()} más</span>
+            </Show>
+          </span>
+        </Show>
         <Show when={props.tags && props.tags.length > 0}>
-          <div class="absolute bottom-[-20px] h-[30px] w-full">
-            <div class="flex h-full w-full flex-1 justify-end gap-1">
-              <For each={props.tags}>
-                {(tag) => <Chip text={tag} variant="primary" />}
-              </For>
-            </div>
+          <div class={tags}>
+            <For each={props.tags}>{(tag) => <Chip text={tag} variant="primary" />}</For>
           </div>
         </Show>
-        <div class="flex h-full flex-col items-end justify-center pb-3 pr-5 pt-2">
-          <div class="flex flex-1">
-            <span class="text-lg font-semibold text-white drop-shadow-sm">
-              {props.title}
-            </span>
-          </div>
-          <Show when={displayedFollowers().length > 0}>
-            <div class="flex flex-1">
-              <span class="text-base font-normal text-primary-500">
-                seguida por{' '}
-                <For each={displayedFollowers()}>
-                  {(follower, index) => (
-                    <>
-                      <span class="font-semibold text-accent-200">{follower.name}</span>
-                      {index() < displayedFollowers().length - 1 && ', '}
-                    </>
-                  )}
-                </For>
-                <Show when={remainingCount() > 0}>
-                  {' '}y <span class="font-semibold text-accent-200">{remainingCount()} más</span>
-                </Show>
-              </span>
-            </div>
-          </Show>
-        </div>
       </div>
     </div>
-  )
+  );
 }

package/src/custom/chip/index.tsx

@@ -1,46 +1,78 @@
-import { type JSX, Show } from 'solid-js'
+import type { JSX } from "solid-js";
+import { Show } from "solid-js";
+import { Button as HeadlessButton } from "@proyecto-viviana/solidaria-components";
+// Styled via the S2 style() macro through viviana's own seam (../../style →
+// src/style.ts). S2 named tokens carry the shape (mirrors Badge's size-S
+// control: minHeight 24, 2px border, ui-sm font, pill radius); Silapse colors
+// ride in as arbitrary `[var(--color-*)]` values.
+import { style } from "../../style" with { type: "macro" };
 
-export type ChipVariant = 'primary' | 'secondary' | 'accent' | 'outline'
+export type ChipVariant = "primary" | "secondary" | "accent" | "outline";
 
 export interface ChipProps {
-  text: string
-  variant?: ChipVariant
-  onClick?: () => void
+  text: string;
+  variant?: ChipVariant;
+  onClick?: () => void;
   /**
    * Icon to display before the text.
    * Use a function returning JSX for SSR compatibility: `icon={() => <MyIcon />}`
    * Or pass a simple string for text-based icons: `icon="★"`
    */
-  icon?: string | (() => JSX.Element)
-  class?: string
+  icon?: string | (() => JSX.Element);
+  class?: string;
 }
 
-const variantStyles: Record<ChipVariant, string> = {
-  primary: 'bg-primary-700 text-primary-200 shadow-primary-chip',
-  secondary: 'bg-primary-600 text-primary-100 hover:bg-primary-500',
-  accent: 'bg-accent text-white',
-  outline: 'bg-transparent border border-primary-500 text-primary-300',
-}
+const chip = style<{ variant: ChipVariant }>({
+  display: "inline-flex",
+  alignItems: "center",
+  justifyContent: "center",
+  columnGap: "text-to-visual",
+  minHeight: 24,
+  width: "fit",
+  paddingX: 12,
+  borderRadius: "full",
+  borderStyle: "solid",
+  borderWidth: 2,
+  font: "ui-sm",
+  borderColor: {
+    default: "transparent",
+    variant: { outline: "[var(--color-primary-600)]" },
+  },
+  backgroundColor: {
+    variant: {
+      primary: "[var(--color-primary-700)]",
+      secondary: "[var(--color-bg-100)]",
+      accent: "[var(--color-accent)]",
+      outline: "transparent",
+    },
+  },
+  color: {
+    variant: {
+      primary: "[var(--color-primary-100)]",
+      secondary: "[var(--color-primary-200)]",
+      accent: "[var(--color-bg-400)]",
+      outline: "[var(--color-primary-200)]",
+    },
+  },
+});
 
 export function Chip(props: ChipProps) {
-  const variant = () => props.variant ?? 'primary'
-
   const renderIcon = () => {
-    const icon = props.icon
-    if (!icon) return null
-    if (typeof icon === 'string') return icon
-    return icon()
-  }
+    const icon = props.icon;
+    if (!icon) return null;
+    if (typeof icon === "string") return icon;
+    return icon();
+  };
 
   return (
-    <button
-      class={`flex justify-center items-center h-6 w-auto rounded-full px-4 py-1 font-medium text-sm tracking-wide transition-colors ${variantStyles[variant()]} ${props.class ?? ''}`}
-      onClick={props.onClick}
+    <HeadlessButton
+      class={`${chip({ variant: props.variant ?? "primary" })} ${props.class ?? ""}`}
+      onPress={() => props.onClick?.()}
     >
       <Show when={props.icon}>
-        <span class="mr-1.5">{renderIcon()}</span>
+        <span>{renderIcon()}</span>
       </Show>
-      <span>{props.text}</span>
-    </button>
-  )
+      {props.text}
+    </HeadlessButton>
+  );
 }

package/src/custom/conversation/index.tsx

@@ -1,96 +1,190 @@
-import { Show, For } from 'solid-js'
-import { Avatar } from '../../avatar'
+import { Show, For } from "solid-js";
+import { Avatar } from "@proyecto-viviana/solid-spectrum";
+import { Button as HeadlessButton } from "@proyecto-viviana/solidaria-components";
+// Styled via the S2 style() macro through viviana's own seam (../../style →
+// src/style.ts). A conversation preview row, message bubbles, and a thread
+// list, on the S2 spacing/radius ramps in Silapse colors.
+import { style } from "../../style" with { type: "macro" };
 
 export interface Message {
-  id: string
-  content: string
-  sender: 'user' | 'other'
-  timestamp?: string
+  id: string;
+  content: string;
+  sender: "user" | "other";
+  timestamp?: string;
 }
 
 export interface ConversationPreviewProps {
   user: {
-    name: string
-    avatar?: string
-    online?: boolean
-  }
-  lastMessage?: string
-  unreadCount?: number
-  timestamp?: string
-  onClick?: () => void
-  class?: string
+    name: string;
+    avatar?: string;
+    online?: boolean;
+  };
+  lastMessage?: string;
+  unreadCount?: number;
+  timestamp?: string;
+  onClick?: () => void;
+  class?: string;
 }
 
+const preview = style({
+  display: "flex",
+  alignItems: "center",
+  gap: 12,
+  width: "full",
+  padding: 12,
+  borderRadius: "lg",
+  textAlign: "start",
+  cursor: "pointer",
+  backgroundColor: "transparent",
+  borderStyle: "none",
+});
+
+const previewBody = style({
+  display: "flex",
+  flexDirection: "column",
+  gap: 2,
+  flexGrow: 1,
+  minWidth: 0,
+});
+
+const previewTop = style({
+  display: "flex",
+  alignItems: "center",
+  justifyContent: "space-between",
+  gap: 8,
+});
+
+const previewName = style({
+  font: "ui",
+  fontWeight: "bold",
+  color: "[var(--color-primary-100)]",
+  overflow: "hidden",
+  textOverflow: "ellipsis",
+  whiteSpace: "nowrap",
+});
+
+const previewTime = style({
+  font: "detail-sm",
+  color: "[var(--color-text-muted)]",
+  flexShrink: 0,
+});
+
+const previewMessage = style({
+  font: "ui-sm",
+  color: "[var(--color-text-secondary)]",
+  overflow: "hidden",
+  textOverflow: "ellipsis",
+  whiteSpace: "nowrap",
+});
+
+const unread = style({
+  display: "flex",
+  alignItems: "center",
+  justifyContent: "center",
+  flexShrink: 0,
+  width: 20,
+  height: 20,
+  borderRadius: "full",
+  font: "detail-sm",
+  fontWeight: "bold",
+  backgroundColor: "[var(--color-accent)]",
+  color: "[var(--color-bg-400)]",
+});
+
 export function ConversationPreview(props: ConversationPreviewProps) {
   return (
-    <button
-      class={`flex w-full items-center gap-3 rounded-xl p-3 hover:bg-bg-300 transition-colors text-left ${props.class ?? ''}`}
-      onClick={props.onClick}
+    <HeadlessButton
+      type="button"
+      class={`${preview} ${props.class ?? ""}`}
+      onPress={() => props.onClick?.()}
     >
-      <Avatar
-        src={props.user.avatar}
-        alt={props.user.name}
-        online={props.user.online}
-        size="md"
-      />
-      <div class="flex-1 min-w-0">
-        <div class="flex items-center justify-between">
-          <span class="font-semibold text-primary-100 truncate">{props.user.name}</span>
+      <Avatar src={props.user.avatar} alt={props.user.name} online={props.user.online} size="md" />
+      <div class={previewBody}>
+        <div class={previewTop}>
+          <span class={previewName}>{props.user.name}</span>
           <Show when={props.timestamp}>
-            <span class="text-xs text-primary-500">{props.timestamp}</span>
+            <span class={previewTime}>{props.timestamp}</span>
           </Show>
         </div>
         <Show when={props.lastMessage}>
-          <p class="text-sm text-primary-400 truncate">{props.lastMessage}</p>
+          <p class={previewMessage}>{props.lastMessage}</p>
         </Show>
       </div>
       <Show when={props.unreadCount && props.unreadCount > 0}>
-        <span class="flex h-5 w-5 items-center justify-center rounded-full bg-accent text-xs font-bold text-white">
-          {props.unreadCount}
-        </span>
+        <span class={unread}>{props.unreadCount}</span>
       </Show>
-    </button>
-  )
+    </HeadlessButton>
+  );
 }
 
 export interface ConversationBubbleProps {
-  content: string
-  sender: 'user' | 'other'
-  timestamp?: string
-  class?: string
+  content: string;
+  sender: "user" | "other";
+  timestamp?: string;
+  class?: string;
 }
 
+const bubbleRow = style<{ isUser: boolean }>({
+  display: "flex",
+  justifyContent: { default: "start", isUser: "end" },
+});
+
+const bubble = style<{ isUser: boolean }>({
+  display: "flex",
+  flexDirection: "column",
+  gap: 2,
+  maxWidth: "[70%]",
+  paddingX: 16,
+  paddingY: 8,
+  borderRadius: "lg",
+  backgroundColor: {
+    default: "[var(--color-bg-300)]",
+    isUser: "[var(--color-accent)]",
+  },
+  color: {
+    default: "[var(--color-primary-100)]",
+    isUser: "[var(--color-bg-400)]",
+  },
+});
+
+const bubbleTime = style<{ isUser: boolean }>({
+  font: "detail-sm",
+  color: {
+    default: "[var(--color-text-muted)]",
+    isUser: "[var(--color-bg-300)]",
+  },
+});
+
 export function ConversationBubble(props: ConversationBubbleProps) {
-  const isUser = () => props.sender === 'user'
+  const isUser = () => props.sender === "user";
 
   return (
-    <div class={`flex ${isUser() ? 'justify-end' : 'justify-start'} ${props.class ?? ''}`}>
-      <div
-        class={`max-w-[70%] rounded-2xl px-4 py-2 ${
-          isUser()
-            ? 'bg-accent text-white rounded-br-sm'
-            : 'bg-bg-300 text-primary-100 rounded-bl-sm'
-        }`}
-      >
+    <div class={`${bubbleRow({ isUser: isUser() })} ${props.class ?? ""}`}>
+      <div class={bubble({ isUser: isUser() })}>
         <p>{props.content}</p>
         <Show when={props.timestamp}>
-          <span class={`text-xs ${isUser() ? 'text-white/70' : 'text-primary-500'}`}>
-            {props.timestamp}
-          </span>
+          <span class={bubbleTime({ isUser: isUser() })}>{props.timestamp}</span>
         </Show>
       </div>
     </div>
-  )
+  );
 }
 
 export interface ConversationProps {
-  messages: Message[]
-  class?: string
+  messages: Message[];
+  class?: string;
 }
 
+const thread = style({
+  display: "flex",
+  flexDirection: "column",
+  gap: 8,
+  padding: 16,
+});
+
 export function Conversation(props: ConversationProps) {
   return (
-    <div class={`flex flex-col gap-2 p-4 ${props.class ?? ''}`}>
+    <div class={`${thread} ${props.class ?? ""}`}>
       <For each={props.messages}>
         {(message) => (
           <ConversationBubble
@@ -101,5 +195,5 @@ export function Conversation(props: ConversationProps) {
         )}
       </For>
     </div>
-  )
+  );
 }