@mohasinac/appkit 4.41.2 → 4.41.4

package/dist/features/admin/components/AdminCarouselView.js

@@ -17,6 +17,16 @@ import { apiClient } from "../../../http";
 const PAGE_SIZE = 50;
 const FILTER_KEYS = ["active"];
 const DEFAULT_SORT = "order";
+function extractCarouselRows(response) {
+    if (Array.isArray(response))
+        return response;
+    if (!response || typeof response !== "object")
+        return undefined;
+    const obj = response;
+    if (Array.isArray(obj.data))
+        return obj.data;
+    return Array.isArray(obj.items) ? obj.items : undefined;
+}
 export function AdminCarouselView({ children, onBulkDelete, ...props }) {
     const hasChildren = React.Children.count(children) > 0;
     const [draggingId, setDraggingId] = useState(null);
@@ -30,7 +40,7 @@ export function AdminCarouselView({ children, onBulkDelete, ...props }) {
         queryKey: ["admin", "carousel", "listing"],
         endpoint: `${HOMEPAGE_ENDPOINTS.CAROUSEL}?includeInactive=true`,
         mapRows: (response) => {
-            const sourceItems = Array.isArray(response.data) ? response.data : response.items;
+            const sourceItems = extractCarouselRows(response);
             return toRecordArray(sourceItems)
                 .sort((a, b) => (a.order ?? 0) - (b.order ?? 0))
                 .map((item, index) => {
@@ -50,7 +60,13 @@ export function AdminCarouselView({ children, onBulkDelete, ...props }) {
                 };
             });
         },
-        getTotal: (response, mappedRows) => typeof response.total === "number" ? response.total : mappedRows.length,
+        getTotal: (response, mappedRows) => {
+            if (Array.isArray(response) || !response || typeof response !== "object") {
+                return mappedRows.length;
+            }
+            const total = response.total;
+            return typeof total === "number" ? total : mappedRows.length;
+        },
         buildFilters: (filterState) => {
             const activeRaw = filterState.active;
             if (activeRaw === "true")

package/dist/features/admin/components/AdminCategoriesView.js

@@ -9,6 +9,24 @@ import { toRecordArray, toRelativeDate, toStringValue, } from "../hooks/useAdmin
 import { DataListingView } from "./DataListingView";
 import { AdminCategoryEditorView } from "./AdminCategoryEditorView";
 import { ADMIN_BULK_ACTIONS, ROW_ACTION_META } from "../../products/constants/action-defs";
+/** Rows, whichever of the three shapes the endpoint returns. */
+function extractCategoryRows(response) {
+    if (Array.isArray(response))
+        return response;
+    if (!response || typeof response !== "object")
+        return undefined;
+    const obj = response;
+    if (Array.isArray(obj.data))
+        return obj.data;
+    return Array.isArray(obj.items) ? obj.items : undefined;
+}
+/** `total` only exists on the object shapes; a bare array has none. */
+function extractCategoryTotal(response) {
+    if (Array.isArray(response) || !response || typeof response !== "object")
+        return undefined;
+    const total = response.total;
+    return typeof total === "number" ? total : undefined;
+}
 const COLUMNS = [
     {
         key: "primary",
@@ -46,7 +64,7 @@ const ADMIN_CATEGORIES_CONFIG = {
     ],
     columns: COLUMNS,
     mapRows: (response) => {
-        const sourceItems = Array.isArray(response.data) ? response.data : response.items;
+        const sourceItems = extractCategoryRows(response);
         return toRecordArray(sourceItems).map((item, index) => ({
             id: toStringValue(item.id, `category-${index}`),
             primary: toStringValue(item.name, "Untitled category"),
@@ -59,7 +77,7 @@ const ADMIN_CATEGORIES_CONFIG = {
             updatedAt: toRelativeDate(item.updatedAt ?? item.createdAt),
         }));
     },
-    getTotal: (response, mappedRows) => typeof response.total === "number" ? response.total : mappedRows.length,
+    getTotal: (response, mappedRows) => extractCategoryTotal(response) ?? mappedRows.length,
     buildFilters: (state) => {
         const parts = [];
         if (state.isActive)

package/dist/features/homepage/components/FeaturedBundlesSection.js

@@ -38,7 +38,7 @@ function FeaturedBundleCard({ bundle, showSavingsBadge = true, onBuyNow, }) {
     const cover = bundle.display?.coverImage;
     const href = String(ROUTES.PUBLIC.BUNDLE_DETAIL?.(bundle.slug) ?? "#");
     const discount = computeBundleDiscount(bundle.bundlePrice, bundle.bundleOriginalTotal);
-    return (_jsxs(Stack, { gap: "none", surface: "default", rounded: "xl", border: "default", children: [_jsxs(Link, { href: href, className: "group block p-[var(--appkit-space-3)] hover:no-underline", children: [_jsxs(Div, { className: `relative mb-2 aspect-square ${__O.hidden}`, rounded: "lg", surface: "subtle", children: [cover ? (_jsx(MediaImage, { src: cover, alt: bundle.name, size: "card", className: "transition-transform group-hover:scale-105" })) : (_jsx(Row, { textSize: "3xl", className: "h-full w-full", align: "center", justify: "center", children: PLACEHOLDER_EMOJI })), showSavingsBadge && discount && (_jsx(Badge, { variant: "success", className: "absolute left-2 top-2", children: BUNDLE_COPY.detail.discountBadge(discount.percent) }))] }), _jsx(Text, { className: "line-clamp-2", size: "sm", weight: "semibold", children: bundle.name }), _jsxs(Row, { gap: "sm", align: "center", className: "mt-1", wrap: true, children: [_jsx(Text, { size: "sm", weight: "bold", children: _jsx(GatedPrice, { label: "Sign in to see the bundle price", children: bundle.bundlePrice
+    return (_jsxs(Stack, { gap: "none", surface: "default", rounded: "xl", border: "default", children: [_jsxs(Link, { href: href, className: "group block p-[var(--appkit-space-3)] hover:no-underline", children: [_jsxs(Div, { className: `relative mb-2 aspect-square ${__O.hidden}`, rounded: "lg", surface: "subtle", children: [cover ? (_jsx(MediaImage, { src: cover, alt: bundle.name, size: "card", className: "transition-transform group-hover:scale-105" })) : (_jsx(Row, { textSize: "3xl", className: "h-full w-full", align: "center", justify: "center", children: PLACEHOLDER_EMOJI })), showSavingsBadge && discount && (_jsx(PricesOnly, { children: _jsx(Badge, { variant: "success", className: "absolute left-2 top-2", children: BUNDLE_COPY.detail.discountBadge(discount.percent) }) }))] }), _jsx(Text, { className: "line-clamp-2", size: "sm", weight: "semibold", children: bundle.name }), _jsxs(Row, { gap: "sm", align: "center", className: "mt-1", wrap: true, children: [_jsx(Text, { size: "sm", weight: "bold", children: _jsx(GatedPrice, { label: "Sign in to see the bundle price", children: bundle.bundlePrice
                                         ? formatCurrency(bundle.bundlePrice, "INR")
                                         : BUNDLE_COPY.featured.priceFallback }) }), discount && (_jsx(PricesOnly, { children: _jsx(Text, { size: "xs", color: "muted", className: "line-through", children: formatCurrency(discount.originalTotal, "INR") }) })), _jsxs(Text, { size: "xs", color: "muted", children: ["\u00B7 ", BUNDLE_COPY.featured.itemCount(memberCount)] }), stock !== "in_stock" && (_jsx(Badge, { variant: BUNDLE_STOCK_VARIANT[stock], children: BUNDLE_COPY.stockBadge.listVariantOutOfStock }))] })] }), onBuyNow && (_jsx(Div, { border: "subtle", className: `border-t ${__P.p3}`, padding: "t-xs", children: _jsx(BundleBuyNowCta, { bundleSlug: bundle.slug, outOfStock: stock === "out_of_stock", onBuyNow: onBuyNow, compact: true }) }))] }));
 }

package/dist/features/products/components/MarketplaceBundleCard.js

@@ -10,7 +10,7 @@ const CLS_BUNDLE_PILL = "inline-flex items-center rounded-full bg-violet-600 px-
 const CLS_STOCK_OK = "bg-success-solid text-success-on-solid";
 // audit-content-alignment-ok: button label text, not page content — buttons are universally center-labeled
 const CLS_VIEW_BTN = "mt-2 w-full cursor-pointer rounded-md bg-violet-600 py-[var(--appkit-space-1-5)] text-center text-[length:var(--appkit-text-xs)] font-semibold text-white transition-colors hover:bg-violet-700 active:scale-[0.98]";
-import { BaseListingCard, Div, GatedPrice, Row, Span, Stack, Text, TextLink } from "../../../ui";
+import { BaseListingCard, Div, GatedPrice, PricesOnly, Row, Span, Stack, Text, TextLink } from "../../../ui";
 import { MediaImage } from "../../media/MediaImage";
 import { computeBundleDiscount } from "../../../_internal/shared/features/categories/bundle-pricing";
 import { BUNDLE_COPY } from "../../../_internal/shared/features/categories/bundle-copy";
@@ -49,7 +49,7 @@ export function MarketplaceBundleCard({ bundle, className = "", variant = "grid"
         }
         router.push(String(detailHref));
     }, [detailHref, onNavigate, router]);
-    return (_jsxs(BaseListingCard, { isSelected: isSelected, variant: variant, className: className, onMouseDown: !isSelected ? longPress.onMouseDown : undefined, onMouseUp: !isSelected ? longPress.onMouseUp : undefined, onMouseLeave: !isSelected ? longPress.onMouseLeave : undefined, onTouchStart: !isSelected ? longPress.onTouchStart : undefined, onTouchEnd: !isSelected ? longPress.onTouchEnd : undefined, onTouchCancel: !isSelected ? longPress.onTouchCancel : undefined, children: [_jsxs(BaseListingCard.Hero, { aspect: "square", variant: variant, children: [_jsx(TextLink, { href: String(detailHref), className: "absolute inset-0 block", children: showCollage ? (_jsx(Div, { layout: "grid", className: `h-full w-full gap-[0.125rem] bg-[var(--appkit-color-surface-muted)] ${collageTiles.length === 2 ? "grid-cols-2 grid-rows-1" : "grid-cols-2 grid-rows-2"}`, children: collageTiles.map((tile, i) => (_jsxs(Div, { className: "relative overflow-hidden bg-[var(--appkit-color-surface-muted)]", children: [_jsx(MediaImage, { src: tile.imageURL, alt: tile.title ?? `${bundle.name} item ${i + 1}`, size: "card" }), i === collageTiles.length - 1 && overflow > 0 && (_jsxs(Row, { textWeight: "semibold", textSize: "sm", surface: "overlay-md", className: "absolute inset-0 text-white", align: "center", justify: "center", children: ["+", overflow] }))] }, `${tile.productId}-${i}`))) })) : cover ? (_jsx(Div, { className: "absolute inset-0 bg-[var(--appkit-color-surface-muted)]", children: _jsx(MediaImage, { src: cover, alt: bundle.name, size: "card" }) })) : (_jsx(Row, { className: "absolute inset-0 bg-[var(--appkit-color-surface-muted)]", align: "center", justify: "center", children: _jsx(Text, { className: "text-[var(--appkit-color-text-muted)]", size: "xs", children: "No image" }) })) }), discount && (_jsx(Span, { size: "xs", weight: "bold", className: "absolute left-2 top-2 bg-success-solid text-success-on-solid", rounded: "full", padding: "pill-xs", children: BUNDLE_COPY.detail.discountBadge(discount.percent) })), _jsxs(Stack, { className: "absolute right-2 top-2", align: "end", gap: "xs", children: [_jsx(Span, { size: "xs", weight: "medium", className: CLS_BUNDLE_PILL, children: mergedLabels.bundleBadge }), _jsx(Span, { layout: "inline-flex", color: "inverse", className: `${stock === "out_of_stock" ? "bg-neutral-500 " : CLS_STOCK_OK}`, rounded: "full", padding: "pill-xs", size: "xs", weight: "medium", children: stock === "out_of_stock" ? mergedLabels.outOfStockBadge : mergedLabels.inStockBadge })] }), stock === "out_of_stock" && (_jsx(Row, { surface: "overlay-xs", className: "absolute inset-0", align: "center", justify: "center", children: _jsx(Span, { color: "inverse", size: "xs", weight: "bold", className: "bg-neutral-900/80 tracking-wider", rounded: "default", padding: "pill-md", transform: "uppercase", children: mergedLabels.outOfStockBadge }) })), onSelect && (_jsx(BaseListingCard.Checkbox, { selected: isSelected, onSelect: (event) => {
+    return (_jsxs(BaseListingCard, { isSelected: isSelected, variant: variant, className: className, onMouseDown: !isSelected ? longPress.onMouseDown : undefined, onMouseUp: !isSelected ? longPress.onMouseUp : undefined, onMouseLeave: !isSelected ? longPress.onMouseLeave : undefined, onTouchStart: !isSelected ? longPress.onTouchStart : undefined, onTouchEnd: !isSelected ? longPress.onTouchEnd : undefined, onTouchCancel: !isSelected ? longPress.onTouchCancel : undefined, children: [_jsxs(BaseListingCard.Hero, { aspect: "square", variant: variant, children: [_jsx(TextLink, { href: String(detailHref), className: "absolute inset-0 block", children: showCollage ? (_jsx(Div, { layout: "grid", className: `h-full w-full gap-[0.125rem] bg-[var(--appkit-color-surface-muted)] ${collageTiles.length === 2 ? "grid-cols-2 grid-rows-1" : "grid-cols-2 grid-rows-2"}`, children: collageTiles.map((tile, i) => (_jsxs(Div, { className: "relative overflow-hidden bg-[var(--appkit-color-surface-muted)]", children: [_jsx(MediaImage, { src: tile.imageURL, alt: tile.title ?? `${bundle.name} item ${i + 1}`, size: "card" }), i === collageTiles.length - 1 && overflow > 0 && (_jsxs(Row, { textWeight: "semibold", textSize: "sm", surface: "overlay-md", className: "absolute inset-0 text-white", align: "center", justify: "center", children: ["+", overflow] }))] }, `${tile.productId}-${i}`))) })) : cover ? (_jsx(Div, { className: "absolute inset-0 bg-[var(--appkit-color-surface-muted)]", children: _jsx(MediaImage, { src: cover, alt: bundle.name, size: "card" }) })) : (_jsx(Row, { className: "absolute inset-0 bg-[var(--appkit-color-surface-muted)]", align: "center", justify: "center", children: _jsx(Text, { className: "text-[var(--appkit-color-text-muted)]", size: "xs", children: "No image" }) })) }), discount && (_jsx(PricesOnly, { children: _jsx(Span, { size: "xs", weight: "bold", className: "absolute left-2 top-2 bg-success-solid text-success-on-solid", rounded: "full", padding: "pill-xs", children: BUNDLE_COPY.detail.discountBadge(discount.percent) }) })), _jsxs(Stack, { className: "absolute right-2 top-2", align: "end", gap: "xs", children: [_jsx(Span, { size: "xs", weight: "medium", className: CLS_BUNDLE_PILL, children: mergedLabels.bundleBadge }), _jsx(Span, { layout: "inline-flex", color: "inverse", className: `${stock === "out_of_stock" ? "bg-neutral-500 " : CLS_STOCK_OK}`, rounded: "full", padding: "pill-xs", size: "xs", weight: "medium", children: stock === "out_of_stock" ? mergedLabels.outOfStockBadge : mergedLabels.inStockBadge })] }), stock === "out_of_stock" && (_jsx(Row, { surface: "overlay-xs", className: "absolute inset-0", align: "center", justify: "center", children: _jsx(Span, { color: "inverse", size: "xs", weight: "bold", className: "bg-neutral-900/80 tracking-wider", rounded: "default", padding: "pill-md", transform: "uppercase", children: mergedLabels.outOfStockBadge }) })), onSelect && (_jsx(BaseListingCard.Checkbox, { selected: isSelected, onSelect: (event) => {
                             event.stopPropagation();
                             onSelect(bundle.id, !isSelected);
                         }, className: selectable || isSelected

package/dist/features/shell/field-ui-meta.js

@@ -162,8 +162,17 @@ function stringMaxLength(schema) {
  */
 function enumOptions(schema) {
     const direct = schema.options;
-    if (Array.isArray(direct))
-        return direct.filter((o) => typeof o === "string");
+    if (Array.isArray(direct)) {
+        const strings = direct.filter((o) => typeof o === "string");
+        // On a ZodUnion `.options` is the member SCHEMAS, not strings, so the
+        // filter above yields []. Empty is truthy downstream, which is how a union
+        // rendered as a <select> with nothing in it. Read the literals instead.
+        if (strings.length === 0) {
+            const literals = unionStringLiterals(direct);
+            return literals.length > 0 ? literals : undefined;
+        }
+        return strings;
+    }
     const values = schema._def?.values;
     if (Array.isArray(values))
         return values.filter((o) => typeof o === "string");
@@ -172,6 +181,26 @@ function enumOptions(schema) {
     }
     return undefined;
 }
+/**
+ * String literal values carried by a union's members.
+ *
+ * `z.literal("a").or(z.literal("b"))` is a genuine choice and yields
+ * `["a", "b"]`. `z.string().optional().or(z.literal(""))` — the idiomatic
+ * "optional text that also accepts empty" — yields nothing usable, because its
+ * only literal is the empty string. That distinction is what decides whether a
+ * union field is a select or a text input.
+ */
+function unionStringLiterals(members) {
+    const out = [];
+    for (const member of members) {
+        const direct = member?.value;
+        const nested = member?._def?.value;
+        const value = typeof direct === "string" ? direct : nested;
+        if (typeof value === "string" && value !== "")
+            out.push(value);
+    }
+    return out;
+}
 /** Public: the option list for a select-shaped field, or null. */
 export function schemaEnumOptions(schema) {
     const { schema: inner } = unwrapSchema(schema);
@@ -180,7 +209,27 @@ export function schemaEnumOptions(schema) {
 /** Public: whether a field's type is optional-wrapped (i.e. not required). */
 export function schemaIsOptional(schema) {
     const type = typeOf(schema);
-    return type === "optional" || type === "default" || type === "nullish";
+    if (type === "optional" || type === "default" || type === "nullish")
+        return true;
+    // A union HIDES optionality from the check above: the outer type is "union",
+    // so `z.string().optional().or(z.literal(""))` read as required and rendered
+    // a `*` on a field the schema is happy to leave empty. If any member is
+    // optional, or accepts "", the field is optional.
+    if (type === "union") {
+        const members = schema.options;
+        if (Array.isArray(members)) {
+            return members.some((member) => {
+                const memberType = typeOf(member);
+                if (memberType === "optional" || memberType === "default" || memberType === "nullish") {
+                    return true;
+                }
+                const direct = member?.value;
+                const nested = member?._def?.value;
+                return direct === "" || nested === "";
+            });
+        }
+    }
+    return false;
 }
 /**
  * The `.shape` of an object schema, seeing through effects wrappers.
@@ -257,8 +306,19 @@ function fromZodType(type, inner) {
         case "enum":
         case "nativeEnum":
         case "literal":
-        case "union":
             return { kind: "select", row: "pair" };
+        case "union": {
+            // Only a union that actually yields choices is a select. The other
+            // common shape, `z.string().optional().or(z.literal(""))`, is an optional
+            // TEXT field — rendering it as a select produced a dropdown with zero
+            // options, which is unusable and (being marked required) made the whole
+            // form unsubmittable. Seen live on /user/addresses/new, where
+            // "Address line 2" and "Landmark" were both required empty dropdowns.
+            const choices = enumOptions(inner);
+            return choices && choices.length > 0
+                ? { kind: "select", row: "pair" }
+                : { kind: "text", row: "pair" };
+        }
         case "date":
             return { kind: "date", row: "pair" };
         case "number":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mohasinac/appkit",
-  "version": "4.41.2",
+  "version": "4.41.4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"