Merged in feat/sw-2879-booking-widget-to-booking-flow-package (pull request #2532)
feat(SW-2879): Move BookingWidget to booking-flow package * Fix lockfile * Fix styling * a tiny little booking widget test * Tiny fixes * Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package * Remove unused scripts * lint:fix * Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package * Tiny lint fixes * update test * Update Input in booking-flow * Clean up comments etc * Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package * Setup tracking context for booking-flow * Add missing use client * Fix temp tracking function * Pass booking to booking-widget * Remove comment * Add use client to booking widget tracking provider * Add use client to tracking functions * Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package * Move debug page * Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package * Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package * Merge branch 'master' into feat/sw-2879-booking-widget-to-booking-flow-package Approved-by: Bianca Widstam
This commit is contained in:
@@ -1,20 +0,0 @@
|
||||
import type { VariantProps } from 'class-variance-authority'
|
||||
import type { ButtonProps as ReactAriaButtonProps } from 'react-aria-components'
|
||||
|
||||
import type { buttonVariants } from './variants'
|
||||
|
||||
export interface ButtonPropsRAC
|
||||
extends Omit<ReactAriaButtonProps, 'isDisabled' | 'onClick'>,
|
||||
VariantProps<typeof buttonVariants> {
|
||||
asChild?: false | undefined | never
|
||||
disabled?: ReactAriaButtonProps['isDisabled']
|
||||
onClick?: ReactAriaButtonProps['onPress']
|
||||
}
|
||||
|
||||
export interface ButtonPropsSlot
|
||||
extends React.ButtonHTMLAttributes<HTMLButtonElement>,
|
||||
VariantProps<typeof buttonVariants> {
|
||||
asChild: true
|
||||
}
|
||||
|
||||
export type ButtonProps = ButtonPropsSlot | ButtonPropsRAC
|
||||
@@ -5,7 +5,24 @@ import { Button as ButtonRAC } from 'react-aria-components'
|
||||
|
||||
import { buttonVariants } from './variants'
|
||||
|
||||
import type { ButtonProps } from './button'
|
||||
import type { VariantProps } from 'class-variance-authority'
|
||||
import type { ButtonProps as ReactAriaButtonProps } from 'react-aria-components'
|
||||
|
||||
export interface ButtonPropsRAC
|
||||
extends Omit<ReactAriaButtonProps, 'isDisabled' | 'onClick'>,
|
||||
VariantProps<typeof buttonVariants> {
|
||||
asChild?: false | undefined | never
|
||||
disabled?: ReactAriaButtonProps['isDisabled']
|
||||
onClick?: ReactAriaButtonProps['onPress']
|
||||
}
|
||||
|
||||
export interface ButtonPropsSlot
|
||||
extends React.ButtonHTMLAttributes<HTMLButtonElement>,
|
||||
VariantProps<typeof buttonVariants> {
|
||||
asChild: true
|
||||
}
|
||||
|
||||
export type ButtonProps = ButtonPropsSlot | ButtonPropsRAC
|
||||
|
||||
/**
|
||||
* @deprecated Use `@scandic-hotels/design-system/Button` instead.
|
||||
@@ -51,5 +68,3 @@ export function OldDSButton(props: ButtonProps) {
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
export type { ButtonPropsRAC, ButtonProps } from './button'
|
||||
|
||||
Reference in New Issue
Block a user