fix: merge

Author: xiaoyatong

CHANGELOG.md

@@ -1,3 +1,23 @@
+# v3.0.6
+
+`2025-03-28`
+
+- :sparkles: feat(skeleton): v15 (#3086)
+- :sparkles: feat(Tabbar): v15 样式适配；增加 icon/value/title 的function类型，支持根据active状态渲染不同数据；增加 onDoubleClick 事件 (#3110)
+- :sparkles: feat(indicator): 增加 UI 变体的类型 (#3114)
+- :sparkles: feat(switch): 异步切换支持受控loading态 (#3122)
+- :sparkles: feat(notify): v15 (#3082)
+- :sparkles: feat(lottie): 支持京东小程序 (#3080)
+- :sparkles: feat(demoblock): code block scrolling behavior， CodesandBox function and copyCode styles (#3106)
+- :bug: fix(searchbar): 支付宝小程序设置 enableInPageRenderInput 后无法触发 onChange (#3130)
+- :bug: fix: doc css (#3126)
+- :bug: fix(overlay): 扩大点击范围 (#3117)
+- :bug: fix(pickerview): 解决小程序获取高度计算错误 (#3120)
+- :bug: fix(badge): 修正css变量定义 (#3123)
+- :bug: fix: update pkgjson title (#3119)
+- 🪵 refactor(badge): 支持禁用模式 (#3118)
+- 🏡 chore: support ui review (#3121)
+
 # v3.0.5
 
 `2025-03-21`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui-react-taro",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "style": "dist/style.css",
   "main": "dist/nutui.react.umd.js",
   "module": "dist/es/packages/nutui.react.build.js",
@@ -54,6 +54,7 @@
     "changelog": "node ./scripts/generate-changelog.js",
     "clone:jdharmony": "node ./scripts/harmony/clone-jdharmony.js",
     "dev": "vite --open --force",
+    "dev:jmapp": "VITE_APP_PROJECT_ID=jmapp vite --open --force",
     "dev:rtl": "VITE_RTL=rtl vite --open --force",
     "dev:jrkf": "VITE_APP_PROJECT_ID=jrkf vite --open --force",
     "dev:taro:rn:dark": "THEME=dark pnpm dev:taro:rn",

packages/nutui-taro-demo/config/prod.js

@@ -11,6 +11,8 @@ try {
   /* empty */
 }
 
+console.log(hash && UI ? `-${hash}` : '')
+
 module.exports = {
   env: {
     NODE_ENV: '"production"',
@@ -19,7 +21,7 @@ module.exports = {
   defineConstants: {},
   mini: {},
   h5: {
-    publicPath: `/taro/react/3x/demo-${hash}`,
+    publicPath: `/taro/react/3x/demo${hash && UI ? `-${hash}` : ''}`,
     /**
      * WebpackChain 插件配置
      * @docs https://github.com/neutrinojs/webpack-chain

scripts/generate-local-changelog.js

@@ -10,7 +10,7 @@ shell.exec(
   { silent: true },
   (code, stdout, stderr) => {
     shell.exec(
-      `git log --since="${stdout.replace('\n', '')}" --pretty=format:"%s" next`,
+      `git log --since="${stdout.replace('\n', '')}" --pretty=format:"%s" feat_v3.x`,
       { silent: true },
       (code, stdout, stderr) => {
         const logs = stdout.split('\n')

src/config.json

@@ -406,7 +406,7 @@
           "sort": 2,
           "show": true,
           "taro": true,
-          "v15": 2,
+          "v15": 1,
           "author": "dsj",
           "dd": true
         },
@@ -989,7 +989,7 @@
           "taro": true,
           "v15": 10,
           "author": "oasis",
-          "dd": false
+          "dd": true
         },
         {
           "version": "3.0.0",
@@ -1013,7 +1013,7 @@
           "sort": 15,
           "show": true,
           "taro": true,
-          "v15": 2,
+          "v15": 1,
           "author": "swag~jun",
           "dd": true
         },
@@ -1127,29 +1127,29 @@
           "dd": false
         },
         {
-          "version": "2.0.0",
+          "version": "3.0.0",
           "name": "Collapse",
           "type": "component",
           "cName": "折叠面板",
           "desc": "折叠面板，可进行内容折叠展开操作，可以多面板配合使用。",
           "sort": 2,
           "show": true,
           "taro": true,
-          "v15": -1,
-          "author": "zhenyulei",
-          "dd": false
+          "v15": 1,
+          "author": "oasis",
+          "dd": true
         },
         {
-          "version": "2.0.0",
+          "version": "3.0.0",
           "name": "CollapseItem",
           "type": "component",
           "cName": "折叠面板子组件",
           "desc": "折叠面板的子组件",
           "sort": 13,
           "show": false,
           "exportEmpty": true,
-          "author": "zhenyulei",
-          "dd": false
+          "author": "oasis",
+          "dd": true
         },
         {
           "version": "3.0.0",

src/packages/collapse/__test__/__snapshots__/collapse.spec.tsx.snap

@@ -42,12 +42,16 @@ exports[`should match snapshot 1`] = `
         </div>
       </div>
       <div
-        class="nut-collapse-item-content"
+        class="nut-collapse-item-content-wrapper nut-collapse-item-content-wrapper-tran"
       >
         <div
-          class="nut-collapse-item-content-text"
+          class="nut-collapse-item-content"
         >
-          京东“厂直优品计划”首推“政府优品馆” 3年覆盖80%镇级政府
+          <div
+            class="nut-collapse-item-content-text"
+          >
+            京东“厂直优品计划”首推“政府优品馆” 3年覆盖80%镇级政府
+          </div>
         </div>
       </div>
     </div>
@@ -88,20 +92,24 @@ exports[`should match snapshot 1`] = `
         </div>
       </div>
       <div
-        class="nut-collapse-item-content"
+        class="nut-collapse-item-content-wrapper nut-collapse-item-content-wrapper-tran"
       >
         <div
-          class="nut-collapse-item-content-text"
+          class="nut-collapse-item-content"
         >
-          京东“厂直优品计划”首推“政府优品馆” 3年覆盖80%镇级政府
+          <div
+            class="nut-collapse-item-content-text"
+          >
+            京东“厂直优品计划”首推“政府优品馆” 3年覆盖80%镇级政府
+          </div>
         </div>
       </div>
     </div>
     <div
       class="nut-collapse-item"
     >
       <div
-        class="nut-collapse-item-header disabled"
+        class="nut-collapse-item-header nut-collapse-item-header-disabled"
       >
         <div
           class="nut-collapse-item-title"
@@ -134,13 +142,16 @@ exports[`should match snapshot 1`] = `
         </div>
       </div>
       <div
-        class="nut-collapse-item-content"
-        style="height: 0px;"
+        class="nut-collapse-item-content-wrapper nut-collapse-item-content-wrapper-tran"
       >
         <div
-          class="nut-collapse-item-content-text"
+          class="nut-collapse-item-content"
         >
-          京东“厂直优品计划”首推“政府优品馆”
+          <div
+            class="nut-collapse-item-content-text"
+          >
+            京东“厂直优品计划”首推“政府优品馆”
+          </div>
         </div>
       </div>
     </div>

src/packages/collapse/__test__/collapse.spec.tsx

@@ -63,10 +63,13 @@ test('prop activeName', async () => {
       </Collapse>
     </>
   )
-
-  expect(
-    container.querySelectorAll('.nut-collapse-item-content')[2]
-  ).toHaveStyle('height:0px')
+  waitFor(() => {
+    expect(
+      container.querySelectorAll('.nut-collapse-item-content-wrapper')[2]
+    ).toHaveStyle({
+      height: '0',
+    })
+  })
 })
 
 test('prop rotate', async () => {

src/packages/collapseitem/collapseitem.scss

@@ -38,8 +38,12 @@
       left: 16px;
       bottom: 0;
       border-bottom: $collapse-item-header-border-bottom;
-      -webkit-transform: scaleY(0.5);
-      transform: scaleY(0.5);
+      /* #ifdef harmony */
+      transform: scale(1, 1);
+      /* #endif */
+      /* #ifndef harmony */
+      transform: scale(1, 0.5);
+      /* #endif */
     }
   }
 
@@ -78,7 +82,7 @@
     transition: transform 0.3s;
   }
 
-  &-header.disabled {
+  &-header-disabled {
     color: $collapse-item-disabled-color;
 
     .nut-collapse-item-title {
@@ -90,21 +94,34 @@
     }
   }
 
-  &-content {
+  &-content-wrapper {
+    width: 100%;
+    position: relative;
+    box-sizing: border-box;
     overflow: hidden;
+    &-tran {
+      transition: all 0.3s linear;
+    }
+  }
+
+  &-content {
     display: block;
+    position: absolute;
+    height: auto;
+    width: 100%;
+    box-sizing: border-box;
     color: $collapse-wrapper-content-color;
     font-size: $collapse-wrapper-content-font-size;
     line-height: $collapse-wrapper-content-line-height;
     background-color: $collapse-wrapper-content-background-color;
-    transition: all 0.3s linear;
 
     &-text {
       color: $collapse-wrapper-content-color;
       padding: $collapse-wrapper-content-padding;
     }
   }
 }
+
 [dir='rtl'] .nut-collapse-item,
 .nut-rtl .nut-collapse-item {
   &-icon {