@swan-io/lake 2.7.9 → 2.7.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swan-io/lake",
-  "version": "2.7.9",
+  "version": "2.7.11",
   "engines": {
     "node": ">=18.0.0",
     "yarn": "^1.22.0"

package/src/components/FixedListViewCells.js

@@ -28,6 +28,9 @@ const styles = StyleSheet.create({
         flexDirection: "row",
         alignItems: "center",
     },
+    disabledCellHeader: {
+        cursor: "text",
+    },
     icon: {
         alignSelf: "stretch",
         alignItems: "center",
@@ -92,13 +95,14 @@ const styles = StyleSheet.create({
 });
 export const SimpleHeaderCell = ({ text, sort, justifyContent = "flex-start", onPress, }) => {
     const sortActive = isNotNullish(sort) && isNotNullish(onPress);
+    const disabled = isNullish(onPress);
     return (_jsx(Pressable, { onPress: () => {
             onPress?.(match(sort)
                 .returnType()
                 .with("Desc", () => "Asc")
                 .with("Asc", () => "Desc")
                 .otherwise(() => "Desc"));
-        }, disabled: isNullish(onPress), style: styles.cellContainer, children: ({ hovered }) => (_jsx(View, { style: [styles.cell, { justifyContent }], children: _jsxs(View, { children: [_jsxs(Box, { direction: "row", alignItems: "center", children: [_jsx(LakeText, { numberOfLines: 1, variant: "medium", color: sortActive ? colors.current[500] : colors.gray[900], style: {
+        }, disabled: disabled, style: [styles.cellContainer, disabled && styles.disabledCellHeader], role: "columnheader", children: ({ hovered }) => (_jsx(View, { style: [styles.cell, { justifyContent }], children: _jsxs(View, { children: [_jsxs(Box, { direction: "row", alignItems: "center", children: [_jsx(LakeText, { numberOfLines: 1, variant: "medium", color: sortActive ? colors.current[500] : colors.gray[900], style: {
                                     textAlign: match(justifyContent)
                                         .with("flex-start", () => "left")
                                         .with("center", () => "center")

package/src/components/LakeTextInput.js

@@ -21,12 +21,12 @@ const styles = StyleSheet.create({
         flexGrow: 1,
         flexDirection: "row",
         alignItems: "stretch",
+        width: "100%",
     },
     contents: {
         flexGrow: 1,
         flexShrink: 1,
         flexDirection: "row",
-        width: "100%",
         display: "flex",
         alignItems: "center",
         justifyContent: "center",

package/src/components/Link.js

@@ -5,7 +5,7 @@ import { isNotNullish } from "../utils/nullish";
 import { PressableText } from "./Pressable";
 export const Link = memo(forwardRef(({ role = "link", children, disabled = false, onPress, replace = false, download = false, style, target, to, ariaCurrentValue = "page", tabIndex, ...props }, forwardedRef) => {
     const { active, onClick } = useLinkProps({ href: to, replace, target });
-    return (_jsx(PressableText, { ...props, role: role, "aria-disabled": disabled, tabIndex: isNotNullish(tabIndex) ? tabIndex : disabled ? -1 : 0, "aria-current": active ? ariaCurrentValue : undefined, href: to, onPress: (event) => {
+    return (_jsx(PressableText, { ...props, role: role, disabled: disabled, "aria-disabled": disabled, tabIndex: isNotNullish(tabIndex) ? tabIndex : disabled ? -1 : 0, "aria-current": active ? ariaCurrentValue : undefined, href: !disabled ? to : undefined, onPress: (event) => {
             const e = event;
             if (disabled) {
                 e.preventDefault();

package/src/components/Pressable.js

@@ -2,6 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 // https://github.com/necolas/react-native-web/blob/0.19.1/packages/react-native-web/src/exports/Pressable/index.js
 import { forwardRef, memo, useCallback, useMemo, useRef, } from "react";
 import { StyleSheet, Text, TextInput, View, } from "react-native";
+import { match } from "ts-pattern";
 import { useForceableState } from "../hooks/useForceableState";
 import { useHover } from "../hooks/useHover";
 import { useMergeRefs } from "../hooks/useMergeRefs";
@@ -12,7 +13,7 @@ const styles = StyleSheet.create({
         touchAction: "manipulation",
     },
     disabled: {
-        pointerEvents: "none",
+        cursor: "not-allowed",
     },
 });
 const getPressable = (
@@ -89,7 +90,10 @@ Component, config = {}) => {
             _tabIndex = disabled ? -1 : 0;
         }
         return (_jsx(Component, { ...rest, ...pressEventHandlers, "aria-disabled": disabled, onBlur: blurHandler, onContextmenu: contextMenuHandler, onFocus: focusHandler, onKeyDown: keyDownHandler, ref: setRef, style: [
-                !disabled && applyPressStyle ? styles.active : styles.disabled,
+                match({ disabled, applyPressStyle })
+                    .with({ disabled: false, applyPressStyle: true }, () => styles.active)
+                    .with({ disabled: true }, () => styles.disabled)
+                    .otherwise(() => null),
                 typeof style === "function" ? style(interactionState) : style,
             ], tabIndex: _tabIndex, children: typeof children === "function" ? children(interactionState) : children }));
     });