fix: conflict

razorpay · Dec 9, 2024 · 7cbdb75 · 7cbdb75
2 parents add73de + fa0c45e
commit 7cbdb75
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/packages/blade/src/components/BaseMotion/BaseMotion.tsx b/packages/blade/src/components/BaseMotion/BaseMotion.tsx
@@ -48,6 +48,8 @@ const _BaseMotionBox = (
     isInsideStaggerContainer ? staggerType : type,
   );
 
+  console.count('BaseMotionBox');
+
   return (
     <MotionDiv
       ref={ref as never}

diff --git a/packages/blade/src/components/Fade/Fade.native.tsx b/packages/blade/src/components/Fade/Fade.native.tsx
@@ -2,6 +2,7 @@ import type { FadeProps } from './types';
 import type { BaseMotionEntryExitProps } from '~components/BaseMotion';
 import { Text } from '~components/Typography';
 import { throwBladeError } from '~utils/logger';
+import type { FadeProps } from './types';
 
 const Fade = (_props: FadeProps): React.ReactElement => {
   throwBladeError({

diff --git a/packages/blade/src/components/Fade/Fade.web.tsx b/packages/blade/src/components/Fade/Fade.web.tsx
@@ -5,6 +5,7 @@ import type { MotionVariantsType } from '~components/BaseMotion';
 import { castWebType, useTheme } from '~utils';
 import { cssBezierToArray } from '~utils/cssBezierToArray';
 import { msToSeconds } from '~utils/msToSeconds';
+import type { FadeProps } from './types';
 
 /**
  * ## Fade

diff --git a/packages/blade/src/components/Scale/Scale.stories.tsx b/packages/blade/src/components/Scale/Scale.stories.tsx
@@ -60,5 +60,9 @@ Default.args = {
 
 export const Controlled = ControlledScaleTemplate.bind({});
 Controlled.args = {
-  children: <InternalCardExample />,
+  children: (
+    <Box display="inline-block">
+      <InternalCardExample />
+    </Box>
+  ),
 };