@appcorp/shadcn 1.0.27 → 1.0.28

package/components/enhanced-table.js

@@ -63,22 +63,31 @@ var EnhancedTable = function (_a) {
             if (!key)
                 return source;
             if (typeof key === "string") {
+                // Handle colon-separated nested keys
+                if (key.includes(":")) {
+                    var keys = key.split(":");
+                    var cur = source;
+                    for (var _i = 0, keys_2 = keys; _i < keys_2.length; _i++) {
+                        var k = keys_2[_i];
+                        if (cur == null || typeof cur !== "object")
+                            return undefined;
+                        cur = cur[k];
+                    }
+                    return cur;
+                }
+                // Simple key access
                 if (source && typeof source === "object")
                     return source[key];
                 return undefined;
             }
-            // array of keys
-            var path = key.slice(0, 3); // enforce max depth 3
-            var cur = source;
-            for (var _i = 0, path_1 = path; _i < path_1.length; _i++) {
-                var k = path_1[_i];
-                if (cur == null)
-                    return undefined;
-                if (typeof cur !== "object")
-                    return undefined;
-                cur = cur[k];
+            // array of keys - try each until we find a defined value
+            for (var _a = 0, key_1 = key; _a < key_1.length; _a++) {
+                var k = key_1[_a];
+                var val = resolveValue(source, k);
+                if (val != null)
+                    return val;
             }
-            return cur;
+            return undefined;
         };
         var getProp = function (obj, prop) {
             if (obj &&
@@ -150,47 +159,51 @@ var EnhancedTable = function (_a) {
                     ? "bg-green-500 hover:bg-green-600"
                     : "bg-red-500 hover:bg-red-600") }, isTrue ? labels.booleanYes : labels.booleanNo));
         }
-        // OBJECT => nested property path supplied as array of strings OR colon-separated string
-        // e.g., "category:name" => row.category.name, "user:profile:bio" => row.user.profile.bio
+        // OBJECT => nested property path supplied as array of colon-separated strings
+        // e.g., ["user:company", "profile:department"] with fallback support
+        // If first path is undefined, try the next one. If all undefined, render '-'
         if (normalizedType === COMPONENT_TYPE.OBJECT) {
             var nested = void 0;
-            // Check if key is a colon-separated string for nested access
-            if (typeof col.key === "string" && col.key.includes(":")) {
-                var keys = col.key.split(":");
-                var cur = row;
-                for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
-                    var k = keys_1[_i];
-                    if (cur == null || typeof cur !== "object") {
-                        nested = undefined;
-                        break;
+            // Key must be an array of colon-separated strings
+            if (Array.isArray(col.key)) {
+                // Try each key path until we find a defined value
+                for (var _i = 0, _c = col.key; _i < _c.length; _i++) {
+                    var keyPath = _c[_i];
+                    if (typeof keyPath === "string" && keyPath.includes(":")) {
+                        var keys = keyPath.split(":");
+                        var cur = row;
+                        var found = true;
+                        for (var _d = 0, keys_1 = keys; _d < keys_1.length; _d++) {
+                            var k = keys_1[_d];
+                            if (cur == null || typeof cur !== "object") {
+                                found = false;
+                                break;
+                            }
+                            cur = cur[k];
+                        }
+                        if (found && cur != null) {
+                            nested = cur;
+                            break;
+                        }
                     }
-                    cur = cur[k];
                 }
-                nested = cur;
             }
-            else {
-                // Fallback to array-based path or single key
-                nested = resolveValue(row, col.key);
-            }
-            // If nested is primitive, show it. If object, stringify first-level value.
+            // If all paths are undefined, render '-'
             if (nested == null)
-                return react_1.default.createElement("span", null, "");
+                return react_1.default.createElement("span", null, "-");
+            // If nested is an object, try to find a primitive value
             if (typeof nested === "object") {
-                // Render primitive values inside object or JSON fallback
-                var primitive = typeof nested === "object"
-                    ? // try to find a primitive child
-                        Object.values(nested).find(function (v) {
-                            return ["string", "number", "boolean"].includes(typeof v);
-                        })
-                    : nested;
+                var primitive = Object.values(nested).find(function (v) {
+                    return ["string", "number", "boolean"].includes(typeof v);
+                });
                 var toRender = primitive !== null && primitive !== void 0 ? primitive : JSON.stringify(nested);
                 return (react_1.default.createElement("span", null, col.textFormatter
                     ? col.textFormatter(toRender, row)
                     : String(toRender)));
             }
+            // Nested is a primitive value
             return (react_1.default.createElement("span", null, col.textFormatter ? col.textFormatter(nested, row) : String(nested)));
-        }
-        // MULTIPLE_TEXT_LINES => col.key is an array of keys, render up to 3 lines
+        } // MULTIPLE_TEXT_LINES => col.key is an array of keys, render up to 3 lines
         if (normalizedType === COMPONENT_TYPE.MULTIPLE_TEXT_LINES) {
             var keys = Array.isArray(col.key) ? col.key : [];
             var lines = keys.slice(0, 3).map(function (k) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appcorp/shadcn",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "scripts": {
     "build:next": "next build",
     "build:storybook": "storybook build -c .storybook -o .out",