Merge branch 'main' into 176-migrate-customclassswitcher-core-functio…

…n-to-typescript
rad-ui · Jan 5, 2024 · 4a5e8f2 · 4a5e8f2
2 parents 49152d5 + 9a10209
commit 4a5e8f2
Show file tree

Hide file tree

Showing 44 changed files with 1,440 additions and 1,722 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -92,7 +92,6 @@
     "rollup-plugin-banner2": "^1.2.2",
     "rollup-plugin-peer-deps-external": "^2.2.4",
     "rollup-plugin-postcss": "^4.0.2",
-    "rollup-plugin-preserve-directives": "^0.2.0",
     "sass-loader": "^13.3.2",
     "storybook": "^7.4.0",
     "tailwindcss": "^3.3.3",

diff --git a/rollup.config.cjs b/rollup.config.cjs
@@ -9,7 +9,7 @@ import alias from '@rollup/plugin-alias';
 import path from 'path';
 import fs from 'fs';
 
-// import preserveDirectives from 'rollup-plugin-preserve-directives';
+
 
 import banner2 from 'rollup-plugin-banner2';
 

diff --git a/src/colors/amber.js → src/colors/amber.ts b/src/colors/amber.js → src/colors/amber.ts
diff --git a/src/colors/blue.js → src/colors/blue.ts b/src/colors/blue.js → src/colors/blue.ts
diff --git a/src/colors/bronze.js → src/colors/bronze.ts b/src/colors/bronze.js → src/colors/bronze.ts
diff --git a/src/colors/brown.js → src/colors/brown.ts b/src/colors/brown.js → src/colors/brown.ts
diff --git a/src/colors/crimson.js → src/colors/crimson.ts b/src/colors/crimson.js → src/colors/crimson.ts
diff --git a/src/colors/cyan.js → src/colors/cyan.ts b/src/colors/cyan.js → src/colors/cyan.ts
diff --git a/src/colors/gold.js → src/colors/gold.ts b/src/colors/gold.js → src/colors/gold.ts
diff --git a/src/colors/grass.js → src/colors/grass.ts b/src/colors/grass.js → src/colors/grass.ts
diff --git a/src/colors/gray.js → src/colors/gray.ts b/src/colors/gray.js → src/colors/gray.ts
diff --git a/src/colors/green.js → src/colors/green.ts b/src/colors/green.js → src/colors/green.ts
diff --git a/src/colors/index.js b/src/colors/index.js
diff --git a/src/colors/index.ts b/src/colors/index.ts
@@ -0,0 +1,68 @@
+import gray from './gray';
+import mauve from './mauve';
+import slate from './slate';
+import sage from './sage';
+import olive from './olive';
+import sand from './sand';
+import tomato from './tomato';
+import red from './red';
+import ruby from './ruby';
+import crimson from './crimson';
+import pink from './pink';
+import plum from './plum';
+import purple from './purple';
+import violet from './violet';
+import iris from './iris';
+import indigo from './indigo';
+import blue from './blue';
+import cyan from './cyan';
+import teal from './teal';
+import jade from './jade';
+import green from './green';
+import grass from './grass';
+import brown from './brown';
+import bronze from './bronze';
+import gold from './gold';
+import sky from './sky';
+import mint from './mint';
+import lime from './lime';
+import yellow from './yellow';
+import amber from './amber';
+import orange from './orange';
+
+const colors = {
+    gray: gray,
+    mauve: mauve,
+    slate: slate,
+    sage: sage,
+    olive: olive,
+    sand: sand,
+    tomato: tomato,
+    red: red,
+    ruby: ruby,
+    crimson: crimson,
+    pink: pink,
+    plum: plum,
+    purple: purple,
+    violet: violet,
+    iris: iris,
+    indigo: indigo,
+    blue: blue,
+    cyan: cyan,
+    teal: teal,
+    jade: jade,
+    green: green,
+    grass: grass,
+    brown: brown,
+    bronze: bronze,
+    gold: gold,
+    sky: sky,
+    mint: mint,
+    lime: lime,
+    yellow: yellow,
+    amber: amber,
+    orange: orange,
+
+} as const;
+
+export default colors;
diff --git a/src/colors/indigo.js → src/colors/indigo.ts b/src/colors/indigo.js → src/colors/indigo.ts
diff --git a/src/colors/iris.js → src/colors/iris.ts b/src/colors/iris.js → src/colors/iris.ts
diff --git a/src/colors/jade.js → src/colors/jade.ts b/src/colors/jade.js → src/colors/jade.ts
diff --git a/src/colors/lime.js → src/colors/lime.ts b/src/colors/lime.js → src/colors/lime.ts
diff --git a/src/colors/mauve.js → src/colors/mauve.ts b/src/colors/mauve.js → src/colors/mauve.ts
diff --git a/src/colors/mint.js → src/colors/mint.ts b/src/colors/mint.js → src/colors/mint.ts
diff --git a/src/colors/olive.js → src/colors/olive.ts b/src/colors/olive.js → src/colors/olive.ts
diff --git a/src/colors/orange.js → src/colors/orange.ts b/src/colors/orange.js → src/colors/orange.ts
diff --git a/src/colors/pink.js → src/colors/pink.ts b/src/colors/pink.js → src/colors/pink.ts
diff --git a/src/colors/plum.js → src/colors/plum.ts b/src/colors/plum.js → src/colors/plum.ts
diff --git a/src/colors/purple.js → src/colors/purple.ts b/src/colors/purple.js → src/colors/purple.ts
diff --git a/src/colors/red.js → src/colors/red.ts b/src/colors/red.js → src/colors/red.ts
diff --git a/src/colors/ruby.js → src/colors/ruby.ts b/src/colors/ruby.js → src/colors/ruby.ts
diff --git a/src/colors/sage.js → src/colors/sage.ts b/src/colors/sage.js → src/colors/sage.ts
diff --git a/src/colors/sand.js → src/colors/sand.ts b/src/colors/sand.js → src/colors/sand.ts
diff --git a/src/colors/sky.js → src/colors/sky.ts b/src/colors/sky.js → src/colors/sky.ts
diff --git a/src/colors/slate.js → src/colors/slate.ts b/src/colors/slate.js → src/colors/slate.ts
diff --git a/src/colors/teal.js → src/colors/teal.ts b/src/colors/teal.js → src/colors/teal.ts
diff --git a/src/colors/tomato.js → src/colors/tomato.ts b/src/colors/tomato.js → src/colors/tomato.ts
diff --git a/src/colors/violet.js → src/colors/violet.ts b/src/colors/violet.js → src/colors/violet.ts
diff --git a/src/colors/yellow.js → src/colors/yellow.ts b/src/colors/yellow.js → src/colors/yellow.ts
diff --git a/src/components/tools/SandboxEditor/SandboxEditor.js b/src/components/tools/SandboxEditor/SandboxEditor.js
diff --git a/src/components/ui/Badge/Badge.stories.js b/src/components/ui/Badge/Badge.stories.js
@@ -1,5 +1,5 @@
 import Badge from './Badge';
