@conecli/cone-render 0.10.1-shop3.5 → 0.10.1-shop3.7

package/dist/components/base/InViewRender/index.tsx

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
  getNativePageScrollRes,
  latestFromNativeMsgStorage,
  const { children, placeholder, height, className, inViewCallback } = props
  const [componentShowState, setComponentShowState] = useState(false)
  const [componentRenderShowState, setComponentRenderShowState] = useState(
    false,
  )
  const componentLazyRef = useRef<HTMLElement | null>(null)
  const componentShowStateRef = useRef(false)
  const needShowHighVersion =
    isH5AndJdShopViewH5Scroll &&
    !(
      global.info.queryInfo?.downgraded &&
      global.info.queryInfo.downgraded === 'true'
    )
  const rootDom =
    isH5AndJdShopView && needShowHighVersion
      ? null
      : document.querySelector('#J_shopHomeRoot')
  if (isH5AndJdShopView && !needShowHighVersion && !isAppStowShop) {
    useEffect(() => {
      const latestRes =
        latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {}
      !componentShowStateRef.current && dealPageScrollInfo(latestRes)
      Taro.eventCenter.on(TaroEventType.PAGE_SCROLL, res => {
        !componentShowStateRef.current && dealPageScrollInfo(res)
      })
    }, [])
    useEffect(() => {
      if (componentShowState) {
        typeof inViewCallback === 'function' && inViewCallback()
      }
    }, [componentShowState])
    
    const dealPageScrollInfo = res => {
      const { displayHeight, offSetY } = getNativePageScrollRes(res) || {}
      if (
        typeof displayHeight === 'undefined' ||
        typeof offSetY === 'undefined'
      )
        return
      if (componentLazyRef.current) {
        const eleClientRect = componentLazyRef.current.getBoundingClientRect()
        const getContainerHeightOffSetY = displayHeight + offSetY
        const eleOffsetTop = Math.ceil(eleClientRect.top)
        if (!componentShowStateRef.current) {
          if (getContainerHeightOffSetY > eleOffsetTop) {
            componentShowStateRef.current = true
            setComponentShowState(true)
            Taro.nextTick(() => {
              setComponentRenderShowState(true)
            })
          }
        }
      }
    }
    return (
      <View
        ref={componentLazyRef}
        className={classNames(
          lazyLayoutLoadStyle['d-app-floor-lazy-layout-load'],
          'd-app-floor-lazy-load',
          className,
        )}
        style={{
          minHeight: `${
            componentRenderShowState
              ? 'auto'
              : height + (typeof height === 'number' ? 'px' : '')
          }`,
          backgroundColor: componentRenderShowState ? 'transparent' : '#ffffff',
        }}
      >
        {componentShowState ? children : placeholder}
      </View>
    )
  } else {
    const { ref, inView } = useInView({
      threshold: 0.5, 
      triggerOnce: true,
      root: rootDom || null, 
      rootMargin: `0px 0px 0px 0px`, 
      delay: 300, 
    })
    useEffect(() => {
      if (inView) {
        typeof inViewCallback === 'function' && inViewCallback()
      }
    }, [inView])
    return (
      <View
        className={className}
        ref={ref}
        style={{
          minHeight: inView
            ? 'auto'
            : typeof height === 'number'
            ? `${height}px`
            : height,
          backgroundColor: 'transparent',
        }}
      >
        {inView ? children : placeholder}
      </View>
    )
  }
  children: null, 
  placeholder: null, 
  height: 1, 
  className: '',
  lazyNodeClassName: '',
  inViewCallback: null,
