diff --git a/packages/components/package.json b/packages/components/package.json index faa26a3157..9c0896313d 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -30,9 +30,9 @@ "@react-aria/accordion": "3.0.0-alpha.19", "@react-aria/autocomplete": "3.0.0-alpha.18", "@react-aria/button": "3.8.0", + "@react-aria/calendar": "3.4.0", "@react-aria/checkbox": "3.9.2", "@react-aria/combobox": "3.6.2", - "@react-aria/calendar": "3.4.0", "@react-aria/datepicker": "3.5.0", "@react-aria/dialog": "3.5.3", "@react-aria/focus": "3.13.0", @@ -57,8 +57,8 @@ "@react-aria/tooltip": "3.6.0", "@react-aria/utils": "3.18.0", "@react-aria/visually-hidden": "3.8.2", - "@react-stately/checkbox": "3.4.3", "@react-stately/calendar": "3.3.0", + "@react-stately/checkbox": "3.4.3", "@react-stately/collections": "3.9.0", "@react-stately/combobox": "3.5.2", "@react-stately/data": "^3.6.0", @@ -84,8 +84,7 @@ "@react-types/radio": "3.4.2", "@react-types/shared": "3.18.1", "@react-types/tooltip": "3.4.2", - "react-is": "18.2.0", - "react-transition-group": "4.4.5" + "react-is": "18.2.0" }, "peerDependencies": { "react": "17.x || 18.x", @@ -94,7 +93,6 @@ "devDependencies": { "@marigold/tsconfig": "workspace:*", "@types/react": "18.2.14", - "@types/react-transition-group": "4.4.6", "react": "18.2.0", "react-dom": "18.2.0", "tsup": "6.7.0" diff --git a/packages/components/src/Overlay/Overlay.tsx b/packages/components/src/Overlay/Overlay.tsx index fb16001cff..8b7117cfde 100644 --- a/packages/components/src/Overlay/Overlay.tsx +++ b/packages/components/src/Overlay/Overlay.tsx @@ -1,5 +1,4 @@ import React, { useRef } from 'react'; -import { Transition } from 'react-transition-group'; import { Overlay as ReactAriaOverlay, @@ -13,21 +12,6 @@ export interface OverlayProps { container?: ReactAriaOverlayProps['portalContainer']; } -const duration = 300; - -const defaultStyle = { - transition: `opacity ${duration}ms ease-in-out`, - opacity: 0, -}; - -const transitionStyles = { - entering: { opacity: 1 }, - entered: { opacity: 1 }, - exiting: { opacity: 0 }, - exited: { opacity: 0 }, - unmounted: { opacity: 0 }, -}; - export const Overlay = ({ children, container, open }: OverlayProps) => { const nodeRef = useRef(null); const theme = useTheme(); @@ -41,21 +25,14 @@ export const Overlay = ({ children, container, open }: OverlayProps) => { return ( - - {state => ( -
- {children} -
- )} - +
+ {children} +
); }; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0fe58f6226..b527717f02 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -624,9 +624,6 @@ importers: react-is: specifier: 18.2.0 version: 18.2.0 - react-transition-group: - specifier: 4.4.5 - version: 4.4.5(react-dom@18.2.0)(react@18.2.0) devDependencies: '@marigold/tsconfig': specifier: workspace:* @@ -634,9 +631,6 @@ importers: '@types/react': specifier: 18.2.14 version: 18.2.14 - '@types/react-transition-group': - specifier: 4.4.6 - version: 4.4.6 react: specifier: 18.2.0 version: 18.2.0 @@ -645,7 +639,7 @@ importers: version: 18.2.0(react@18.2.0) tsup: specifier: 6.7.0 - version: 6.7.0(postcss@8.4.26)(typescript@5.0.4) + version: 6.7.0 packages/icons: dependencies: @@ -8978,15 +8972,6 @@ packages: dependencies: '@types/react': 18.2.14 - /@types/react-transition-group@4.4.6: - resolution: - { - integrity: sha512-VnCdSxfcm08KjsJVQcfBmhEQAPnLB8G08hAxn39azX1qYBQ/5RVQuoHuKIcfKOdncuaUvEpFKFzEvbtIMsfVew==, - } - dependencies: - '@types/react': 18.2.14 - dev: true - /@types/react@18.2.14: resolution: { @@ -12529,16 +12514,6 @@ packages: } dev: false - /dom-helpers@5.2.1: - resolution: - { - integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==, - } - dependencies: - '@babel/runtime': 7.22.6 - csstype: 3.1.2 - dev: false - /dom-serializer@2.0.0: resolution: { @@ -20279,6 +20254,25 @@ packages: camelcase-css: 2.0.1 postcss: 8.4.26 + /postcss-load-config@3.1.4: + resolution: + { + integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==, + } + engines: { node: '>= 10' } + peerDependencies: + postcss: '>=8.0.9' + ts-node: '>=9.0.0' + peerDependenciesMeta: + postcss: + optional: true + ts-node: + optional: true + dependencies: + lilconfig: 2.1.0 + yaml: 1.10.2 + dev: true + /postcss-load-config@3.1.4(postcss@8.4.26): resolution: { @@ -21495,23 +21489,6 @@ packages: scheduler: 0.23.0 dev: false - /react-transition-group@4.4.5(react-dom@18.2.0)(react@18.2.0): - resolution: - { - integrity: sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==, - } - peerDependencies: - react: '>=16.6.0' - react-dom: '>=16.6.0' - dependencies: - '@babel/runtime': 7.22.6 - dom-helpers: 5.2.1 - loose-envify: 1.4.0 - prop-types: 15.8.1 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - dev: false - /react-universal-interface@0.6.2(react@18.2.0)(tslib@2.6.0): resolution: { @@ -23956,6 +23933,44 @@ packages: integrity: sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==, } + /tsup@6.7.0: + resolution: + { + integrity: sha512-L3o8hGkaHnu5TdJns+mCqFsDBo83bJ44rlK7e6VdanIvpea4ArPcU3swWGsLVbXak1PqQx/V+SSmFPujBK+zEQ==, + } + engines: { node: '>=14.18' } + hasBin: true + peerDependencies: + '@swc/core': ^1 + postcss: ^8.4.12 + typescript: '>=4.1.0' + peerDependenciesMeta: + '@swc/core': + optional: true + postcss: + optional: true + typescript: + optional: true + dependencies: + bundle-require: 4.0.1(esbuild@0.17.19) + cac: 6.7.14 + chokidar: 3.5.3 + debug: 4.3.4 + esbuild: 0.17.19 + execa: 5.1.1 + globby: 11.1.0 + joycon: 3.1.1 + postcss-load-config: 3.1.4 + resolve-from: 5.0.0 + rollup: 3.26.0 + source-map: 0.8.0-beta.0 + sucrase: 3.32.0 + tree-kill: 1.2.2 + transitivePeerDependencies: + - supports-color + - ts-node + dev: true + /tsup@6.7.0(postcss@8.4.26)(typescript@5.0.4): resolution: {