Skip to content

Commit

Permalink
0.3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
lerte committed Nov 7, 2024
1 parent 8981d78 commit 0046426
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 13 deletions.
2 changes: 1 addition & 1 deletion packages/actify/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "actify",
"version": "0.3.1",
"version": "0.3.3",
"license": "MIT",
"author": "Lerte Smith",
"keywords": [
Expand Down
7 changes: 0 additions & 7 deletions packages/actify/rollup.config.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import commonjs from '@rollup/plugin-commonjs'
import copy from 'rollup-plugin-copy'
import { exec } from 'child_process'
import json from '@rollup/plugin-json'
import peerDepsExternal from 'rollup-plugin-peer-deps-external'
Expand Down Expand Up @@ -67,12 +66,6 @@ export default [
typescriptPaths(),
preserveDirectives(),
terser({ compress: { directives: false } }),
copy({
targets: [
{ src: './../../README.md', dest: 'dist' },
{ src: './../../LICENSE.md', dest: 'dist' }
]
}),
tscAlias()
],
onwarn(warning, warn) {
Expand Down
5 changes: 2 additions & 3 deletions packages/actify/src/components/Carousel/CarouselContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { AnimatePresence, motion } from 'framer-motion'
import React, { Children, isValidElement, useEffect } from 'react'

import { twMerge } from 'tailwind-merge'
import clsx from 'clsx'
import { useCarousel } from './CarouselContext'
import { wrap } from 'popmotion'

Expand Down Expand Up @@ -58,8 +58,7 @@ const CarouselContent = ({ children }: React.ComponentProps<'div'>) => {
<MotionComponent
// @ts-ignore
{...child.props}
// @ts-ignore
className={twMerge(child.props.className, 'absolute')}
style={{ position: 'absolute' }}
variants={variants}
key={page}
custom={direction}
Expand Down
4 changes: 2 additions & 2 deletions packages/actify/src/components/Slot/Slot.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import clsx from 'clsx'
import { mergeRefs } from './../../hooks/mergeRefs'
import { twMerge } from 'tailwind-merge'

/* -------------------------------------------------------------------------------------------------
* Slot
Expand Down Expand Up @@ -140,7 +140,7 @@ function mergeProps(slotProps: AnyProps, childProps: AnyProps) {
if (typeof overrideProps[propName] == 'function') {
overrideProps[propName] = overrideProps[propName]({ ...parentProps })
} else {
overrideProps[propName] = twMerge(slotPropValue, childPropValue)
overrideProps[propName] = clsx(slotPropValue, childPropValue)
}
}
}
Expand Down

0 comments on commit 0046426

Please sign in to comment.