fix(tw preset): fix tailwind preset paths

shuoink · Jul 15, 2022 · 1a6a91f · 1a6a91f
1 parent 644d109
commit 1a6a91f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/src/_internal/utils/dock.ts b/src/_internal/utils/dock.ts
@@ -1,8 +1,8 @@
-import pushpop from '@spudly/pushpop';
+import * as pushpop from '@spudly/pushpop';
 import _clsx from 'clsx';
 import {defaultImport} from 'default-import';
 
-const {isNotNil, unique} = pushpop;
+const {isNotNil, unique} = defaultImport(pushpop);
 
 const clsx = defaultImport(_clsx);
 

diff --git a/src/components/buttons/DropdownButton.stories.tsx b/src/components/buttons/DropdownButton.stories.tsx
@@ -16,12 +16,12 @@ export const DropdownButton: FC = () => (
   <div className="flex flex-wrap gap-2">
     <DropdownButtonComponent
       label="Dropdown Button (bottom-left)"
-      placement="left-start"
+      placement="left-end"
     >
       {menu}
     </DropdownButtonComponent>
     <DropdownButtonComponent
-      label="Dropdown Button (right-end)"
+      label="Dropdown Button (bottom-right)"
       placement="right-end"
     >
       {menu}

diff --git a/src/components/buttons/DropdownButton.tsx b/src/components/buttons/DropdownButton.tsx
@@ -24,7 +24,7 @@ const DropdownButton: FC<Props> = ({
     <Dropdown
       isOpen={isOpen}
       close={close}
-      renderTrigger={ref => (
+      renderTrigger={({ref}) => (
         <Button ref={ref as any} {...buttonProps} onClick={toggle}>
           {label} <CollapsibleIcon isOpen={isOpen} />
         </Button>

diff --git a/tailwind-preset.cjs b/tailwind-preset.cjs
@@ -7,7 +7,11 @@ const colors = require('tailwindcss/colors.js');
  */
 module.exports = ({content = []} = {}) => ({
   mode: 'jit',
-  content: ['./src/**/*.{js,cjs,mjs,jsx,ts,tsx,mts,cts}', ...content],
+  content: [
+    // eslint-disable-next-line node/no-path-concat -- glob
+    `${__dirname}/dist/**/*.{js,cjs,mjs,jsx,ts,tsx,mts,cts}`,
+    ...content,
+  ],
   darkMode: 'class',
   theme: {
     extend: {

diff --git a/tailwind.config.cjs b/tailwind.config.cjs
@@ -3,7 +3,10 @@ const uiPreset = require('./tailwind-preset.cjs');
 module.exports = {
   presets: [
     uiPreset({
-      content: ['./.ladle/**/*.{js,cjs,mjs,jsx,ts,tsx,mts,cts}'],
+      content: [
+        './src/**/*.{js,cjs,mjs,jsx,ts,tsx,mts,cts}',
+        './.ladle/**/*.{js,cjs,mjs,jsx,ts,tsx,mts,cts}',
+      ],
     }),
   ],
 };