Clean up tailwind

noya-app · Jan 13, 2024 · 73d186c · 73d186c
1 parent d65ab28
commit 73d186c
Show file tree

Hide file tree

Showing 9 changed files with 289 additions and 360 deletions.
diff --git a/packages/noya-compiler/src/project.ts b/packages/noya-compiler/src/project.ts
@@ -17,7 +17,7 @@ import {
   renderResolvedNode,
 } from 'noya-component';
 import { loadDesignSystem } from 'noya-module-loader';
-import { parametersToTailwindStyle, tailwindColors } from 'noya-tailwind';
+import { classNamesToStyle, tailwindColors } from 'noya-tailwind';
 import React, {
   CSSProperties,
   ReactElement,
@@ -900,7 +900,7 @@ function compileCSS({
 
       simpleElementToClassName.set(simple, className);
 
-      const convertedFromTailwind = parametersToTailwindStyle(
+      const convertedFromTailwind = classNamesToStyle(
         (simple.props.className as string | undefined)?.split(' '),
       );
 

diff --git a/packages/noya-component/src/renderResolvedNode.tsx b/packages/noya-component/src/renderResolvedNode.tsx
@@ -18,11 +18,11 @@ import {
 } from 'noya-component';
 import {
   BreakpointKey,
+  classNamesToStyle,
   extractTailwindClassesByBreakpoint,
   extractTailwindClassesByColorScheme,
   filterTailwindClassesByLastInGroup,
   matchBreakpoint,
-  parametersToTailwindStyle,
   tailwindColors,
 } from 'noya-tailwind';
 import React, { ReactNode } from 'react';
@@ -103,7 +103,7 @@ export function createNoyaDSRenderingContext({
       classNamesByBreakpoint,
     );
 
-    const style = parametersToTailwindStyle(classNamesForCurrentPage);
+    const style = classNamesToStyle(classNamesForCurrentPage);
 
     const stylingProps = {
       // Include all classnames regardless of breakpoint/colorScheme