feat: improve

saas-js · Nov 15, 2024 · 4ca3e77 · 4ca3e77
1 parent 8804082
commit 4ca3e77
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 100 deletions.
diff --git a/packages/saas-ui-core/src/error-boundary/error-boundary.tsx b/packages/saas-ui-core/src/error-boundary/error-boundary.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import { SuiContext } from '../provider'
+import { ErrorContext } from './error-provider.tsx'
 
 export interface ErrorBoundaryProps {
   fallback?: React.ReactNode
@@ -21,9 +21,9 @@ export interface ErrorBoundaryState {
 export class ErrorBoundary extends React.Component<ErrorBoundaryProps> {
   state: ErrorBoundaryState
 
-  static contextType = SuiContext
+  static contextType = ErrorContext
 
-  declare context: React.ContextType<typeof SuiContext>
+  declare context: React.ContextType<typeof ErrorContext>
 
   constructor(props: ErrorBoundaryProps) {
     super(props)

diff --git a/packages/saas-ui-core/src/error-boundary/error-provider.tsx b/packages/saas-ui-core/src/error-boundary/error-provider.tsx
@@ -9,14 +9,14 @@ export interface ErrorContextValue {
   onError?: (error: Error, errorInfo: React.ErrorInfo) => void
 }
 
-const context = React.createContext<ErrorContextValue>({})
+export const ErrorContext = React.createContext<ErrorContextValue>({})
 
 export const ErrorProvider = (props: ErrorProviderProps) => {
   const { children, onError } = props
 
   const value = React.useMemo(() => ({ onError }), [onError])
 
-  return <context.Provider value={value}>{children}</context.Provider>
+  return <ErrorContext.Provider value={value}>{children}</ErrorContext.Provider>
 }
 
-export const useErrorContext = () => React.useContext(context)
+export const useErrorContext = () => React.useContext(ErrorContext)
diff --git a/packages/saas-ui-core/src/index.ts b/packages/saas-ui-core/src/index.ts
@@ -1,9 +1,6 @@
 export { defaultSystem, defaultConfig } from '../../saas-ui-react/src/preset'
 export { createSystem } from '@chakra-ui/react'
 
-export { SuiProvider, useLink, useSui } from './provider'
-export type { SuiContext, SuiContextValue, SuiProviderProps } from './provider'
-
 export { ErrorBoundary } from './error-boundary'
 export type { ErrorBoundaryProps, ErrorBoundaryState } from './error-boundary'
 

diff --git a/packages/saas-ui-core/src/system/factory.ts b/packages/saas-ui-core/src/system/factory.ts
diff --git a/packages/saas-ui-react/src/components/button/button.recipe.ts b/packages/saas-ui-react/src/components/button/button.recipe.ts
@@ -44,7 +44,7 @@ export const buttonRecipe = defineRecipe({
         h: '7',
         minW: '8',
         textStyle: 'sm',
-        borderRadius: 'sm',
+        borderRadius: 'md',
         px: '3',
       },
       md: {

diff --git a/packages/saas-ui-react/src/components/persona/persona-primitive.tsx b/packages/saas-ui-react/src/components/persona/persona-primitive.tsx
@@ -5,16 +5,11 @@ import {
   type AvatarRootProps,
   HTMLChakraProps,
   type ImageProps,
-} from '@chakra-ui/react'
-
-import {
-  type HTMLSystemProps,
   SlotRecipeProps,
+  chakra,
   createSlotRecipeContext,
-  sui,
-} from '#system'
-
-import { dataAttr } from '../utils'
+} from '@chakra-ui/react'
+import { dataAttr } from '@saas-ui/core/utils'
 
 const {
   useStyles: usePersonaStyles,
@@ -97,7 +92,7 @@ export const PersonaRoot = withProvider<HTMLDivElement, PersonaRootProps>(
     const { outOfOffice, presence, ...rest } = props
 
     return (
-      <sui.div
+      <chakra.div
         ref={ref}
         {...rest}
         data-out-of-office={dataAttr(outOfOffice)}
@@ -171,14 +166,14 @@ export const PersonaAvatar = forwardRef<HTMLDivElement, PersonaAvatarProps>(
   },
 )
 
-export interface PersonaPresenceBadgeProps extends HTMLSystemProps<'span'> {}
+export interface PersonaPresenceBadgeProps extends HTMLChakraProps<'span'> {}
 
 export const PersonaPresenceBadge = withContext<
   HTMLSpanElement,
   PersonaPresenceBadgeProps
 >('span', 'presence')
 
-export interface PersonaDetailsProps extends HTMLSystemProps<'div'> {}
+export interface PersonaDetailsProps extends HTMLChakraProps<'div'> {}
 
 /**
  * Wrapper component for the labels.
@@ -190,7 +185,7 @@ export const PersonaDetails = withContext<HTMLDivElement, PersonaDetailsProps>(
   'details',
 )
 
-export interface PersonaLabelProps extends HTMLSystemProps<'span'> {}
+export interface PersonaLabelProps extends HTMLChakraProps<'span'> {}
 
 /**
  * The main label, usually a name.

diff --git a/packages/saas-ui-react/src/components/persona/persona.tsx b/packages/saas-ui-react/src/components/persona/persona.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import * as PersonaPrimitive from './namespace.tsx'
+import * as PersonaPrimitive from './namespace.ts'
 
 interface PersonaOptions {
   /**

diff --git a/packages/saas-ui-react/src/components/sidebar/namespace.ts b/packages/saas-ui-react/src/components/sidebar/namespace.ts
@@ -16,12 +16,12 @@ export {
   SidebarNavItem as NavItem,
   SidebarNavButton as NavButton,
   SidebarNavItemEndElement as NavItemEndElement,
-} from './sidebar.ts'
+} from './sidebar.tsx'
 
 export type {
   SidebarRootProps as RootProps,
   SidebarNavButtonProps as NavButtonProps,
   SidebarFlyoutTriggerProps as FlyoutTriggerProps,
   SidebarProviderProps as ProviderProps,
   SidebarTriggerProps as TriggerProps,
-} from './sidebar.ts'
+} from './sidebar.tsx'