@korsolutions/ui 0.0.42 → 0.0.44

package/src/primitives/button/button-root.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { Pressable, type PressableProps, type StyleProp, type ViewStyle } from "react-native";
+import { Pressable, type CursorValue, type PressableProps, type StyleProp, type ViewStyle } from "react-native";
 import { ButtonPrimitiveContext } from "./button-context";
 import type { ButtonState, ButtonStyles } from "./types";
 
@@ -11,8 +11,6 @@ export interface ButtonPrimitiveRootProps extends PressableProps {
 
   style?: StyleProp<ViewStyle>;
   styles?: ButtonStyles;
-
-  render?: (props: this) => React.ReactElement;
 }
 
 const calculateState = (props: ButtonPrimitiveRootProps, isHovered: boolean): ButtonState => {
@@ -28,6 +26,17 @@ const calculateState = (props: ButtonPrimitiveRootProps, isHovered: boolean): Bu
   return "default";
 };
 
+const cursorValue = (state: ButtonState): CursorValue => {
+  switch (state) {
+    case "disabled":
+      return "not-allowed" as CursorValue;
+    case "loading":
+      return "wait" as CursorValue;
+    default:
+      return "pointer";
+  }
+};
+
 export function ButtonRoot(props: ButtonPrimitiveRootProps) {
   const [isHovered, setIsHovered] = useState(false);
 
@@ -35,10 +44,29 @@ export function ButtonRoot(props: ButtonPrimitiveRootProps) {
 
   const calculatedStyle = [props.styles?.root?.default, props.styles?.root?.[state], props.style];
 
-  const Container = props.render ?? Pressable;
+  const handlePress: PressableProps["onPress"] = (event) => {
+    if (props.isDisabled || props.isLoading) {
+      event.preventDefault();
+      return;
+    }
+    props.onPress?.(event);
+  };
+
   return (
     <ButtonPrimitiveContext.Provider value={{ disabled: props.isDisabled, state, styles: props.styles }}>
-      <Container {...props} onHoverIn={() => setIsHovered(true)} onHoverOut={() => setIsHovered(false)} style={calculatedStyle} />
+      <Pressable
+        {...props}
+        onPress={handlePress}
+        onHoverIn={() => setIsHovered(true)}
+        onHoverOut={() => setIsHovered(false)}
+        disabled={props.isDisabled}
+        style={[
+          calculatedStyle,
+          {
+            cursor: cursorValue(state),
+          },
+        ]}
+      />
     </ButtonPrimitiveContext.Provider>
   );
 }

package/src/primitives/calendar/calendar-day.tsx

@@ -17,7 +17,7 @@ const calculateState = (
   selected: Date | null | undefined,
   isCurrentMonth: boolean,
   isDisabled: boolean,
-  isHovered: boolean
+  isHovered: boolean,
 ): CalendarDayState => {
   if (isDisabled) return "disabled";
   if (selected && isDateSameDay(date, selected)) return "selected";
@@ -42,7 +42,6 @@ export function CalendarDay(props: CalendarDayProps) {
   const state = calculateState(props.date, calendar.value, isCurrentMonth, isDisabled, isHovered);
 
   const handlePress = () => {
-    console.log("Day pressed:", isDisabled, calendar.onChange);
     if (isDisabled || !calendar.onChange) return;
     calendar.onChange(props.date);
   };

package/src/primitives/empty/empty-description.tsx

@@ -11,6 +11,6 @@ export interface EmptyDescriptionProps {
 export function EmptyDescription(props: EmptyDescriptionProps) {
   const empty = useEmpty();
   const composedStyles = [empty.styles?.description, props.style];
-  const Component = props.render ?? Text;
-  return <Component {...props} style={composedStyles} />;
+
+  return <Text {...props} style={composedStyles} />;
 }

package/src/primitives/popover/popover-content.tsx

@@ -1,4 +1,5 @@
 import { useRelativePosition } from "@/hooks/use-relative-position";
+import { useSafeAreaInsets } from "@/safe-area";
 import React from "react";
 import { type StyleProp, View, type ViewStyle } from "react-native";
 import { usePopover } from "./context";
@@ -13,6 +14,7 @@ export interface PopoverContentProps {
 
 export function PopoverContent(props: PopoverContentProps) {
   const popover = usePopover();
+  const insets = useSafeAreaInsets();
 
   const positionStyle = useRelativePosition({
     align: "start",
@@ -22,6 +24,7 @@ export function PopoverContent(props: PopoverContentProps) {
     alignOffset: 0,
     side: "bottom",
     sideOffset: 0,
+    insets,
   });
 
   const composedStyle = [positionStyle, popover.styles?.content, props.style];