@opengovsg/oui 0.0.33 → 0.0.34

package/dist/cjs/accordion/accordion.cjs

@@ -90,6 +90,7 @@ function AccordionHeader({
                 {
                   "aria-hidden": true,
                   className: slots.indicator({
+                    isExpanded,
                     className: ouiTheme.cn(
                       contextClassNames?.indicator,
                       classNames?.indicator
@@ -101,7 +102,7 @@ function AccordionHeader({
                   )
                 }
               ),
-              startContent && /* @__PURE__ */ jsxRuntime.jsx(
+              endContent && /* @__PURE__ */ jsxRuntime.jsx(
                 "div",
                 {
                   className: slots.endContentWrapper({
@@ -112,8 +113,7 @@ function AccordionHeader({
                   }),
                   children: children.renderChildren(headerRenderProps, endContent)
                 }
-              ),
-              children.renderChildren(headerRenderProps, endContent)
+              )
             ] });
           }
         }

package/dist/cjs/banner/banner.cjs

@@ -7,9 +7,9 @@ var $670gB$react = require('react');
 var reactAria = require('react-aria');
 var reactStately = require('react-stately');
 var ouiTheme = require('@opengovsg/oui-theme');
-var button = require('../button/button.cjs');
 var circleAlert = require('../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/circle-alert.cjs');
 var info = require('../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/info.cjs');
+var button = require('../button/button.cjs');
 var x = require('../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/x.cjs');
 
 const i18nStrings = {

package/dist/cjs/checkbox/checkbox.cjs

@@ -5,11 +5,11 @@
 var jsxRuntime = require('react/jsx-runtime');
 var reactAriaComponents = require('react-aria-components');
 var ouiTheme = require('@opengovsg/oui-theme');
-var field = require('../field/field.cjs');
 var utils = require('../system/utils.cjs');
 var checkboxGroupStyleContext = require('./checkbox-group-style-context.cjs');
 var minus = require('../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/minus.cjs');
 var check = require('../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/check.cjs');
+var field = require('../field/field.cjs');
 
 const Checkbox = ({
   classNames,

package/dist/cjs/combo-box/combo-box.cjs

@@ -7,10 +7,10 @@ var $670gB$react = require('react');
 var reactAria = require('react-aria');
 var reactAriaComponents = require('react-aria-components');
 var ouiTheme = require('@opengovsg/oui-theme');
-var field = require('../field/field.cjs');
 var popover = require('../popover/popover.cjs');
 var utils = require('../system/utils.cjs');
 var comboBoxVariantContext = require('./combo-box-variant-context.cjs');
+var field = require('../field/field.cjs');
 var chevronUp = require('../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/chevron-up.cjs');
 var chevronDown = require('../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/chevron-down.cjs');
 var x = require('../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/x.cjs');

package/dist/cjs/date-field/date-field.cjs

@@ -6,8 +6,8 @@ var jsxRuntime = require('react/jsx-runtime');
 var $670gB$react = require('react');
 var reactAriaComponents = require('react-aria-components');
 var ouiTheme = require('@opengovsg/oui-theme');
-var field = require('../field/field.cjs');
 var utils = require('../system/utils.cjs');
+var field = require('../field/field.cjs');
 
 function DateField(originalProps) {
   const [

package/dist/cjs/date-picker/date-picker.cjs

@@ -6,14 +6,13 @@ var jsxRuntime = require('react/jsx-runtime');
 var $670gB$react = require('react');
 var reactAriaComponents = require('react-aria-components');
 var ouiTheme = require('@opengovsg/oui-theme');
-var button = require('../button/button.cjs');
-var calendar$1 = require('../calendar/calendar.cjs');
-require('@internationalized/date');
-var dateField = require('../date-field/date-field.cjs');
-var field = require('../field/field.cjs');
 var popover = require('../popover/popover.cjs');
 var utils = require('../system/utils.cjs');
+var dateField = require('../date-field/date-field.cjs');
 var calendar = require('../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/calendar.cjs');
+var calendar$1 = require('../calendar/calendar.cjs');
+var field = require('../field/field.cjs');
+var button = require('../button/button.cjs');
 
 function DatePicker(originalProps) {
   const [

package/dist/cjs/date-range-picker/date-range-picker.cjs

@@ -7,13 +7,13 @@ var $670gB$react = require('react');
 var date = require('@internationalized/date');
 var reactAriaComponents = require('react-aria-components');
 var ouiTheme = require('@opengovsg/oui-theme');
-var button = require('../button/button.cjs');
-var dateField = require('../date-field/date-field.cjs');
-var field = require('../field/field.cjs');
 var popover = require('../popover/popover.cjs');
 var rangeCalendar = require('../range-calendar/range-calendar.cjs');
 var utils = require('../system/utils.cjs');
 var calendar = require('../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/calendar.cjs');
+var field = require('../field/field.cjs');
+var dateField = require('../date-field/date-field.cjs');
+var button = require('../button/button.cjs');
 
 function DateRangePicker(originalProps) {
   const [

package/dist/cjs/file-dropzone/file-dropzone.cjs

@@ -9,13 +9,13 @@ var reactAria = require('react-aria');
 var reactAriaComponents = require('react-aria-components');
 var reactDropzone = require('react-dropzone');
 var ouiTheme = require('@opengovsg/oui-theme');
-var field = require('../field/field.cjs');
 var useControllableState = require('../hooks/use-controllable-state.cjs');
 var utils = require('../system/utils.cjs');
 var contexts = require('./contexts.cjs');
 var fileInfo = require('./file-info.cjs');
 var utils$1 = require('./utils.cjs');
 var upload = require('../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/upload.cjs');
+var field = require('../field/field.cjs');
 
 const FileDropzone = (originalProps) => {
   const [props, variantProps] = utils.mapPropsVariants(

package/dist/cjs/file-dropzone/file-info.cjs

@@ -5,10 +5,10 @@
 var jsxRuntime = require('react/jsx-runtime');
 var $670gB$react = require('react');
 var ouiTheme = require('@opengovsg/oui-theme');
-var button = require('../button/button.cjs');
 var contexts = require('./contexts.cjs');
 var utils = require('./utils.cjs');
 var trash2 = require('../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/trash-2.cjs');
+var button = require('../button/button.cjs');
 
 const FileInfo = ({ file, imagePreview, classNames }) => {
   const {

package/dist/cjs/index.cjs

@@ -3,7 +3,6 @@
 
 var useControllableState = require('./hooks/use-controllable-state.cjs');
 var useDraggable = require('./hooks/use-draggable.cjs');
-var button = require('./button/button.cjs');
 var govtBanner = require('./govt-banner/govt-banner.cjs');
 var ripple = require('./ripple/ripple.cjs');
 var useRipple = require('./ripple/use-ripple.cjs');
@@ -13,33 +12,17 @@ var toggle = require('./toggle/toggle.cjs');
 var skipNavLink = require('./skip-nav-link/skip-nav-link.cjs');
 var input = require('./input/input.cjs');
 var textField = require('./text-field/text-field.cjs');
-var field = require('./field/field.cjs');
 var textArea = require('./text-area/text-area.cjs');
 var textAreaField = require('./text-area-field/text-area-field.cjs');
-var comboBox = require('./combo-box/combo-box.cjs');
-var comboBoxFuzzy = require('./combo-box/combo-box-fuzzy.cjs');
-var comboBoxItem = require('./combo-box/combo-box-item.cjs');
-var comboBoxVariantContext = require('./combo-box/combo-box-variant-context.cjs');
-var banner = require('./banner/banner.cjs');
 var tagField = require('./tag-field/tag-field.cjs');
 var tagFieldItem = require('./tag-field/tag-field-item.cjs');
 var select = require('./select/select.cjs');
 var selectItem = require('./select/select-item.cjs');
 var selectVariantContext = require('./select/select-variant-context.cjs');
-var badge = require('./badge/badge.cjs');
-var calendar = require('./calendar/calendar.cjs');
-var calendarStyleContext = require('./calendar/calendar-style-context.cjs');
-var utils = require('./calendar/utils.cjs');
-var date = require('@internationalized/date');
 var rangeCalendar = require('./range-calendar/range-calendar.cjs');
 var menu = require('./menu/menu.cjs');
 var popover = require('./popover/popover.cjs');
 var tabs = require('./tabs/tabs.cjs');
-var dateField = require('./date-field/date-field.cjs');
-var datePicker = require('./date-picker/date-picker.cjs');
-var dateRangePicker = require('./date-range-picker/date-range-picker.cjs');
-var checkbox = require('./checkbox/checkbox.cjs');
-var checkboxGroupStyleContext = require('./checkbox/checkbox-group-style-context.cjs');
 var pagination = require('./pagination/pagination.cjs');
 var paginationCursor = require('./pagination/pagination-cursor.cjs');
 var paginationItem = require('./pagination/pagination-item.cjs');
@@ -66,18 +49,34 @@ var navbarItem = require('./navbar/navbar-item.cjs');
 var useNavbar = require('./navbar/use-navbar.cjs');
 var navbarContext = require('./navbar/navbar-context.cjs');
 var index = require('./avatar/index.cjs');
-var accordion = require('./accordion/accordion.cjs');
+var button = require('./button/button.cjs');
+var field = require('./field/field.cjs');
+var comboBox = require('./combo-box/combo-box.cjs');
+var comboBoxFuzzy = require('./combo-box/combo-box-fuzzy.cjs');
+var comboBoxItem = require('./combo-box/combo-box-item.cjs');
+var comboBoxVariantContext = require('./combo-box/combo-box-variant-context.cjs');
+var banner = require('./banner/banner.cjs');
+var badge = require('./badge/badge.cjs');
+var date = require('@internationalized/date');
+var calendar = require('./calendar/calendar.cjs');
+var calendarStyleContext = require('./calendar/calendar-style-context.cjs');
+var utils = require('./calendar/utils.cjs');
+var dateField = require('./date-field/date-field.cjs');
+var datePicker = require('./date-picker/date-picker.cjs');
+var dateRangePicker = require('./date-range-picker/date-range-picker.cjs');
+var checkbox = require('./checkbox/checkbox.cjs');
+var checkboxGroupStyleContext = require('./checkbox/checkbox-group-style-context.cjs');
 var sonner = require('sonner');
 var avatarContext = require('./avatar/avatar-context.cjs');
 var avatarGroup = require('./avatar/avatar-group.cjs');
 var avatarGroupContext = require('./avatar/avatar-group-context.cjs');
 var avatar = require('./avatar/avatar.cjs');
+var accordion = require('./accordion/accordion.cjs');
 
 
 
 exports.useControllableState = useControllableState.useControllableState;
 exports.useDraggable = useDraggable.useDraggable;
-exports.Button = button.Button;
 exports.GovtBanner = govtBanner.GovtBanner;
 exports.Ripple = ripple.Ripple;
 exports.useRipple = useRipple.useRipple;
@@ -87,39 +86,14 @@ exports.Toggle = toggle.Toggle;
 exports.SkipNavLink = skipNavLink.SkipNavLink;
 exports.Input = input.Input;
 exports.TextField = textField.TextField;
-exports.Description = field.Description;
-exports.FieldError = field.FieldError;
-exports.FieldErrorIcon = field.FieldErrorIcon;
-exports.FieldGroup = field.FieldGroup;
-exports.Label = field.Label;
 exports.TextArea = textArea.TextArea;
 exports.TextAreaField = textAreaField.TextAreaField;
-exports.ComboBox = comboBox.ComboBox;
-exports.ComboBoxEmptyState = comboBox.ComboBoxEmptyState;
-exports.ComboBoxFuzzy = comboBoxFuzzy.ComboBoxFuzzy;
-exports.ComboBoxItem = comboBoxItem.ComboBoxItem;
-exports.ComboBoxVariantContext = comboBoxVariantContext.ComboBoxVariantContext;
-exports.useComboBoxVariantContext = comboBoxVariantContext.useComboBoxVariantContext;
-exports.Banner = banner.Banner;
 exports.TagField = tagField.TagField;
 exports.TagFieldItem = tagFieldItem.TagFieldItem;
 exports.Select = select.Select;
 exports.SelectItem = selectItem.SelectItem;
 exports.SelectVariantContext = selectVariantContext.SelectVariantContext;
 exports.useSelectVariantContext = selectVariantContext.useSelectVariantContext;
-exports.Badge = badge.Badge;
-exports.Calendar = calendar.Calendar;
-exports.CalendarStateWrapper = calendar.CalendarStateWrapper;
-exports.CalendarStyleContext = calendarStyleContext.CalendarStyleContext;
-exports.useCalendarStyleContext = calendarStyleContext.useCalendarStyleContext;
-exports.getEraFormat = utils.getEraFormat;
-exports.useGenerateLocalizedMonths = utils.useGenerateLocalizedMonths;
-exports.useGenerateLocalizedYears = utils.useGenerateLocalizedYears;
-exports.useLocalizedMonthYear = utils.useLocalizedMonthYear;
-Object.defineProperty(exports, "CalendarDate", {
-	enumerable: true,
-	get: function () { return date.CalendarDate; }
-});
 exports.RangeCalendar = rangeCalendar.RangeCalendar;
 exports.RangeCalendarCell = rangeCalendar.RangeCalendarCell;
 exports.RangeCalendarStateWrapper = rangeCalendar.RangeCalendarStateWrapper;
@@ -138,14 +112,6 @@ exports.TabPanel = tabs.TabPanel;
 exports.Tabs = tabs.Tabs;
 exports.TabsVariantContext = tabs.TabsVariantContext;
 exports.useTabsVariantContext = tabs.useTabsVariantContext;
-exports.DateField = dateField.DateField;
-exports.DateInput = dateField.DateInput;
-exports.DatePicker = datePicker.DatePicker;
-exports.DateRangePicker = dateRangePicker.DateRangePicker;
-exports.Checkbox = checkbox.Checkbox;
-exports.CheckboxGroup = checkbox.CheckboxGroup;
-exports.CheckboxGroupStyleContext = checkboxGroupStyleContext.CheckboxGroupStyleContext;
-exports.useCheckboxGroupStyleContext = checkboxGroupStyleContext.useCheckboxGroupStyleContext;
 exports.Pagination = pagination.Pagination;
 exports.PaginationCursor = paginationCursor.PaginationCursor;
 exports.PaginationItem = paginationItem.PaginationItem;
@@ -176,12 +142,40 @@ exports.useNavbar = useNavbar.useNavbar;
 exports.NavbarProvider = navbarContext.NavbarProvider;
 exports.useNavbarContext = navbarContext.useNavbarContext;
 exports.Avatar = index.Avatar;
-exports.Accordion = accordion.Accordion;
-exports.AccordionContent = accordion.AccordionContent;
-exports.AccordionHeader = accordion.AccordionHeader;
-exports.AccordionItem = accordion.AccordionItem;
-exports.AccordionStyleContext = accordion.AccordionStyleContext;
-exports.useAccordionStyleContext = accordion.useAccordionStyleContext;
+exports.Button = button.Button;
+exports.Description = field.Description;
+exports.FieldError = field.FieldError;
+exports.FieldErrorIcon = field.FieldErrorIcon;
+exports.FieldGroup = field.FieldGroup;
+exports.Label = field.Label;
+exports.ComboBox = comboBox.ComboBox;
+exports.ComboBoxEmptyState = comboBox.ComboBoxEmptyState;
+exports.ComboBoxFuzzy = comboBoxFuzzy.ComboBoxFuzzy;
+exports.ComboBoxItem = comboBoxItem.ComboBoxItem;
+exports.ComboBoxVariantContext = comboBoxVariantContext.ComboBoxVariantContext;
+exports.useComboBoxVariantContext = comboBoxVariantContext.useComboBoxVariantContext;
+exports.Banner = banner.Banner;
+exports.Badge = badge.Badge;
+Object.defineProperty(exports, "CalendarDate", {
+	enumerable: true,
+	get: function () { return date.CalendarDate; }
+});
+exports.Calendar = calendar.Calendar;
+exports.CalendarStateWrapper = calendar.CalendarStateWrapper;
+exports.CalendarStyleContext = calendarStyleContext.CalendarStyleContext;
+exports.useCalendarStyleContext = calendarStyleContext.useCalendarStyleContext;
+exports.getEraFormat = utils.getEraFormat;
+exports.useGenerateLocalizedMonths = utils.useGenerateLocalizedMonths;
+exports.useGenerateLocalizedYears = utils.useGenerateLocalizedYears;
+exports.useLocalizedMonthYear = utils.useLocalizedMonthYear;
+exports.DateField = dateField.DateField;
+exports.DateInput = dateField.DateInput;
+exports.DatePicker = datePicker.DatePicker;
+exports.DateRangePicker = dateRangePicker.DateRangePicker;
+exports.Checkbox = checkbox.Checkbox;
+exports.CheckboxGroup = checkbox.CheckboxGroup;
+exports.CheckboxGroupStyleContext = checkboxGroupStyleContext.CheckboxGroupStyleContext;
+exports.useCheckboxGroupStyleContext = checkboxGroupStyleContext.useCheckboxGroupStyleContext;
 Object.defineProperty(exports, "toast", {
 	enumerable: true,
 	get: function () { return sonner.toast; }
@@ -194,3 +188,9 @@ exports.useAvatarGroup = avatarGroupContext.useAvatarGroup;
 exports.AvatarFallback = avatar.AvatarFallback;
 exports.AvatarImage = avatar.AvatarImage;
 exports.AvatarRoot = avatar.AvatarRoot;
+exports.Accordion = accordion.Accordion;
+exports.AccordionContent = accordion.AccordionContent;
+exports.AccordionHeader = accordion.AccordionHeader;
+exports.AccordionItem = accordion.AccordionItem;
+exports.AccordionStyleContext = accordion.AccordionStyleContext;
+exports.useAccordionStyleContext = accordion.useAccordionStyleContext;

package/dist/cjs/modal/modal-content.cjs

@@ -7,10 +7,10 @@ var $670gB$react = require('react');
 var reactAria = require('react-aria');
 var reactAriaComponents = require('react-aria-components');
 var ouiTheme = require('@opengovsg/oui-theme');
-var button = require('../button/button.cjs');
 var i18n = require('./i18n.cjs');
 var modalVariantContext = require('./modal-variant-context.cjs');
 var x = require('../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/x.cjs');
+var button = require('../button/button.cjs');
 
 function ModalContent({
   closeButtonContent: closeButtonContentProp,

package/dist/cjs/number-field/number-field.cjs

@@ -5,12 +5,12 @@
 var jsxRuntime = require('react/jsx-runtime');
 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 input = require('../input/input.cjs');
 var utils = require('../system/utils.cjs');
 var minus = require('../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/minus.cjs');
 var plus = require('../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/plus.cjs');
+var field = require('../field/field.cjs');
+var button = require('../button/button.cjs');
 
 function NumberField(originalProps) {
   const [

package/dist/cjs/range-calendar/range-calendar.cjs

@@ -8,12 +8,12 @@ var date = require('@internationalized/date');
 var reactAriaComponents = require('react-aria-components');
 var useDeepCompare = require('use-deep-compare');
 var ouiTheme = require('@opengovsg/oui-theme');
-var calendarStyleContext = require('../calendar/calendar-style-context.cjs');
 var agnosticCalendarStateContext = require('../calendar/agnostic-calendar-state-context.cjs');
 var calendarBottomContent = require('../calendar/calendar-bottom-content.cjs');
 var calendarGridHeader = require('../calendar/calendar-grid-header.cjs');
 var calendarHeader = require('../calendar/calendar-header.cjs');
 var utils = require('../system/utils.cjs');
+var calendarStyleContext = require('../calendar/calendar-style-context.cjs');
 
 const RangeCalendar = utils.forwardRefGeneric(function RangeCalendar2(originalProps, ref) {
   const [props, variantProps] = utils.mapPropsVariants(

package/dist/cjs/select/select.cjs

@@ -7,12 +7,12 @@ var $670gB$react = require('react');
 var reactAria = require('react-aria');
 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 popover = require('../popover/popover.cjs');
 var utils = require('../system/utils.cjs');
 var selectVariantContext = require('./select-variant-context.cjs');
+var field = require('../field/field.cjs');
 var chevronDown = require('../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/chevron-down.cjs');
+var button = require('../button/button.cjs');
 
 const i18nStrings = {
   "en-SG": {

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

@@ -6,7 +6,6 @@ var jsxRuntime = require('react/jsx-runtime');
 var $670gB$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 popover = require('../popover/popover.cjs');
 var tagFieldItem = require('./tag-field-item.cjs');
@@ -15,6 +14,7 @@ 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.2.3/node_modules/lucide-react/dist/esm/icons/chevron-down.cjs');
+var field = require('../field/field.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 field = require('../field/field.cjs');
 var textArea = require('../text-area/text-area.cjs');
+var field = require('../field/field.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 field = require('../field/field.cjs');
 var input = require('../input/input.cjs');
+var field = require('../field/field.cjs');
 
 function TextField({
   label,

package/dist/esm/accordion/accordion.js

@@ -88,6 +88,7 @@ function AccordionHeader({
                 {
                   "aria-hidden": true,
                   className: slots.indicator({
+                    isExpanded,
                     className: cn(
                       contextClassNames?.indicator,
                       classNames?.indicator
@@ -99,7 +100,7 @@ function AccordionHeader({
                   )
                 }
               ),
-              startContent && /* @__PURE__ */ jsx(
+              endContent && /* @__PURE__ */ jsx(
                 "div",
                 {
                   className: slots.endContentWrapper({
@@ -110,8 +111,7 @@ function AccordionHeader({
                   }),
                   children: renderChildren(headerRenderProps, endContent)
                 }
-              ),
-              renderChildren(headerRenderProps, endContent)
+              )
             ] });
           }
         }

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.2.3/node_modules/lucide-react/dist/esm/icons/circle-alert.js';
 import Info from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/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.2.3/node_modules/lucide-react/dist/esm/icons/x.js';
 
 const i18nStrings = {

package/dist/esm/checkbox/checkbox.js

@@ -3,11 +3,11 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { Checkbox as Checkbox$1, composeRenderProps, Provider, CheckboxGroup as CheckboxGroup$1 } from 'react-aria-components';
 import { checkboxStyles, checkboxGroupStyles } from '@opengovsg/oui-theme';
-import { Label, Description, FieldError } from '../field/field.js';
 import { mapPropsVariants } from '../system/utils.js';
 import { useCheckboxGroupStyleContext, CheckboxGroupStyleContext } from './checkbox-group-style-context.js';
 import Minus from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/minus.js';
 import Check from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/check.js';
+import { Label, Description, FieldError } from '../field/field.js';
 
 const Checkbox = ({
   classNames,

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

@@ -5,10 +5,10 @@ import { useMemo, useCallback } from 'react';
 import { useMessageFormatter } from 'react-aria';
 import { ListLayout, Provider, ComboBox as ComboBox$1, Input, Button, Virtualizer, ListBox } from 'react-aria-components';
 import { listBoxItemStyles, cn, comboBoxStyles, composeTailwindRenderProps, composeRenderProps, comboBoxClearButtonStyles } from '@opengovsg/oui-theme';
-import { Label, FieldGroup, Description, FieldError } from '../field/field.js';
 import { Popover } from '../popover/popover.js';
 import { mapPropsVariants } from '../system/utils.js';
 import { ComboBoxVariantContext } from './combo-box-variant-context.js';
+import { Label, FieldGroup, Description, FieldError } from '../field/field.js';
 import ChevronUp from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/chevron-up.js';
 import ChevronDown from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/chevron-down.js';
 import X from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/x.js';

package/dist/esm/date-field/date-field.js

@@ -4,8 +4,8 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 import { useMemo } from 'react';
 import { DateField as DateField$1, DateInput as DateInput$1, DateSegment } from 'react-aria-components';
 import { dateFieldStyles, composeTailwindRenderProps, dateInputStyles, composeRenderProps } from '@opengovsg/oui-theme';
-import { Label, Description, FieldError } from '../field/field.js';
 import { mapPropsVariants } from '../system/utils.js';
+import { Label, Description, FieldError } from '../field/field.js';
 
 function DateField(originalProps) {
   const [

package/dist/esm/date-picker/date-picker.js

@@ -4,14 +4,13 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 import { useMemo } from 'react';
 import { DatePicker as DatePicker$1, Dialog } from 'react-aria-components';
 import { datePickerStyles, composeTailwindRenderProps } from '@opengovsg/oui-theme';
-import { Button } from '../button/button.js';
-import { Calendar as Calendar$1 } from '../calendar/calendar.js';
-import '@internationalized/date';
-import { DateInput } from '../date-field/date-field.js';
-import { Label, FieldGroup, Description, FieldError } from '../field/field.js';
 import { Popover } from '../popover/popover.js';
 import { mapPropsVariants } from '../system/utils.js';
+import { DateInput } from '../date-field/date-field.js';
 import Calendar from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/calendar.js';
+import { Calendar as Calendar$1 } from '../calendar/calendar.js';
+import { Label, FieldGroup, Description, FieldError } from '../field/field.js';
+import { Button } from '../button/button.js';
 
 function DatePicker(originalProps) {
   const [

package/dist/esm/date-range-picker/date-range-picker.js

@@ -5,13 +5,13 @@ import { useMemo } from 'react';
 import { CalendarDate } from '@internationalized/date';
 import { DateRangePicker as DateRangePicker$1, Dialog } from 'react-aria-components';
 import { dateRangePickerStyles, composeTailwindRenderProps } from '@opengovsg/oui-theme';
-import { Button } from '../button/button.js';
-import { DateInput } from '../date-field/date-field.js';
-import { Label, FieldGroup, Description, FieldError } from '../field/field.js';
 import { Popover } from '../popover/popover.js';
 import { RangeCalendar } from '../range-calendar/range-calendar.js';
 import { mapPropsVariants } from '../system/utils.js';
 import Calendar from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/calendar.js';
+import { Label, FieldGroup, Description, FieldError } from '../field/field.js';
+import { DateInput } from '../date-field/date-field.js';
+import { Button } from '../button/button.js';
 
 function DateRangePicker(originalProps) {
   const [

package/dist/esm/file-dropzone/file-dropzone.js

@@ -7,13 +7,13 @@ import { useField, useId } from 'react-aria';
 import { Provider, LabelContext, GroupContext, TextContext, FieldErrorContext, Group } from 'react-aria-components';
 import { useDropzone } from 'react-dropzone';
 import { fileDropzoneStyles, dataAttr } from '@opengovsg/oui-theme';
-import { Label, Description, FieldError } from '../field/field.js';
 import { useControllableState } from '../hooks/use-controllable-state.js';
 import { mapPropsVariants } from '../system/utils.js';
 import { FileDropzoneStyleContext, FileDropzoneStateContext, useFileDropzoneStateContext, useFileDropzoneStyleContext } from './contexts.js';
 import { FileInfo } from './file-info.js';
 import { formatErrorMessage, formatBytes } from './utils.js';
 import Upload from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/upload.js';
+import { Label, Description, FieldError } from '../field/field.js';
 
 const FileDropzone = (originalProps) => {
   const [props, variantProps] = mapPropsVariants(

package/dist/esm/file-dropzone/file-info.js

@@ -3,10 +3,10 @@
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { useState, useEffect } from 'react';
 import { fileInfoDropzoneStyles, cn } from '@opengovsg/oui-theme';
-import { Button } from '../button/button.js';
 import { useFileDropzoneStateContext, useFileDropzoneStyleContext } from './contexts.js';
 import { formatBytes } from './utils.js';
 import Trash2 from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/trash-2.js';
+import { Button } from '../button/button.js';
 
 const FileInfo = ({ file, imagePreview, classNames }) => {
   const {

package/dist/esm/index.js

@@ -1,7 +1,6 @@
 "use strict";
 export { useControllableState } from './hooks/use-controllable-state.js';
 export { useDraggable } from './hooks/use-draggable.js';
-export { Button } from './button/button.js';
 export { GovtBanner } from './govt-banner/govt-banner.js';
 export { Ripple } from './ripple/ripple.js';
 export { useRipple } from './ripple/use-ripple.js';
@@ -11,33 +10,17 @@ export { Toggle } from './toggle/toggle.js';
 export { SkipNavLink } from './skip-nav-link/skip-nav-link.js';
 export { Input } from './input/input.js';
 export { TextField } from './text-field/text-field.js';
-export { Description, FieldError, FieldErrorIcon, 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 } 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 { TagFieldItem } from './tag-field/tag-field-item.js';
 export { Select } from './select/select.js';
 export { SelectItem } from './select/select-item.js';
 export { SelectVariantContext, useSelectVariantContext } from './select/select-variant-context.js';
-export { Badge } from './badge/badge.js';
-export { Calendar, CalendarStateWrapper } from './calendar/calendar.js';
-export { CalendarStyleContext, useCalendarStyleContext } from './calendar/calendar-style-context.js';
-export { getEraFormat, useGenerateLocalizedMonths, useGenerateLocalizedYears, useLocalizedMonthYear } from './calendar/utils.js';
-export { CalendarDate } from '@internationalized/date';
 export { RangeCalendar, RangeCalendarCell, RangeCalendarStateWrapper } from './range-calendar/range-calendar.js';
 export { Menu, MenuItem, MenuSection, MenuSeparator, MenuTrigger, MenuVariantContext, SubmenuTrigger, useMenuVariantContext } from './menu/menu.js';
 export { Popover } from './popover/popover.js';
 export { Tab, TabList, TabPanel, Tabs, TabsVariantContext, useTabsVariantContext } from './tabs/tabs.js';
-export { DateField, DateInput } from './date-field/date-field.js';
-export { DatePicker } from './date-picker/date-picker.js';
-export { DateRangePicker } from './date-range-picker/date-range-picker.js';
-export { Checkbox, CheckboxGroup } from './checkbox/checkbox.js';
-export { CheckboxGroupStyleContext, useCheckboxGroupStyleContext } from './checkbox/checkbox-group-style-context.js';
 export { Pagination } from './pagination/pagination.js';
 export { PaginationCursor } from './pagination/pagination-cursor.js';
 export { PaginationItem } from './pagination/pagination-item.js';
@@ -64,9 +47,26 @@ export { NavbarItem } from './navbar/navbar-item.js';
 export { useNavbar } from './navbar/use-navbar.js';
 export { NavbarProvider, useNavbarContext } from './navbar/navbar-context.js';
 export { Avatar } from './avatar/index.js';
-export { Accordion, AccordionContent, AccordionHeader, AccordionItem, AccordionStyleContext, useAccordionStyleContext } from './accordion/accordion.js';
+export { Button } from './button/button.js';
+export { Description, FieldError, FieldErrorIcon, FieldGroup, Label } from './field/field.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 { Badge } from './badge/badge.js';
+export { CalendarDate } from '@internationalized/date';
+export { Calendar, CalendarStateWrapper } from './calendar/calendar.js';
+export { CalendarStyleContext, useCalendarStyleContext } from './calendar/calendar-style-context.js';
+export { getEraFormat, useGenerateLocalizedMonths, useGenerateLocalizedYears, useLocalizedMonthYear } from './calendar/utils.js';
+export { DateField, DateInput } from './date-field/date-field.js';
+export { DatePicker } from './date-picker/date-picker.js';
+export { DateRangePicker } from './date-range-picker/date-range-picker.js';
+export { Checkbox, CheckboxGroup } from './checkbox/checkbox.js';
+export { CheckboxGroupStyleContext, useCheckboxGroupStyleContext } from './checkbox/checkbox-group-style-context.js';
 export { toast } from 'sonner';
 export { AvatarContext, useAvatarContext } from './avatar/avatar-context.js';
 export { AvatarGroup } from './avatar/avatar-group.js';
 export { AvatarGroupProvider, useAvatarGroup } from './avatar/avatar-group-context.js';
 export { AvatarFallback, AvatarImage, AvatarRoot } from './avatar/avatar.js';
+export { Accordion, AccordionContent, AccordionHeader, AccordionItem, AccordionStyleContext, useAccordionStyleContext } from './accordion/accordion.js';

package/dist/esm/modal/modal-content.js

@@ -5,10 +5,10 @@ import { useContext, isValidElement } from 'react';
 import { useMessageFormatter } from 'react-aria';
 import { Dialog } from 'react-aria-components';
 import { cn } from '@opengovsg/oui-theme';
-import { Button } from '../button/button.js';
 import { i18nStrings } from './i18n.js';
 import { ModalVariantContext } from './modal-variant-context.js';
 import X from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/x.js';
+import { Button } from '../button/button.js';
 
 function ModalContent({
   closeButtonContent: closeButtonContentProp,

package/dist/esm/number-field/number-field.js

@@ -3,12 +3,12 @@
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import { NumberField as NumberField$1 } from 'react-aria-components';
 import { numberFieldStyles, composeTailwindRenderProps, dataAttr, fieldBorderStyles, cn } from '@opengovsg/oui-theme';
-import { Button } from '../button/button.js';
-import { Label, FieldGroup, Description, FieldError } from '../field/field.js';
 import { Input } from '../input/input.js';
 import { mapPropsVariants } from '../system/utils.js';
 import Minus from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/minus.js';
 import Plus from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/plus.js';
+import { Label, FieldGroup, Description, FieldError } from '../field/field.js';
+import { Button } from '../button/button.js';
 
 function NumberField(originalProps) {
   const [

package/dist/esm/range-calendar/range-calendar.js

@@ -6,12 +6,12 @@ import { CalendarDate, today, getLocalTimeZone, getDayOfWeek } from '@internatio
 import { RangeCalendar as RangeCalendar$1, Provider, CalendarGrid, CalendarGridBody, Text, RangeCalendarStateContext, useLocale, CalendarCell } from 'react-aria-components';
 import { useDeepCompareMemo } from 'use-deep-compare';
 import { calendarStyles, composeRenderProps, cn, dataAttr } from '@opengovsg/oui-theme';
-import { CalendarStyleContext, useCalendarStyleContext } from '../calendar/calendar-style-context.js';
 import { AgnosticCalendarStateContext } from '../calendar/agnostic-calendar-state-context.js';
 import { CalendarBottomContent } from '../calendar/calendar-bottom-content.js';
 import { CalendarGridHeader } from '../calendar/calendar-grid-header.js';
 import { CalendarHeader } from '../calendar/calendar-header.js';
 import { forwardRefGeneric, mapPropsVariants } from '../system/utils.js';
+import { CalendarStyleContext, useCalendarStyleContext } from '../calendar/calendar-style-context.js';
 
 const RangeCalendar = forwardRefGeneric(function RangeCalendar2(originalProps, ref) {
   const [props, variantProps] = mapPropsVariants(

package/dist/esm/select/select.js

@@ -5,12 +5,12 @@ import { useMemo, isValidElement, cloneElement } from 'react';
 import { useLocalizedStringFormatter } from 'react-aria';
 import { useFilter, Virtualizer, ListLayout, ListBox, Provider, Select as Select$1, SelectValue, Autocomplete, SearchField, Input } from 'react-aria-components';
 import { selectStyles, cn, composeRenderProps } from '@opengovsg/oui-theme';
-import { Button } from '../button/button.js';
-import { Label, Description, FieldError } from '../field/field.js';
 import { Popover } from '../popover/popover.js';
 import { mapPropsVariants } from '../system/utils.js';
 import { SelectVariantContext } from './select-variant-context.js';
+import { Label, Description, FieldError } from '../field/field.js';
 import ChevronDown from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/chevron-down.js';
+import { Button } from '../button/button.js';
 
 const i18nStrings = {
   "en-SG": {

package/dist/esm/tag-field/tag-field.js

@@ -4,7 +4,6 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 import { createElement } from 'react';
 import { composeRenderProps } from 'react-aria-components';
 import { tagFieldStyles } from '@opengovsg/oui-theme';
-import { Label, FieldGroup, Description, FieldError } from '../field/field.js';
 import { Input } from '../input/input.js';
 import { Popover } from '../popover/popover.js';
 import { TagFieldItem } from './tag-field-item.js';
@@ -13,6 +12,7 @@ import { TagFieldRoot } from './tag-field-root.js';
 import { TagFieldTagList } from './tag-field-tag-list.js';
 import { TagFieldTrigger } from './tag-field-trigger.js';
 import ChevronDown from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/chevron-down.js';
+import { Label, FieldGroup, Description, FieldError } from '../field/field.js';
 
 function TagField({
   classNames,

package/dist/esm/text-area-field/text-area-field.js

@@ -3,8 +3,8 @@
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { TextField } from 'react-aria-components';
 import { composeTailwindRenderProps } from '@opengovsg/oui-theme';
-import { Label, Description, FieldError } from '../field/field.js';
 import { TextArea } from '../text-area/text-area.js';
+import { Label, Description, FieldError } from '../field/field.js';
 
 function TextAreaField({
   label,

package/dist/esm/text-field/text-field.js

@@ -3,8 +3,8 @@
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { TextField as TextField$1 } from 'react-aria-components';
 import { composeTailwindRenderProps } from '@opengovsg/oui-theme';
-import { Label, Description, FieldError } from '../field/field.js';
 import { Input } from '../input/input.js';
+import { Label, Description, FieldError } from '../field/field.js';
 
 function TextField({
   label,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengovsg/oui",
-  "version": "0.0.33",
+  "version": "0.0.34",
   "sideEffects": false,
   "license": "SEE LICENSE IN LICENSE.md",
   "type": "module",
@@ -50,7 +50,7 @@
     "storybook": "10.1.10",
     "tsx": "^4.21.0",
     "typescript": "5.7.3",
-    "@opengovsg/oui-theme": "0.0.33",
+    "@opengovsg/oui-theme": "0.0.34",
     "@oui/chromatic": "0.0.0",
     "@oui/eslint-config": "0.0.0",
     "@oui/prettier-config": "0.0.0",
@@ -88,7 +88,7 @@
     "motion": ">=11.12.0 || >=12.0.0-alpha.1",
     "react": ">= 18",
     "react-aria-components": "^1.13.0",
-    "@opengovsg/oui-theme": "0.0.33"
+    "@opengovsg/oui-theme": "0.0.34"
   },
   "scripts": {
     "build": "tsx ../../tooling/build-scripts/main.ts --dts --clean",