Merge branch 'hotfix/1.15.1'

marceloglacial · Aug 1, 2024 · fe439a2 · fe439a2
2 parents e1bc5ed + 0a0665b
commit fe439a2
Show file tree

Hide file tree

Showing 5 changed files with 1,109 additions and 2,347 deletions.
diff --git a/.storybook/main.ts b/.storybook/main.ts
@@ -12,8 +12,6 @@ const config: StorybookConfig = {
         name: '@storybook/react-vite',
         options: {},
     },
-    docs: {
-        autodocs: true,
-    },
+    docs: {},
 }
 export default config
diff --git a/.storybook/preview.ts b/.storybook/preview.ts
@@ -20,6 +20,8 @@ const preview: Preview = {
             },
         },
     },
+
+    tags: ['autodocs']
 }
 
 export default preview
diff --git a/package.json b/package.json
@@ -1,87 +1,87 @@
 {
-    "name": "@marceloglacial/brinca-ui",
-    "version": "1.15.0",
-    "author": "Marcelo Glacial",
-    "type": "module",
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/marceloglacial/brinca-ui.git"
+  "name": "@marceloglacial/brinca-ui",
+  "version": "1.15.0",
+  "author": "Marcelo Glacial",
+  "type": "module",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/marceloglacial/brinca-ui.git"
+  },
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/marceloglacial/brinca-ui/issues"
+  },
+  "homepage": "https://github.com/marceloglacial/brinca-ui#readme",
+  "files": [
+    "dist"
+  ],
+  "main": "./dist/brinca-ui.umd.js",
+  "module": "./dist/brinca-ui.es.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/brinca-ui.es.js",
+      "require": "./dist/brinca-ui.umd.js"
     },
-    "license": "ISC",
-    "bugs": {
-        "url": "https://github.com/marceloglacial/brinca-ui/issues"
-    },
-    "homepage": "https://github.com/marceloglacial/brinca-ui#readme",
-    "files": [
-        "dist"
-    ],
-    "main": "./dist/brinca-ui.umd.js",
-    "module": "./dist/brinca-ui.es.js",
-    "types": "./dist/index.d.ts",
-    "exports": {
-        ".": {
-            "types": "./dist/index.d.ts",
-            "import": "./dist/brinca-ui.es.js",
-            "require": "./dist/brinca-ui.umd.js"
-        },
-        "./dist/style.css": "./dist/style.css"
-    },
-    "scripts": {
-        "dev": "storybook dev -p 6006 -c .storybook",
-        "build": "yarn run format && yarn run lint && rm -rf ./dist && tsc && vite build",
-        "build:docs": "storybook build -o docs",
-        "storybook": "storybook dev -p 6006",
-        "format": "prettier -w src",
-        "lint": "eslint --fix src/**/*.* --no-warn-ignored",
-        "husky-actions": "npm run format && npm run lint",
-        "prepare": "npx husky install",
-        "start": "storybook dev -p 6006 --ci --quiet --no-open",
-        "build-storybook": "storybook build",
-        "test": "concurrently \"yarn dev\" \"npx cypress open\"",
-        "test:ci": "concurrently \"yarn start\" \"npx cypress run --headless\""
-    },
-    "dependencies": {
-        "jackspeak": "4.0.1",
-        "react": "^18.3.1",
-        "react-dom": "^18.3.1"
-    },
-    "peerDependencies": {
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0"
-    },
-    "devDependencies": {
-        "@storybook/addon-essentials": "^8.1.11",
-        "@storybook/addon-interactions": "^8.1.11",
-        "@storybook/addon-links": "^8.1.11",
-        "@storybook/addon-onboarding": "^8.1.11",
-        "@storybook/blocks": "^8.1.11",
-        "@storybook/react": "^8.1.11",
-        "@storybook/react-vite": "^8.1.11",
-        "@storybook/testing-library": "^0.2.2",
-        "@types/react": "^18.3.3",
-        "@types/react-dom": "^18.3.0",
-        "@typescript-eslint/eslint-plugin": "^7.16.0",
-        "@typescript-eslint/parser": "^7.16.0",
-        "@vitejs/plugin-react": "^4.3.1",
-        "autoprefixer": "^10.4.19",
-        "concurrently": "^8.2.2",
-        "cypress": "^13.13.0",
-        "eslint": "^9.6.0",
-        "eslint-config-prettier": "^9.1.0",
-        "eslint-plugin-prettier": "5.1.3",
-        "eslint-plugin-react": "^7.34.3",
-        "eslint-plugin-react-hooks": "^4.6.2",
-        "eslint-plugin-react-refresh": "^0.4.7",
-        "eslint-plugin-storybook": "^0.8.0",
-        "postcss": "^8.4.39",
-        "prettier": "^3.3.2",
-        "storybook": "^8.1.11",
-        "tailwindcss": "^3.4.4",
-        "typescript": "^5.5.3",
-        "vite": "^5.3.3",
-        "vite-plugin-dts": "^3.9.1"
-    },
-    "resolutions": {
-        "jackspeak": "2.1.1"
-    }
+    "./dist/style.css": "./dist/style.css"
+  },
+  "scripts": {
+    "dev": "storybook dev -p 6006 -c .storybook",
+    "build": "yarn run format && yarn run lint && rm -rf ./dist && tsc && vite build",
+    "build:docs": "storybook build -o docs",
+    "storybook": "storybook dev -p 6006",
+    "format": "prettier -w src",
+    "lint": "eslint --fix src/**/*.* --no-warn-ignored",
+    "husky-actions": "npm run format && npm run lint",
+    "prepare": "npx husky install",
+    "start": "storybook dev -p 6006 --ci --quiet --no-open",
+    "build-storybook": "storybook build",
+    "test": "concurrently \"yarn dev\" \"npx cypress open\"",
+    "test:ci": "concurrently \"yarn start\" \"npx cypress run --headless\""
+  },
+  "dependencies": {
+    "jackspeak": "4.0.1",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
+  },
+  "peerDependencies": {
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "devDependencies": {
+    "@storybook/addon-essentials": "^8.2.7",
+    "@storybook/addon-interactions": "^8.2.7",
+    "@storybook/addon-links": "^8.2.7",
+    "@storybook/addon-onboarding": "^8.2.7",
+    "@storybook/blocks": "^8.2.7",
+    "@storybook/react": "^8.2.7",
+    "@storybook/react-vite": "^8.2.7",
+    "@storybook/testing-library": "^0.2.2",
+    "@types/react": "^18.3.3",
+    "@types/react-dom": "^18.3.0",
+    "@typescript-eslint/eslint-plugin": "^8.0.0",
+    "@typescript-eslint/parser": "^8.0.0",
+    "@vitejs/plugin-react": "^4.3.1",
+    "autoprefixer": "^10.4.19",
+    "concurrently": "^8.2.2",
+    "cypress": "^13.13.2",
+    "eslint": "^9.8.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "5.2.1",
+    "eslint-plugin-react": "^7.35.0",
+    "eslint-plugin-react-hooks": "^4.6.2",
+    "eslint-plugin-react-refresh": "^0.4.9",
+    "eslint-plugin-storybook": "^0.8.0",
+    "postcss": "^8.4.40",
+    "prettier": "^3.3.3",
+    "storybook": "^8.2.7",
+    "tailwindcss": "^3.4.7",
+    "typescript": "^5.5.4",
+    "vite": "^5.3.5",
+    "vite-plugin-dts": "^4.0.0-beta.2"
+  },
+  "resolutions": {
+    "jackspeak": "2.1.1"
+  }
 }