+import Taro from '@tarojs/taro';
  getNativePageScrollRes,
  latestFromNativeMsgStorage,
  const { children, placeholder, height, className, inViewCallback } = props;
  const [componentShowState, setComponentShowState] = useState(false);
  const [componentRenderShowState, setComponentRenderShowState] = useState(false);
  const componentLazyRef = useRef<HTMLElement | null>(null);
  const componentShowStateRef = useRef(false);
  const needShowHighVersion =
    isH5AndJdShopViewH5Scroll &&
    !(global.info.queryInfo?.downgraded && global.info.queryInfo.downgraded === 'true');
  const rootDom =
    isH5AndJdShopView && needShowHighVersion ? null : document.querySelector('#J_shopHomeRoot');
  if (isH5AndJdShopView && !needShowHighVersion && !isAppStowShop) {
    useEffect(() => {
      const latestRes = latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {};
      !componentShowStateRef.current && dealPageScrollInfo(latestRes);
      Taro.eventCenter.on(TaroEventType.PAGE_SCROLL, (res) => {
        !componentShowStateRef.current && dealPageScrollInfo(res);
      });
    }, []);
    useEffect(() => {
      if (componentShowState) {
        typeof inViewCallback === 'function' && inViewCallback();
      }
    }, [componentShowState]);
    
    const dealPageScrollInfo = (res) => {
      const { displayHeight, offSetY } = getNativePageScrollRes(res) || {};
      if (typeof displayHeight === 'undefined' || typeof offSetY === 'undefined') return;
      if (componentLazyRef.current) {
        const eleClientRect = componentLazyRef.current.getBoundingClientRect();
        const getContainerHeightOffSetY = displayHeight + offSetY;
        const eleOffsetTop = Math.ceil(eleClientRect.top);
        if (!componentShowStateRef.current) {
          if (getContainerHeightOffSetY > eleOffsetTop) {
            componentShowStateRef.current = true;
            setComponentShowState(true);
            Taro.nextTick(() => {
              setComponentRenderShowState(true);
            });
          }
        }
      }
    };
    return (
      <View
        ref={componentLazyRef}
        className={classNames(
          lazyLayoutLoadStyle['d-app-floor-lazy-layout-load'],
          'd-app-floor-lazy-load',
          className,
        )}
        style={{
          minHeight: `${
            componentRenderShowState ? 'auto' : height + (typeof height === 'number' ? 'px' : '')
          }`,
          backgroundColor: componentRenderShowState ? 'transparent' : '#ffffff',
        }}
      >
        {componentShowState ? children : placeholder}
      </View>
    );
  } else {
    const { ref, inView } = useInView({
      threshold: 0.5, 
      triggerOnce: true,
      root: rootDom || null, 
      rootMargin: `0px 0px 0px 0px`, 
      delay: 300, 
    });
    useEffect(() => {
      if (inView) {
        typeof inViewCallback === 'function' && inViewCallback();
      }
    }, [inView]);
    return (
      <div
        className={className}
        ref={ref}
        style={{
          minHeight: inView ? 'auto' : typeof height === 'number' ? `${height}px` : height,
          backgroundColor: 'transparent',
        }}
      >
        {inView ? children : placeholder}
      </div>
    );
  }
  children: null, 
  placeholder: null, 
  height: 1, 
  className: '',
  lazyNodeClassName: '',
  inViewCallback: null,

package/dist/components/floorItem.weapp.tsx

@@ -1 +1 @@
-import React from 'react'
  const {
    floorData,
    renderSourceType = BUSINESS_TYPE.ONLINE, 
    builtInComponents = {},
    updateContainerFloorListDataFn,
  } = props
  const isDevMode = renderSourceType === BUSINESS_TYPE.DECORATE
  const floorModuleType = floorData?.floorExtInfo?.moduleFlag
  const FloorContentItem =
    (floorModuleType && builtInComponents[floorModuleType]) || null
  const dataDefines = getFloorDataToDataDefines(floorData)
  
  const renderDecorateDefaultModule = () => {
    return (
      <View
        style={{
          lineHeight: '120px',
          textAlign: 'center',
        }}
      >
        当前模块是{floorData.moduleName}
      </View>
    )
  }
  return FloorContentItem ? (
    <ErrorBoundary {...props}>
      <FloorContentItem {...props} dataDefines={dataDefines} />
    </ErrorBoundary>
  ) : isDevMode ? (
    renderDecorateDefaultModule()
  ) : null
  switch (moduleId) {
    case 83158:
      return 'freeLayout'
    case 99654:
      return 'activeText'
    case 100382:
      return 'superGoods'
  }
  floorList.map((item) => {
    if (!item.floorExtInfo) {
      return null
    }
    const moduleFlag = item.floorExtInfo.moduleFlag
    if (!moduleFlag) {
      const newModuleFlag = moduleId2ModuleFlag(item.moduleId)
      if (newModuleFlag) {
        item.floorExtInfo.moduleFlag = newModuleFlag
      }
    }
  })
