@mercurjs/admin 2.2.0-canary.3 → 2.2.0-canary.30

package/dist/{chunk-BCVUMATY.js → chunk-UZO3CIEN.js}

@@ -1,31 +1,45 @@
-import {
-  useOrderTableColumns
-} from "./chunk-DBYUB2YI.js";
 import {
   useCustomerGroupTableColumns
 } from "./chunk-54EPH67T.js";
-import {
-  useOrderTableFilters
-} from "./chunk-JQBSPUH2.js";
 import {
   useCustomerGroupTableFilters
-} from "./chunk-CMHI2RPL.js";
+} from "./chunk-AKSUGT5I.js";
 import {
   useOrderTableQuery
-} from "./chunk-3B6MTW5G.js";
+} from "./chunk-QUHSHIAC.js";
 import {
   useCustomerGroupTableQuery
-} from "./chunk-VKOE5J66.js";
+} from "./chunk-3XOE4NV5.js";
+import {
+  FulfillmentStatusCell,
+  FulfillmentStatusHeader,
+  PaymentStatusCell,
+  PaymentStatusHeader
+} from "./chunk-TZSOL34K.js";
+import {
+  DateCell,
+  DateHeader
+} from "./chunk-25LYVP3C.js";
+import {
+  getStylizedAmount
+} from "./chunk-PXYDR7WQ.js";
+import {
+  TextCell,
+  TextHeader
+} from "./chunk-JHIMVLB2.js";
+import {
+  TwoColumnPage
+} from "./chunk-E74OUNA3.js";
 import {
   _DataTable,
   useDataTable
-} from "./chunk-NQEXDLYH.js";
+} from "./chunk-JGCGVEFZ.js";
 import {
   NoRecords
-} from "./chunk-634XVU3D.js";
+} from "./chunk-PAYQJPGK.js";
 import {
-  TwoColumnPage
-} from "./chunk-E74OUNA3.js";
+  useOrderGroups
+} from "./chunk-VYMODH6P.js";
 import {
   useBatchCustomerCustomerGroups,
   useCustomer,
@@ -33,10 +47,7 @@ import {
   useDeleteCustomer,
   useDeleteCustomerAddress,
   useRemoveCustomersFromGroup
-} from "./chunk-PRBE5CM3.js";
-import {
-  useOrders
-} from "./chunk-B3EEDC47.js";
+} from "./chunk-QYDWMBEX.js";
 import {
   ActionMenu
 } from "./chunk-BDGZ4EQO.js";
@@ -49,9 +60,9 @@ import { Children } from "react";
 import { useLoaderData, useParams } from "react-router-dom";
 
 // src/pages/customers/customer-detail/components/customer-address-section/customer-address-section.tsx
-import { clx, Container, Heading, toast, usePrompt } from "@medusajs/ui";
+import { Button, clx, Container, Heading, toast, usePrompt } from "@medusajs/ui";
 import { useTranslation } from "react-i18next";
-import { Trash } from "@medusajs/icons";
+import { PencilSquare, Trash } from "@medusajs/icons";
 import { Link, useNavigate } from "react-router-dom";
 
 // src/components/common/listicle/listicle.tsx
