@opengovsg/oui 0.0.0-snapshot-20250314033410 → 0.0.0-snapshot-20250318052429

package/dist/cjs/select/select.cjs

@@ -6,11 +6,11 @@ var jsxRuntime = require('react/jsx-runtime');
 var react = require('react');
 var reactAriaComponents = require('react-aria-components');
 var ouiTheme = require('@opengovsg/oui-theme');
+var button = require('../button/button.cjs');
+var field = require('../field/field.cjs');
 var utils = require('../system/utils.cjs');
-var selectItem = require('./select-item.cjs');
+var selectVariantContext = require('./select-variant-context.cjs');
 var chevronsUpDown = require('../node_modules/.pnpm/lucide-react@0.475.0_react@19.0.0/node_modules/lucide-react/dist/esm/icons/chevrons-up-down.cjs');
-var field = require('../field/field.cjs');
-var button = require('../button/button.cjs');
 
 const calculateEstimatedRowHeight = (size) => {
   switch (size) {
@@ -26,7 +26,6 @@ function Select({
   label,
   description,
   classNames,
-  itemClassNames,
   ...originalProps
 }) {
   const [_props, variantProps] = utils.mapPropsVariants(
@@ -43,7 +42,7 @@ function Select({
       ...listLayoutOptions
     });
   }, [listLayoutOptions, variantProps.size]);
-  return /* @__PURE__ */ jsxRuntime.jsxs(
+  return /* @__PURE__ */ jsxRuntime.jsx(reactAriaComponents.Provider, { values: [[selectVariantContext.SelectVariantContext, variantProps]], children: /* @__PURE__ */ jsxRuntime.jsxs(
     reactAriaComponents.Select,
     {
       className: ouiTheme.composeRenderProps(
@@ -93,24 +92,12 @@ function Select({
               classNames?.list,
               (className, renderProps) => styles.list({ className, ...renderProps })
             ),
-            children: (item) => {
-              if (typeof children === "function") {
-                return children(item);
-              }
-              return /* @__PURE__ */ jsxRuntime.jsx(
-                selectItem.SelectItem,
-                {
-                  classNames: itemClassNames,
-                  size: variantProps.size,
-                  children: item.textValue
-                }
-              );
-            }
+            children
           }
         ) }) })
       ]
     }
-  );
+  ) });
 }
 
 exports.Select = Select;

package/dist/cjs/system/react-utils/context.cjs

@@ -21,11 +21,7 @@ function createContext(options = {}) {
     }
     return context;
   }
-  return [
-    Context.Provider,
-    useContext,
-    Context
-  ];
+  return [Context, useContext];
 }
 
 exports.createContext = createContext;

package/dist/cjs/tag-field/tag-field-list.cjs

@@ -1,4 +1,5 @@
 "use strict";
+"use client";
 'use strict';
 
 var jsxRuntime = require('react/jsx-runtime');

package/dist/cjs/tag-field/tag-field-trigger.cjs

@@ -1,4 +1,5 @@
 "use strict";
+"use client";
 'use strict';
 
 var jsxRuntime = require('react/jsx-runtime');

package/dist/cjs/tag-field/tag-field.cjs

@@ -6,13 +6,13 @@ var jsxRuntime = require('react/jsx-runtime');
 var react = require('react');
 var reactAriaComponents = require('react-aria-components');
 var ouiTheme = require('@opengovsg/oui-theme');
+var field = require('../field/field.cjs');
+var input = require('../input/input.cjs');
 var tagFieldList = require('./tag-field-list.cjs');
 var tagFieldRoot = require('./tag-field-root.cjs');
 var tagFieldTagList = require('./tag-field-tag-list.cjs');
 var tagFieldTrigger = require('./tag-field-trigger.cjs');
 var chevronDown = require('../node_modules/.pnpm/lucide-react@0.475.0_react@19.0.0/node_modules/lucide-react/dist/esm/icons/chevron-down.cjs');
