@opengovsg/oui 0.0.33 → 0.0.35

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/button/button.cjs

@@ -7,10 +7,10 @@ var $670gB$react = require('react');
 var utils = require('@react-aria/utils');
 var reactAriaComponents = require('react-aria-components');
 var ouiTheme = require('@opengovsg/oui-theme');
-var ripple = require('../ripple/ripple.cjs');
+var children = require('../system/react-utils/children.cjs');
 var useRipple = require('../ripple/use-ripple.cjs');
 var spinner = require('../spinner/spinner.cjs');
-var children = require('../system/react-utils/children.cjs');
+var ripple = require('../ripple/ripple.cjs');
 
 const Button = $670gB$react.forwardRef(
   ({

package/dist/cjs/calendar/calendar-month-day-selector.cjs

@@ -6,11 +6,11 @@ var jsxRuntime = require('react/jsx-runtime');
 var $670gB$react = require('react');
 var date = require('@internationalized/date');
 var reactAriaComponents = require('react-aria-components');
-var select = require('../select/select.cjs');
-var selectItem = require('../select/select-item.cjs');
 var agnosticCalendarStateContext = require('./agnostic-calendar-state-context.cjs');
 var calendarStyleContext = require('./calendar-style-context.cjs');
 var useCalendarSelectors = require('./hooks/use-calendar-selectors.cjs');
+var select = require('../select/select.cjs');
+var selectItem = require('../select/select-item.cjs');
 var useCalendarI18n = require('./hooks/use-calendar-i18n.cjs');
 
 const CalendarMonthDaySelector = () => {

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,13 +7,13 @@ 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');
+var popover = require('../popover/popover.cjs');
 
 const calculateEstimatedRowHeight = (size) => {
   switch (size) {

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 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');
 var popover = require('../popover/popover.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');
 
 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 rangeCalendar = require('../range-calendar/range-calendar.cjs');
+var field = require('../field/field.cjs');
+var dateField = require('../date-field/date-field.cjs');
+var button = require('../button/button.cjs');
+var popover = require('../popover/popover.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 useControllableState = require('../hooks/use-controllable-state.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

@@ -1,6 +1,7 @@
 "use strict";
 'use strict';
 
+var index = require('./avatar/index.cjs');
 var useControllableState = require('./hooks/use-controllable-state.cjs');
 var useDraggable = require('./hooks/use-draggable.cjs');
 var button = require('./button/button.cjs');
@@ -27,10 +28,10 @@ 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 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 date = require('@internationalized/date');
 var rangeCalendar = require('./range-calendar/range-calendar.cjs');
 var menu = require('./menu/menu.cjs');
 var popover = require('./popover/popover.cjs');
@@ -40,10 +41,10 @@ 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 usePagination = require('./pagination/hooks/use-pagination.cjs');
 var pagination = require('./pagination/pagination.cjs');
 var paginationCursor = require('./pagination/pagination-cursor.cjs');
 var paginationItem = require('./pagination/pagination-item.cjs');
-var usePagination = require('./pagination/hooks/use-pagination.cjs');
 var usePagination$1 = require('./pagination/use-pagination.cjs');
 var fileDropzone = require('./file-dropzone/file-dropzone.cjs');
 var fileInfo = require('./file-dropzone/file-info.cjs');
@@ -56,6 +57,7 @@ var modalBody = require('./modal/modal-body.cjs');
 var modalHeader = require('./modal/modal-header.cjs');
 var modalVariantContext = require('./modal/modal-variant-context.cjs');
 var toast = require('./toast/toast.cjs');
+var sonner = require('sonner');
 var navbar = require('./navbar/navbar.cjs');
 var navbarBrand = require('./navbar/navbar-brand.cjs');
 var navbarContent = require('./navbar/navbar-content.cjs');
@@ -65,16 +67,15 @@ var toggle$1 = require('./navbar/navbar-menu/toggle.cjs');
 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 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.Avatar = index.Avatar;
 exports.useControllableState = useControllableState.useControllableState;
 exports.useDraggable = useDraggable.useDraggable;
 exports.Button = button.Button;
@@ -108,6 +109,10 @@ exports.SelectItem = selectItem.SelectItem;
 exports.SelectVariantContext = selectVariantContext.SelectVariantContext;
 exports.useSelectVariantContext = selectVariantContext.useSelectVariantContext;
 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;
@@ -116,10 +121,6 @@ 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;
@@ -146,10 +147,10 @@ exports.Checkbox = checkbox.Checkbox;
 exports.CheckboxGroup = checkbox.CheckboxGroup;
 exports.CheckboxGroupStyleContext = checkboxGroupStyleContext.CheckboxGroupStyleContext;
 exports.useCheckboxGroupStyleContext = checkboxGroupStyleContext.useCheckboxGroupStyleContext;
+exports.PaginationItemType = usePagination.PaginationItemType;
 exports.Pagination = pagination.Pagination;
 exports.PaginationCursor = paginationCursor.PaginationCursor;
 exports.PaginationItem = paginationItem.PaginationItem;
-exports.PaginationItemType = usePagination.PaginationItemType;
 exports.CURSOR_TRANSITION_TIMEOUT = usePagination$1.CURSOR_TRANSITION_TIMEOUT;
 exports.usePagination = usePagination$1.usePagination;
 exports.FileDropzone = fileDropzone.FileDropzone;
@@ -165,6 +166,10 @@ exports.ModalHeader = modalHeader.ModalHeader;
 exports.ModalVariantContext = modalVariantContext.ModalVariantContext;
 exports.useModalVariantContext = modalVariantContext.useModalVariantContext;
 exports.Toaster = toast.Toaster;
+Object.defineProperty(exports, "toast", {
+	enumerable: true,
+	get: function () { return sonner.toast; }
+});
 exports.Navbar = navbar.Navbar;
 exports.NavbarBrand = navbarBrand.NavbarBrand;
 exports.NavbarContent = navbarContent.NavbarContent;
@@ -175,17 +180,6 @@ exports.NavbarItem = navbarItem.NavbarItem;
 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;
-Object.defineProperty(exports, "toast", {
-	enumerable: true,
-	get: function () { return sonner.toast; }
-});
 exports.AvatarContext = avatarContext.AvatarContext;
 exports.useAvatarContext = avatarContext.useAvatarContext;
 exports.AvatarGroup = avatarGroup.AvatarGroup;
@@ -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/menu/menu.cjs

@@ -6,11 +6,11 @@ var jsxRuntime = require('react/jsx-runtime');
 var $670gB$react = require('react');
 var reactAriaComponents = require('react-aria-components');
 var ouiTheme = require('@opengovsg/oui-theme');
-var popover = require('../popover/popover.cjs');
 var utils = require('../system/utils.cjs');
 var context = require('../system/react-utils/context.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 chevronRight = require('../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/chevron-right.cjs');
+var popover = require('../popover/popover.cjs');
 
 const [MenuVariantContext, useMenuVariantContext] = context.createContext({
   name: "MenuVariantContext",

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 input = require('../input/input.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 popover = require('../popover/popover.cjs');
+var button = require('../button/button.cjs');
 
 const i18nStrings = {
   "en-SG": {

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

@@ -6,15 +6,15 @@ 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');
 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.2.3/node_modules/lucide-react/dist/esm/icons/chevron-down.cjs');
+var field = require('../field/field.cjs');
+var input = require('../input/input.cjs');
+var popover = require('../popover/popover.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/cjs/toast/toast.cjs

@@ -5,9 +5,9 @@
 var jsxRuntime = require('react/jsx-runtime');
 var sonner = require('sonner');
 var ouiTheme = require('@opengovsg/oui-theme');
-var spinner = require('../spinner/spinner.cjs');
 var utils = require('../system/utils.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 spinner = require('../spinner/spinner.cjs');
 
 function Toaster(originalProps) {
   const [{ toastOptions, closeButton = true, ...props }, variantProps] = utils.mapPropsVariants(originalProps, ouiTheme.toastStyles.variantKeys);

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/button/button.js

@@ -5,10 +5,10 @@ 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 { renderChildren } from '../system/react-utils/children.js';
 import { useRipple } from '../ripple/use-ripple.js';
 import { Spinner } from '../spinner/spinner.js';
-import { renderChildren } from '../system/react-utils/children.js';
+import { Ripple } from '../ripple/ripple.js';
 
 const Button = forwardRef(
   ({

package/dist/esm/calendar/calendar-month-day-selector.js

@@ -4,11 +4,11 @@ import { jsx } from 'react/jsx-runtime';
 import { useContext } from 'react';
 import { CalendarDate } from '@internationalized/date';
 import { Group } from 'react-aria-components';
-import { Select } from '../select/select.js';
-import { SelectItem } from '../select/select-item.js';
 import { AgnosticCalendarStateContext } from './agnostic-calendar-state-context.js';
 import { useCalendarStyleContext } from './calendar-style-context.js';
 import { useCalendarSelectors } from './hooks/use-calendar-selectors.js';
+import { Select } from '../select/select.js';
+import { SelectItem } from '../select/select-item.js';
 import { useCalendarI18n } from './hooks/use-calendar-i18n.js';
 
 const CalendarMonthDaySelector = () => {

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,13 +5,13 @@ 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';
+import { Popover } from '../popover/popover.js';
 
 const calculateEstimatedRowHeight = (size) => {
   switch (size) {

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 { 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';
 import { Popover } from '../popover/popover.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';
 
 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 { RangeCalendar } from '../range-calendar/range-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';
+import { Popover } from '../popover/popover.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 { useControllableState } from '../hooks/use-controllable-state.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,4 +1,5 @@
 "use strict";
+export { Avatar } from './avatar/index.js';
 export { useControllableState } from './hooks/use-controllable-state.js';
 export { useDraggable } from './hooks/use-draggable.js';
 export { Button } from './button/button.js';
@@ -25,10 +26,10 @@ 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 { 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 { 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';
@@ -38,10 +39,10 @@ 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 { PaginationItemType } from './pagination/hooks/use-pagination.js';
 export { Pagination } from './pagination/pagination.js';
 export { PaginationCursor } from './pagination/pagination-cursor.js';
 export { PaginationItem } from './pagination/pagination-item.js';
-export { PaginationItemType } from './pagination/hooks/use-pagination.js';
 export { CURSOR_TRANSITION_TIMEOUT, usePagination } from './pagination/use-pagination.js';
 export { FileDropzone } from './file-dropzone/file-dropzone.js';
 export { FileInfo } from './file-dropzone/file-info.js';
@@ -54,6 +55,7 @@ export { ModalBody } from './modal/modal-body.js';
 export { ModalHeader } from './modal/modal-header.js';
 export { ModalVariantContext, useModalVariantContext } from './modal/modal-variant-context.js';
 export { Toaster } from './toast/toast.js';
+export { toast } from 'sonner';
 export { Navbar } from './navbar/navbar.js';
 export { NavbarBrand } from './navbar/navbar-brand.js';
 export { NavbarContent } from './navbar/navbar-content.js';
@@ -63,10 +65,8 @@ export { NavbarMenuToggle } from './navbar/navbar-menu/toggle.js';
 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 { 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/menu/menu.js

@@ -4,11 +4,11 @@ import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { forwardRef, useMemo, useCallback } from 'react';
 import { useContextProps, MenuItem as MenuItem$1, composeRenderProps, Provider, Menu as Menu$1, MenuSection as MenuSection$1, Header, Collection, MenuTrigger as MenuTrigger$1, SubmenuTrigger as SubmenuTrigger$1, Separator } from 'react-aria-components';
 import { listBoxItemStyles, menuItemStyles, menuStyles, menuSectionStyles, menuDividerStyles } from '@opengovsg/oui-theme';
-import { Popover } from '../popover/popover.js';
 import { forwardRefGeneric, mapPropsVariants } from '../system/utils.js';
 import { createContext } from '../system/react-utils/context.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 ChevronRight from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/chevron-right.js';
+import { Popover } from '../popover/popover.js';
 
 const [MenuVariantContext, useMenuVariantContext] = createContext({
   name: "MenuVariantContext",

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 { Input } from '../input/input.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 { Popover } from '../popover/popover.js';
+import { Button } from '../button/button.js';
 
 const i18nStrings = {
   "en-SG": {

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

@@ -4,15 +4,15 @@ 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';
 import { TagFieldList } from './tag-field-list.js';
 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';
+import { Input } from '../input/input.js';
+import { Popover } from '../popover/popover.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/dist/esm/toast/toast.js

@@ -4,9 +4,9 @@ import { jsx } from 'react/jsx-runtime';
 import { Toaster as Toaster$1 } from 'sonner';
 export { toast } from 'sonner';
 import { toastStyles } from '@opengovsg/oui-theme';
-import { Spinner } from '../spinner/spinner.js';
 import { mapPropsVariants } from '../system/utils.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 { Spinner } from '../spinner/spinner.js';
 
 function Toaster(originalProps) {
   const [{ toastOptions, closeButton = true, ...props }, variantProps] = mapPropsVariants(originalProps, toastStyles.variantKeys);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengovsg/oui",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "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.35",
     "@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.35"
   },
   "scripts": {
     "build": "tsx ../../tooling/build-scripts/main.ts --dts --clean",