@artsy/palette-mobile 11.0.18 → 11.0.20

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+# v11.0.20 (Mon May 01 2023)
+
+#### 🐛 Bug Fix
+
+- feat(old-button): Copy old Eigen button over to palette-mobile [#94](https://github.com/artsy/palette-mobile/pull/94) ([@damassi](https://github.com/damassi))
+
+#### Authors: 1
+
+- Christopher Pappas ([@damassi](https://github.com/damassi))
+
+---
+
+# v11.0.19 (Tue Apr 25 2023)
+
+#### 🐛 Bug Fix
+
+- build(deps): followup on rn upgrade [#92](https://github.com/artsy/palette-mobile/pull/92) ([@gkartalis](https://github.com/gkartalis))
+
+#### Authors: 1
+
+- George Kartalis ([@gkartalis](https://github.com/gkartalis))
+
+---
+
 # v11.0.18 (Tue Apr 25 2023)
 
 :tada: This release contains work from a new contributor! :tada:

package/dist/elements/Button/Button.d.ts

@@ -1,13 +1,12 @@
 /// <reference types="react" />
+import { TextVariant } from "@artsy/palette-tokens/dist/typography/v3";
 import { PressableProps } from "react-native";
 import { HapticFeedbackTypes } from "react-native-haptic-feedback";
 import { BoxProps } from "../Box";
-type ButtonSize = "small" | "large";
-type ButtonVariant = "fillDark" | "fillLight" | "fillGray" | "fillSuccess" | "outline" | "outlineGray" | "outlineLight" | "text";
 export interface ButtonProps extends BoxProps {
     children: React.ReactNode;
-    size?: ButtonSize;
-    variant?: ButtonVariant;
+    size?: "small" | "large";
+    variant?: "fillDark" | "fillLight" | "fillGray" | "fillSuccess" | "outline" | "outlineGray" | "outlineLight" | "text";
     onPress?: PressableProps["onPress"];
     icon?: React.ReactNode;
     iconPosition?: "left" | "left-start" | "right";
@@ -28,7 +27,14 @@ export interface ButtonProps extends BoxProps {
     /** Pass the longest text to the button for the button to keep longest text width */
     longestText?: string;
     /** Used only for tests and stories */
-    testOnly_pressed?: PressableProps["testOnly_pressed"];
+    testOnly_state?: DisplayState;
+    textVariant?: TextVariant;
 }
-export declare const Button: ({ children, disabled: disabledProp, haptic, icon, iconPosition, loading: loadingProp, block, longestText, onPress, size, variant, testOnly_pressed, testID, hitSlop, ...restProps }: ButtonProps) => JSX.Element;
-export {};
+declare enum DisplayState {
+    Enabled = "enabled",
+    Disabled = "disabled",
+    Loading = "loading",
+    Pressed = "pressed"
+}
+export declare const Button: React.FC<ButtonProps>;
+export { DisplayState as _test_DisplayState };

package/dist/elements/Button/Button.js

@@ -1,130 +1,304 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Button = void 0;
+exports._test_DisplayState = exports.Button = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const react_native_1 = require("react-native");
 const react_native_haptic_feedback_1 = __importDefault(require("react-native-haptic-feedback"));
-const react_native_reanimated_1 = __importStar(require("react-native-reanimated"));
-const colors_1 = require("./colors");
-const MeasuredView_1 = require("../../elements/MeasuredView");
+const react_spring_1 = require("react-spring");
+// @ts-ignore
+const renderprops_native_1 = require("react-spring/renderprops-native");
+const native_1 = __importDefault(require("styled-components/native"));
+const hooks_1 = require("../../utils/hooks");
 const Box_1 = require("../Box");
-const Flex_1 = require("../Flex");
+const Flex_1 = require("../Flex/Flex");
+const MeasuredView_1 = require("../MeasuredView");
 const Spacer_1 = require("../Spacer");
 const Spinner_1 = require("../Spinner");
-const Text_1 = require("../Text");
-const ANIMATION_DURATION = 150;
-const Button = ({ children, disabled: disabledProp, haptic, icon, iconPosition = "left", loading: loadingProp, block, longestText, onPress, size = "large", variant = "fillDark", testOnly_pressed, testID, hitSlop, ...restProps }) => {
-    const [disabled, setDisabled, disabledV] = useStateWithProp(!!disabledProp);
-    const [loading, setLoading, loadingV] = useStateWithProp(!!loadingProp);
-    const [pressed, setPressed, pressedV] = useStateWithProp(!!testOnly_pressed);
-    const pressAnimationProgress = (0, react_native_reanimated_1.useSharedValue)(0);
-    (0, react_native_reanimated_1.useAnimatedReaction)(() => pressedV.value, (pressedVal) => {
-        pressAnimationProgress.value = (0, react_native_reanimated_1.withTiming)(pressedVal, { duration: ANIMATION_DURATION });
-    });
-    const textStyle = (0, Text_1.useTextStyleForPalette)(size === "small" ? "xs" : "sm");
+const Text_1 = require("../Text/Text");
+const helpers_1 = require("../Text/helpers");
+var DisplayState;
+(function (DisplayState) {
+    DisplayState["Enabled"] = "enabled";
+    DisplayState["Disabled"] = "disabled";
+    DisplayState["Loading"] = "loading";
+    DisplayState["Pressed"] = "pressed";
+})(DisplayState || (DisplayState = {}));
+exports._test_DisplayState = DisplayState;
+const Button = ({ children, disabled, haptic, icon, iconPosition = "left", loading, longestText, onPress, size = "large", variant = "fillDark", testOnly_state, testID, textVariant, hitSlop, ...rest }) => {
+    const textVariantBySize = size === "small" ? "xs" : "sm";
+    const textStyle = (0, helpers_1.useTextStyleForPalette)(textVariant ?? textVariantBySize);
+    const [innerDisplayState, setInnerDisplayState] = (0, react_1.useState)(DisplayState.Enabled);
     const [longestTextMeasurements, setLongestTextMeasurements] = (0, react_1.useState)({
         width: 0,
         height: 0,
     });
-    const height = (() => {
+    const displayState = testOnly_state ?? // if we use the test prop, use that
+        (loading // if we have loading or disabled in props, they are used
+            ? DisplayState.Loading
+            : disabled
+                ? DisplayState.Disabled
+                : innerDisplayState); // otherwise use the inner state for pressed or enabled
+    const getSize = () => {
         switch (size) {
             case "small":
-                return 30;
+                return { height: 30, mx: "15px" };
             case "large":
-                return 50;
+                return { height: 50, mx: "30px" };
         }
-    })();
+    };
     const spinnerColor = variant === "text" ? "blue100" : "white100";
     const handlePress = (event) => {
         if (onPress === undefined || onPress === null) {
             return;
         }
-        if (disabled || loading) {
+        if (displayState === DisplayState.Loading || displayState === DisplayState.Disabled) {
             return;
         }
+        // Did someone tap really fast? Flick the highlighted state
+        if (displayState === DisplayState.Enabled) {
+            setInnerDisplayState(DisplayState.Pressed);
+            setTimeout(() => {
+                setInnerDisplayState(DisplayState.Enabled);
+            }, 0.3);
+        }
+        else {
+            // Was already selected
+            setInnerDisplayState(DisplayState.Enabled);
+        }
         if (haptic !== undefined) {
             react_native_haptic_feedback_1.default.trigger(haptic === true ? "impactLight" : haptic);
         }
         onPress(event);
     };
-    const colorsForVariantAndState = (0, colors_1.useColorsForVariantAndState)();
-    const containerColorsAnim = (0, react_native_reanimated_1.useAnimatedStyle)(() => {
-        const colors = colorsForVariantAndState[variant];
-        if (disabled) {
-            return {
-                backgroundColor: colors.disabled.bg,
-                borderColor: colors.disabled.border,
-            };
-        }
-        return {
-            backgroundColor: (0, react_native_reanimated_1.interpolateColor)(pressAnimationProgress.value, [0, 1], [colors.active.bg, colors.pressed.bg]),
-            borderColor: (0, react_native_reanimated_1.interpolateColor)(pressAnimationProgress.value, [0, 1], [colors.active.border, colors.pressed.border]),
-        };
-    });
-    const textAnim = (0, react_native_reanimated_1.useAnimatedStyle)(() => {
-        "worklet";
-        const colors = colorsForVariantAndState[variant];
-        if (loading) {
-            return { color: "rgba(0, 0, 0, 0)" };
-        }
-        return {
-            color: (0, react_native_reanimated_1.interpolateColor)(pressAnimationProgress.value, [0, 1], [colors.active.text, colors.pressed.text]),
-            textDecorationLine: pressAnimationProgress.value > 0 ? "underline" : "none",
-        };
-    });
-    return ((0, jsx_runtime_1.jsx)(react_native_1.Pressable, { disabled: disabled, onPressIn: () => {
-            if (loading) {
-                return;
-            }
-            setPressed(true);
-        }, onPressOut: () => {
-            if (loading) {
-                return;
-            }
-            setPressed(false);
-        }, onPress: handlePress, testID: testID, testOnly_pressed: testOnly_pressed, hitSlop: hitSlop, children: (0, jsx_runtime_1.jsx)(Flex_1.Flex, { flexDirection: "row", children: (0, jsx_runtime_1.jsx)(Flex_1.Flex, { ...restProps, height: height, width: block ? "100%" : undefined, borderRadius: 50, overflow: "hidden", children: (0, jsx_runtime_1.jsx)(AFlex, { borderWidth: 1, borderRadius: 50, overflow: "hidden", style: containerColorsAnim, children: (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { height: "100%", mx: "25px", flexDirection: "row", alignItems: "center", justifyContent: "center", children: [iconPosition === "left-start" && !!icon ? ((0, jsx_runtime_1.jsxs)(Box_1.Box, { position: "absolute", left: 0, children: [icon, (0, jsx_runtime_1.jsx)(Spacer_1.Spacer, { x: 0.5 })] })) : null, iconPosition === "left" && !!icon ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [icon, (0, jsx_runtime_1.jsx)(Spacer_1.Spacer, { x: 0.5 })] })) : null, (0, jsx_runtime_1.jsx)(AText, { style: [{ width: Math.ceil(longestTextMeasurements.width) }, textStyle, textAnim], textAlign: "center", children: children }), (0, jsx_runtime_1.jsx)(MeasuredView_1.MeasuredView, { setMeasuredState: setLongestTextMeasurements, children: (0, jsx_runtime_1.jsx)(Text_1.Text, { color: "red", style: textStyle, children: longestText ? longestText : children }) }), iconPosition === "right" && !!icon ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(Spacer_1.Spacer, { x: 0.5 }), icon] })) : null, loading ? ((0, jsx_runtime_1.jsx)(Box_1.Box, { position: "absolute", width: "100%", height: "100%", alignItems: "center", justifyContent: "center", children: (0, jsx_runtime_1.jsx)(Spinner_1.Spinner, { size: size, color: spinnerColor }) })) : null] }) }) }) }) }));
+    const containerSize = getSize();
+    const to = useStyleForVariantAndState(variant, testOnly_state ?? displayState);
+    return ((0, jsx_runtime_1.jsx)(renderprops_native_1.Spring, { native: true, to: to, config: react_spring_1.config.stiff, children: (springProps) => ((0, jsx_runtime_1.jsx)(react_native_1.Pressable, { hitSlop: hitSlop, testOnly_pressed: testOnly_state === DisplayState.Pressed, disabled: testOnly_state === DisplayState.Disabled || disabled, onPressIn: () => {
+                if (displayState === DisplayState.Loading) {
+                    return;
+                }
+                setInnerDisplayState(DisplayState.Pressed);
+            }, onPressOut: () => {
+                if (displayState === DisplayState.Loading) {
+                    return;
+                }
+                setInnerDisplayState(DisplayState.Enabled);
+            }, onPress: handlePress, testID: testID, children: (0, jsx_runtime_1.jsx)(Flex_1.Flex, { flexDirection: "row", children: (0, jsx_runtime_1.jsx)(AnimatedContainer, { ...rest, style: {
+                        backgroundColor: springProps.backgroundColor,
+                        borderColor: springProps.borderColor,
+                        height: containerSize.height,
+                    }, children: (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { mx: containerSize.mx, children: [(0, jsx_runtime_1.jsxs)(Flex_1.Flex, { height: "100%", flexDirection: "row", alignItems: "center", justifyContent: "center", children: [iconPosition === "left-start" && !!icon ? ((0, jsx_runtime_1.jsxs)(Box_1.Box, { position: "absolute", left: 0, children: [icon, (0, jsx_runtime_1.jsx)(Spacer_1.Spacer, { x: 0.5 })] })) : null, iconPosition === "left" && !!icon ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [icon, (0, jsx_runtime_1.jsx)(Spacer_1.Spacer, { x: 0.5 })] })) : null, !__TEST__ && ((0, jsx_runtime_1.jsx)(MeasuredView_1.MeasuredView, { setMeasuredState: setLongestTextMeasurements, children: (0, jsx_runtime_1.jsx)(Text_1.Text, { color: "red", style: textStyle, children: longestText ? longestText : children }) })), (0, jsx_runtime_1.jsx)(AnimatedText, { style: [
+                                            {
+                                                width: Math.ceil(longestTextMeasurements.width),
+                                                color: springProps.textColor,
+                                                textDecorationLine: springProps.textDecorationLine,
+                                            },
+                                            textStyle,
+                                        ], textAlign: "center", children: children }), iconPosition === "right" && !!icon ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(Spacer_1.Spacer, { x: 0.5 }), icon] })) : null] }), displayState === DisplayState.Loading ? ((0, jsx_runtime_1.jsx)(SpinnerContainer, { children: (0, jsx_runtime_1.jsx)(Spinner_1.Spinner, { size: size, color: spinnerColor }) })) : null] }) }) }) })) }));
 };
 exports.Button = Button;
