Merge pull request #136 from GovConnex/chore/radio-group-change-label

chore: moved tailwind files and edited radio label
GovConnex · Apr 16, 2024 · 4d4aa03 · 4d4aa03
2 parents 961c781 + f03c47e
commit 4d4aa03
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ storybook-static
 
 src/theming/tokens-style-dictionary
 src/theming/tokens-output
+src/tailwind/tokens-output
 
 .env
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@govconnex/ui",
-  "version": "0.0.173",
+  "version": "0.0.174",
   "description": "GovConnex UI - React Component Library",
   "scripts": {
     "build:tokens": "./tokens-build.sh",

diff --git a/src/components/Radio/Radio.stories.tsx b/src/components/Radio/Radio.stories.tsx
@@ -61,6 +61,18 @@ IconRadio.args = {
   startAdornment: <Icon icon={faBook} />,
 };
 
+export const IconOnLabel = Template.bind({});
+
+IconOnLabel.args = {
+  variant: "card",
+  label: (
+    <>
+      <Icon icon={faBook} /> Label
+    </>
+  ),
+  description: "Description",
+};
+
 Example.parameters = {
   //  design: {
   //    type: "figma",

diff --git a/src/components/Radio/Radio.tsx b/src/components/Radio/Radio.tsx
@@ -19,7 +19,7 @@ export interface RadioProps extends React.InputHTMLAttributes<HTMLInputElement>
   /**
    * renders a text label next to the radio
    */
-  label?: string;
+  label?: string | React.ReactNode;
 
   /**
    * renders a text bellow the label

diff --git a/...test-js-component-screenshots-should-match-image-snapshot-for-button-1-snap.png b/...test-js-component-screenshots-should-match-image-snapshot-for-button-1-snap.png
diff --git a/src/theming/README.md → src/tailwind/README.md b/src/theming/README.md → src/tailwind/README.md
diff --git a/src/theming/package.json → src/tailwind/package.json b/src/theming/package.json → src/tailwind/package.json
@@ -4,7 +4,8 @@
   "description": "GovConnex UI - Tailwind Theme Config",
   "main": "tailwind.config.js",
   "scripts": {
-    "test": "tailwindcss -i ./tailwind-theme.css"
+    "test": "tailwindcss -i ./tailwind-theme.css",
+    "prepublishOnly": "cp -R ../theming/tokens-output tokens-output"
   },
   "files": [
     "tailwind.config.js",

diff --git a/src/theming/tailwind-theme.css → src/tailwind/tailwind-theme.css b/src/theming/tailwind-theme.css → src/tailwind/tailwind-theme.css
diff --git a/src/theming/tailwind.config.js → src/tailwind/tailwind.config.js b/src/theming/tailwind.config.js → src/tailwind/tailwind.config.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ storybook-static @@
     src/theming/tokens-style-dictionary
     src/theming/tokens-output
+    src/tailwind/tokens-output
     .env
@@ Expand Down @@