ag-common 0.0.771 → 0.0.772

package/dist/ui/components/Confirm/Modal.js

@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfirmModal = void 0;
 const styled_1 = __importDefault(require("@emotion/styled"));
 const react_1 = __importDefault(require("react"));
-const Button_1 = require("../Button");
 const FlexColumn_1 = require("../FlexColumn");
 const FlexRow_1 = require("../FlexRow");
 const Modal_1 = require("../Modal/Modal");
+const button_1 = require("../shadcn/button");
 const Base = styled_1.default.div `
   width: 95vw;
   max-width: 30rem;
@@ -47,7 +47,7 @@ const ConfirmModal = ({ onSubmit, bottomText, topText, okText = 'OK', cancelText
                 topText && react_1.default.createElement(TopText, null, topText),
                 react_1.default.createElement(BottomText, null, bottomText),
                 react_1.default.createElement(Bottom, { noGrow: true },
-                    react_1.default.createElement(Button_1.Button, { onClick: () => onSubmit(true) }, okText),
-                    react_1.default.createElement(Button_1.Button, { invert: true, onClick: () => onSubmit(false) }, cancelText))))));
+                    react_1.default.createElement(button_1.Button, { onClick: () => onSubmit(true) }, okText),
+                    react_1.default.createElement(button_1.Button, { variant: "outline", onClick: () => onSubmit(false) }, cancelText))))));
 };
 exports.ConfirmModal = ConfirmModal;

package/dist/ui/components/Prompt/Modal.js

@@ -40,10 +40,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PromptModal = void 0;
 const styled_1 = __importDefault(require("@emotion/styled"));
 const react_1 = __importStar(require("react"));
-const Button_1 = require("../Button");
 const FlexColumn_1 = require("../FlexColumn");
 const FlexRow_1 = require("../FlexRow");
 const Modal_1 = require("../Modal/Modal");
+const button_1 = require("../shadcn/button");
 const TextEdit_1 = require("../TextEdit");
 const Base = styled_1.default.div `
   width: 95vw;
@@ -105,7 +105,7 @@ const PromptModal = ({ root, wrapper, res, bottomText, topText, okText = 'OK', c
                         }
                     }, placeholder: placeholder, defaultEditing: { focus: true }, singleLine: true, noGrow: true, allowUndo: false }),
                 react_1.default.createElement(Bottom, { noGrow: true },
-                    react_1.default.createElement(Button_1.Button, { onClick: () => ret(text) }, okText),
-                    react_1.default.createElement(Button_1.Button, { invert: true, onClick: () => ret(undefined) }, cancelText))))));
+                    react_1.default.createElement(button_1.Button, { onClick: () => ret(text) }, okText),
+                    react_1.default.createElement(button_1.Button, { variant: "outline", onClick: () => ret(undefined) }, cancelText))))));
 };
 exports.PromptModal = PromptModal;

package/dist/ui/components/shadcn/button.d.ts

@@ -4,8 +4,6 @@ declare const buttonVariants: (props?: ({
     variant?: "default" | "link" | "outline" | "destructive" | "secondary" | "ghost" | null | undefined;
     size?: "default" | "icon" | "sm" | "lg" | null | undefined;
 } & import("class-variance-authority/dist/types").ClassProp) | undefined) => string;
-export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement>, VariantProps<typeof buttonVariants> {
-    asChild?: boolean;
-}
-declare const Button: React.ForwardRefExoticComponent<ButtonProps & React.RefAttributes<HTMLButtonElement>>;
+export type ButtonProps = React.ButtonHTMLAttributes<HTMLButtonElement> & VariantProps<typeof buttonVariants>;
+declare const Button: ({ className, variant, size, ...props }: ButtonProps) => React.JSX.Element;
 export { Button, buttonVariants };

package/dist/ui/components/shadcn/button.js

@@ -45,7 +45,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buttonVariants = exports.Button = void 0;
-const react_slot_1 = require("@radix-ui/react-slot");
 const class_variance_authority_1 = require("class-variance-authority");
 const React = __importStar(require("react"));
 const utils_1 = require("../../helpers/utils");
