@kyro-cms/admin 0.11.6 → 0.12.1

package/src/components/ui/IconPickerModal.tsx

@@ -0,0 +1,80 @@
+import React, { useState, useMemo } from "react";
+import { Modal } from "./Modal";
+import * as LucideIcons from "lucide-react";
+import { Search } from "./icons";
+
+// Extract only valid components from lucide-react
+const availableIcons = Object.keys(LucideIcons).filter((key) => {
+  return /^[A-Z]/.test(key) && key !== "LucideProps" && key !== "Icon";
+});
+
+interface IconPickerModalProps {
+  open: boolean;
+  onClose: () => void;
+  onSelect: (iconName: string) => void;
+}
+
+export function IconPickerModal({ open, onClose, onSelect }: IconPickerModalProps) {
+  const [search, setSearch] = useState("");
+
+  const filteredIcons = useMemo(() => {
+    if (!search) return availableIcons;
+    const lowerSearch = search.toLowerCase();
+    return availableIcons.filter((iconName) => iconName.toLowerCase().includes(lowerSearch));
+  }, [search]);
+
+  return (
+    <Modal
+      open={open}
+      onClose={onClose}
+      title="Select an Icon"
+      size="xl"
+    >
+      <div className="flex flex-col h-[60vh]">
+        <div className="relative mb-6">
+          <Search className="absolute left-3 top-1/2 -translate-y-1/2 w-4 h-4 text-[var(--kyro-text-muted)]" />
+          <input
+            type="text"
+            placeholder="Search icons..."
+            value={search}
+            onChange={(e) => setSearch(e.target.value)}
+            className="w-full pl-10 pr-4 py-3 bg-[var(--kyro-surface-accent)] border border-[var(--kyro-border)] rounded-xl focus:outline-none focus:ring-2 focus:ring-[var(--kyro-primary)] transition-all text-sm font-bold"
+          />
+        </div>
+
+        <div className="flex-1 overflow-y-auto min-h-0 custom-scrollbar pr-2">
+          {filteredIcons.length === 0 ? (
+            <div className="flex items-center justify-center h-full text-[var(--kyro-text-secondary)] font-medium">
+              No icons found
+            </div>
+          ) : (
+            <div className="grid grid-cols-4 sm:grid-cols-6 md:grid-cols-8 gap-3 pb-8">
+              {filteredIcons.map((iconName) => {
+                const IconComponent = (LucideIcons as any)[iconName];
+                // we store standard kebab-case in db
+                const kebabName = iconName
+                  .replace(/([a-z])([A-Z])/g, "$1-$2")
+                  .toLowerCase();
+
+                return (
+                  <button
+                    key={iconName}
+                    type="button"
+                    onClick={() => {
+                      onSelect(kebabName);
+                      onClose();
+                    }}
+                    className="flex flex-col items-center justify-center p-3 gap-2 rounded-md border border-[var(--kyro-border)] hover:bg-[var(--kyro-surface-accent)] hover:border-[var(--kyro-primary)] transition-all group"
+                    title={iconName}
+                  >
+                    <IconComponent className="w-6 h-6 text-[var(--kyro-text-secondary)] group-hover:text-[var(--kyro-primary)] transition-colors" strokeWidth={1.5} />
+                  </button>
+                );
+              })}
+            </div>
+          )}
+        </div>
+      </div>
+    </Modal>
+  );
+}

package/src/components/ui/ImageFocalEditor.tsx

@@ -1,7 +1,7 @@
-import React, { useState, useRef, useEffect, useCallback } from "react";
+import React, { useState, useRef, useEffect, useCallback, useMemo } from "react";
 import ReactCrop, { type Crop } from "react-image-crop";
 import "react-image-crop/dist/ReactCrop.css";
