chore: solve conflicts

Author: anotherso1a

CHANGELOG.md

@@ -4,8 +4,14 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [3.0.8](https://github.com/ant-design/ant-design-mini/compare/3.0.7...3.0.8)
+
+- indexbar scroll  not silky [`#1386`](https://github.com/ant-design/ant-design-mini/pull/1386)
+
 #### [3.0.7](https://github.com/ant-design/ant-design-mini/compare/3.0.6...3.0.7)
 
+> 16 January 2025
+
 - fix: display range problem [`#1383`](https://github.com/ant-design/ant-design-mini/pull/1383)
 - Fix card divier [`#1378`](https://github.com/ant-design/ant-design-mini/pull/1378)
 - fix: card divider [`#1377`](https://github.com/ant-design/ant-design-mini/pull/1377)

mini.project.json

@@ -16,4 +16,4 @@
     "sourcemap": false,
     "lazyCompile": false
   }
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-mini",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "antd-mini 是支付宝小程序 UI 组件库，遵循 Ant Design 规范。",
   "miniprogram": "compiled/wechat/src",
   "scripts": {

scripts/axml/mapping.ts

@@ -195,6 +195,9 @@ export const wechatCustomMapping = {
   'ant-select-contact': {
     onSelect: 'bindselect',
   },
+  'ant-empty': {
+    onClickButton: 'bindclickbutton',
+  },
   'ant-prompts': {
     onItemTap: 'binditemtap',
   },
@@ -206,9 +209,6 @@ export const wechatCustomMapping = {
     onExpand: 'bindexpand',
     onContentItemTap: 'bindcontentitemtap'
   },
-  'ant-empty': {
-    onClickButton: 'bindclickbutton',
-  },
   'ant-actions': {
     onItemTap: 'binditemtap',
   },

src/IndexBar/index.ts

@@ -29,11 +29,19 @@ Component(
         ? current
         : defaultCurrent;
       const _index = items?.findIndex((u) => initCurrent === u.label);
-      this.setData({
-        currentKey: _index,
-        touchKeyIndex: _index,
-        touchKey: initCurrent,
-      });
+      this.setData(
+        {
+          currentKey: _index,
+          touchKeyIndex: _index,
+          touchKey: initCurrent,
+        },
+        () => {
+          this.setData({
+            touchKeyIndex: -1,
+            touchKey: '',
+          });
+        }
+      );
     },
     isControlled(nextProps, valueKey = 'current') {
       if ('controlled' in nextProps) {
@@ -129,8 +137,6 @@ Component(
       if (currentKey !== newIndex - 1 && newIndex - 1 >= 0 && !moving) {
         this.setData({
           currentKey: newIndex - 1,
-          touchKeyIndex: newIndex - 1,
-          touchKey: items[newIndex - 1].label,
         });
         this.onAlphabetClick(items[newIndex - 1], newIndex - 1);
       }