fix: badge适配

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

Hide file tree

Showing 15 changed files with 307 additions and 147 deletions.
diff --git a/scripts/rn/copy-file.js b/scripts/rn/copy-file.js
@@ -76,7 +76,6 @@ const removeFile = async (url) => {
 }
 
 const modify = (fileUrl, importStatement) => {
-  if(!fse.ensureFileSync(fileUrl)) return
   fse.readFile(fileUrl, 'utf8').then((content) => {
     let modifiedContent = content
     modifiedContent = [importStatement, modifiedContent.slice(0)].join('')

diff --git a/src/config.json b/src/config.json
@@ -716,7 +716,7 @@
           "author": "dsj"
         },
         {
-          "version": "2.0.0",
+          "version": "3.0.0",
           "name": "Badge",
           "type": "component",
           "cName": "徽标",

diff --git a/src/packages/badge/badge.harmony.css b/src/packages/badge/badge.harmony.css
@@ -1,21 +1,27 @@
 .nut-badge {
   position: relative;
-  display: inline-block;
+  display: inline-flex;
+  width: auto;
+  /* #ifdef harmony */
+  min-width: 1px;
+  /* #endif */
 }
 .nut-badge-icon {
   position: absolute;
   display: flex;
   justify-content: center;
   align-items: center;
-  background: linear-gradient(135deg, #ff475d 0%, #ff0f23 100%);
-  top: -10%;
-  right: -15%;
+  background: #ff0f23;
   padding: 3px;
   text-align: center;
   border: 0px solid #ffffff;
   border-radius: 14px;
   z-index: 1;
 }
+.nut-badge-icon-rtl {
+  right: auto;
+  left: -15%;
+}
 .nut-badge-icon .nut-icon {
   width: 12px;
   height: 12px;
@@ -27,7 +33,7 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  background: linear-gradient(135deg, #ff475d 0%, #ff0f23 100%);
+  background: #ff0f23;
   color: #fff;
   padding: 0 4px;
   font-size: 10px;
@@ -45,7 +51,13 @@
   padding: 0;
 }
 .nut-badge-content {
-  transform: translateY(-50%) translateX(100%);
+  /* #ifdef harmony */
+  top: 0;
+  /* #endif */
+  /* #ifndef rn harmony */
+  top: initial;
+  transform: translateX(100%);
+  /* #endif */
 }
 .nut-badge-dot {
   width: 7px;
@@ -54,20 +66,8 @@
   border-radius: 7px;
   padding: 0;
 }
-.nut-badge-outline .nut-badge-content {
+.nut-badge-outline {
   background: #ffffff;
   border: 1px solid #ff0f23;
   color: #ff0f23;
-}
-
-[dir=rtl] .nut-badge-icon,
-.nut-rtl .nut-badge-icon {
-  right: auto;
-  left: -15%;
-}
-[dir=rtl] .nut-badge-content {
-  transform: translateY(-50%) translateX(-100%);
-}
-.nut-rtl .nut-badge-content {
-  transform: translateY(-50%) translateX(-100%);
 }
diff --git a/src/packages/badge/badge.scss b/src/packages/badge/badge.scss
@@ -1,21 +1,27 @@
 .nut-badge {
   position: relative;
-  display: inline-block;
-
+  display: inline-flex;
+  width: auto;
+  /* #ifdef harmony */
+  min-width: 1px;
+  /* #endif */
   &-icon {
     position: absolute;
     display: flex;
     justify-content: center;
     align-items: center;
     background: $badge-background-color;
-    top: -10%;
-    right: -15%;
     padding: $badge-icon-padding;
     text-align: center;
     border: $badge-border;
     border-radius: $badge-border-radius;
     z-index: $badge-z-index;
 
+    &-rtl {
+      right: auto;
+      left: -15%;
+    }
+
     .nut-icon {
       width: $badge-icon-size;
       height: $badge-icon-size;
@@ -49,7 +55,13 @@
   }
 
   &-content {
+    /* #ifdef harmony */
+    top: 0;
+    /* #endif */
+    /* #ifndef rn harmony */
+    top: initial;
     transform: $badge-content-transform;
+    /* #endif */
   }
 
   &-dot {
@@ -61,25 +73,8 @@
   }
 
   &-outline {
-    .nut-badge-content {
-      background: $color-primary-text;
-      border: 1px solid $color-primary;
-      color: $color-primary;
-    }
-  }
-}
-
-[dir='rtl'] .nut-badge,
-.nut-rtl .nut-badge {
-  &-icon {
-    right: auto;
-    left: -15%;
-  }
-
-  &-content {
-    transform: var(
-      --nutui-badge-content-transform,
-      translateY(-50%) translateX(-100%)
-    );
+    background: $color-primary-text;
+    border: 1px solid $color-primary;
+    color: $color-primary;
   }
 }
diff --git a/src/packages/badge/badge.taro.tsx b/src/packages/badge/badge.taro.tsx
@@ -1,8 +1,18 @@
-import React, { CSSProperties, FunctionComponent, ReactNode } from 'react'
+import React, {
+  CSSProperties,
+  FunctionComponent,
+  ReactNode,
+  useEffect,
+  useRef,
+  useState,
+} from 'react'
 import classNames from 'classnames'
 import { View } from '@tarojs/components'
 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'
 
 export type BadgeFill = 'solid' | 'outline'
 export interface BadgeProps extends BasicComponent {
@@ -42,9 +52,10 @@ export const Badge: FunctionComponent<Partial<BadgeProps>> = (props) => {
     ...props,
   }
   const classPrefix = 'nut-badge'
-  const classes = classNames(classPrefix, className, {
-    [`${classPrefix}-${fill}`]: fill === 'outline',
-  })
+  const classes = classNames(classPrefix, className)
+  const isHarmonyAndRn = harmonyAndRn()
+  const badgeRef = useRef(null)
+  const [contentStyle, setContentStyle] = useState({})
 
   function content() {
     if (dot || typeof value === 'object' || value === 0) return null
@@ -66,41 +77,75 @@ export const Badge: FunctionComponent<Partial<BadgeProps>> = (props) => {
     if (typeof value === 'string' && value) return value
   }
 
-  const contentClasses = classNames(
-    { [`${classPrefix}-dot`]: dot },
-    `${classPrefix}-content`,
-    { [`${classPrefix}-sup`]: isNumber() || isString() || dot },
-    {
-      [`${classPrefix}-one`]:
-        typeof content() === 'string' && `${content()}`?.length === 1,
+  const contentClasses = classNames(`${classPrefix}-content`, {
+    [`${classPrefix}-sup`]: isNumber() || isString() || dot,
+    [`${classPrefix}-one`]:
+      typeof content() === 'string' && `${content()}`?.length === 1,
+    [`${classPrefix}-dot`]: dot,
+    [`${classPrefix}-${fill}`]: fill === 'outline',
+  })
+
+  useEffect(() => {
+    if (badgeRef.current) {
+      getPositionStyle()
     }
-  )
-  const getStyle = () => {
+  }, [badgeRef.current])
+  const getPositionStyle = async () => {
     const style: CSSProperties = {}
-    style.top = `${Number(top) || parseFloat(String(top)) || 0}px`
-    const dir = rtl ? 'left' : 'right'
-    style[dir] = `${Number(right) || parseFloat(String(right)) || 0}px`
+    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)
+      }
+    } else {
+      const dir = rtl ? 'left' : 'right'
+      style[dir] = `${Number(right) || parseFloat(String(right)) || 0}px`
+    }
+    setContentStyle(style)
+  }
 
+  const getStyle = () => {
+    const style: CSSProperties = {}
     if (color) {
       if (fill === 'outline') {
         style.color = color
-        style.background = '#fff'
+        style.backgroundColor = '#fff'
         if (!color?.includes('gradient')) {
-          style.border = `1px solid ${color}`
+          style.borderColor = color
         }
       } else {
         style.color = '#fff'
-        style.background = color
+        style.backgroundColor = color
       }
     }
     return style
   }
+
   return (
-    <View className={classes} style={style}>
-      {isIcon() && <View className={`${classPrefix}-icon`}>{value}</View>}
+    <View className={classes} style={style} ref={badgeRef}>
+      {isIcon() && (
+        <View
+          className={classNames(`${classPrefix}-content`, {
+            [`${classPrefix}-icon`]: true,
+            [`${classPrefix}-icon-rtl`]: rtl,
+          })}
+          style={contentStyle}
+        >
+          {value}
+        </View>
+      )}
       {children}
       {!isIcon() && (
-        <View className={contentClasses} style={getStyle()}>
+        <View
+          className={contentClasses}
+          style={{ ...contentStyle, ...getStyle() }}
+        >
           {content()}
         </View>
       )}

diff --git a/src/packages/badge/badge.tsx b/src/packages/badge/badge.tsx
@@ -66,18 +66,16 @@ export const Badge: FunctionComponent<Partial<BadgeProps>> = (props) => {
     if (typeof value === 'string' && value) return value
   }
 
-  const contentClasses = classNames(
-    { [`${classPrefix}-dot`]: dot },
-    `${classPrefix}-content`,
-    { [`${classPrefix}-sup`]: isNumber() || isString() || dot },
-    {
-      [`${classPrefix}-one`]:
-        typeof content() === 'string' && `${content()}`?.length === 1,
-    }
-  )
+  const contentClasses = classNames(`${classPrefix}-content`, {
+    [`${classPrefix}-sup`]: isNumber() || isString() || dot,
+    [`${classPrefix}-one`]:
+      typeof content() === 'string' && `${content()}`?.length === 1,
+    [`${classPrefix}-dot`]: dot,
+    [`${classPrefix}-${fill}`]: fill === 'outline',
+  })
   const getStyle = () => {
     const style: CSSProperties = {}
-    style.top = `${Number(top) || parseFloat(String(top)) || 0}px`
+    style.top = `${Number(-top) || parseFloat(String(-top)) || 0}px`
     const dir = rtl ? 'left' : 'right'
     style[dir] = `${Number(right) || parseFloat(String(right)) || 0}px`
 
@@ -97,7 +95,16 @@ export const Badge: FunctionComponent<Partial<BadgeProps>> = (props) => {
   }
   return (
     <div className={classes} style={style}>
-      {isIcon() && <div className={`${classPrefix}-icon`}>{value}</div>}
+      {isIcon() && (
+        <div
+          className={classNames(`${classPrefix}-content`, {
+            [`${classPrefix}-icon`]: true,
+            [`${classPrefix}-icon-rtl`]: rtl,
+          })}
+        >
+          {value}
+        </div>
+      )}
       {children}
       {!isIcon() && (
         <div className={contentClasses} style={getStyle()}>

diff --git a/src/packages/badge/demos/taro/demo1.tsx b/src/packages/badge/demos/taro/demo1.tsx
@@ -1,21 +1,35 @@
 import { User } from '@nutui/icons-react-taro'
 import { Avatar, Badge, Cell } from '@nutui/nutui-react-taro'
 import React from 'react'
+import pxTransform from '@/utils/px-transform'
+import { harmonyAndRn } from '@/utils/platform-taro'
 
 const Demo1 = () => {
+  const isRnAndHarmony = harmonyAndRn()
+  const renderChildren = () => {
+    return (
+      <>
+        {isRnAndHarmony ? (
+          <Avatar shape="square">N</Avatar>
+        ) : (
+          <Avatar icon={<User />} shape="square" />
+        )}
+      </>
+    )
+  }
   return (
     <Cell>
-      <Badge style={{ marginInlineEnd: '40px' }} value={8}>
-        <Avatar icon={<User />} shape="square" />
+      <Badge style={{ marginRight: pxTransform(40) }} value={8}>
+        {renderChildren()}
       </Badge>
-      <Badge style={{ marginInlineEnd: '40px' }} value={76}>
-        <Avatar icon={<User />} shape="square" />
+      <Badge style={{ marginRight: pxTransform(40) }} value={76}>
+        {renderChildren()}
       </Badge>
-      <Badge style={{ marginInlineEnd: '40px' }} value="NEW">
-        <Avatar icon={<User />} shape="square" />
+      <Badge style={{ marginRight: pxTransform(40) }} value="NEW">
+        {renderChildren()}
       </Badge>
-      <Badge style={{ marginInlineEnd: '40px' }} dot top="2" right="4">
-        <Avatar icon={<User />} shape="square" />
+      <Badge style={{ marginRight: pxTransform(40) }} dot top="2" right="4">
+        {renderChildren()}
       </Badge>
     </Cell>
   )