-import { Crop as CropIcon, MousePointerClick, RefreshCcw } from "./icons";
+import { Crop as CropIcon, MousePointerClick, RefreshCcw, Eye } from "./icons";
 
 interface RectPercent {
   x: number;
@@ -145,6 +145,19 @@ export function ImageFocalEditor({
     setShowHotspot(false);
   };
 
+  // Build preview URL with crop params
+  const previewUrl = useMemo(() => {
+    if (!crop || !crop.width || !crop.height) return null;
+    const params = new URLSearchParams({ url });
+    params.set("cx", String(crop.x));
+    params.set("cy", String(crop.y));
+    params.set("cw", String(crop.width));
+    params.set("ch", String(crop.height));
+    return `/api/media/resize?${params.toString()}`;
+  }, [url, crop]);
+
+  const hasCrop = crop?.width && crop.height;
+
   return (
     <div className="flex flex-col h-full bg-[var(--kyro-bg)]">
       {/* Toolbar */}
@@ -211,87 +224,115 @@ export function ImageFocalEditor({
         </div>
       </div>
 
-      {/* Editor Area */}
-      <div className="flex-1 w-full flex items-center justify-center p-8 overflow-hidden relative select-none">
-        <div className="relative max-w-full max-h-full flex items-center justify-center" ref={containerRef}>
-          <ReactCrop
-            crop={crop}
-            onChange={(c, pc) => setCrop(pc)} // Save percentage crop
-            locked={mode === "hotspot"}
-            className={mode === "hotspot" ? "opacity-70 transition-opacity" : "transition-opacity"}
-          >
-            <img
-              ref={imgRef}
-              src={url}
-              alt="Focal Editor"
-              className="max-h-[70vh] object-contain pointer-events-none"
-              onLoad={onImageLoad}
-            />
-          </ReactCrop>
-          
-          {/* Hotspot Overlay */}
-          {showHotspot && imgRef.current && (
-            <div
-              className="absolute inset-0 z-10 pointer-events-none flex items-center justify-center"
+      {/* Editor + Preview Area */}
+      <div className="flex-1 flex overflow-hidden">
+        {/* Editor (left) */}
+        <div className="flex-1 w-full flex items-center justify-center p-8 overflow-hidden relative select-none">
+          <div className="relative max-w-full max-h-full flex items-center justify-center" ref={containerRef}>
+            <ReactCrop
+              crop={crop}
+              onChange={(c, pc) => setCrop(pc)} // Save percentage crop
+              locked={mode === "hotspot"}
+              className={mode === "hotspot" ? "opacity-70 transition-opacity" : "transition-opacity"}
             >
-              {/* Overlay that matches the image dimensions exactly */}
-              <div 
-                className="relative" 
-                style={{ 
-                  width: imgRef.current.width, 
-                  height: imgRef.current.height 
-                }}
+              <img
+                ref={imgRef}
+                src={url}
+                alt="Focal Editor"
+                className="max-h-[70vh] object-contain pointer-events-none"
+                onLoad={onImageLoad}
+              />
+            </ReactCrop>
+            
+            {/* Hotspot Overlay */}
+            {showHotspot && imgRef.current && (
+              <div
+                className="absolute inset-0 z-10 pointer-events-none flex items-center justify-center"
               >
-                <div
-                  className={`absolute border-2 shadow-2xl transition-colors duration-200 ${
-                    mode === "hotspot" 
-                      ? "border-blue-500 bg-blue-500/20 cursor-move pointer-events-auto shadow-blue-500/50" 
-                      : "border-blue-500/50 bg-blue-500/10 pointer-events-none"
-                  }`}
-                  style={{
-                    left: `${hotspot.x}%`,
-                    top: `${hotspot.y}%`,
-                    width: `${hotspot.width}%`,
-                    height: `${hotspot.height}%`,
-                    borderRadius: "50%",
+                {/* Overlay that matches the image dimensions exactly */}
+                <div 
+                  className="relative" 
+                  style={{ 
+                    width: imgRef.current.width, 
+                    height: imgRef.current.height 
                   }}
-                  onPointerDown={(e) => handlePointerDown(e)}
                 >
-                  {/* Center dot */}
-                  <div className="absolute top-1/2 left-1/2 w-2 h-2 -ml-1 -mt-1 bg-blue-500 rounded-full"></div>
-                  
-                  {/* Resize handles */}
-                  {mode === "hotspot" && (
-                    <>
-                      <div 
-                        className="absolute top-0 left-1/2 w-4 h-4 -ml-2 -mt-2 bg-blue-500 rounded-full cursor-ns-resize"
-                        onPointerDown={(e) => handlePointerDown(e, "n")}
-                      />
-                      <div 
-                        className="absolute bottom-0 left-1/2 w-4 h-4 -ml-2 -mb-2 bg-blue-500 rounded-full cursor-ns-resize"
-                        onPointerDown={(e) => handlePointerDown(e, "s")}
-                      />
-                      <div 
-                        className="absolute top-1/2 left-0 w-4 h-4 -ml-2 -mt-2 bg-blue-500 rounded-full cursor-ew-resize"
-                        onPointerDown={(e) => handlePointerDown(e, "w")}
-                      />
-                      <div 
-                        className="absolute top-1/2 right-0 w-4 h-4 -mr-2 -mt-2 bg-blue-500 rounded-full cursor-ew-resize"
-                        onPointerDown={(e) => handlePointerDown(e, "e")}
-                      />
-                    </>
-                  )}
+                  <div
+                    className={`absolute border-2 shadow-2xl transition-colors duration-200 ${
+                      mode === "hotspot" 
+                        ? "border-blue-500 bg-blue-500/20 cursor-move pointer-events-auto shadow-blue-500/50" 
+                        : "border-blue-500/50 bg-blue-500/10 pointer-events-none"
+                    }`}
+                    style={{
+                      left: `${hotspot.x}%`,
+                      top: `${hotspot.y}%`,
+                      width: `${hotspot.width}%`,
+                      height: `${hotspot.height}%`,
+                      borderRadius: "50%",
+                    }}
+                    onPointerDown={(e) => handlePointerDown(e)}
+                  >
+                    {/* Center dot */}
+                    <div className="absolute top-1/2 left-1/2 w-2 h-2 -ml-1 -mt-1 bg-blue-500 rounded-full"></div>
+                    
+                    {/* Resize handles */}
+                    {mode === "hotspot" && (
+                      <>
+                        <div 
+                          className="absolute top-0 left-1/2 w-4 h-4 -ml-2 -mt-2 bg-blue-500 rounded-full cursor-ns-resize"
+                          onPointerDown={(e) => handlePointerDown(e, "n")}
+                        />
+                        <div 
+                          className="absolute bottom-0 left-1/2 w-4 h-4 -ml-2 -mb-2 bg-blue-500 rounded-full cursor-ns-resize"
+                          onPointerDown={(e) => handlePointerDown(e, "s")}
+                        />
+                        <div 
+                          className="absolute top-1/2 left-0 w-4 h-4 -ml-2 -mt-2 bg-blue-500 rounded-full cursor-ew-resize"
+                          onPointerDown={(e) => handlePointerDown(e, "w")}
+                        />
+                        <div 
+                          className="absolute top-1/2 right-0 w-4 h-4 -mr-2 -mt-2 bg-blue-500 rounded-full cursor-ew-resize"
+                          onPointerDown={(e) => handlePointerDown(e, "e")}
+                        />
+                      </>
+                    )}
+                  </div>
                 </div>
               </div>
-            </div>
-          )}
+            )}
+          </div>
         </div>
+
+        {/* Preview (right) */}
+        {hasCrop && (
+          <div className="w-[280px] border-l border-[var(--kyro-border)] bg-[var(--kyro-surface)] flex flex-col overflow-hidden">
+            <div className="flex items-center gap-2 px-4 py-3 border-b border-[var(--kyro-border)]">
+              <Eye className="w-4 h-4 text-[var(--kyro-text-secondary)]" />
+              <span className="text-xs font-bold text-[var(--kyro-text-secondary)] tracking-wide uppercase">
+                Preview
+              </span>
+            </div>
+            <div className="flex-1 flex items-center justify-center p-4 overflow-hidden">
+              {previewUrl && (
+                <img
+                  src={previewUrl}
+                  alt="Crop preview"
+                  className="max-w-full max-h-full object-contain rounded-lg shadow-lg border border-[var(--kyro-border)]"
+                />
+              )}
+            </div>
+            <div className="px-4 py-3 border-t border-[var(--kyro-border)] text-[10px] text-[var(--kyro-text-secondary)] font-mono">
+              <div>x: {crop?.x?.toFixed(1)}%  y: {crop?.y?.toFixed(1)}%</div>
+              <div>w: {crop?.width?.toFixed(1)}%  h: {crop?.height?.toFixed(1)}%</div>
+            </div>
+          </div>
+        )}
       </div>
       
       {/* Help Text */}
       <div className="p-4 text-center bg-[var(--kyro-surface-accent)] border-t border-[var(--kyro-border)] text-sm text-[var(--kyro-text-secondary)]">
         {mode === "crop" 
-          ? "Drag to define the crop area. This creates a bounding box for the image."
+          ? "Drag to define the crop area. The preview panel shows the result in real-time."
           : "Drag the circle to define the focal hotspot. This area will always remain visible when the image is resized."}
       </div>
     </div>

package/src/components/ui/Modal.tsx

@@ -18,7 +18,7 @@ interface ModalProps {
   title: string;
   children: ReactNode;
   footer?: ReactNode;
-  size?: "sm" | "md" | "lg" | "full";
+  size?: "sm" | "md" | "lg" | "xl" | "2xl" | "full";
   variant?: "default" | "danger" | "lightbox";
 }
 
@@ -28,7 +28,7 @@ export function Modal({
   title,
   children,
   footer,
-  size = "md",
+  size = "lg",
   variant = "default",
 }: ModalProps) {
   useEffect(() => {
@@ -53,6 +53,8 @@ export function Modal({
     sm: "max-w-sm",
     md: "max-w-md",
     lg: "max-w-lg",
+    xl: "max-w-xl",
+    "2xl": "max-w-2xl",
     full: "w-full h-full max-w-none rounded-none border-0",
   };
 

package/src/components/ui/icons.tsx

@@ -110,4 +110,4 @@ export { Grid3X3 as IconGrid3X3 } from "lucide-react";
 // Direct re-exports for files that still use original lucide-react names
 export { Activity as Activity, AlignLeft as AlignLeft, Archive as Archive, ArrowDown as ArrowDown, ArrowRight as ArrowRight, ArrowUpRight as ArrowUpRight, Blocks as Blocks, Box as Box, Calendar as Calendar, Check as Check, ChevronDown as ChevronDown, ChevronLeft as ChevronLeft, ChevronRight as ChevronRight, ChevronUp as ChevronUp, Clock as Clock, Code as Code, Columns3 as Columns3, Copy as Copy, Crop as Crop, Download as Download, ExternalLink as ExternalLink, Eye as Eye, EyeOff as EyeOff, File as File, File as FileIcon, FileText as FileText, Globe as Globe, Film as Film, Filter as Filter, Folder as Folder, FolderInput as FolderInput, FolderPlus as FolderPlus, GripVertical as GripVertical, Heading1 as Heading1, Image as Image, Info as Info, Key as Key, LayoutDashboard as LayoutDashboard, Link as Link, Link2 as Link2, List as List, ListOrdered as ListOrdered, Lock as Lock, Mail as Mail, Maximize2 as Maximize2, Menu as Menu, Minus as Minus, Monitor as Monitor, MousePointerClick as MousePointerClick, Music as Music, Palette as Palette, Pause as Pause, Play as Play, Plus as Plus, RefreshCcw as RefreshCcw, RefreshCw as RefreshCw, Save as Save, Search as Search, Send as Send, Settings as Settings, Shield as Shield, Sparkles as Sparkles, Star as Star, Tag as Tag, Terminal as Terminal, ToggleLeft as ToggleLeft, ToggleRight as ToggleRight, Trash2 as Trash2, TrendingUp as TrendingUp, Type as Type, User as User, UserPlus as UserPlus, Users as Users, Video as Video, Webhook as Webhook, X as X, Zap as Zap, CircleHelp as HelpCircle } from "lucide-react";
 export { CircleCheck as CheckCircle2, Grid3X3 as Grid, House as Home, LayoutPanelTop as Layout, LoaderCircle as Loader2, LockOpen as Unlock, CirclePlay as PlayCircle, TriangleAlert as AlertTriangle, CodeXml as Code2, CloudDownload as DownloadCloud, EllipsisVertical as MoreVertical, ShieldCheck as ShieldCheck, ShieldAlert as ShieldAlert, Pencil as Edit2, Moon as Moon, Sun as Sun, LogOut as LogOut, Database as Database, Hexagon as Hexagon, Network as Network, Book as Book, Bold as Bold, Italic as Italic, Underline as Underline, Strikethrough as Strikethrough, Undo as Undo, Redo as Redo, Dot as Dot, Grid3X3, Laptop as Laptop, Smartphone as Smartphone } from "lucide-react";
-export { Server as Server, XCircle as XCircle, Clipboard as Clipboard, Upload as Upload } from "lucide-react";
+export { Server as Server, XCircle as XCircle, Clipboard as Clipboard, ClipboardPaste as ClipboardPaste, ClipboardCopy as ClipboardCopy, Upload as Upload } from "lucide-react";

package/src/hooks/useAutoFormState.ts

@@ -151,7 +151,7 @@ const persistBrowserDraft = useCallback(
     const latestFormData = state.formData;
     const currentLastSaved = state.lastSavedData;
 
-    if (autoSaveSkipRef.current || (!versionsEnabled && !!globalSlug)) return;
+    if (autoSaveSkipRef.current) return;
     if (!globalSlug && (!collectionSlug || !latestFormData.id)) return;
     if (!state.hasDirtyFields()) return;
 
@@ -169,6 +169,10 @@ const persistBrowserDraft = useCallback(
     setAutoSaveStatus("saving");
     state.setBackgroundProcessing(true);
 
+    if (globalSlug) {
+      window.dispatchEvent(new Event("kyro:global-save-start"));
+    }
+
     try {
       const url = globalSlug
         ? resolveUrl(`/api/globals/${globalSlug}?autosave=true`)
@@ -226,6 +230,9 @@ const persistBrowserDraft = useCallback(
         setAutoSaveStatus("offline");
       }
     } finally {
+      if (globalSlug) {
+        window.dispatchEvent(new Event("kyro:global-save-end"));
+      }
       setIsAutoSaving(false);
       useAutoFormStore.getState().setBackgroundProcessing(false);
     }
@@ -287,6 +294,48 @@ const persistBrowserDraft = useCallback(
     [collectionSlug, globalSlug, setAutoSaveStatus],
   );
 
+  // Force-save: retries without baseUpdatedAt to bypass OCC (conflict override)
+  const forceSave = useCallback(
+    async (isDraft = true) => {
+      const state = useAutoFormStore.getState();
+      const payload = state.formData;
+
+      const url = globalSlug
+        ? resolveUrl(`/api/globals/${globalSlug}`)
+        : resolveUrl(`/api/${collectionSlug}/${payload.id}`);
+
+      const response = await fetchWithAuth(
+        url,
+        {
+          method: "PATCH",
+          headers: {
+            "Content-Type": "application/json",
+            "X-Draft": String(isDraft),
+          },
+          body: JSON.stringify({
+            ...normalizeUploadFields(payload) as Record<string, unknown>,
+          }),
+        },
+      );
+
+      if (response.ok) {
+        const result = await response.json();
+        const savedData = result.data || payload;
+        state.setFormData({ ...payload, ...savedData });
+        state.setLastSavedData({ ...payload, ...savedData });
+        setAutoSaveStatus("success");
+        setTimeout(() => {
+          if (useAutoFormStore.getState().autoSaveStatus === "success") {
+            setAutoSaveStatus("idle");
+          }
+        }, 2000);
+      }
+
+      return response;
+    },
+    [collectionSlug, globalSlug, setAutoSaveStatus],
+  );
+
   // Track sidebar toggle
   useEffect(() => {
     const handleToggle = () => {
@@ -527,6 +576,7 @@ const persistBrowserDraft = useCallback(
     fetchVersions,
     performAutoSave: performAutosave,
     saveDocument,
+    forceSave,
     autoSaveSkipRef,
     lastAutoSaveTimeRef,
     documentStatus,

package/src/integration.ts

@@ -141,11 +141,11 @@ export function kyroAdmin(options: KyroAdminOptions = {}): AstroIntegration {
           ];
           for (const col of (configResult.collections || [])) {
             if (col.seo) {
-              const mainTabsField = col.fields?.find((f: any) => f.type === 'tabs' && f.name === 'mainTabs');
-              if (mainTabsField?.tabs) {
+              const tabsField = col.fields?.find((f: any) => f.type === 'tabs' && f.name === 'tabs');
+              if (tabsField?.tabs) {
                 // Only add if not already injected (avoid duplicates on hot-reload)
-                if (!mainTabsField.tabs.find((t: any) => t.label === 'SEO Settings')) {
-                  mainTabsField.tabs.push({ label: "SEO Settings", fields: seoFields });
+                if (!tabsField.tabs.find((t: any) => t.label === 'SEO Settings')) {
+                  tabsField.tabs.push({ label: "SEO Settings", fields: seoFields });
                 }
               }
             }

package/src/pages/settings/[slug].astro

@@ -118,7 +118,7 @@ const description =
     window.addEventListener("kyro:global-save-start", () => {
       if (saveBtn) {
         saveBtn.disabled = true;
-        saveBtn.innerHTML = "Saving...";
+        saveBtn.innerHTML = `<svg class="animate-spin -ml-1 mr-2 h-4 w-4 text-white inline-block" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle><path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z"></path></svg>Saving...`;
         saveBtn.classList.add("opacity-50", "cursor-wait");
       }
     });