@obosbbl/grunnmuren-react 2.0.0-canary.43 → 2.0.0-canary.45

package/dist/index.d.mts

@@ -58,7 +58,7 @@ declare const badgeVariants: (props?: ({
     color?: "gray-dark" | "mint" | "sky" | "white" | "blue-dark" | "green-dark" | undefined;
     size?: "small" | "medium" | "large" | undefined;
 } & ({
-    class?: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | any | {
+    class?: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | /*elided*/ any | {
         [x: string]: any;
     } | null | undefined)[] | {
         [x: string]: any;
@@ -86,7 +86,7 @@ declare const badgeVariants: (props?: ({
     className?: never;
 } | {
     class?: never;
-    className?: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | any | {
+    className?: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | /*elided*/ any | {
         [x: string]: any;
     } | null | undefined)[] | {
         [x: string]: any;
@@ -116,7 +116,7 @@ declare const _Badge: react.ForwardRefExoticComponent<VariantProps<(props?: ({
     color?: "gray-dark" | "mint" | "sky" | "white" | "blue-dark" | "green-dark" | undefined;
     size?: "small" | "medium" | "large" | undefined;
 } & ({
-    class?: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | any | {
+    class?: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | /*elided*/ any | {
         [x: string]: any;
     } | null | undefined)[] | {
         [x: string]: any;
@@ -144,7 +144,7 @@ declare const _Badge: react.ForwardRefExoticComponent<VariantProps<(props?: ({
     className?: never;
 } | {
     class?: never;
-    className?: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | any | {
+    className?: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | /*elided*/ any | {
         [x: string]: any;
     } | null | undefined)[] | {
         [x: string]: any;
@@ -183,7 +183,7 @@ declare const buttonVariants: (props?: ({
     isIconOnly?: boolean | undefined;
     isPending?: boolean | undefined;
 } & ({
-    class?: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | any | {
+    class?: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | /*elided*/ any | {
         [x: string]: any;
     } | null | undefined)[] | {
         [x: string]: any;
@@ -211,7 +211,7 @@ declare const buttonVariants: (props?: ({
     className?: never;
 } | {
     class?: never;
-    className?: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | any | {
+    className?: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | /*elided*/ any | {
         [x: string]: any;
     } | null | undefined)[] | {
         [x: string]: any;
@@ -239,7 +239,7 @@ declare const buttonVariants: (props?: ({
 })) | undefined) => string;
 type ButtonOrLinkProps$1 = VariantProps<typeof buttonVariants> & {
     children?: React.ReactNode;
-    href?: string;
+    href?: LinkProps['href'];
     /**
      * Display the button in a loading state
      * @deprecated Use isPending instead.
@@ -592,7 +592,7 @@ declare const _NumberField: react.ForwardRefExoticComponent<{
 declare const alertVariants: (props?: ({
     variant?: "info" | "success" | "warning" | "danger" | undefined;
 } & ({
-    class?: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | any | {
+    class?: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | /*elided*/ any | {
         [x: string]: any;
     } | null | undefined)[] | {
         [x: string]: any;
@@ -620,7 +620,7 @@ declare const alertVariants: (props?: ({
     className?: never;
 } | {
     class?: never;
-    className?: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | any | {
+    className?: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | /*elided*/ any | {
         [x: string]: any;
     } | null | undefined)[] | {
         [x: string]: any;
@@ -710,7 +710,7 @@ type BreadcrumbProps = {
     /** Additional style properties for the element. */
     style?: React.CSSProperties;
     /** The URL to navigate to when clicking the breadcrumb. */
-    href?: string;
+    href?: LinkProps['href'];
 } & Omit<BreadcrumbProps$1, 'className' | 'style'>;
 declare const _Breadcrumb: react.ForwardRefExoticComponent<{
     /** Additional CSS className for the element. */
@@ -719,7 +719,7 @@ declare const _Breadcrumb: react.ForwardRefExoticComponent<{
     /** Additional style properties for the element. */
     style?: React.CSSProperties;
     /** The URL to navigate to when clicking the breadcrumb. */
-    href?: string;
+    href?: LinkProps["href"];
 } & Omit<BreadcrumbProps$1, "style" | "className"> & react.RefAttributes<HTMLLIElement>>;
 
 type BreadcrumbsProps = {
@@ -740,7 +740,7 @@ type ButtonOrLinkProps = {
     /** Additional CSS className for the element. */
     className?: string;
     /** Determines whether to use an anchor or a button for the Backlink */
-    href?: string;
+    href?: LinkProps['href'];
     /** To add a permanent underline on the link (not only on hover)
      * @default false
      */
@@ -756,7 +756,7 @@ type CardProps = VariantProps<typeof cardVariants> & {
 declare const cardVariants: (props?: ({
     variant?: "subtle" | "outlined" | undefined;
 } & ({
-    class?: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | any | {
+    class?: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | /*elided*/ any | {
         [x: string]: any;
     } | null | undefined)[] | {
         [x: string]: any;
@@ -784,7 +784,7 @@ declare const cardVariants: (props?: ({
     className?: never;
 } | {
     class?: never;
-    className?: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | any | {
+    className?: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | /*elided*/ any | {
         [x: string]: any;
     } | null | undefined)[] | {
         [x: string]: any;
@@ -811,13 +811,13 @@ declare const cardVariants: (props?: ({
     } | null | undefined;
 })) | undefined) => string;
 declare const Card: ({ children, className: _className, variant, ...restProps }: CardProps) => react_jsx_runtime.JSX.Element;
-type RACLinkProps = Pick<LinkProps, 'href' | 'routerOptions' | 'children'>;
-type CardLinkWrapperProps = RACLinkProps & {
-    children: React.ReactNode;
-};
-type CardLinkProps = {
+type CardLinkWrapperProps = {
+    children?: React.ReactNode;
     className?: string;
-} & (RACLinkProps | CardLinkWrapperProps);
+} & {
+    [K in keyof Omit<LinkProps, 'className' | 'children'>]?: never;
+};
+type CardLinkProps = (Omit<LinkProps, 'href'> & Required<Pick<LinkProps, 'href'>>) | CardLinkWrapperProps;
 /**
  * A component that creates a clickable area on a card.
  * It can be used either as a wrapper around a link or as a standalone link.

package/dist/index.mjs

@@ -2,7 +2,7 @@
 import { I18nProvider, RouterProvider, useLocale, useContextProps, Provider, Link, Button as Button$1, Text, CheckboxContext, Checkbox as Checkbox$1, FieldError, Label as Label$1, CheckboxGroup as CheckboxGroup$1, ListBoxItem as ListBoxItem$1, ListBox as ListBox$1, ComboBox, Group, Input, Popover, RadioGroup as RadioGroup$1, Radio as Radio$1, Select as Select$1, SelectValue, TextField as TextField$1, TextArea as TextArea$1, NumberField as NumberField$1, Breadcrumbs as Breadcrumbs$1, Breadcrumb as Breadcrumb$1 } from 'react-aria-components';
 export { Form } from 'react-aria-components';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { ChevronDown, LoadingSpinner, Check, Close, InfoCircle, CheckCircle, Warning, CloseCircle, ChevronRight, ChevronLeft } from '@obosbbl/grunnmuren-icons-react';
+import { ChevronDown, LoadingSpinner, Check, Close, InfoCircle, CheckCircle, Warning, Error, ChevronRight, ChevronLeft } from '@obosbbl/grunnmuren-icons-react';
 import { useLayoutEffect } from '@react-aria/utils';
 import { cx, cva, compose } from 'cva';
 import { createContext, forwardRef, Children, useId, useState } from 'react';
@@ -153,7 +153,7 @@ function AccordionItem(props, ref) {
                         inert: isOpen ? undefined : 'true',
                         'aria-labelledby': buttonId,
                         _outerWrapper: (children)=>/*#__PURE__*/ jsx("div", {
-                                className: cx('grid transition-all duration-300 after:relative after:block after:h-0 after:transition-all after:duration-300 motion-reduce:transition-none', isOpen ? 'grid-rows-[1fr] after:h-3.5' : 'grid-rows-[0fr] '),
+                                className: cx('grid transition-all duration-300 after:relative after:block after:h-0 after:transition-all after:duration-300 motion-reduce:transition-none', isOpen ? 'grid-rows-[1fr] after:h-3.5' : 'grid-rows-[0fr]'),
                                 children: children
                             })
                     }
@@ -881,12 +881,11 @@ function NumberField(props, ref) {
 }
 const _NumberField = /*#__PURE__*/ forwardRef(NumberField);
 
-// TODO: add new icons
 const iconMap = {
     info: InfoCircle,
     success: CheckCircle,
     warning: Warning,
-    danger: CloseCircle
+    danger: Error
 };
 const alertVariants = cva({
     base: [
@@ -1188,9 +1187,9 @@ const cardLinkVariants = cva({
     // because it still renders with role="link" and tabindex="0" which makes it focusable.
     // So we need to render a div instead.
     /*#__PURE__*/ jsx("div", {
+        ...restProps,
         "data-slot": "card-link",
-        className: className,
-        ...restProps
+        className: className
     });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@obosbbl/grunnmuren-react",
-  "version": "2.0.0-canary.43",
+  "version": "2.0.0-canary.45",
   "description": "Grunnmuren components in React",
   "repository": {
     "url": "https://github.com/code-obos/grunnmuren"