-const AText = react_native_reanimated_1.default.createAnimatedComponent(Text_1.Text);
-const AFlex = react_native_reanimated_1.default.createAnimatedComponent(Flex_1.Flex);
-const useStateWithProp = (prop) => {
-    const [state, setState] = (0, react_1.useState)(!!prop);
-    (0, react_1.useEffect)(() => {
-        setState(!!prop);
-    }, [prop]);
-    const stateV = (0, react_native_reanimated_1.useDerivedValue)(() => {
-        "worklet";
-        if (!!state) {
-            return 1;
-        }
-        return 0;
-    }, [state]);
-    return [state, setState, stateV];
+const useStyleForVariantAndState = (variant, state) => {
+    const color = (0, hooks_1.useColor)();
+    const retval = {
+        textDecorationLine: "none",
+    };
+    if (state === DisplayState.Loading) {
+        retval.backgroundColor = variant === "text" ? color("black10") : color("blue100");
+        retval.borderColor = "rgba(0, 0, 0, 0)";
+        retval.borderWidth = 0;
+        retval.textColor = "rgba(0, 0, 0, 0)";
+        return retval;
+    }
+    switch (variant) {
+        case "fillDark":
+            retval.textColor = color("white100");
+            switch (state) {
+                case DisplayState.Enabled:
+                    retval.backgroundColor = color("black100");
+                    retval.borderColor = color("black100");
+                    break;
+                case DisplayState.Disabled:
+                    retval.backgroundColor = color("black30");
+                    retval.borderColor = color("black30");
+                    break;
+                case DisplayState.Pressed:
+                    retval.backgroundColor = color("blue100");
+                    retval.borderColor = color("blue100");
+                    retval.textDecorationLine = "underline";
+                    break;
+                default:
+                    assertNever(state);
+            }
+            break;
+        case "fillLight":
+            switch (state) {
+                case DisplayState.Enabled:
+                    retval.backgroundColor = color("white100");
+                    retval.borderColor = color("white100");
+                    retval.textColor = color("black100");
+                    break;
+                case DisplayState.Disabled:
+                    retval.backgroundColor = color("black30");
+                    retval.borderColor = color("black30");
+                    retval.textColor = color("white100");
+                    break;
+                case DisplayState.Pressed:
+                    retval.backgroundColor = color("blue100");
+                    retval.borderColor = color("blue100");
+                    retval.textColor = color("white100");
+                    retval.textDecorationLine = "underline";
+                    break;
+                default:
+                    assertNever(state);
+            }
+            break;
+        case "fillGray":
+            switch (state) {
+                case DisplayState.Enabled:
+                    retval.backgroundColor = color("black10");
+                    retval.borderColor = color("black10");
+                    retval.textColor = color("black100");
+                    break;
+                case DisplayState.Disabled:
+                    retval.backgroundColor = color("black30");
+                    retval.borderColor = color("black30");
+                    retval.textColor = color("white100");
+                    break;
+                case DisplayState.Pressed:
+                    retval.backgroundColor = color("blue100");
+                    retval.borderColor = color("blue100");
+                    retval.textColor = color("white100");
+                    retval.textDecorationLine = "underline";
+                    break;
+                default:
+                    assertNever(state);
+            }
+            break;
+        case "fillSuccess":
+            retval.textColor = color("white100");
+            switch (state) {
+                case DisplayState.Enabled:
+                    retval.backgroundColor = color("blue100");
+                    retval.borderColor = color("blue100");
+                    break;
+                case DisplayState.Disabled:
+                    retval.backgroundColor = color("blue100");
+                    retval.borderColor = color("blue100");
+                    break;
+                case DisplayState.Pressed:
+                    retval.backgroundColor = color("blue10");
+                    retval.borderColor = color("blue10");
+                    retval.textDecorationLine = "underline";
+                    break;
+                default:
+                    assertNever(state);
+            }
+            break;
+        case "outline":
+            switch (state) {
+                case DisplayState.Enabled:
+                    retval.backgroundColor = color("white100");
+                    retval.borderColor = color("black60");
+                    retval.textColor = color("black100");
+                    break;
+                case DisplayState.Disabled:
+                    retval.backgroundColor = color("white100");
+                    retval.borderColor = color("black30");
+                    retval.textColor = color("black30");
+                    break;
+                case DisplayState.Pressed:
+                    retval.backgroundColor = color("blue100");
+                    retval.borderColor = color("blue100");
+                    retval.textColor = color("white100");
+                    retval.textDecorationLine = "underline";
+                    break;
+                default:
+                    assertNever(state);
+            }
+            break;
+        case "outlineGray":
+            switch (state) {
+                case DisplayState.Enabled:
+                    retval.backgroundColor = color("white100");
+                    retval.borderColor = color("black30");
+                    retval.textColor = color("black100");
+                    break;
+                case DisplayState.Disabled:
+                    retval.backgroundColor = color("white100");
+                    retval.borderColor = color("black30");
+                    retval.textColor = color("black30");
+                    break;
+                case DisplayState.Pressed:
+                    retval.backgroundColor = color("blue100");
+                    retval.borderColor = color("blue100");
+                    retval.textColor = color("white100");
+                    retval.textDecorationLine = "underline";
+                    break;
+                default:
+                    assertNever(state);
+            }
+            break;
+        case "outlineLight":
+            switch (state) {
+                case DisplayState.Enabled:
+                    retval.backgroundColor = "rgba(0, 0, 0, 0)";
+                    retval.borderColor = color("white100");
+                    retval.textColor = color("white100");
+                    break;
+                case DisplayState.Disabled:
+                    retval.backgroundColor = "rgba(0, 0, 0, 0)";
+                    retval.borderColor = color("black30");
+                    retval.textColor = color("black30");
+                    break;
+                case DisplayState.Pressed:
+                    retval.backgroundColor = color("blue100");
+                    retval.borderColor = color("blue100");
+                    retval.textColor = color("white100");
+                    retval.textDecorationLine = "underline";
+                    break;
+                default:
+                    assertNever(state);
+            }
+            break;
+        case "text":
+            retval.backgroundColor = "rgba(0, 0, 0, 0)";
+            retval.borderColor = "rgba(0, 0, 0, 0)";
+            switch (state) {
+                case DisplayState.Enabled:
+                    retval.textColor = color("black100");
+                    break;
+                case DisplayState.Disabled:
+                    retval.textColor = color("black30");
+                    break;
+                case DisplayState.Pressed:
+                    retval.textColor = color("blue100");
+                    retval.textDecorationLine = "underline";
+                    break;
+                default:
+                    assertNever(state);
+            }
+            break;
+        default:
+            assertNever(variant);
+    }
+    return retval;
 };
+const Container = (0, native_1.default)(Box_1.Box) `
+  position: relative;
+  border-width: 1px;
+  border-radius: 50px;
+  width: ${(p) => (p.block ? "100%" : "auto")};
+  overflow: hidden;
+`;
+const SpinnerContainer = (0, native_1.default)(Box_1.Box) `
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  align-items: center;
+  justify-content: center;
+`;
+const AnimatedContainer = (0, renderprops_native_1.animated)(Container);
+const AnimatedText = (0, renderprops_native_1.animated)(Text_1.Text);

package/dist/elements/Button/FollowButton.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { ButtonProps } from "./Button";
+import { ButtonProps } from ".";
 type FollowButtonProps = Omit<ButtonProps, "variant" | "size" | "longestText" | "icon" | "children"> & {
     isFollowed: boolean;
 };

package/dist/elements/Button/FollowButton.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FollowButton = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
-const Button_1 = require("./Button");
-const svgs_1 = require("../../svgs");
+const _1 = require(".");
+const CheckIcon_1 = require("../../svgs/CheckIcon");
 const FollowButton = ({ isFollowed, ...restProps }) => {
-    return ((0, jsx_runtime_1.jsx)(Button_1.Button, { variant: isFollowed ? "outline" : "outlineGray", size: "small", longestText: "Following", icon: isFollowed && (0, jsx_runtime_1.jsx)(svgs_1.CheckIcon, { fill: "black60", width: "16px", height: "16px" }), ...restProps, children: isFollowed ? "Following" : "Follow" }));
+    return ((0, jsx_runtime_1.jsx)(_1.Button, { variant: isFollowed ? "outline" : "outlineGray", size: "small", longestText: "Following", icon: isFollowed && (0, jsx_runtime_1.jsx)(CheckIcon_1.CheckIcon, { fill: "black60", width: "16px", height: "16px" }), ...restProps, children: isFollowed ? "Following" : "Follow" }));
 };
 exports.FollowButton = FollowButton;

package/dist/elements/Button/LinkButton.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LinkButton = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
+const __1 = require("..");
 const Text_1 = require("../Text");
-const Touchable_1 = require("../Touchable");
-const LinkButton = (props) => ((0, jsx_runtime_1.jsx)(Touchable_1.Touchable, { onPress: props.onPress, children: (0, jsx_runtime_1.jsx)(Text_1.Text, { underline: true, ...props }) }));
+const LinkButton = (props) => ((0, jsx_runtime_1.jsx)(__1.Touchable, { onPress: props.onPress, children: (0, jsx_runtime_1.jsx)(Text_1.Text, { underline: true, ...props }) }));
 exports.LinkButton = LinkButton;

package/dist/elements/Button/colors.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useColorsForVariantAndState = void 0;
-const hooks_1 = require("../../utils/hooks");
+const useColor_1 = require("../../utils/hooks/useColor");
 const useColorsForVariantAndState = () => {
-    const color = (0, hooks_1.useColor)();
+    const color = (0, useColor_1.useColor)();
     return {
         fillDark: {
             disabled: { bg: color("black30"), border: color("black30"), text: color("onPrimaryHigh") },

package/dist/elements/Button/index.d.ts

@@ -1,4 +1,4 @@
 export * from "./Button";
 export * from "./CTAButton";
-export * from "./FollowButton";
 export * from "./LinkButton";
+export * from "./FollowButton";

package/dist/elements/Button/index.js

@@ -16,5 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Button"), exports);
 __exportStar(require("./CTAButton"), exports);
-__exportStar(require("./FollowButton"), exports);
 __exportStar(require("./LinkButton"), exports);
+__exportStar(require("./FollowButton"), exports);

package/dist/elements/ButtonNew/Button.d.ts

@@ -0,0 +1,34 @@
+/// <reference types="react" />
+import { PressableProps } from "react-native";
+import { HapticFeedbackTypes } from "react-native-haptic-feedback";
+import { BoxProps } from "../Box";
+type ButtonSize = "small" | "large";
+type ButtonVariant = "fillDark" | "fillLight" | "fillGray" | "fillSuccess" | "outline" | "outlineGray" | "outlineLight" | "text";
+export interface ButtonProps extends BoxProps {
+    children: React.ReactNode;
+    size?: ButtonSize;
+    variant?: ButtonVariant;
+    onPress?: PressableProps["onPress"];
+    icon?: React.ReactNode;
+    iconPosition?: "left" | "left-start" | "right";
+    /**
+     * `haptic` can be used like:
+     * <Button haptic />
+     * or
+     * <Button haptic="impactHeavy" />
+     * to add haptic feedback on the button.
+     */
+    haptic?: HapticFeedbackTypes | true;
+    /** Displays a loader in the button */
+    loading?: boolean;
+    /** Disabled interactions */
+    disabled?: boolean;
+    /** Makes button full width */
+    block?: boolean;
+    /** Pass the longest text to the button for the button to keep longest text width */
+    longestText?: string;
+    /** Used only for tests and stories */
+    testOnly_pressed?: PressableProps["testOnly_pressed"];
+}
+export declare const Button: ({ children, disabled: disabledProp, haptic, icon, iconPosition, loading: loadingProp, block, longestText, onPress, size, variant, testOnly_pressed, testID, hitSlop, ...restProps }: ButtonProps) => JSX.Element;
+export {};

package/dist/elements/ButtonNew/Button.js

@@ -0,0 +1,130 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Button = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("react");
+const react_native_1 = require("react-native");
+const react_native_haptic_feedback_1 = __importDefault(require("react-native-haptic-feedback"));
+const react_native_reanimated_1 = __importStar(require("react-native-reanimated"));
+const colors_1 = require("./colors");
+const MeasuredView_1 = require("../../elements/MeasuredView");
+const Box_1 = require("../Box");
+const Flex_1 = require("../Flex");
+const Spacer_1 = require("../Spacer");
+const Spinner_1 = require("../Spinner");
+const Text_1 = require("../Text");
+const ANIMATION_DURATION = 150;
+const Button = ({ children, disabled: disabledProp, haptic, icon, iconPosition = "left", loading: loadingProp, block, longestText, onPress, size = "large", variant = "fillDark", testOnly_pressed, testID, hitSlop, ...restProps }) => {
+    const [disabled, setDisabled, disabledV] = useStateWithProp(!!disabledProp);
+    const [loading, setLoading, loadingV] = useStateWithProp(!!loadingProp);
+    const [pressed, setPressed, pressedV] = useStateWithProp(!!testOnly_pressed);
+    const pressAnimationProgress = (0, react_native_reanimated_1.useSharedValue)(0);
+    (0, react_native_reanimated_1.useAnimatedReaction)(() => pressedV.value, (pressedVal) => {
+        pressAnimationProgress.value = (0, react_native_reanimated_1.withTiming)(pressedVal, { duration: ANIMATION_DURATION });
+    });
+    const textStyle = (0, Text_1.useTextStyleForPalette)(size === "small" ? "xs" : "sm");
+    const [longestTextMeasurements, setLongestTextMeasurements] = (0, react_1.useState)({
+        width: 0,
+        height: 0,
+    });
+    const height = (() => {
+        switch (size) {
+            case "small":
+                return 30;
+            case "large":
+                return 50;
+        }
+    })();
+    const spinnerColor = variant === "text" ? "blue100" : "white100";
+    const handlePress = (event) => {
+        if (onPress === undefined || onPress === null) {
+            return;
+        }
+        if (disabled || loading) {
+            return;
+        }
+        if (haptic !== undefined) {
+            react_native_haptic_feedback_1.default.trigger(haptic === true ? "impactLight" : haptic);
+        }
+        onPress(event);
+    };
+    const colorsForVariantAndState = (0, colors_1.useColorsForVariantAndState)();
+    const containerColorsAnim = (0, react_native_reanimated_1.useAnimatedStyle)(() => {
+        const colors = colorsForVariantAndState[variant];
+        if (disabled) {
+            return {
+                backgroundColor: colors.disabled.bg,
+                borderColor: colors.disabled.border,
+            };
+        }
+        return {
+            backgroundColor: (0, react_native_reanimated_1.interpolateColor)(pressAnimationProgress.value, [0, 1], [colors.active.bg, colors.pressed.bg]),
+            borderColor: (0, react_native_reanimated_1.interpolateColor)(pressAnimationProgress.value, [0, 1], [colors.active.border, colors.pressed.border]),
+        };
+    });
+    const textAnim = (0, react_native_reanimated_1.useAnimatedStyle)(() => {
+        "worklet";
+        const colors = colorsForVariantAndState[variant];
+        if (loading) {
+            return { color: "rgba(0, 0, 0, 0)" };
+        }
+        return {
+            color: (0, react_native_reanimated_1.interpolateColor)(pressAnimationProgress.value, [0, 1], [colors.active.text, colors.pressed.text]),
+            textDecorationLine: pressAnimationProgress.value > 0 ? "underline" : "none",
+        };
+    });
+    return ((0, jsx_runtime_1.jsx)(react_native_1.Pressable, { disabled: disabled, onPressIn: () => {
+            if (loading) {
+                return;
+            }
+            setPressed(true);
+        }, onPressOut: () => {
+            if (loading) {
+                return;
+            }
+            setPressed(false);
+        }, onPress: handlePress, testID: testID, testOnly_pressed: testOnly_pressed, hitSlop: hitSlop, children: (0, jsx_runtime_1.jsx)(Flex_1.Flex, { flexDirection: "row", children: (0, jsx_runtime_1.jsx)(Flex_1.Flex, { ...restProps, height: height, width: block ? "100%" : undefined, borderRadius: 50, overflow: "hidden", children: (0, jsx_runtime_1.jsx)(AFlex, { borderWidth: 1, borderRadius: 50, overflow: "hidden", style: containerColorsAnim, children: (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { height: "100%", mx: "25px", flexDirection: "row", alignItems: "center", justifyContent: "center", children: [iconPosition === "left-start" && !!icon ? ((0, jsx_runtime_1.jsxs)(Box_1.Box, { position: "absolute", left: 0, children: [icon, (0, jsx_runtime_1.jsx)(Spacer_1.Spacer, { x: 0.5 })] })) : null, iconPosition === "left" && !!icon ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [icon, (0, jsx_runtime_1.jsx)(Spacer_1.Spacer, { x: 0.5 })] })) : null, (0, jsx_runtime_1.jsx)(AText, { style: [{ width: Math.ceil(longestTextMeasurements.width) }, textStyle, textAnim], textAlign: "center", children: children }), (0, jsx_runtime_1.jsx)(MeasuredView_1.MeasuredView, { setMeasuredState: setLongestTextMeasurements, children: (0, jsx_runtime_1.jsx)(Text_1.Text, { color: "red", style: textStyle, children: longestText ? longestText : children }) }), iconPosition === "right" && !!icon ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(Spacer_1.Spacer, { x: 0.5 }), icon] })) : null, loading ? ((0, jsx_runtime_1.jsx)(Box_1.Box, { position: "absolute", width: "100%", height: "100%", alignItems: "center", justifyContent: "center", children: (0, jsx_runtime_1.jsx)(Spinner_1.Spinner, { size: size, color: spinnerColor }) })) : null] }) }) }) }) }));
+};
+exports.Button = Button;
+const AText = react_native_reanimated_1.default.createAnimatedComponent(Text_1.Text);
+const AFlex = react_native_reanimated_1.default.createAnimatedComponent(Flex_1.Flex);
+const useStateWithProp = (prop) => {
+    const [state, setState] = (0, react_1.useState)(!!prop);
+    (0, react_1.useEffect)(() => {
+        setState(!!prop);
+    }, [prop]);
+    const stateV = (0, react_native_reanimated_1.useDerivedValue)(() => {
+        "worklet";
+        if (!!state) {
+            return 1;
+        }
+        return 0;
+    }, [state]);
+    return [state, setState, stateV];
+};