@@ -111,7 +122,7 @@ var CustomerAddressSection = ({
   return /* @__PURE__ */ jsxs2(Container, { className: "p-0", "data-testid": "customer-address-section", children: [
     /* @__PURE__ */ jsxs2("div", { className: "flex items-center justify-between px-6 py-4", "data-testid": "customer-address-section-header", children: [
       /* @__PURE__ */ jsx2(Heading, { level: "h2", "data-testid": "customer-address-section-heading", children: t2("addresses.title") }),
-      /* @__PURE__ */ jsx2(Link, { to: `create-address`, className: "text-ui-fg-muted text-xs", "data-testid": "customer-address-section-add-link", children: "Add" })
+      /* @__PURE__ */ jsx2(Link, { to: `create-address`, "data-testid": "customer-address-section-add-link", children: /* @__PURE__ */ jsx2(Button, { variant: "secondary", size: "small", "data-testid": "customer-address-section-create-button", children: t2("actions.create") }) })
     ] }),
     addresses.length === 0 && /* @__PURE__ */ jsx2("div", { "data-testid": "customer-address-section-no-records", children: /* @__PURE__ */ jsx2(
       NoRecords,
@@ -135,6 +146,15 @@ var CustomerAddressSection = ({
             {
               "data-testid": `customer-address-section-address-${address.id}-actions`,
               groups: [
+                {
+                  actions: [
+                    {
+                      icon: /* @__PURE__ */ jsx2(PencilSquare, {}),
+                      label: t2("actions.edit"),
+                      to: `edit-address/${address.id}`
+                    }
+                  ]
+                },
                 {
                   actions: [
                     {
@@ -156,7 +176,7 @@ var CustomerAddressSection = ({
 };
 
 // src/pages/customers/customer-detail/components/customer-general-section/customer-general-section.tsx
-import { PencilSquare, Trash as Trash2 } from "@medusajs/icons";
+import { PencilSquare as PencilSquare2, Trash as Trash2 } from "@medusajs/icons";
 import {
   Container as Container2,
   Heading as Heading2,
@@ -220,7 +240,7 @@ var CustomerGeneralSection = ({
                 actions: [
                   {
                     label: t2("actions.edit"),
-                    icon: /* @__PURE__ */ jsx3(PencilSquare, {}),
+                    icon: /* @__PURE__ */ jsx3(PencilSquare2, {}),
                     to: "edit"
                   }
                 ]
@@ -256,7 +276,7 @@ var CustomerGeneralSection = ({
 
 // src/pages/customers/customer-detail/components/customer-group-section/customer-group-section.tsx
 import {
-  Button,
+  Button as Button2,
   Checkbox,
   Container as Container3,
   Heading as Heading3,
@@ -266,7 +286,7 @@ import {
 import { createColumnHelper } from "@tanstack/react-table";
 import { t } from "i18next";
 import { useMemo, useState } from "react";
-import { PencilSquare as PencilSquare2, Trash as Trash3 } from "@medusajs/icons";
+import { PencilSquare as PencilSquare3, Trash as Trash3 } from "@medusajs/icons";
 import { keepPreviousData } from "@tanstack/react-query";
 import { useTranslation as useTranslation3 } from "react-i18next";
 import { Link as Link2 } from "react-router-dom";
@@ -285,7 +305,7 @@ var CustomerGroupSection = ({
   const { customer_groups, count, isLoading, isError, error } = useCustomerGroups(
     {
       ...searchParams,
-      fields: "+customers.id",
+      fields: "+customers.id,+seller.id,+seller.name",
       customers: { id: customer.id }
     },
     {
@@ -344,7 +364,7 @@ var CustomerGroupSection = ({
   return /* @__PURE__ */ jsxs4(Container3, { className: "divide-y p-0", "data-testid": "customer-group-section", children: [
     /* @__PURE__ */ jsxs4("div", { className: "flex items-center justify-between px-6 py-4", "data-testid": "customer-group-section-header", children: [
       /* @__PURE__ */ jsx4(Heading3, { level: "h2", "data-testid": "customer-group-section-heading", children: t("customerGroups.domain") }),
-      /* @__PURE__ */ jsx4(Link2, { to: `/customers/${customer.id}/add-customer-groups`, "data-testid": "customer-group-section-add-link", children: /* @__PURE__ */ jsx4(Button, { variant: "secondary", size: "small", "data-testid": "customer-group-section-add-button", children: t("general.add") }) })
+      /* @__PURE__ */ jsx4(Link2, { to: `/customers/${customer.id}/add-customer-groups`, "data-testid": "customer-group-section-add-link", children: /* @__PURE__ */ jsx4(Button2, { variant: "secondary", size: "small", "data-testid": "customer-group-section-add-button", children: t("general.add") }) })
     ] }),
     /* @__PURE__ */ jsx4(
       _DataTable,
@@ -413,7 +433,7 @@ var CustomerGroupRowActions = ({
           actions: [
             {
               label: t2("actions.edit"),
-              icon: /* @__PURE__ */ jsx4(PencilSquare2, {}),
+              icon: /* @__PURE__ */ jsx4(PencilSquare3, {}),
               to: `/customer-groups/${group.id}/edit`
             },
             {
@@ -457,6 +477,14 @@ var useColumns = (customerId) => {
         }
       }),
       ...columns,
+      columnHelper.display({
+        id: "owner",
+        header: t("fields.owner"),
+        cell: ({ row }) => {
+          const seller = row.original.seller;
+          return /* @__PURE__ */ jsx4("span", { "data-testid": `customer-group-section-owner-${row.original.id}`, children: seller?.name ?? "-" });
+        }
+      }),
       columnHelper.display({
         id: "actions",
         cell: ({ row }) => /* @__PURE__ */ jsx4(
@@ -473,8 +501,8 @@ var useColumns = (customerId) => {
 };
 
 // src/pages/customers/customer-detail/components/customer-order-section/customer-order-section.tsx
-import { ArrowPath } from "@medusajs/icons";
-import { Container as Container4, Heading as Heading4 } from "@medusajs/ui";
+import { ArrowPath, TriangleRightMini } from "@medusajs/icons";
+import { Container as Container4, Heading as Heading4, IconButton, clx as clx2 } from "@medusajs/ui";
 import { keepPreviousData as keepPreviousData2 } from "@tanstack/react-query";
 import { createColumnHelper as createColumnHelper2 } from "@tanstack/react-table";
 import { useMemo as useMemo2 } from "react";
@@ -482,8 +510,59 @@ import { useTranslation as useTranslation4 } from "react-i18next";
 import { jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
 var PREFIX2 = "cusord";
 var PAGE_SIZE2 = 10;
-var DEFAULT_RELATIONS = "*customer,*items,*sales_channel";
-var DEFAULT_FIELDS = "id,status,display_id,created_at,email,fulfillment_status,payment_status,total,currency_code";
+var DEFAULT_FIELDS = [
+  "id",
+  "display_id",
+  "customer_id",
+  "seller_count",
+  "total",
+  "created_at",
+  "updated_at",
+  "orders.id",
+  "orders.display_id",
+  "orders.created_at",
+  "orders.updated_at",
+  "orders.payment_status",
+  "orders.fulfillment_status",
+  "orders.total",
+  "orders.currency_code",
+  "*orders.seller"
+].join(",");
+function transformOrderGroups(orderGroups, t2) {
+  return orderGroups.map((group) => {
+    const orders = group.orders ?? [];
+    const orderIds = orders.map((o) => `#${o.display_id}`).join(", ");
+    const currencyCode = orders[0]?.currency_code ?? "usd";
+    const children = orders.map((order) => ({
+      _type: "order",
+      id: order.id,
+      display_id: `#${order.display_id}`,
+      order_ids: "",
+      store: order.seller?.name ?? "-",
+      created_at: new Date(order.created_at),
+      updated_at: new Date(order.updated_at),
+      payment_status: order.payment_status ?? null,
+      fulfillment_status: order.fulfillment_status ?? null,
+      total: order.total ?? null,
+      currency_code: order.currency_code ?? "usd",
+      children: []
+    }));
+    return {
+      _type: "group",
+      id: group.id,
+      display_id: `#G${group.display_id}`,
+      order_ids: orderIds,
+      store: t2("orders.fields.vendorsCount", { count: group.seller_count }),
+      created_at: new Date(group.created_at),
+      updated_at: new Date(group.updated_at),
+      payment_status: null,
+      fulfillment_status: null,
+      total: group.total ?? null,
+      currency_code: currencyCode,
+      children
+    };
+  });
+}
 var CustomerOrderSection = ({
   customer
 }) => {
@@ -492,22 +571,28 @@ var CustomerOrderSection = ({
     pageSize: PAGE_SIZE2,
     prefix: PREFIX2
   });
-  const { orders, count, isLoading, isError, error } = useOrders(
+  const { order_groups, count, isLoading, isError, error } = useOrderGroups(
     {
       ...searchParams,
       customer_id: customer.id,
-      fields: DEFAULT_FIELDS + "," + DEFAULT_RELATIONS
+      fields: DEFAULT_FIELDS
     },
     {
       placeholderData: keepPreviousData2
     }
   );
+  const rows = useMemo2(
+    () => transformOrderGroups(order_groups ?? [], t2),
+    [order_groups, t2]
+  );
   const columns = useColumns2();
-  const filters = useOrderTableFilters();
   const { table } = useDataTable({
-    data: orders ?? [],
+    data: rows,
     columns,
     enablePagination: true,
+    enableExpandableRows: true,
+    getSubRows: (row) => row.children,
+    getRowId: (row) => row.id,
     count,
     pageSize: PAGE_SIZE2,
     prefix: PREFIX2
@@ -523,8 +608,7 @@ var CustomerOrderSection = ({
         columns,
         table,
         pagination: true,
-        navigateTo: (row) => `/orders/${row.original.id}`,
-        filters,
+        navigateTo: (row) => row.original._type === "order" ? `/orders/${row.original.id}` : "",
         count,
         isLoading,
         pageSize: PAGE_SIZE2,
@@ -540,18 +624,18 @@ var CustomerOrderSection = ({
     )
   ] });
 };
-var CustomerOrderActions = ({ order }) => {
+var CustomerOrderActions = ({ orderId }) => {
   const { t: t2 } = useTranslation4();
   return /* @__PURE__ */ jsx5(
     ActionMenu,
     {
-      "data-testid": `customer-order-section-row-actions-${order.id}`,
+      "data-testid": `customer-order-section-row-actions-${orderId}`,
       groups: [
         {
           actions: [
             {
               label: t2("transferOwnership.label"),
-              to: `${order.id}/transfer`,
+              to: `${orderId}/transfer`,
               icon: /* @__PURE__ */ jsx5(ArrowPath, {})
             }
           ]
@@ -562,16 +646,108 @@ var CustomerOrderActions = ({ order }) => {
 };
 var columnHelper2 = createColumnHelper2();
 var useColumns2 = () => {
-  const base = useOrderTableColumns({ exclude: ["customer"] });
+  const { t: t2 } = useTranslation4();
   return useMemo2(
     () => [
-      ...base,
+      columnHelper2.accessor("display_id", {
+        header: () => /* @__PURE__ */ jsx5(TextHeader, { text: t2("orders.fields.groupId") }),
+        cell: ({ row, getValue }) => {
+          if (row.original._type === "order") {
+            return null;
+          }
+          const expandHandler = row.getToggleExpandedHandler();
+          return /* @__PURE__ */ jsxs5("div", { className: "flex size-full items-center gap-x-2 overflow-hidden", children: [
+            /* @__PURE__ */ jsx5("div", { className: "flex size-7 items-center justify-center", children: row.getCanExpand() ? /* @__PURE__ */ jsx5(
+              IconButton,
+              {
+                type: "button",
+                onClick: (e) => {
+                  e.stopPropagation();
+                  e.preventDefault();
+                  expandHandler();
+                },
+                size: "small",
+                variant: "transparent",
+                className: "text-ui-fg-subtle",
+                "data-testid": `customer-order-group-expand-${row.original.id}`,
+                children: /* @__PURE__ */ jsx5(
+                  TriangleRightMini,
+                  {
+                    className: clx2({
+                      "rotate-90 transition-transform will-change-transform": row.getIsExpanded()
+                    })
+                  }
+                )
+              }
+            ) : null }),
+            /* @__PURE__ */ jsx5("span", { className: "truncate", children: getValue() })
+          ] });
+        }
+      }),
+      columnHelper2.accessor("order_ids", {
+        header: () => /* @__PURE__ */ jsx5(TextHeader, { text: t2("orders.fields.orderIds") }),
+        cell: ({ row, getValue }) => {
+          if (row.original._type === "group") {
+            return /* @__PURE__ */ jsx5(TextCell, { text: getValue() });
+          }
+          return /* @__PURE__ */ jsx5(TextCell, { text: row.original.display_id });
+        }
+      }),
+      columnHelper2.accessor("store", {
+        header: () => /* @__PURE__ */ jsx5(TextHeader, { text: t2("fields.store") }),
+        cell: ({ getValue }) => /* @__PURE__ */ jsx5(TextCell, { text: getValue() })
+      }),
+      columnHelper2.accessor("created_at", {
+        header: () => /* @__PURE__ */ jsx5(DateHeader, {}),
+        cell: ({ getValue }) => /* @__PURE__ */ jsx5(DateCell, { date: getValue() })
+      }),
+      columnHelper2.accessor("payment_status", {
+        header: () => /* @__PURE__ */ jsx5(PaymentStatusHeader, {}),
+        cell: ({ row, getValue }) => {
+          if (row.original._type === "group") {
+            return null;
+          }
+          const status = getValue();
+          if (!status) {
+            return "-";
+          }
+          return /* @__PURE__ */ jsx5(PaymentStatusCell, { status });
+        }
+      }),
+      columnHelper2.accessor("fulfillment_status", {
+        header: () => /* @__PURE__ */ jsx5(FulfillmentStatusHeader, {}),
+        cell: ({ row, getValue }) => {
+          if (row.original._type === "group") {
+            return null;
+          }
+          const status = getValue();
+          if (!status) {
+            return "-";
+          }
+          return /* @__PURE__ */ jsx5(FulfillmentStatusCell, { status });
+        }
+      }),
+      columnHelper2.accessor("total", {
+        header: () => /* @__PURE__ */ jsx5(TextHeader, { text: t2("fields.total") }),
+        cell: ({ row, getValue }) => {
+          const total = getValue();
+          if (total == null) {
+            return "-";
+          }
+          return /* @__PURE__ */ jsx5(
+            TextCell,
+            {
+              text: getStylizedAmount(total, row.original.currency_code)
+            }
+          );
+        }
+      }),
       columnHelper2.display({
         id: "actions",
-        cell: ({ row }) => /* @__PURE__ */ jsx5(CustomerOrderActions, { order: row.original })
+        cell: ({ row }) => row.original._type === "order" ? /* @__PURE__ */ jsx5(CustomerOrderActions, { orderId: row.original.id }) : null
       })
     ],
-    [base]
+    [t2]
   );
 };
 

package/dist/{chunk-2LQ5SCPB.js → chunk-VJ32NGUB.js}

@@ -1,6 +1,6 @@
 import {
   useOrderTableQuery
-} from "./chunk-3B6MTW5G.js";
+} from "./chunk-QUHSHIAC.js";
 import {
   FulfillmentStatusCell,
   FulfillmentStatusHeader,
@@ -11,17 +11,17 @@ import {
   DateCell,
   DateHeader
 } from "./chunk-25LYVP3C.js";
+import {
+  getStylizedAmount
+} from "./chunk-PXYDR7WQ.js";
 import {
   TextCell,
   TextHeader
 } from "./chunk-JHIMVLB2.js";
-import {
-  getStylizedAmount
-} from "./chunk-PXYDR7WQ.js";
 import {
   _DataTable,
   useDataTable
-} from "./chunk-NQEXDLYH.js";
+} from "./chunk-JGCGVEFZ.js";
 import {
   SingleColumnPage
 } from "./chunk-H6MYB7GB.js";
@@ -33,10 +33,10 @@ import {
 } from "./chunk-LEG67A2R.js";
 import {
   useCustomers
-} from "./chunk-PRBE5CM3.js";
+} from "./chunk-QYDWMBEX.js";
 import {
   useSalesChannels
-} from "./chunk-S5BJ5CMF.js";
+} from "./chunk-XKRR5ALR.js";
 
 // src/pages/orders/order-list/order-list.tsx
 import { Children as Children3 } from "react";
@@ -144,7 +144,7 @@ var useOrderGroupTableFilters = () => {
     if (sellers?.length) {
       filters.push({
         key: "seller_id",
-        label: "Seller",
+        label: "Store",
         type: "select",
         multiple: true,
         searchable: true,
@@ -179,6 +179,18 @@ var useOrderGroupTableFilters = () => {
         { label: "Requires action", value: "requires_action" }
       ]
     });
+    filters.push({
+      key: "request",
+      label: t("orders.filters.request.label"),
+      type: "select",
+      multiple: true,
+      options: [
+        { label: t("orders.filters.request.edit"), value: "edit" },
+        { label: t("orders.filters.request.return"), value: "return" },
+        { label: t("orders.filters.request.exchange"), value: "exchange" },
+        { label: t("orders.filters.request.claim"), value: "claim" }
+      ]
+    });
     filters.push(
       {
         key: "created_at",

package/dist/{chunk-4KX6CBJ4.js → chunk-VSLHL2AZ.js}

@@ -112,6 +112,7 @@ var FileUpload = ({
         "input",
         {
           hidden: true,
+          "aria-label": "File upload",
           ref: inputRef,
           onChange: handleFileChange,
           type: "file",
@@ -162,6 +163,7 @@ var FileUpload = ({
       "input",
       {
         hidden: true,
+        "aria-label": "File upload",
         ref: inputRef,
         onChange: handleFileChange,
         type: "file",

package/dist/{chunk-6RQR3B6T.js → chunk-WBSUHLO7.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-PHOCVOZ5.js";
 import {
   require_dist
-} from "./chunk-FMRP2CNF.js";
+} from "./chunk-YZBEJ3CY.js";
 import {
   __toESM
 } from "./chunk-NBMM2TZK.js";
@@ -43,7 +43,6 @@ var ProductStatusCell = ({ status }) => {
     [import_types.ProductStatus.DRAFT]: ["grey", t("products.productStatus.draft")],
     [import_types.ProductStatus.PROPOSED]: ["orange", t("products.productStatus.proposed")],
     [import_types.ProductStatus.PUBLISHED]: ["green", t("products.productStatus.published")],
-    [import_types.ProductStatus.REQUIRES_ACTION]: ["blue", t("products.productStatus.requires_action")],
     [import_types.ProductStatus.REJECTED]: ["red", t("products.productStatus.rejected")]
   }[status];
   return /* @__PURE__ */ jsx2(StatusCell, { color, children: text });

package/dist/{chunk-G4PROEJI.js → chunk-WE66XPIF.js}

@@ -8,19 +8,19 @@ import {
 } from "./chunk-V74Y5NIV.js";
 import {
   optionalInt
-} from "./chunk-UXD3VNBO.js";
+} from "./chunk-AJLGY3LQ.js";
 import {
   TabbedForm,
   defineTabMeta,
   useTabbedForm
-} from "./chunk-4LXBQTFN.js";
+} from "./chunk-FREUYHMS.js";
 import {
   SwitchBox
 } from "./chunk-2EME4AWX.js";
 import {
   DataGrid,
   createDataGridHelper
-} from "./chunk-V6OGMYAI.js";
+} from "./chunk-HHW4PPNH.js";
 import {
   RouteFocusModal,
   useRouteModal
@@ -34,7 +34,7 @@ import {
 import {
   inventoryItemsQueryKeys,
   useCreateInventoryItem
-} from "./chunk-2YYXP6XI.js";
+} from "./chunk-AM5XDEIN.js";
 import {
   queryClient
 } from "./chunk-RHKRREUU.js";

package/dist/{chunk-YPESX7CE.js → chunk-WKTRJNOK.js}

@@ -1,9 +1,9 @@
-import {
-  require_dist
-} from "./chunk-FMRP2CNF.js";
 import {
   useQueryParams
 } from "./chunk-THHRRYRS.js";
+import {
+  require_dist
+} from "./chunk-YZBEJ3CY.js";
 import {
   __toESM
 } from "./chunk-NBMM2TZK.js";

package/dist/{chunk-BHOZKBYY.js → chunk-WV43FOTY.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-PYDRHQTY.js";
 import {
   useProductCategories
-} from "./chunk-H5PYBIOZ.js";
+} from "./chunk-5I6YZOBU.js";
 import {
   TextSkeleton
 } from "./chunk-INNFZYX2.js";
@@ -11,7 +11,7 @@ import {
 // src/pages/products/common/components/category-combobox/category-combobox.tsx
 import {
   ArrowUturnLeft,
-  EllipseMiniSolid,
+  CheckMini,
   TriangleRightMini,
   TrianglesMini,
   XMarkMini
@@ -104,7 +104,8 @@ var CategoryCombobox = forwardRef(({ value, onChange, className, isSingleSelect,
         innerRef.current?.focus();
       };
     },
-    [value, onChange, isSingleSelect]
+    // oxlint-disable-next-line react-hooks/exhaustive-deps
+    [value, onChange, isSingleSelect, handleOpenChange]
   );
   function handleOpenChange(open2) {
     if (!open2) {
@@ -333,7 +334,7 @@ var CategoryCombobox = forwardRef(({ value, onChange, className, isSingleSelect,
                       onMouseLeave: () => setFocusedIndex(-1),
                       tabIndex: -1,
                       children: [
-                        /* @__PURE__ */ jsx("div", { className: "flex size-5 items-center justify-center", children: isSelected(value, option.value) && /* @__PURE__ */ jsx(EllipseMiniSolid, {}) }),
+                        /* @__PURE__ */ jsx("div", { className: "flex size-5 items-center justify-center", children: isSelected(value, option.value) && /* @__PURE__ */ jsx(CheckMini, {}) }),
                         /* @__PURE__ */ jsx(
                           Text,
                           {
@@ -422,7 +423,7 @@ function isSelected(values, value) {
 // src/pages/products/common/components/category-combobox/single-category-combobox.tsx
 import {
   ArrowUturnLeft as ArrowUturnLeft2,
-  EllipseMiniSolid as EllipseMiniSolid2,
+  EllipseMiniSolid,
   TriangleRightMini as TriangleRightMini2,
   TrianglesMini as TrianglesMini2
 } from "@medusajs/icons";
@@ -512,7 +513,8 @@ var SingleCategoryCombobox = forwardRef2(({ value, onChange, className, ...props
         innerRef.current?.focus();
       };
     },
-    [value, onChange]
+    // oxlint-disable-next-line react-hooks/exhaustive-deps
+    [value, onChange, handleOpenChange]
   );
   function handleOpenChange(open2) {
     if (!open2) {
@@ -673,7 +675,6 @@ var SingleCategoryCombobox = forwardRef2(({ value, onChange, className, ...props
               "button",
               {
                 "data-active": focusedIndex === 0,
-                role: "button",
                 className: clx2(
                   "transition-fg grid w-full appearance-none grid-cols-[20px_1fr] items-center justify-center gap-2 rounded-md px-2 py-1.5 text-start outline-none",
                   "data-[active=true]:bg-ui-bg-field-hover"
@@ -708,6 +709,7 @@ var SingleCategoryCombobox = forwardRef2(({ value, onChange, className, ...props
                       "data-active": showLevelUp ? focusedIndex === index + 1 : focusedIndex === index,
                       type: "button",
                       role: "option",
+                      "aria-selected": value === option.value,
                       className: clx2(
                         "grid h-full w-full appearance-none grid-cols-[20px_1fr] items-center gap-2 overflow-hidden rounded-md px-2 py-1.5 text-start outline-none",
                         "data-[active=true]:bg-ui-bg-field-hover"
@@ -717,7 +719,7 @@ var SingleCategoryCombobox = forwardRef2(({ value, onChange, className, ...props
                       onMouseLeave: () => setFocusedIndex(-1),
                       tabIndex: -1,
                       children: [
-                        /* @__PURE__ */ jsx2("div", { className: "flex size-5 items-center justify-center", children: value === option.value && /* @__PURE__ */ jsx2(EllipseMiniSolid2, {}) }),
+                        /* @__PURE__ */ jsx2("div", { className: "flex size-5 items-center justify-center", children: value === option.value && /* @__PURE__ */ jsx2(EllipseMiniSolid, {}) }),
                         /* @__PURE__ */ jsx2(
                           Text2,
                           {