@conecli/cone-render 0.10.1-beta.8 → 0.10.1-beta.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@conecli/cone-render",
-  "version": "0.10.1-beta.8",
+  "version": "0.10.1-beta.9",
   "private": false,
   "files": [
     "dist/"
@@ -24,8 +24,7 @@
   "templateInfo": {
     "name": "default",
     "typescript": true,
-    "css": "sass",
-    "framework": "React"
+    "css": "sass"
   },
   "scripts": {
     "build:weapp": "taro build --type weapp",
@@ -36,7 +35,7 @@
     "build:rn": "taro build --type rn",
     "build:qq": "taro build --type qq",
     "build:jd": "taro build --type jd",
-    "build:harmony-hybrid": "taro build --type harmony-hybrid",
+    "build:quickapp": "taro build --type quickapp",
     "dev:weapp": "npm run build:weapp -- --watch",
     "dev:swan": "npm run build:swan -- --watch",
     "dev:alipay": "npm run build:alipay -- --watch",
@@ -45,23 +44,17 @@
     "dev:rn": "npm run build:rn -- --watch",
     "dev:qq": "npm run build:qq -- --watch",
     "dev:jd": "npm run build:jd -- --watch",
-    "dev:harmony-hybrid": "npm run build:harmony-hybrid -- --watch",
+    "dev:quickapp": "npm run build:quickapp -- --watch",
     "compressWatch": "gulp compressWatch --gulpfile ./publish/gulpfile.js",
     "compress": "gulp compress --gulpfile ./publish/gulpfile.js",
     "build": "npm run compress",
     "check": "gulp check --gulpfile ./publish/gulpfile.js"
   },
-  "browserslist": {
-    "development": [
-      "defaults and fully supports es6-module",
-      "maintained node versions"
-    ],
-    "production": [
-      "last 3 versions",
-      "Android >= 4.1",
-      "ios >= 8"
-    ]
-  },
+  "browserslist": [
+    "last 3 versions",
+    "Android >= 4.1",
+    "ios >= 8"
+  ],
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged",
@@ -85,76 +78,72 @@
   ],
   "author": "conecli",
   "dependencies": {
-    "@babel/runtime": "7.24.4",
-    "@tarojs/components": "4.1.2",
-    "@tarojs/helper": "4.1.2",
-    "@tarojs/plugin-platform-weapp": "4.1.2",
-    "@tarojs/plugin-platform-alipay": "4.1.2",
-    "@tarojs/plugin-platform-tt": "4.1.2",
-    "@tarojs/plugin-platform-swan": "4.1.2",
-    "@tarojs/plugin-platform-jd": "4.1.2",
-    "@tarojs/plugin-platform-qq": "4.1.2",
-    "@tarojs/plugin-platform-h5": "4.1.2",
-    "@tarojs/plugin-platform-harmony-hybrid": "4.1.2",
-    "@tarojs/runtime": "4.1.2",
-    "@tarojs/shared": "4.1.2",
-    "@tarojs/taro": "4.1.2",
-    "@tarojs/plugin-framework-react": "4.1.2",
-    "@tarojs/react": "4.1.2",
-    "@tarojs/service": "4.1.2",
-    "react-dom": "^18.2.0",
-    "react": "^18.2.0",
+    "@tarojs/cli": "3.5.4",
+    "@tarojs/components": "3.5.4",
+    "@tarojs/plugin-framework-react": "3.5.4",
+    "@tarojs/react": "3.5.4",
+    "@tarojs/runtime": "3.5.4",
+    "@tarojs/shared": "3.5.4",
+    "@tarojs/taro": "3.5.4",
+    "@tarojs/taro-h5": "3.5.4",
+    "@tarojs/taro-loader": "3.5.4",
+    "@tarojs/webpack5-runner": "3.5.4",
     "art-template": "^4.13.2",
     "gulp-filter": "^7.0.0",
     "normalize.css": "^8.0.1",
+    "raf": "^3.4.1",
+    "react": "^18.2.0",
     "react-content-loader": "^6.2.0",
+    "react-dom": "^18.2.0",
     "react-intersection-observer": "8.33.1",
     "react-refresh": "^0.14.0",
     "sha256": "^0.2.0"
   },
   "devDependencies": {
+    "@babel/core": "^7.8.0",
+    "@babel/runtime": "7.23.7",
     "@babel/plugin-transform-strict-mode": "^7.16.7",
-    "@babel/core": "7.24.4",
-    "@tarojs/cli": "4.1.2",
-    "@babel/plugin-proposal-class-properties": "7.14.5",
-    "@types/webpack-env": "^1.13.6",
-    "@types/react": "^18.0.17",
-    "webpack": "5.91.0",
-    "@tarojs/taro-loader": "4.1.2",
-    "@tarojs/webpack5-runner": "4.1.2",
-    "sass": "^1.75.0",
-    "babel-preset-taro": "4.1.2",
-    "eslint-config-taro": "4.1.2",
-    "eslint": "^8.57.0",
+    "@commitlint/cli": "^13.1.0",
+    "@commitlint/config-conventional": "^13.1.0",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
-    "react-refresh": "^0.14.0",
-    "@babel/preset-react": "^7.24.1",
-    "eslint-plugin-react": "^7.34.1",
-    "eslint-plugin-import": "^2.12.0",
-    "eslint-plugin-react-hooks": "^4.4.0",
-    "stylelint": "^16.4.0",
-    "@typescript-eslint/parser": "^6.2.0",
-    "@typescript-eslint/eslint-plugin": "^6.2.0",
-    "typescript": "^5.4.5",
-    "tsconfig-paths-webpack-plugin": "^4.1.0",
-    "postcss": "^8.4.38",
-    "ts-node": "^10.9.1",
-    "@types/node": "^18",
+    "@swc/core": "1.2.242",
+    "@swc/register": "^0.1.10",
+    "@types/react": "^18.0.17",
+    "@types/webpack-env": "^1.13.6",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
+    "babel-preset-taro": "3.5.4",
     "del": "^6.1.1",
     "escodegen": "^2.0.0",
+    "eslint": "^8.56.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-config-taro": "3.5.4",
+    "eslint-plugin-import": "^2.12.0",
+    "eslint-plugin-prettier": "^3.4.0",
+    "eslint-plugin-react": "^7.8.2",
+    "eslint-plugin-react-hooks": "^4.2.0",
     "espree": "^9.3.2",
     "esprima": "^4.0.1",
     "estraverse": "^5.3.0",
     "gulp": "^4.0.2",
     "gulp-util": "^3.0.8",
     "html-webpack-plugin": "^5.5.0",
+    "husky": "^4.3.8",
+    "lint-staged": "^11.1.1",
     "mini-css-extract-plugin": "^2.6.1",
+    "prettier": "^3.3.3",
+    "sass": "^1.53.0",
     "shelljs": "^0.8.5",
-    "terser-webpack-plugin": "^5.3.6"
+    "stylelint": "^14.4.0",
+    "terser-webpack-plugin": "^5.3.6",
+    "typescript": "^4.1.0",
+    "webpack": "5.69.0"
   },
   "resolutions": {
-    "@babel/runtime": "7.24.4",
-    "@tarojs/cli": "4.1.2",
-    "@tarojs/helper": "4.1.2"
+    "@babel/runtime": "7.23.7",
+    "@tarojs/cli": "3.5.4",
+    "@tarojs/helper": "3.5.4",
+    "@tarojs/service": "3.5.4",
+    "@tarojs/shared": "3.5.4"
   }
 }

