fix border Button

platformbuilders · Dec 14, 2023 · 1b24928 · 1b24928
1 parent f821982
commit 1b24928
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@platformbuilders/fluid-react",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "private": false,
   "description": "Builders React for Fluid Design System",
   "keywords": [
@@ -47,7 +47,7 @@
   },
   "dependencies": {
     "@platformbuilders/helpers": "0.10.2",
-    "@platformbuilders/theme-toolkit": "0.2.6",
+    "@platformbuilders/theme-toolkit": "^0.3.0",
     "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-label": "^2.0.2",
     "@radix-ui/react-select": "^1.2.2",

diff --git a/src/components/Button/styles.tsx b/src/components/Button/styles.tsx
@@ -101,6 +101,7 @@ const sizeButton = {
 };
 
 export const Touchable = styled(TouchableComponent)<ButtonWrapperProps>`
+  border: none;
   ${getStylesButton}
   ${({ size }) => !!size && sizeButton[size]}
   width: ${({ fullWidth }) => (!!fullWidth ? '100%' : undefined)};

diff --git a/src/components/Button/types.ts b/src/components/Button/types.ts
@@ -1,17 +1,11 @@
 import { ReactNode } from 'react';
-import { TypographyVariants } from '@platformbuilders/theme-toolkit';
+import {
+  ButtonColorType,
+  ButtonVariants,
+  TypographyVariants,
+} from '@platformbuilders/theme-toolkit';
 import RadixIcon from '@radix-ui/react-icons';
 
-export type ButtonVariants = 'filled' | 'ghost' | 'tint' | 'outline';
-export type ButtonColorType =
-  | 'primary'
-  | 'secondary'
-  | 'accent'
-  | 'danger'
-  | 'success'
-  | 'warning'
-  | 'info';
-
 export type ButtonProps = {
   style?: any;
   type?: 'button' | 'submit' | 'reset';

diff --git a/yarn.lock b/yarn.lock
@@ -2725,10 +2725,10 @@
   dependencies:
     lint-staged "^13.2.2"
 
-"@platformbuilders/theme-toolkit@0.2.6":
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/@platformbuilders/theme-toolkit/-/theme-toolkit-0.2.6.tgz#532a712bcce6d43cee76f90f4a0d0a913250dffb"
-  integrity sha512-uoRf3D2dszihYYHF/KP1iC6Gc0uzeri16/bw6ZVlBeDdFFDZbSc7RFcXePbU6Hg6hbuN7n4bSVB0g0Wyg5qhBQ==
+"@platformbuilders/theme-toolkit@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@platformbuilders/theme-toolkit/-/theme-toolkit-0.3.0.tgz#eff59fd6693e9e59a6d65b304d22dd204cb7793c"
+  integrity sha512-6/Ifts8C1DeQaavmOM5JnZRfFL/qJRdfzKgUeB1B01iDEIiIzpDNGp6bn2oGd5JnDkXpwgnCuuo4K0InoYPnwA==
   dependencies:
     "@platformbuilders/helpers" "0.8.2"
     lodash "4.17.21"