+import React from 'react'
  const { floorData, renderSourceType, builtInComponents = {} } = props
  const isDevMode = renderSourceType === BUSINESS_TYPE.DECORATE
  const floorModuleType = floorData?.floorExtInfo?.moduleFlag
  const FloorContentItem =
    (floorModuleType && builtInComponents[floorModuleType]) || null
  const dataDefines = getFloorDataToDataDefines(floorData)
  
  const renderDecorateDefaultModule = () => {
    return (
      <View
        style={{
          lineHeight: '120px',
          textAlign: 'center',
        }}
      >
        当前模块是{floorData.moduleName}
      </View>
    )
  }
  return FloorContentItem ? (
    <ErrorBoundary {...props}>
      <FloorContentItem {...props} dataDefines={dataDefines} />
    </ErrorBoundary>
  ) : isDevMode ? (
    renderDecorateDefaultModule()
  ) : null
  renderSourceType: BUSINESS_TYPE.ONLINE, 
  switch (moduleId) {
    case 83158:
      return 'freeLayout'
    case 99654:
      return 'activeText'
    case 100382:
      return 'superGoods'
  }
  floorList.map((item) => {
    if (!item.floorExtInfo) {
      return null
    }
    const moduleFlag = item.floorExtInfo.moduleFlag
    if (!moduleFlag) {
      const newModuleFlag = moduleId2ModuleFlag(item.moduleId)
      if (newModuleFlag) {
        item.floorExtInfo.moduleFlag = newModuleFlag
      }
    }
  })

package/dist/interface/common.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
    isJingxiMiniViewState?: boolean
      floorVideInfo: object
      isFloorInfoDataByPage?: boolean
        originQueryInfo: {
    openAppData?: {
      [key: string]: any
    }
+import Taro from '@tarojs/taro'
        abTestLabels: {
            [key: string]: any
        }
    isJingxiMiniViewState?: boolean
      floorVideInfo: object
      isFloorInfoDataByPage?: boolean
        originQueryInfo: {
    openAppData?: {
      [key: string]: any
    }

package/dist/jumpEventReport/const.ts

@@ -1 +1 @@
-import { isH5, isWxMinAndWxapp } from '../utils'
  ? 'Terminator_New_Mobile_Shop'
  : 'W_jdgwxcx_shop'
  CONFIG_TYPE_NO_LINK = 0, 
  CONFIG_TYPE_SKU_LIST = 1, 
  CONFIG_TYPE_COUPON_LIST = 2, 
  CONFIG_TYPE_CATEGORY = 3,
  CONFIG_TYPE_JSHOP_MOBILE = 4,
  CONFIG_TYPE_JSHOP_PC = 5,
  CONFIG_TYPE_JSHOP_DETAIL = 6,
  CONFIG_TYPE_CUSTOM_LINK = 7, 
  CONFIG_TYPE_MEMBER = 9, 
  CONFIG_TYPE_SHOP_ACTIVITY = 10,
  CONFIG_TYPE_SHOP_HOME = 12,
  CONFIG_TYPE_ANCHOR_POINT = 13,
  CONFIG_TYPE_SHOPPING_GUIDE = 17, 
  CONFIG_TYPE_MINI_PROGRAM = 18, 
  CONFIG_TYPE_FINANCE_COUPON = 22, 
  CONFIG_TYPE_CATEGORY_PAGE = 25, 
  CONFIG_TYPE_SHOP_SEARCH = 31, 
+import { isH5, isWxMinAndWxapp } from '../utils'
  ? 'Terminator_New_Mobile_Shop'
  : 'W_jdgwxcx_shop'
  CONFIG_TYPE_NO_LINK = 0, 
  CONFIG_TYPE_SKU_LIST = 1, 
  CONFIG_TYPE_COUPON_LIST = 2, 
  CONFIG_TYPE_CATEGORY = 3,
  CONFIG_TYPE_JSHOP_MOBILE = 4,
  CONFIG_TYPE_JSHOP_PC = 5,
  CONFIG_TYPE_JSHOP_DETAIL = 6,
  CONFIG_TYPE_CUSTOM_LINK = 7, 
  CONFIG_TYPE_MEMBER = 9, 
  CONFIG_TYPE_SHOP_ACTIVITY = 10,
  CONFIG_TYPE_SHOP_HOME = 12,
  CONFIG_TYPE_ANCHOR_POINT = 13,
  CONFIG_TYPE_SHOPPING_GUIDE = 17, 
  CONFIG_TYPE_MINI_PROGRAM = 18, 
  CONFIG_TYPE_FINANCE_COUPON = 22, 
  CONFIG_TYPE_CATEGORY_PAGE = 25, 
  CONFIG_TYPE_SHOP_SEARCH = 31,