package/dist/elements/ButtonNew/CTAButton.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+import { ButtonProps } from "./Button";
+export declare const CTAButton: (props: ButtonProps) => JSX.Element;

package/dist/elements/ButtonNew/CTAButton.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CTAButton = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const Button_1 = require("./Button");
+const CTAButton = (props) => (0, jsx_runtime_1.jsx)(Button_1.Button, { block: true, haptic: true, ...props });
+exports.CTAButton = CTAButton;

package/dist/elements/ButtonNew/FollowButton.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+import { ButtonProps } from "./Button";
+type FollowButtonProps = Omit<ButtonProps, "variant" | "size" | "longestText" | "icon" | "children"> & {
+    isFollowed: boolean;
+};
+export declare const FollowButton: ({ isFollowed, ...restProps }: FollowButtonProps) => JSX.Element;
+export {};

package/dist/elements/ButtonNew/FollowButton.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FollowButton = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const Button_1 = require("./Button");
+const svgs_1 = require("../../svgs");
+const FollowButton = ({ isFollowed, ...restProps }) => {
+    return ((0, jsx_runtime_1.jsx)(Button_1.Button, { variant: isFollowed ? "outline" : "outlineGray", size: "small", longestText: "Following", icon: isFollowed && (0, jsx_runtime_1.jsx)(svgs_1.CheckIcon, { fill: "black60", width: "16px", height: "16px" }), ...restProps, children: isFollowed ? "Following" : "Follow" }));
+};
+exports.FollowButton = FollowButton;

