fix: 鸿蒙适配

jdf2e · Sep 26, 2024 · 9a61a86 · 9a61a86
1 parent d906bc9
commit 9a61a86
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 23 deletions.
diff --git a/src/packages/badge/badge.harmony.css b/src/packages/badge/badge.harmony.css
@@ -51,11 +51,7 @@
   padding: 0;
 }
 .nut-badge-content {
-  /* #ifdef harmony */
-  top: 0;
-  /* #endif */
-  /* #ifndef rn harmony */
-  top: initial;
+  /* #ifndef rn */
   transform: translateX(100%);
   /* #endif */
 }

diff --git a/src/packages/badge/badge.scss b/src/packages/badge/badge.scss
@@ -55,11 +55,7 @@
   }
 
   &-content {
-    /* #ifdef harmony */
-    top: 0;
-    /* #endif */
-    /* #ifndef rn harmony */
-    top: initial;
+    /* #ifndef rn */
     transform: $badge-content-transform;
     /* #endif */
   }

diff --git a/src/packages/badge/badge.taro.tsx b/src/packages/badge/badge.taro.tsx
@@ -12,7 +12,7 @@ import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import { useRtl } from '@/packages/configprovider/index.taro'
 import pxTransform from '@/utils/px-transform'
 import { getRectByTaro } from '@/utils/get-rect-by-taro'
-import { harmonyAndRn } from '@/utils/platform-taro'
+import { harmony, rn } from '@/utils/platform-taro'
 
 export type BadgeFill = 'solid' | 'outline'
 export interface BadgeProps extends BasicComponent {
@@ -53,7 +53,6 @@ export const Badge: FunctionComponent<Partial<BadgeProps>> = (props) => {
   }
   const classPrefix = 'nut-badge'
   const classes = classNames(classPrefix, className)
-  const isHarmonyAndRn = harmonyAndRn()
   const badgeRef = useRef(null)
   const [contentStyle, setContentStyle] = useState({})
 
@@ -93,19 +92,17 @@ export const Badge: FunctionComponent<Partial<BadgeProps>> = (props) => {
   const getPositionStyle = async () => {
     const style: CSSProperties = {}
     style.top = pxTransform(Number(-top) || 0)
-    if (isHarmonyAndRn) {
-      try {
-        const reacts = await getRectByTaro(badgeRef.current)
-        style.left =
-          reacts?.width && reacts?.width > Number(right)
-            ? pxTransform(reacts.width - Number(right))
-            : 0
-      } catch (error) {
-        console.log(error)
-      }
+    if (rn()) {
+      const reacts = await getRectByTaro(badgeRef.current)
+      style.left =
+        reacts?.width && reacts?.width > Number(right)
+          ? pxTransform(reacts.width - Number(right))
+          : 0
     } else {
       const dir = rtl ? 'left' : 'right'
-      style[dir] = `${Number(right) || parseFloat(String(right)) || 0}px`
+      style[dir] = harmony()
+        ? pxTransform(Number(right))
+        : `${Number(right) || parseFloat(String(right)) || 0}px`
     }
     setContentStyle(style)
   }