-var field = require('../field/field.cjs');
-var input = require('../input/input.cjs');
 
 function TagField({
   classNames,

package/dist/cjs/text-area-field/text-area-field.cjs

@@ -5,8 +5,8 @@
 var jsxRuntime = require('react/jsx-runtime');
 var reactAriaComponents = require('react-aria-components');
 var ouiTheme = require('@opengovsg/oui-theme');
-var textArea = require('../text-area/text-area.cjs');
 var field = require('../field/field.cjs');
+var textArea = require('../text-area/text-area.cjs');
 
 function TextAreaField({
   label,

package/dist/cjs/text-field/text-field.cjs

@@ -5,8 +5,8 @@
 var jsxRuntime = require('react/jsx-runtime');
 var reactAriaComponents = require('react-aria-components');
 var ouiTheme = require('@opengovsg/oui-theme');
-var input = require('../input/input.cjs');
 var field = require('../field/field.cjs');
+var input = require('../input/input.cjs');
 
 function TextField({
   label,

package/dist/esm/banner/banner.js

@@ -5,9 +5,9 @@ import { useMemo, useRef } from 'react';
 import { useMessageFormatter, useDisclosure } from 'react-aria';
 import { useDisclosureState } from 'react-stately';
 import { bannerStyles } from '@opengovsg/oui-theme';
+import { Button } from '../button/button.js';
 import CircleAlert from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.0.0/node_modules/lucide-react/dist/esm/icons/circle-alert.js';
 import Info from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.0.0/node_modules/lucide-react/dist/esm/icons/info.js';
-import { Button } from '../button/button.js';
 import X from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.0.0/node_modules/lucide-react/dist/esm/icons/x.js';
 
 const i18nStrings = {

package/dist/esm/button/button.js

@@ -5,9 +5,9 @@ import { forwardRef, useMemo } from 'react';
 import { chain } from '@react-aria/utils';
 import { Button as Button$1, composeRenderProps } from 'react-aria-components';
 import { buttonStyles } from '@opengovsg/oui-theme';
+import { Ripple } from '../ripple/ripple.js';
 import { useRipple } from '../ripple/use-ripple.js';
 import { Spinner } from '../spinner/spinner.js';
-import { Ripple } from '../ripple/ripple.js';
 
 const Button = forwardRef(
   ({

package/dist/esm/combo-box/combo-box-fuzzy.js

@@ -1,10 +1,13 @@
 "use strict";
 "use client";
-import { jsx } from 'react/jsx-runtime';
+import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useDeferredValue, useMemo, useState, useCallback } from 'react';
 import fuzzysort from 'fuzzysort';
-import { comboBoxFuzzyHighlightedTextStyles } from '@opengovsg/oui-theme';
-import { ComboBox, ComboBoxItem } from './combo-box.js';
+import { Text } from 'react-aria-components';
+import { comboBoxStyles, comboBoxItemStyles, comboBoxFuzzyHighlightedTextStyles } from '@opengovsg/oui-theme';
+import { mapPropsVariants } from '../system/utils.js';
+import { ComboBox } from './combo-box.js';
+import { ComboBoxItem } from './combo-box-item.js';
 
 function HighlightedText({
   result,
@@ -27,18 +30,24 @@ function HighlightedText({
     i
   ));
 }
-function ComboBoxFuzzy({
-  items,
-  itemClassNames,
-  onSelectionChange: onSelectionChangeProp,
-  onInputChange: onInputChangeProp,
-  ...props
-}) {
-  const deferredInputValue = useDeferredValue(props.inputValue);
+function ComboBoxFuzzy(originalProps) {
+  const [_props, variantProps] = mapPropsVariants(
+    originalProps,
+    comboBoxStyles.variantKeys
+  );
+  const {
+    items,
+    itemClassNames,
+    onSelectionChange: onSelectionChangeProp,
+    onInputChange: onInputChangeProp,
+    inputValue,
+    ...props
+  } = _props;
+  const deferredInputValue = useDeferredValue(inputValue);
   const preparedItems = useMemo(() => {
     return items?.map((item) => ({
       ...item,
-      prepared: fuzzysort.prepare(item.name)
+      prepared: fuzzysort.prepare(item.textValue)
     })) ?? [];
   }, [items]);
   const [filteredResults, setFilteredResults] = useState({ items, result: {} });
@@ -61,7 +70,7 @@ function ComboBoxFuzzy({
       }).reduce(
         (acc, result) => {
           acc.items.push(result.obj);
-          acc.result[result.obj.name] = result;
+          acc.result[result.obj.textValue] = result;
           return acc;
         },
         { items: [], result: {} }
@@ -70,34 +79,47 @@ function ComboBoxFuzzy({
     },
     [onInputChangeProp, preparedItems]
   );
+  const comboboxItemStyles = comboBoxItemStyles(variantProps);
   return /* @__PURE__ */ jsx(
     ComboBox,
     {
       ...props,
+      inputValue,
       items: filteredResults.items,
       dependencies: [deferredInputValue],
       onSelectionChange,
       onInputChange,
-      children: (item) => /* @__PURE__ */ jsx(
-        ComboBoxItem,
-        {
-          classNames: itemClassNames,
-          label: ({ isSelected, isFocused }) => /* @__PURE__ */ jsx(
-            HighlightedText,
-            {
-              className: itemClassNames?.highlight,
-              result: filteredResults.result?.[item.name],
-              originalText: item.name,
-              isSelected,
-              isFocused
-            }
-          ),
-          description: item.description,
-          textValue: item.name,
-          id: item.value
-        },
-        item.name
-      )
+      children: (item) => /* @__PURE__ */ jsx(ComboBoxItem, { textValue: item.textValue, id: item.id, children: ({ isSelected, isFocused }) => /* @__PURE__ */ jsxs(Fragment, { children: [
+        /* @__PURE__ */ jsx(
+          Text,
+          {
+            className: comboboxItemStyles.label({
+              className: itemClassNames?.label
+            }),
+            slot: "label",
+            children: /* @__PURE__ */ jsx(
+              HighlightedText,
+              {
+                className: itemClassNames?.highlight,
+                result: filteredResults.result?.[item.textValue],
+                originalText: item.textValue,
+                isSelected,
+                isFocused
+              }
+            )
+          }
+        ),
+        item.description && /* @__PURE__ */ jsx(
+          Text,
+          {
+            className: comboboxItemStyles.description({
+              className: itemClassNames?.description
+            }),
+            slot: "description",
+            children: item.description
+          }
+        )
+      ] }) }, item.id)
     }
   );
 }

package/dist/esm/combo-box/combo-box-item.js

@@ -0,0 +1,68 @@
+"use strict";
+"use client";
+import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
+import { useMemo } from 'react';
+import { useContextProps, ListBoxItem, composeRenderProps, Text } from 'react-aria-components';
+import { comboBoxItemStyles } from '@opengovsg/oui-theme';
+import { forwardRef, mapPropsVariants } from '../system/utils.js';
+import { ComboBoxVariantContext } from './combo-box-variant-context.js';
+
+const ComboBoxItem = forwardRef(function ComboBoxItem2(originalProps, ref) {
+  [originalProps, ref] = useContextProps(
+    originalProps,
+    ref,
+    ComboBoxVariantContext
+  );
+  const [
+    { className, description, children, classNames, ...props },
+    variantProps
+  ] = mapPropsVariants(originalProps, comboBoxItemStyles.variantKeys);
+  const styles = comboBoxItemStyles(variantProps);
+  const defaultTextValue = useMemo(() => {
+    if (props.textValue) {
+      return props.textValue;
+    }
+    if (typeof children === "string") {
+      return children;
+    }
+    return void 0;
+  }, [children, props.textValue]);
+  return /* @__PURE__ */ jsx(
+    ListBoxItem,
+    {
+      textValue: defaultTextValue,
+      ...props,
+      className: composeRenderProps(
+        className ?? classNames?.container,
+        (className2, renderProps) => styles.container({ ...renderProps, className: className2 })
+      ),
+      children: (renderProps) => {
+        if (typeof children === "function") {
+          return children(renderProps);
+        }
+        return /* @__PURE__ */ jsxs(Fragment, { children: [
+          /* @__PURE__ */ jsx(
+            Text,
+            {
+              className: styles.label({ className: classNames?.label }),
+              slot: "label",
+              children
+            }
+          ),
+          description && /* @__PURE__ */ jsx(
+            Text,
+            {
+              className: styles.description({
+                className: classNames?.description
+              }),
+              slot: "description",
+              children: description
+            }
+          )
+        ] });
+      }
+    }
+  );
+});
+
+export { ComboBoxItem };

package/dist/esm/combo-box/combo-box-variant-context.js

@@ -0,0 +1,10 @@
+"use strict";
+"use client";
+import { createContext } from '../system/react-utils/context.js';
+
+const [ComboBoxVariantContext, useComboBoxVariantContext] = createContext({
+  name: "ComboBoxVariantContext",
+  strict: true
+});
+
+export { ComboBoxVariantContext, useComboBoxVariantContext };

package/dist/esm/combo-box/combo-box.js

@@ -3,9 +3,11 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useMemo, useCallback } from 'react';
 import { useMessageFormatter } from 'react-aria';
-import { ListLayout, ComboBox as ComboBox$1, Input, Button, Virtualizer, Popover, ListBox, ListBoxItem, Text } from 'react-aria-components';
+import { ListLayout, Provider, ComboBox as ComboBox$1, Input, Button, Popover, Virtualizer, ListBox } from 'react-aria-components';
 import { comboBoxItemStyles, cn, comboBoxStyles, composeTailwindRenderProps, composeRenderProps, comboBoxClearButtonStyles } from '@opengovsg/oui-theme';
 import { Label, FieldGroup, Description, FieldError } from '../field/field.js';
+import { mapPropsVariants } from '../system/utils.js';
+import { ComboBoxVariantContext } from './combo-box-variant-context.js';
 import ChevronUp from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.0.0/node_modules/lucide-react/dist/esm/icons/chevron-up.js';
 import ChevronDown from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.0.0/node_modules/lucide-react/dist/esm/icons/chevron-down.js';
 import X from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.0.0/node_modules/lucide-react/dist/esm/icons/x.js';
@@ -54,38 +56,43 @@ function ComboBoxEmptyState({
     }
   );
 }
-function ComboBox({
-  label,
-  description,
-  errorMessage,
-  classNames,
-  itemClassNames,
-  size,
-  listLayoutOptions,
-  children,
-  dependencies,
-  onClear,
-  renderEmptyState: renderEmptyStateProp,
-  ...props
-}) {
+function ComboBox(originalProps) {
   const formatMessage = useMessageFormatter(i18nStrings);
-  const styles = comboBoxStyles({ size });
+  const [_props, variantProps] = mapPropsVariants(
+    originalProps,
+    comboBoxStyles.variantKeys
+  );
+  const {
+    label,
+    description,
+    errorMessage,
+    classNames,
+    listLayoutOptions,
+    children,
+    dependencies,
+    onClear,
+    renderEmptyState: renderEmptyStateProp,
+    ...props
+  } = _props;
+  const styles = comboBoxStyles(variantProps);
   const layout = useMemo(() => {
     return new ListLayout({
-      estimatedRowHeight: calculateEstimatedRowHeight(size ?? "md"),
+      estimatedRowHeight: calculateEstimatedRowHeight(
+        variantProps.size ?? "md"
+      ),
       ...listLayoutOptions
     });
-  }, [listLayoutOptions, size]);
+  }, [listLayoutOptions, variantProps.size]);
   const renderEmptyState = useCallback(
     (props2) => {
       if (renderEmptyStateProp) {
         return renderEmptyStateProp(props2);
       }
-      return /* @__PURE__ */ jsx(ComboBoxEmptyState, { size, className: classNames?.emptyState });
+      return /* @__PURE__ */ jsx(ComboBoxEmptyState, { className: classNames?.emptyState });
     },
-    [classNames?.emptyState, renderEmptyStateProp, size]
+    [classNames?.emptyState, renderEmptyStateProp]
   );
-  return /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsx(Provider, { values: [[ComboBoxVariantContext, variantProps]], children: /* @__PURE__ */ jsx(
     ComboBox$1,
     {
       className: composeTailwindRenderProps(
@@ -94,13 +101,14 @@ function ComboBox({
       ),
       shouldFocusWrap: true,
       allowsEmptyCollection: true,
+      isDisabled: variantProps.isDisabled,
       ...props,
       children: ({ isOpen, isDisabled: isComboBoxDisabled }) => /* @__PURE__ */ jsxs(Fragment, { children: [
         /* @__PURE__ */ jsx(
           Label,
           {
-            size,
-            className: styles.label({ className: classNames?.label, size }),
+            size: variantProps.size,
+            className: styles.label({ className: classNames?.label }),
             children: label
           }
         ),
@@ -108,12 +116,12 @@ function ComboBox({
           /* @__PURE__ */ jsxs(
             FieldGroup,
             {
+              isDisabled: isComboBoxDisabled,
               className: composeRenderProps(
                 classNames?.group,
                 (className, renderProps) => styles.group({
                   ...renderProps,
                   className,
-                  size,
                   isClearable: !!onClear
                 })
               ),
@@ -123,7 +131,7 @@ function ComboBox({
                   {
                     className: composeRenderProps(
                       classNames?.field,
-                      (className, renderProps) => styles.field({ ...renderProps, className, size })
+                      (className, renderProps) => styles.field({ ...renderProps, className })
                     )
                   }
                 ),
@@ -132,22 +140,20 @@ function ComboBox({
                   {
                     className: composeRenderProps(
                       classNames?.expandButton,
-                      (className, renderProps) => styles.expandButton({ ...renderProps, className, size })
+                      (className, renderProps) => styles.expandButton({ ...renderProps, className })
                     ),
                     children: isOpen ? /* @__PURE__ */ jsx(
                       ChevronUp,
                       {
                         className: styles.icon({
-                          className: classNames?.icon,
-                          size
+                          className: classNames?.icon
                         })
                       }
                     ) : /* @__PURE__ */ jsx(
                       ChevronDown,
                       {
                         className: styles.icon({
-                          className: classNames?.icon,
-                          size
+                          className: classNames?.icon
                         })
                       }
                     )
@@ -166,35 +172,33 @@ function ComboBox({
               className: composeRenderProps(
                 classNames?.clearButton,
                 (className, renderProps) => comboBoxClearButtonStyles({
+                  ...variantProps,
                   ...renderProps,
                   className,
-                  size,
-                  isInactive: !props.inputValue,
-                  isDisabled: renderProps.isDisabled
+                  isInactive: !props.inputValue
                 })
               ),
               children: /* @__PURE__ */ jsx(
                 X,
                 {
                   className: styles.icon({
-                    className: classNames?.icon,
-                    size
+                    className: classNames?.icon
                   })
                 }
               )
             }
           )
         ] }),
-        description && /* @__PURE__ */ jsx(Description, { size, children: description }),
-        /* @__PURE__ */ jsx(FieldError, { size, children: errorMessage }),
-        /* @__PURE__ */ jsx(Virtualizer, { layout, children: /* @__PURE__ */ jsx(
+        description && /* @__PURE__ */ jsx(Description, { size: variantProps.size, children: description }),
+        /* @__PURE__ */ jsx(FieldError, { size: variantProps.size, children: errorMessage }),
+        /* @__PURE__ */ jsx(
           Popover,
           {
             className: composeRenderProps(
               classNames?.popover,
               (className, renderProps) => styles.popover({ ...renderProps, className })
             ),
-            children: /* @__PURE__ */ jsx(
+            children: /* @__PURE__ */ jsx(Virtualizer, { layout, children: /* @__PURE__ */ jsx(
               ListBox,
               {
                 className: composeRenderProps(
@@ -203,71 +207,14 @@ function ComboBox({
                 ),
                 dependencies,
                 renderEmptyState,
-                children: (item) => {
-                  if (children) {
-                    return children(item);
-                  }
-                  return /* @__PURE__ */ jsx(
-                    ComboBoxItem,
-                    {
-                      size,
-                      id: item.value,
-                      label: item.name,
-                      textValue: item.name,
-                      description: item.description,
-                      classNames: itemClassNames
-                    }
-                  );
-                }
+                children
               }
-            )
+            ) })
           }
-        ) })
+        )
       ] })
     }
-  );
-}
-function ComboBoxItem({
-  className,
-  size,
-  description,
-  label,
-  classNames,
-  ...props
-}) {
-  const styles = comboBoxItemStyles({ size });
-  return /* @__PURE__ */ jsx(
-    ListBoxItem,
-    {
-      ...props,
-      className: composeRenderProps(
-        className ?? classNames?.container,
-        (className2, renderProps) => styles.container({ ...renderProps, className: className2 })
-      ),
-      children: (renderProps) => {
-        return /* @__PURE__ */ jsxs(Fragment, { children: [
-          /* @__PURE__ */ jsx(
-            Text,
-            {
-              className: styles.label({ className: classNames?.label }),
-              slot: "label",
-              children: typeof label === "function" ? label(renderProps) : label
-            }
-          ),
-          description && /* @__PURE__ */ jsx(
-            Text,
-            {
-              className: styles.description({
-                className: classNames?.description
-              }),
-              slot: "description",
-              children: typeof description === "function" ? description(renderProps) : description
-            }
-          )
-        ] });
-      }
-    }
-  );
+  ) });
 }
 
-export { ComboBox, ComboBoxEmptyState, ComboBoxItem };
+export { ComboBox, ComboBoxEmptyState };

package/dist/esm/combo-box/index.js

@@ -1,3 +1,5 @@
 "use strict";
-export { ComboBox, ComboBoxEmptyState, ComboBoxItem } from './combo-box.js';
+export { ComboBox, ComboBoxEmptyState } from './combo-box.js';
 export { ComboBoxFuzzy } from './combo-box-fuzzy.js';
+export { ComboBoxItem } from './combo-box-item.js';
+export { ComboBoxVariantContext, useComboBoxVariantContext } from './combo-box-variant-context.js';

package/dist/esm/index.js

@@ -13,8 +13,12 @@ export { TextField } from './text-field/text-field.js';
 export { Description, FieldError, FieldGroup, Label } from './field/field.js';
 export { TextArea } from './text-area/text-area.js';
 export { TextAreaField } from './text-area-field/text-area-field.js';
-export { ComboBox, ComboBoxEmptyState, ComboBoxItem } from './combo-box/combo-box.js';
+export { ComboBox, ComboBoxEmptyState } from './combo-box/combo-box.js';
 export { ComboBoxFuzzy } from './combo-box/combo-box-fuzzy.js';
+export { ComboBoxItem } from './combo-box/combo-box-item.js';
+export { ComboBoxVariantContext, useComboBoxVariantContext } from './combo-box/combo-box-variant-context.js';
 export { Banner } from './banner/banner.js';
 export { TagField } from './tag-field/tag-field.js';
 export { Select } from './select/select.js';
+export { SelectItem } from './select/select-item.js';
+export { SelectVariantContext, useSelectVariantContext } from './select/select-variant-context.js';

package/dist/esm/select/index.js

@@ -1,2 +1,4 @@
 "use strict";
 export { Select } from './select.js';
+export { SelectItem } from './select-item.js';
+export { SelectVariantContext, useSelectVariantContext } from './select-variant-context.js';