package/dist/elements/ButtonNew/LinkButton.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+import { TextProps } from "../Text";
+export declare const LinkButton: (props: TextProps) => JSX.Element;

package/dist/elements/ButtonNew/LinkButton.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LinkButton = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const Text_1 = require("../Text");
+const Touchable_1 = require("../Touchable");
+const LinkButton = (props) => ((0, jsx_runtime_1.jsx)(Touchable_1.Touchable, { onPress: props.onPress, children: (0, jsx_runtime_1.jsx)(Text_1.Text, { underline: true, ...props }) }));
+exports.LinkButton = LinkButton;

package/dist/elements/ButtonNew/colors.d.ts

@@ -0,0 +1,9 @@
+import { ButtonProps } from "./Button";
+import { NoUndefined } from "../../utils/types";
+type State = "disabled" | "pressed" | "active";
+export declare const useColorsForVariantAndState: () => Record<NoUndefined<ButtonProps["variant"]>, Record<State, {
+    bg: string;
+    border: string;
+    text: string;
+}>>;
+export {};

package/dist/elements/ButtonNew/colors.js

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useColorsForVariantAndState = void 0;
+const hooks_1 = require("../../utils/hooks");
+const useColorsForVariantAndState = () => {
+    const color = (0, hooks_1.useColor)();
+    return {
+        fillDark: {
+            disabled: { bg: color("black30"), border: color("black30"), text: color("onPrimaryHigh") },
+            pressed: { bg: color("blue100"), border: color("blue100"), text: color("onPrimaryHigh") },
+            active: { bg: color("primary"), border: color("primary"), text: color("onPrimaryHigh") },
+        },
+        fillLight: {
+            disabled: { bg: color("black30"), border: color("black30"), text: color("onPrimaryHigh") },
+            pressed: { bg: color("blue100"), border: color("blue100"), text: color("onPrimaryHigh") },
+            active: {
+                bg: color("white100"),
+                border: color("white100"),
+                text: color("black100"),
+            },
+        },
+        fillGray: {
+            disabled: { bg: color("black30"), border: color("black30"), text: color("white100") },
+            pressed: { bg: color("blue100"), border: color("blue100"), text: color("white100") },
+            active: { bg: color("black10"), border: color("black10"), text: color("black100") },
+        },
+        fillSuccess: {
+            disabled: { bg: color("blue100"), border: color("blue100"), text: color("white100") },
+            pressed: { bg: color("blue100"), border: color("blue100"), text: color("white100") },
+            active: { bg: color("blue10"), border: color("blue10"), text: color("white100") },
+        },
+        outline: {
+            disabled: {
+                bg: color("background"),
+                border: color("onBackgroundLow"),
+                text: color("onBackgroundLow"),
+            },
+            pressed: { bg: color("blue100"), border: color("blue100"), text: color("white100") },
+            active: {
+                bg: color("background"),
+                border: color("onBackgroundMedium"),
+                text: color("onBackgroundHigh"),
+            },
+        },
+        outlineGray: {
+            disabled: {
+                bg: color("white100"),
+                border: color("black30"),
+                text: color("black30"),
+            },
+            pressed: { bg: color("blue100"), border: color("blue100"), text: color("white100") },
+            active: {
+                bg: color("white100"),
+                border: color("black30"),
+                text: color("black100"),
+            },
+        },
+        outlineLight: {
+            disabled: {
+                bg: "rgba(0, 0, 0, 0)",
+                border: color("black30"),
+                text: color("black30"),
+            },
+            pressed: { bg: color("blue100"), border: color("blue100"), text: color("white100") },
+            active: {
+                bg: "rgba(0, 0, 0, 0)",
+                border: color("white100"),
+                text: color("white100"),
+            },
+        },
+        text: {
+            disabled: { bg: "rgba(0, 0, 0, 0)", border: "rgba(0, 0, 0, 0)", text: color("black30") },
+            pressed: { bg: color("black10"), border: color("black10"), text: color("blue100") },
+            active: { bg: "rgba(0, 0, 0, 0)", border: "rgba(0, 0, 0, 0)", text: color("black100") },
+        },
+    };
+};
+exports.useColorsForVariantAndState = useColorsForVariantAndState;