@@ -72,10 +71,8 @@ const buttonVariants = (0, class_variance_authority_1.cva)('!cursor-pointer inli
     },
 });
 exports.buttonVariants = buttonVariants;
-const Button = React.forwardRef((_a, ref) => {
-    var { className, variant, size, asChild = false } = _a, props = __rest(_a, ["className", "variant", "size", "asChild"]);
-    const Comp = asChild ? react_slot_1.Slot : 'button';
-    return (React.createElement(Comp, Object.assign({ className: (0, utils_1.cn)(buttonVariants({ variant, size, className })), ref: ref }, props)));
-});
+const Button = (_a) => {
+    var { className, variant, size } = _a, props = __rest(_a, ["className", "variant", "size"]);
+    return (React.createElement("button", Object.assign({ className: (0, utils_1.cn)(buttonVariants({ variant, size, className })) }, props)));
+};
 exports.Button = Button;
-Button.displayName = 'Button';

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.771",
+  "version": "0.0.772",
   "name": "ag-common",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/dist/ui/components/Button/index.d.ts

@@ -1,14 +0,0 @@
-import type { JSX, KeyboardEventHandler, MouseEventHandler } from 'react';
-export declare const ButtonBase: import("@emotion/react").SerializedStyles;
-export interface IButton {
-    title?: string;
-    invert?: boolean;
-    disabled?: boolean;
-    className?: string;
-    onClick?: MouseEventHandler<HTMLButtonElement>;
-    onKeyDown?: KeyboardEventHandler<HTMLButtonElement>;
-    children: string | JSX.Element;
-    href?: string;
-    colourTheme?: 'green' | 'red';
-}
-export declare const Button: (props: IButton) => JSX.Element;

package/dist/ui/components/Button/index.js

@@ -1,68 +0,0 @@
-"use strict";
-'use client';
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Button = exports.ButtonBase = void 0;
-const react_1 = require("@emotion/react");
-const styled_1 = __importDefault(require("@emotion/styled"));
-const react_2 = __importDefault(require("react"));
-const colours_1 = require("../../styles/colours");
-exports.ButtonBase = (0, react_1.css) `
-  text-decoration: none;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  border: 0;
-  font-weight: bold;
-  font-family: inherit;
-  font-size: 1.2rem;
-  border-radius: 0.5rem;
-  cursor: pointer;
-  height: 3rem;
-  line-height: 1rem;
-  &:hover {
-    filter: saturate(1.5);
-  }
-  padding-left: 1rem;
-  padding-right: 1rem;
-  color: white;
-
-  &[data-disabled='true'] {
-    cursor: default !important;
-    background-color: #888 !important;
-  }
-
-  &[data-theme='green'] {
-    background-color: ${colours_1.colours.darkGreen};
-    &[data-invert='true'] {
-      color: ${colours_1.colours.darkGreen};
-      background-color: white;
-      border: solid 1px ${colours_1.colours.darkGreen};
-    }
-  }
-
-  &[data-theme='red'] {
-    background-color: ${colours_1.colours.orangeRed};
-    &[data-invert='true'] {
-      color: ${colours_1.colours.orangeRed};
-      background-color: white;
-      border: solid 1px ${colours_1.colours.orangeRed};
-    }
-  }
-`;
-const BaseButton = styled_1.default.button `
-  ${exports.ButtonBase}
-`;
-const BaseA = styled_1.default.a `
-  ${exports.ButtonBase}
-`;
-const Button = (props) => {
-    var _a, _b;
-    const Component = props.href
-        ? BaseA
-        : BaseButton;
-    return (react_2.default.createElement(Component, Object.assign({ className: props.className, "data-invert": props.invert, "data-disabled": (_a = props.disabled) !== null && _a !== void 0 ? _a : false, role: "button", title: props.title || undefined, "data-theme": (_b = props.colourTheme) !== null && _b !== void 0 ? _b : 'green' }, props), props.children));
-};
-exports.Button = Button;