Merge pull request #26 from jhbruhn/fix/skeleton-fixes

Fix: skeleton fixes and upload button disable logic

src/components/FileUpload.tsx

@@ -256,16 +256,34 @@ export function FileUpload() {
             onChange={handleFileChange}
             id="file-input"
             className="hidden"
-            disabled={isLoading || patternUploaded || isUploading}
+            disabled={
+              isLoading ||
+              patternUploaded ||
+              isUploading ||
+              (uploadProgress > 0 && !patternUploaded)
+            }
           />
           <Button
-            asChild={!fileService.hasNativeDialogs()}
+            asChild={
+              !fileService.hasNativeDialogs() &&
+              !(
+                isLoading ||
+                patternUploaded ||
+                isUploading ||
+                (uploadProgress > 0 && !patternUploaded)
+              )
+            }
             onClick={
               fileService.hasNativeDialogs()
                 ? () => handleFileChange()
                 : undefined
             }
-            disabled={isLoading || patternUploaded || isUploading}
+            disabled={
+              isLoading ||
+              patternUploaded ||
+              isUploading ||
+              (uploadProgress > 0 && !patternUploaded)
+            }
             variant="outline"
             className="flex-[2]"
           >
@@ -289,7 +307,10 @@ export function FileUpload() {
                 )}
               </>
             ) : (
-              <label htmlFor="file-input" className="flex items-center gap-2">
+              <label
+                htmlFor="file-input"
+                className="flex items-center gap-2 cursor-pointer"
+              >
                 {isLoading ? (
                   <>
                     <Loader2 className="w-3.5 h-3.5 animate-spin" />

src/components/PatternInfo.tsx

@@ -117,7 +117,13 @@ export function PatternInfo({
                 .join(" ");
 
               // Secondary metadata: chart and description
-              const secondaryMetadata = [color.chart, color.description]
+              // Only show chart if it's different from catalogNumber
+              const secondaryMetadata = [
+                color.chart && color.chart !== color.catalogNumber
+                  ? color.chart
+                  : null,
+                color.description,
+              ]
                 .filter(Boolean)
                 .join(" ");
 

src/components/ProgressMonitor.tsx

@@ -281,8 +281,13 @@ export function ProgressMonitor() {
                                     .join(" ");
 
                                   // Secondary metadata: chart and description
+                                  // Only show chart if it's different from catalogNumber
                                   const secondaryMetadata = [
-                                    block.threadChart,
+                                    block.threadChart &&
+                                    block.threadChart !==
+                                      block.threadCatalogNumber
+                                      ? block.threadChart
+                                      : null,
                                     block.threadDescription,
                                   ]
                                     .filter(Boolean)

src/components/SkeletonLoader.tsx

@@ -65,16 +65,33 @@ export function PatternCanvasSkeleton() {
 
 export function PatternInfoSkeleton() {
   return (
-    <div className="mt-4">
+    <div className="mb-3">
-      <SkeletonLoader className="h-6 w-40 mb-4" variant="text" />
+      {/* Three column grid matching PatternInfo stats */}
-      <div className="bg-gray-200 dark:bg-gray-900 p-4 rounded-lg space-y-3">
+      <div className="grid grid-cols-3 gap-2 text-xs mb-2">
-        {[1, 2, 3, 4].map((i) => (
+        {[1, 2, 3].map((i) => (
-          <div key={i} className="flex justify-between">
+          <div key={i} className="bg-gray-200 dark:bg-gray-700/50 p-2 rounded">
-            <SkeletonLoader className="h-4 w-24" variant="text" />
+            <SkeletonLoader className="h-3 w-12 mb-1" variant="text" />
-            <SkeletonLoader className="h-4 w-32" variant="text" />
+            <SkeletonLoader className="h-4 w-16" variant="text" />
           </div>
         ))}
       </div>
+
+      {/* Separator */}
+      <div className="h-px bg-gray-200 dark:bg-gray-700 mb-3" />
+
+      {/* Color swatches row */}
+      <div className="flex items-center gap-2 mb-2">
+        <SkeletonLoader className="h-3 w-12" variant="text" />
+        <div className="flex gap-1">
+          {[1, 2, 3, 4, 5].map((i) => (
+            <SkeletonLoader
+              key={i}
+              className="w-3 h-3 rounded-full"
+              variant="circle"
+            />
+          ))}
+        </div>
+      </div>
     </div>
   );
 }

src/lib/utils.ts

@@ -1,6 +1,6 @@
-import { clsx, type ClassValue } from "clsx"
+import { clsx, type ClassValue } from "clsx";
-import { twMerge } from "tailwind-merge"
+import { twMerge } from "tailwind-merge";
 
 export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs))
+  return twMerge(clsx(inputs));
 }