package/dist/elements/ButtonNew/index.d.ts

@@ -0,0 +1,4 @@
+export * from "./Button";
+export * from "./CTAButton";
+export * from "./FollowButton";
+export * from "./LinkButton";

package/dist/elements/ButtonNew/index.js

@@ -0,0 +1,20 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./Button"), exports);
+__exportStar(require("./CTAButton"), exports);
+__exportStar(require("./FollowButton"), exports);
+__exportStar(require("./LinkButton"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@artsy/palette-mobile",
-  "version": "11.0.18",
+  "version": "11.0.20",
   "description": "Artsy's design system for React Native",
   "scripts": {
     "android": "react-native run-android",
@@ -24,7 +24,7 @@
     "setup:artsy": "./scripts/download-fonts",
     "start:reset-cache": "react-native start --reset-cache",
     "start": "react-native start",
-    "../../storybook-watcher": "sb-rn-watcher",
+    "storybook-watcher": "sb-rn-watcher",
     "test": "jest",
     "type-check": "tsc --noEmit"
   },
@@ -39,6 +39,7 @@
     "events": "^3.3.0",
     "lodash": "^4.17.21",
     "react-nanny": "^2.15.0",
+    "react-spring": "8.0.23",
     "styled-system": "^5.1.5"
   },
   "peerDependenciesComments": [