Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "pnpm build:props && pnpm build:colors && pnpm build:tsc && pnpm build:assets && pnpm build:app",
"build:app": "vite build",
"build:assets": "mkdir -p public/resources/icons && cp -r node_modules/@obosbbl/grunnmuren-icons-svg/src/* public/resources/icons/",
"build:props": "node extract-component-props.js && biome lint --write component-props.ts --files-max-size=4000000",
"build:props": "node extract-component-props.js && biome lint --write component-props.ts --files-max-size=5000000",
"build:colors": "node extract-colors.js && biome format --write colors.ts",
"build:tsc": "tsc",
"dev": "vite dev --port 3000",
Expand All @@ -23,7 +23,7 @@
"@obosbbl/grunnmuren-icons-svg": "workspace:*",
"@obosbbl/grunnmuren-react": "workspace:*",
"@portabletext/react": "3.2.1",
"@react-aria/utils": "3.29.1",
"@react-aria/utils": "3.30.0",
"@sanity/client": "7.6.0",
"@sanity/code-input": "5.1.2",
"@sanity/table": "1.1.3",
Expand All @@ -34,7 +34,7 @@
"groq": "3.92.0",
"prism-react-renderer": "2.4.1",
"react": "19.0.0",
"react-aria-components": "1.10.1",
"react-aria-components": "1.11.0",
"react-dom": "19.0.0",
"react-element-to-jsx-string": "17.0.1",
"react-live": "4.1.8",
Expand Down
4 changes: 2 additions & 2 deletions packages/react/src/backlink/backlink.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function Backlink(props: BacklinkProps) {
if (isLinkProps(props)) {
return (
<Link
{...restProps}
{...(restProps as RACLinkProps)}
className={_className}
style={style as CSSProperties}
ref={ref as Ref<HTMLAnchorElement>}
Expand All @@ -75,7 +75,7 @@ function Backlink(props: BacklinkProps) {

return (
<Button
{...restProps}
{...(restProps as ButtonProps)}
className={_className}
style={style as CSSProperties}
ref={ref as Ref<HTMLButtonElement>}
Expand Down
5 changes: 2 additions & 3 deletions packages/react/src/button/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -177,16 +177,15 @@ function Button({ ref = null, ...props }: ButtonProps) {

return isLinkProps(restProps) ? (
<RACLink
{...restProps}
routerOptions={restProps.routerOptions}
{...(restProps as RACLinkProps)}
className={className}
ref={ref as Ref<HTMLAnchorElement>}
>
{children}
</RACLink>
) : (
<RACButton
{...restProps}
{...(restProps as RACButtonProps)}
className={className}
isPending={isPending}
ref={ref as Ref<HTMLButtonElement>}
Expand Down
4 changes: 2 additions & 2 deletions packages/react/src/carousel/carousel.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ChevronLeft, ChevronRight } from '@obosbbl/grunnmuren-icons-react';
import { useUpdateEffect } from '@react-aria/utils';
import { cx } from 'cva';
import { createContext, useEffect, useRef, useState } from 'react';
import { type JSX, createContext, useEffect, useRef, useState } from 'react';
import { Provider } from 'react-aria-components';
import { useDebouncedCallback } from 'use-debounce';
import { Button, ButtonContext } from '../button';
Expand Down Expand Up @@ -256,7 +256,7 @@ const CarouselItems = ({ className, children }: CarouselItemsProps) => (

type CarouselItemProps = {
/** The component/components to display as the <CarouselItem/>. */
children: React.ReactNode;
children: JSX.Element | JSX.Element[];
/** Additional CSS className for the element. */
className?: string;
id?: string;
Expand Down
Loading