@opengovsg/oui 0.0.29 → 0.0.31

package/dist/esm/avatar/avatar-group.js

@@ -0,0 +1,58 @@
+"use strict";
+import { jsx, jsxs } from 'react/jsx-runtime';
+import { useMemo } from 'react';
+import { forwardRef } from '../system/utils.js';
+import { AvatarRoot, AvatarFallback } from './avatar.js';
+import { useAvatarGroup, AvatarGroupProvider } from './avatar-group-context.js';
+
+const AvatarGroup = forwardRef((props, ref) => {
+  const {
+    Component,
+    clones,
+    context,
+    remainingCount,
+    getAvatarGroupCountProps,
+    getAvatarGroupProps,
+    renderCount
+  } = useAvatarGroup({
+    ...props,
+    ref
+  });
+  const renderedCount = useMemo(() => {
+    if (remainingCount <= 0) return null;
+    if (renderCount) {
+      return renderCount(remainingCount);
+    }
+    const countAvatarVariantProps = {
+      prominence: "subtle",
+      color: "primary"
+    };
+    if (context.prominence === "subtle") {
+      countAvatarVariantProps.color = "white";
+    }
+    return /* @__PURE__ */ jsx(
+      AvatarRoot,
+      {
+        ...countAvatarVariantProps,
+        ...getAvatarGroupCountProps(),
+        name: `+${remainingCount}`,
+        children: /* @__PURE__ */ jsxs(AvatarFallback, { children: [
+          "+",
+          remainingCount
+        ] })
+      }
+    );
+  }, [
+    context.prominence,
+    getAvatarGroupCountProps,
+    remainingCount,
+    renderCount
+  ]);
+  return /* @__PURE__ */ jsx(Component, { ...getAvatarGroupProps(), children: /* @__PURE__ */ jsxs(AvatarGroupProvider, { value: context, children: [
+    clones,
+    renderedCount
+  ] }) });
+});
+AvatarGroup.displayName = "AvatarGroup";
+
+export { AvatarGroup };

package/dist/esm/avatar/avatar.js

@@ -0,0 +1,128 @@
+"use strict";
+"use client";
+import { jsx } from 'react/jsx-runtime';
+import { useState, useMemo } from 'react';
+import { useLayoutEffect } from '@react-aria/utils';
+import { avatarStyles, dataAttr } from '@opengovsg/oui-theme';
+import { forwardRef, mapPropsVariants } from '../system/utils.js';
+import { AvatarContext, useAvatarContext } from './avatar-context.js';
+import { useAvatarGroupContext } from './avatar-group-context.js';
+import { useImageLoadingStatus } from './hooks/use-img-loading-status.js';
+import { getInitialsFromText } from './utils.js';
+import { useDomRef } from '../system/react-utils/refs.js';
+import User from '../node_modules/.pnpm/lucide-react@0.475.0_react@19.2.3/node_modules/lucide-react/dist/esm/icons/user.js';
+
+const AvatarRoot = forwardRef(
+  (originalProps, ref) => {
+    const groupContext = useAvatarGroupContext();
+    const [
+      {
+        name,
+        getInitials = getInitialsFromText,
+        classNames,
+        className,
+        children,
+        as,
+        ...props
+      },
+      {
+        color = groupContext?.color,
+        prominence = groupContext?.prominence,
+        size = groupContext?.size,
+        radius = groupContext?.radius,
+        ...variantProps
+      }
+    ] = mapPropsVariants(originalProps, avatarStyles.variantKeys);
+    const isInGroup = !!groupContext;
+    const domRef = useDomRef(ref);
+    const slots = avatarStyles({
+      color,
+      prominence,
+      size,
+      radius,
+      isInGroup,
+      ...variantProps
+    });
+    const [imageLoadingStatus, setImageLoadingStatus] = useState("idle");
+    const Component = as || "span";
+    return /* @__PURE__ */ jsx(
+      AvatarContext,
+      {
+        value: {
+          imageLoadingStatus,
+          setImageLoadingStatus,
+          slots,
+          classNames,
+          getInitials,
+          name
+        },
+        children: /* @__PURE__ */ jsx(
+          Component,
+          {
+            ref: domRef,
+            ...props,
+            className: slots.base({ className: className ?? classNames?.base }),
+            children
+          }
+        )
+      }
+    );
+  }
+);
+const AvatarImage = forwardRef(
+  ({ src, as, ...props }, ref) => {
+    const domRef = useDomRef(ref);
+    const {
+      setImageLoadingStatus,
+      imageLoadingStatus,
+      slots,
+      name,
+      classNames
+    } = useAvatarContext();
+    const currentImageStatus = useImageLoadingStatus(src, props);
+    const Component = as || "img";
+    useLayoutEffect(() => {
+      setImageLoadingStatus(currentImageStatus);
+    }, [currentImageStatus, setImageLoadingStatus]);
+    return /* @__PURE__ */ jsx(
+      Component,
+      {
+        ref: domRef,
+        alt: name,
+        "data-loaded": dataAttr(imageLoadingStatus === "loaded"),
+        ...props,
+        src,
+        className: slots.image({ className: classNames?.image })
+      }
+    );
+  }
+);
+const AvatarFallback = forwardRef(
+  ({ children, as, ...props }, ref) => {
+    const domRef = useDomRef(ref);
+    const { slots, classNames, imageLoadingStatus, name, getInitials } = useAvatarContext();
+    const childrenToRender = useMemo(() => {
+      if (children) return children;
+      if (name) {
+        return getInitials(name);
+      }
+      return /* @__PURE__ */ jsx(User, { className: slots.icon({ className: classNames?.icon }) });
+    }, [children, classNames?.icon, getInitials, name, slots]);
+    const Component = as || "div";
+    if (imageLoadingStatus === "loaded") {
+      return null;
+    }
+    return /* @__PURE__ */ jsx(
+      Component,
+      {
+        title: name,
+        className: slots.fallback({ className: classNames?.fallback }),
+        ref: domRef,
+        ...props,
+        children: childrenToRender
+      }
+    );
+  }
+);
+
+export { AvatarFallback, AvatarImage, AvatarRoot };