package/dist/components/base/CustomScrollView/index-back.tsx

@@ -1 +0,0 @@
-import React, { useRef, useEffect } from 'react';
  isH5AndJdShopView,
  isAndroidDevice,
  isJdAndAndroidDevice,
  isJdAndIosDevice,
  isIosDevice,
  isJdApp,
  isWxMin,
  isH5AndJdShopViewH5Scroll,
  isH5AndJdShopH5CustomScrollView,
  isH5,
  isAppClassifyPage,
  lodashThrottle,
  START: 'start',
  MOVE: 'move',
  END: 'end',
  const {
    style = {},
    scrollX = false,
    scrollY = false,
    scrollWithAnimation = true,
    iosNeedDisableVertical = false, 
    className = null,
    dispatchTouchMove = true, 
    children,
    ...otherProps
  } = props;
  const rootEleNode = isH5 && document?.querySelector('body');
  const needShowHighVersion =
    isH5AndJdShopViewH5Scroll && global.info.queryInfo?.downgraded !== 'true';
  const mLastClientPosRef = useRef({
    mLastClientX: 0,
    mLastClientY: 0,
  });
  const isJdAndH5ScrollState = needShowHighVersion || isH5AndJdShopH5CustomScrollView;
  
  const touchstartEventBubbleFunc = (e) => {
    const isH5SwiperCustomEle = e?.target?.closest('.J_h5SwiperCustom');
    if (!isH5SwiperCustomEle) {
      const hasCustomEle = e
        ? e?.target?.closest('.J_customScroll') || e?.target?.closest('.J_customLayout')
        : false;
      if (isJdAndAndroidDevice && !hasCustomEle) {
        window.JdAndroid && window.JdAndroid.requestEvent(false);
      }
      !hasCustomEle &&
        rootEleNode &&
        rootEleNode.classList.contains('over-hidden') &&
        rootEleNode.classList.remove('over-hidden');
    }
  };
  const touchstartEventCaptureFunc = (e) => {
    if (e && !e?.target?.closest('.J_h5SwiperCustom') && !e?.target?.closest('.J_customLayout')) {
      rootEleNode &&
        rootEleNode.classList.contains('over-hidden') &&
        rootEleNode.classList.remove('over-hidden');
    }
  };
  useEffect(() => {
    isJdApp &&
      !window.JDJshopViewInfo.getAndroidTouchSlopState &&
      nativePageGetScaledTouchSlop((res) => {
        console.log('获取安卓系统滑动阈值', res);
        window.JDJshopViewInfo.androidTouchSlop = res;
        window.JDJshopViewInfo.getAndroidTouchSlopState = true;
      });
    if (isJdAndH5ScrollState && rootEleNode && !rootEleAddEventListenerState) {
      global?.removeJdAndroidRquestEventForTouchStart &&
        global.removeJdAndroidRquestEventForTouchStart();
      rootEleNode.addEventListener('touchstart', touchstartEventBubbleFunc, false);
      
      rootEleNode.addEventListener('touchstart', touchstartEventCaptureFunc, true);
      rootEleAddEventListenerState = true;
      console.log('customScrollView 初始化document监听完成');
    }
    return () => {
      if (isJdAndH5ScrollState && rootEleNode && rootEleAddEventListenerState) {
        console.log('customScrollView document监听取消完成');
        rootEleNode.removeEventListener('touchstart', touchstartEventBubbleFunc, false);
        rootEleNode.removeEventListener('touchstart', touchstartEventCaptureFunc, true);
      }
    };
  }, []);
  
  const androidDeviceStopNativeScrollEvent = (touchType) => {
    isJdApp &&
      isAndroidDevice &&
      window?.JdAndroid &&
      window?.JdAndroid.requestEvent(touchType === TouchType.START);
  };
  const iosDeviceStopNativeScrollEvent = (e, touchType, sendIosState = true) => {
    sendIosState && iosDeviceSendRouter(touchType);
  };
  
  const iosDeviceSendRouter = (state: string) => {
    window?.webkit?.messageHandlers?.MobileNavi?.postMessage?.({
      method: 'callRouterModuleWithParams',
      params: {
        routerURL: 'router://JDShopModule/processShoph5SlideState',
        routerParam: {
          slideDirection: 'horizontal',
          needDisableVertical: `${iosNeedDisableVertical}`,
          state,
        },
        callBackId: new Date().getTime(),
      },
    });
  };
  const stopNativeScrollEvent = (e: Event, touchType, sendIosState = true) => {
    if (isJdApp) {
      if (isIosDevice && !isAppClassifyPage) {
        iosDeviceStopNativeScrollEvent(e, touchType, sendIosState);
      } else if (isAndroidDevice) {
        androidDeviceStopNativeScrollEvent(touchType);
      }
    }
  };
  
  const GetSlideAngle = (dx, dy) => {
    return (Math.atan2(dy, dx) * 180) / Math.PI;
  };
  
  const GetSlideDirection = (startX, startY, endX, endY) => {
    const dy = startY - endY;
    const dx = endX - startX;
    let result = 0;
    if (Math.abs(dx) < 2 && Math.abs(dy) < 2) {
      return result;
    }
    const angle = GetSlideAngle(dx, dy);
    if (angle >= -45 && angle < 45) {
      result = 4;
    } else if (angle >= 45 && angle < 135) {
      result = 1;
    } else if (angle >= -135 && angle < -45) {
      result = 2;
    } else if ((angle >= 135 && angle <= 180) || (angle >= -180 && angle < -135)) {
      result = 3;
    }
    return result;
  };
  const changeTouchStart = (e) => {
    if (isJdApp) {
      stopNativeScrollEvent(e, TouchType.START, !iosNeedDisableVertical);
      if (isH5AndJdShopView || isH5AndJdShopH5CustomScrollView) {
        isJdAndH5ScrollState && rootEleNode && rootEleNode.classList.add('over-hidden');
        const touchEvent = e?.originalEvent?.targetTouches[0] || e?.targetTouches[0];
        mLastClientPosRef.current.mLastClientX = touchEvent.clientX;
        mLastClientPosRef.current.mLastClientY = touchEvent.clientY;
      }
    }
  };
  const changeTouchEnd = (e) => {
    stopNativeScrollEvent(e, TouchType.END);
    mLastClientPosRef.current.mLastClientX = 0;
    mLastClientPosRef.current.mLastClientY = 0;
  };
  const triggerIosTouchMove = () => {
    isJdAndIosDevice && iosDeviceStopNativeScrollEvent(null, TouchType.START, true);
  };
  
  const lodashThrottleTriggerIosTouchMove = lodashThrottle(triggerIosTouchMove, 500);
  
  const recoverRootEleVerticalScroll = (touchEvent) => {
    const direction = GetSlideDirection(
      mLastClientPosRef.current.mLastClientX,
      mLastClientPosRef.current.mLastClientY,
      touchEvent.clientX,
      touchEvent.clientY,
    );
    if (direction === 1 || direction === 2) {
      rootEleNode &&
        rootEleNode.classList.contains('over-hidden') &&
        rootEleNode.classList.remove('over-hidden');
    }
  };
  const changeTouchMove = (e) => {
    if (isH5AndJdShopView || isH5AndJdShopH5CustomScrollView) {
      const touchEvent = e?.originalEvent?.targetTouches[0] || e?.targetTouches[0];
      const xDiff = Math.abs(touchEvent.clientX - mLastClientPosRef.current.mLastClientX).toFixed(
        2,
      );
      const yDiff = Math.abs(touchEvent.clientY - mLastClientPosRef.current.mLastClientY).toFixed(
        2,
      );
      if (isJdApp) {
        if (xDiff >= window.JDJshopViewInfo.androidTouchSlop) {
          iosNeedDisableVertical && isJdApp && lodashThrottleTriggerIosTouchMove();
        } else if (yDiff > window.JDJshopViewInfo.androidTouchSlop) {
          stopNativeScrollEvent(e, TouchType.END);
        }
      }
      isJdAndH5ScrollState && recoverRootEleVerticalScroll(touchEvent);
    }
    if (!dispatchTouchMove) {
      return;
    }
    const parentNode = e.target?.parentNode;
    if (!parentNode) {
      return;
    }
    const event = new TouchEvent('touchmove', e);
    parentNode.dispatchEvent(event);
  };
  if (scrollX && isJdApp && !isIgnorePreventNative) {
    return (
      <ScrollView
        scrollX
        onTouchStart={changeTouchStart}
        onTouchEnd={changeTouchEnd}
        onTouchCancel={changeTouchEnd}
        onTouchMove={changeTouchMove}
        enhanced
        showScrollbar={false}
        style={style}
        className={classNames(
          className,
          {
            [customScrollViewStyle['d-custom-ios-h5-extend-border-radius']]: isIosDevice,
          },
          'J_customScroll',
        )}
        scrollY
        scrollWithAnimation
        {...otherProps}
      >
        {children}
      </ScrollView>
    );
  } else {
    return (
      <ScrollView
        scrollX
        scrollY
        scrollWithAnimation
        enhanced
        showScrollbar={false}
        {...otherProps}
        className={classNames(
          className,
          {
            [customScrollViewStyle['d-custom-ios-mini-extend-border-radius']]:
              isIosDevice && isWxMin && scrollX && style['borderRadius'],
          },
          {
            [customScrollViewStyle['d-custom-ios-h5-extend-border-radius']]: isIosDevice,
          },
          {
            [customScrollViewStyle['d-custom-mini-hide-scroll']]: isWxMin,
          },
        )}
        style={style}
      >
        {children}
      </ScrollView>
    );
  }

package/dist/utils/log.ts

@@ -1 +0,0 @@
-export const timeLog = (...messages) => {
  const level = 'info';
  const now = new Date();
  const timestamp = now.toLocaleString('zh-CN', {
    year: 'numeric',
    month: '2-digit',
    day: '2-digit',
    hour: '2-digit',
    minute: '2-digit',
    second: '2-digit',
    hour12: false,
  });
  const milliseconds = now.getMilliseconds().toString().padStart(3, '0');
  const prefix = `[${timestamp}.${milliseconds}] `;
  const logMethods = {
    info: console.info,
    warn: console.warn,
    error: console.error,
  };
  logMethods[level](prefix, ...messages);