diff --git a/src/components/Form/FormStyles.ts b/src/components/Form/FormStyles.ts
@@ -5,6 +5,8 @@ type stylesType = {
     [k: string]: string
 }
 
+const formButtonClass = `form__button ${buttonClass.button} ${buttonClass.secondary} ${buttonClass.size.md} hover:cursor-pointer`
+
 const styles: stylesType = {
     form: `form mx-auto max-w-2xl space-y-8`,
     group: `form__group flex flex-wrap gap-4 items-center`,
@@ -14,8 +16,8 @@ const styles: stylesType = {
     inputFull: `w-full`,
     selectContainer: `form__select-container inline-block relative after:absolute after:top-4 after:right-3 after:flex after:items-center after:justify-center after:leading-none after:w-4 after:h-4 after:text-xl after:text-green-600 after:content-['⌄'] after:z-0`,
     select: `form__select appearance-none relative rounded-2xl border-2 border-green-600 py-4 pl-4 pr-10 bg-transparent z-10`,
-    button: `form__button ${buttonClass.button} ${buttonClass.primary} hover:cursor-pointer`,
-    submit: `form__button ${buttonClass.button} ${buttonClass.primary} hover:cursor-pointer`,
+    button: formButtonClass,
+    submit: formButtonClass,
     checkbox: `form__checkbox appearance-none  relative hover:cursor-pointer after:block after:w-6 after:h-6 after:checked:bg-green-600 after:rounded-lg after:border-2 after:border-green-600 focus:ring-green-500 focus:ring-2 before:absolute before:top-[4px] before:left-[3px] before:z-10 before:checked:block before:w-4 before:h-4 before:checked:bg-[url('https://res.cloudinary.com/brinca/image/upload/v1671588190/brinca-ui/checkbox-white_dqjam0.svg')] before:bg-no-repeat before:bg-cover`,
     radio: `form__radio appearance-none  relative hover:cursor-pointer after:block after:w-6 after:h-6 after:checked:bg-green-600 after:rounded-full after:border-2 after:border-green-600 focus:ring-green-500 focus:ring-2 before:absolute before:top-[7px] before:left-[7px] before:z-10 before:rounded-full before:checked:block before:w-[10px] before:h-[10px] before:bg-white`,
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,8 @@ const preview: Preview = { @@
                 },
             },
         },
+        tags: ['autodocs']
     }
     export default preview