package/dist/esm/avatar/hooks/use-img-loading-status.js

@@ -0,0 +1,66 @@
+"use strict";
+import { useRef, useState, useLayoutEffect, useSyncExternalStore } from 'react';
+
+function useIsHydrated() {
+  return useSyncExternalStore(
+    subscribe,
+    () => true,
+    () => false
+  );
+}
+function subscribe() {
+  return () => {
+  };
+}
+function resolveLoadingStatus(image, src) {
+  if (!image) {
+    return "idle";
+  }
+  if (!src) {
+    return "error";
+  }
+  if (image.src !== src) {
+    image.src = src;
+  }
+  return image.complete && image.naturalWidth > 0 ? "loaded" : "loading";
+}
+function useImageLoadingStatus(src, { referrerPolicy, crossOrigin }) {
+  const isHydrated = useIsHydrated();
+  const imageRef = useRef(null);
+  const image = (() => {
+    if (!isHydrated) return null;
+    if (!imageRef.current) {
+      imageRef.current = new window.Image();
+    }
+    return imageRef.current;
+  })();
+  const [loadingStatus, setLoadingStatus] = useState(
+    () => resolveLoadingStatus(image, src)
+  );
+  useLayoutEffect(() => {
+    setLoadingStatus(resolveLoadingStatus(image, src));
+  }, [image, src]);
+  useLayoutEffect(() => {
+    const updateStatus = (status) => () => {
+      setLoadingStatus(status);
+    };
+    if (!image) return;
+    const handleLoad = updateStatus("loaded");
+    const handleError = updateStatus("error");
+    image.addEventListener("load", handleLoad);
+    image.addEventListener("error", handleError);
+    if (referrerPolicy) {
+      image.referrerPolicy = referrerPolicy;
+    }
+    if (typeof crossOrigin === "string") {
+      image.crossOrigin = crossOrigin;
+    }
+    return () => {
+      image.removeEventListener("load", handleLoad);
+      image.removeEventListener("error", handleError);
+    };
+  }, [image, crossOrigin, referrerPolicy]);
+  return loadingStatus;
+}
+
+export { useImageLoadingStatus };

package/dist/esm/avatar/index.js

@@ -0,0 +1,13 @@
+"use strict";
+import { AvatarRoot, AvatarFallback, AvatarImage } from './avatar.js';
+export { AvatarContext, useAvatarContext } from './avatar-context.js';
+export { AvatarGroup } from './avatar-group.js';
+export { AvatarGroupProvider, useAvatarGroup } from './avatar-group-context.js';
+
+const Avatar = Object.assign(AvatarRoot, {
+  Root: AvatarRoot,
+  Image: AvatarImage,
+  Fallback: AvatarFallback
+});
+
+export { Avatar, AvatarFallback, AvatarImage, AvatarRoot };