-import {Separator} from '~/';
+import Separator from '../Separator/Separator';
 import SandboxEditor from '~/components/tools/SandboxEditor/SandboxEditor';
 
 const ArrowIcon = ({className}) => {

diff --git a/src/components/ui/Dropdown/Dropdown.stories.js b/src/components/ui/Dropdown/Dropdown.stories.js
@@ -1,5 +1,6 @@
 
-import {Dropdown, Heading} from '~/';
+import Heading from '~/components/ui/Heading/Heading';
+import Dropdown from '~/components/ui/Dropdown/Dropdown';
 import SandboxEditor from '~/components/tools/SandboxEditor/SandboxEditor';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export

diff --git a/src/components/ui/Em/Em.stories.js b/src/components/ui/Em/Em.stories.js
@@ -1,5 +1,6 @@
 import Em from './Em';
-import {Heading} from '~/';
+import Heading from '../Heading/Heading';
+
 import SandboxEditor from '~/components/tools/SandboxEditor/SandboxEditor';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export

diff --git a/src/components/ui/Link/Link.stories.js b/src/components/ui/Link/Link.stories.js
@@ -1,5 +1,4 @@
 import Link from './Link';
-import {Text} from '~/';
 import SandboxEditor from '~/components/tools/SandboxEditor/SandboxEditor';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export

diff --git a/src/components/ui/Quote/Quote.stories.js b/src/components/ui/Quote/Quote.stories.js
@@ -1,10 +1,7 @@
 import Quote from './Quote';
-import {Text} from '~/';
+import Text from '~/components/ui/Text/Text';
 import SandboxEditor from '~/components/tools/SandboxEditor/SandboxEditor';
 
-const ArrowIcon = ({className}) => {
-    return <svg className={className} width="16" height="16" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M8.14645 3.14645C8.34171 2.95118 8.65829 2.95118 8.85355 3.14645L12.8536 7.14645C13.0488 7.34171 13.0488 7.65829 12.8536 7.85355L8.85355 11.8536C8.65829 12.0488 8.34171 12.0488 8.14645 11.8536C7.95118 11.6583 7.95118 11.3417 8.14645 11.1464L11.2929 8H2.5C2.22386 8 2 7.77614 2 7.5C2 7.22386 2.22386 7 2.5 7H11.2929L8.14645 3.85355C7.95118 3.65829 7.95118 3.34171 8.14645 3.14645Z" fill="currentColor" fillRule="evenodd" clipRule="evenodd"></path></svg>;
-};
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 export default {

diff --git a/src/components/ui/Tooltip/Tooltip.stories.js b/src/components/ui/Tooltip/Tooltip.stories.js
@@ -1,5 +1,5 @@
 
-import {Tooltip, Heading} from '~/';
+import Tooltip from './Tooltip';
 import SandboxEditor from '~/components/tools/SandboxEditor/SandboxEditor';
 import ScrollPlayground from '~/components/tools/ScrollPlayground/ScrollPlayground';
 

diff --git a/src/index.js b/src/index.js