package/dist/esm/avatar/utils.js

@@ -0,0 +1,7 @@
+"use strict";
+const getInitialsFromText = (text, limit = 2) => {
+  const initials = text?.trim().split(/[\s\-_.]+/).filter(Boolean).map((word) => word.charAt(0).toUpperCase()).join("") || "";
+  return initials.slice(0, limit);
+};
+
+export { getInitialsFromText };

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,
@@ -18,8 +18,8 @@ const Checkbox = ({
     originalProps,
     checkboxStyles.variantKeys
   );
-  const { size } = useCheckboxGroupStyleContext();
-  const styles = checkboxStyles({ size, ...variants });
+  const context = useCheckboxGroupStyleContext();
+  const styles = checkboxStyles({ size: context?.size, ...variants });
   return /* @__PURE__ */ jsx(
     Checkbox$1,
     {

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 { mapPropsVariants } from '../system/utils.js';
 import { Label, Description, FieldError } from '../field/field.js';
+import { mapPropsVariants } from '../system/utils.js';
 
 function DateField(originalProps) {
   const [

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

@@ -4,13 +4,14 @@ 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(
@@ -23,6 +23,7 @@ const FileDropzone = (originalProps) => {
   const {
     name,
     allowedMimeTypes = [],
+    fileSizeBase = "binary",
     maxFileSize = Number.POSITIVE_INFINITY,
     minFileSize = 0,
     showFileSizeText = true,
@@ -67,9 +68,10 @@ const FileDropzone = (originalProps) => {
     (error) => formatErrorMessage(error, {
       maxFileSize,
       minFileSize,
-      maxFiles
+      maxFiles,
+      fileSizeBase
     }),
-    [maxFileSize, maxFiles, minFileSize]
+    [fileSizeBase, maxFileSize, maxFiles, minFileSize]
   );
   const onDrop = useCallback(
     (acceptedFiles, fileRejections) => {
@@ -127,19 +129,20 @@ const FileDropzone = (originalProps) => {
     const shouldShow = showFileSizeText && (notDefaultMaxFileSize || notDefaultMinFileSize);
     if (!shouldShow) return null;
     if (notDefaultMaxFileSize && notDefaultMinFileSize) {
-      return `File size must be between ${formatBytes(minFileSize, 2)} and ${formatBytes(
+      return `File size must be between ${formatBytes(minFileSize, 2, fileSizeBase)} and ${formatBytes(
         maxFileSize,
-        2
+        2,
+        fileSizeBase
       )}`;
     }
     if (notDefaultMaxFileSize) {
-      return `Maximum file size: ${formatBytes(maxFileSize, 2)}`;
+      return `Maximum file size: ${formatBytes(maxFileSize, 2, fileSizeBase)}`;
     }
     if (notDefaultMinFileSize) {
-      return `Minimum file size: ${formatBytes(minFileSize, 2)}`;
+      return `Minimum file size: ${formatBytes(minFileSize, 2, fileSizeBase)}`;
     }
     return null;
-  }, [maxFileSize, minFileSize, showFileSizeText]);
+  }, [maxFileSize, minFileSize, showFileSizeText, fileSizeBase]);
   const triggerFileSelector = useCallback(() => {
     if (isDisabled || isReadOnly) return;
     dropzoneState.inputRef.current?.click();
@@ -185,6 +188,7 @@ const FileDropzone = (originalProps) => {
           {
             isDisabled,
             isReadOnly,
+            fileSizeBase,
             maxFiles,
             maxFileSize,
             showDropzone,

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 {
@@ -17,7 +17,8 @@ const FileInfo = ({ file, imagePreview, classNames }) => {
     isReadOnly
   } = useFileDropzoneStateContext();
   const { size, variant, itemClassNames } = useFileDropzoneStyleContext();
-  const readableFileSize = formatBytes(file.size, 2);
+  const { fileSizeBase } = useFileDropzoneStateContext();
+  const readableFileSize = formatBytes(file.size, 2, fileSizeBase);
   const styles = fileInfoDropzoneStyles({
     size,
     variant,

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

@@ -1,8 +1,8 @@
 "use strict";
 import { ErrorCode } from 'react-dropzone';
 
-const formatBytes = (bytes, decimals = 2, size) => {
-  const k = 1e3;
+const formatBytes = (bytes, decimals = 2, base = "binary", size) => {
+  const k = base === "binary" ? 1024 : 1e3;
   const dm = decimals < 0 ? 0 : decimals;
   const sizes = ["bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
   if (bytes === 0 || bytes === void 0)
@@ -14,9 +14,9 @@ const formatErrorMessage = (error, config) => {
   const { maxFileSize, minFileSize, maxFiles } = config;
   switch (error.code) {
     case ErrorCode.FileTooLarge:
-      return `You have exceeded the size limit, please upload a file below ${formatBytes(maxFileSize, 2)}`;
+      return `You have exceeded the size limit, please upload a file below ${formatBytes(maxFileSize, 2, config.fileSizeBase)}`;
     case ErrorCode.FileTooSmall:
-      return `Please upload a file above ${formatBytes(minFileSize, 2)}`;
+      return `Please upload a file above ${formatBytes(minFileSize, 2, config.fileSizeBase)}`;
     case ErrorCode.TooManyFiles:
       return `Maximum number of files allowed is ${maxFiles}.`;
     default: {

package/dist/esm/hooks/use-scroll-position.js

@@ -0,0 +1,51 @@
+"use strict";
+import { useRef, useCallback, useEffect } from 'react';
+
+const isBrowser = typeof window !== "undefined";
+function getScrollPosition(element) {
+  if (!isBrowser) return { x: 0, y: 0 };
+  if (!element) {
+    return { x: window.scrollX, y: window.scrollY };
+  }
+  return { x: element.scrollLeft, y: element.scrollTop };
+}
+const useScrollPosition = (props) => {
+  const { elementRef, delay = 30, callback, isEnabled } = props;
+  const position = useRef(
+    isEnabled ? getScrollPosition(elementRef?.current) : { x: 0, y: 0 }
+  );
+  const throttleTimeout = useRef(null);
+  const handler = useCallback(() => {
+    const currPos = getScrollPosition(elementRef?.current);
+    if (typeof callback === "function") {
+      callback({ prevPos: position.current, currPos });
+    }
+    position.current = currPos;
+    throttleTimeout.current = null;
+  }, [callback, elementRef]);
+  useEffect(() => {
+    if (!isEnabled) return;
+    const handleScroll = () => {
+      if (delay) {
+        if (throttleTimeout.current) {
+          clearTimeout(throttleTimeout.current);
+        }
+        throttleTimeout.current = setTimeout(handler, delay);
+      } else {
+        handler();
+      }
+    };
+    const target = elementRef?.current || window;
+    target.addEventListener("scroll", handleScroll);
+    return () => {
+      target.removeEventListener("scroll", handleScroll);
+      if (throttleTimeout.current) {
+        clearTimeout(throttleTimeout.current);
+        throttleTimeout.current = null;
+      }
+    };
+  }, [elementRef?.current, delay, handler, isEnabled]);
+  return position.current;
+};
+
+export { useScrollPosition };

package/dist/esm/index.js

@@ -1,6 +1,7 @@
 "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';
@@ -10,17 +11,31 @@ 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 { 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 { 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';
@@ -46,21 +61,11 @@ 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 { 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 { Avatar } from './avatar/index.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';

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/navbar/navbar-menu/menu.js

@@ -14,7 +14,7 @@ const NavbarMenu = forwardRef(
     const {
       slots,
       isMenuOpen,
-      height,
+      menuTopOffsetPx,
       classNames,
       setIsMenuOpen,
       domRef: parentRef,
@@ -44,7 +44,7 @@ const NavbarMenu = forwardRef(
             style: {
               ...style,
               // @ts-expect-error due to not having any type declaration for CSS variables in React style prop
-              "--navbar-height": typeof height === "number" ? `${height}px` : height
+              "--menu-offset": menuTopOffsetPx
             },
             onKeyDown: chain(handleKeyDown, onKeyDown),
             ...props,

package/dist/esm/navbar/navbar-menu/toggle.js

@@ -24,13 +24,14 @@ const NavbarMenuToggle = ({
     isMenuOpen,
     setIsMenuOpen,
     menuRef,
-    position
+    position,
+    menuTopOffset
   } = useNavbarContext();
   const shouldScrollToTop = (isMenuOpen2) => {
     if (!isMenuOpen2 || position === "sticky" || typeof window === "undefined") {
       return;
     }
-    window.scrollTo({ top: 0, behavior: "instant" });
+    window.scrollTo({ top: menuTopOffset, behavior: "instant" });
   };
   const formatMessage = useMessageFormatter(i18nStrings);
   const toggleStyles = useMemo(() => {