@conecli/cone-render 0.10.1-isv2.1 → 0.10.1-isv2.4

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/base/InViewRender/index.weapp.tsx

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
+import Taro from '@tarojs/taro'
  SECTION_HOME_TAB_TYPE,
  SECTION_HOME_TAB_NAME_TYPE,
  const {
    sectionType = SECTION_HOME_TAB_NAME_TYPE[
      SECTION_HOME_TAB_TYPE.HOME_WELL_CHOSEN
    ],
    type = LazyType.FLOOR, 
    children = null, 
    placeholder = null, 
    height = 200, 
    className = '',
    lazyNodeClassName = '',
    containerId,
  } = props
  const [componentShowState, setComponentShowState] = useState(false)
  const componentLazyRef = useRef<HTMLElement | null>(null)
  const lazyLayoutLoadFloor =
    'lazy-layout-load-floor' + Math.floor(Math.random() * 10000000)
  useEffect(() => {
    Taro.nextTick(() => {
      const createIntersectionObserver = new intersectionObserver({
        selector: `.${lazyLayoutLoadFloor}`,
        context: this,
        onFinal: () => {
          setComponentShowState(true)
          createIntersectionObserver.disconnect()
        },
      })
      createIntersectionObserver.connect()
    })
  }, [])
  return type === LazyType.IMAGE ? (
    children
  ) : (
    <View
      id={`${containerId}_lazy`}
      ref={componentLazyRef}
      className={classNames(
        lazyLayoutLoadStyle['d-app-floor-lazy-layout-load'],
        'd-app-floor-lazy-load',
        lazyLayoutLoadFloor,
      )}
      style={{
        minHeight: `${componentShowState ? 'auto' : height + 'px'}`,
        backgroundColor: componentShowState ? 'transparent' : '#ffffff',
      }}
    >
      {componentShowState ? children : placeholder}
    </View>
  )

package/dist/components/base/ItemViewExposureSmart/index.module.scss

@@ -1,7 +1,7 @@
 
-.d-item-point-layout{
+.d-item-point-layout {
   position: relative;
-  .d-item-chart-point{
+  .d-item-chart-point {
     opacity: 1;
     z-index: 100;
   }

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

@@ -1 +1 @@
-import React from 'react'
  const { className, pointClassName, children, reportData, customReportDataKey,customReportDataFn, trackCallback, ...otherProps } =
    props
  const isCustomReport = customReportDataKey && customReportDataFn
  const checkReportData = Array.isArray(reportData)
  const [floorData, mInfo] = checkReportData ? reportData : []
  const checkReportDataState = isCustomReport ? true : floorData && mInfo
  
  floorData && mInfo && !mInfo.hasOwnProperty('pos') && (mInfo.pos = 0)
  return (
    <View
      ref={ref}
      className={classNames(
        itemViewExposureSmartStyle['d-item-point-layout'],
        className,
      )}
      {...otherProps}
    >
      {children ? children : null}
      {checkReportDataState && (
        <ExposureSmart
          className={classNames(pointClassName,{
            [itemViewExposureSmartStyle['d-item-chart-point']]: isChartH5,
          })}
          reportData={reportData}
          trackCallback={trackCallback}
          customReportDataFn={customReportDataFn}
          customReportDataKey={customReportDataKey}
          markPoint
        />
      )}
    </View>
  )
  reportData: [],
  customReportDataKey: null,
  customReportDataFn: null
+import React, { useRef } from 'react';
  const {
    className,
    pointClassName,
    children,
    reportData,
    customReportDataKey,
    customReportDataFn,
    trackCallback,
    ...otherProps
  } = props;
  const itemViewExposureRef = useRef(null);
  const isCustomReport = customReportDataKey && customReportDataFn;
  const checkReportData = Array.isArray(reportData);
  const [floorData, mInfo] = checkReportData ? reportData : [];
  const checkReportDataState = isCustomReport ? true : floorData && mInfo;
  
  floorData && mInfo && !mInfo.hasOwnProperty('pos') && (mInfo.pos = 0);
  return (
    <View
      ref={itemViewExposureRef}
      className={classNames(itemViewExposureSmartStyle['d-item-point-layout'], className)}
      {...otherProps}
    >
      {children ? children : null}
      {checkReportDataState && (
        <ExposureSmart
          className={classNames(pointClassName, {
            [itemViewExposureSmartStyle['d-item-chart-point']]: isChartH5,
          })}
          innerRef={itemViewExposureRef}
          reportData={reportData}
          trackCallback={trackCallback}
          customReportDataFn={customReportDataFn}
          customReportDataKey={customReportDataKey}
          markPoint
        />
      )}
    </View>
  );
  reportData: [],
  customReportDataKey: null,
  customReportDataFn: null,
  customReportDataForMapFn: null,

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

@@ -1 +1 @@
-import Taro, { useRouter } from '@tarojs/taro'
  isH5AndJdShopView,
  isH5AndJdShopViewH5Scroll,
  sgmCustomReport,
  getSgmCustomCode,
  SECTION_HOME_TAB_TYPE,
  SECTION_HOME_TAB_NAME_TYPE,
  TaroEventType,
  latestFromNativeMsgStorage,
  nativePageRegisterMessage,
  Message_Type,
  getNativePageScrollRes,
  const {
    children,
    containerId,
    type,
    placeholder,
    height,
    floorData = {},
    sectionType,
    lazyNodeClassName,
  } = props
  const getRouterInfo = useRouter()
  const getQueryData = getRouterInfo?.params || {}
  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')
  const { ref, inView } = useInView({
    threshold: 0,
    triggerOnce: true,
    root: rootDom, 
    rootMargin: `0px 0px ${window.innerHeight}px 0px`, 
  })
  useEffect(() => {
    if (needShowHighVersion || !isH5AndJdShopView) return
    if (type === LazyType.FLOOR) {
      const latestRes =
        latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {}
      !componentShowStateRef.current && dealPageScrollInfo(latestRes, false)
      Taro.eventCenter.on(TaroEventType.PAGE_SCROLL, res => {
        !componentShowStateRef.current && dealPageScrollInfo(res, true)
      })
    }
  }, [])
  useEffect(() => {
    if (
      (!needShowHighVersion && componentShowState === true) ||
      (needShowHighVersion && inView && isH5AndJdShopView)
    ) {
      console.log(
        '>>>>>>>>>>>>>>>>>>> 楼层【id=' + containerId + '】已经渲染！',
      )
      const modularPackResult = floorData?.floorExtInfo?.modularPackResult
      const modularPackResultObj =
        typeof modularPackResult === 'string'
          ? JSON.parse(modularPackResult)
          : modularPackResult
      if (modularPackResultObj && modularPackResultObj.bundleUrl) {
        const { bundleUrl } = modularPackResultObj
        nativePageRegisterMessage(Message_Type.NATIVE_INJECT_JS_FILE, {
          data: {
            bundleUrl: [bundleUrl],
          },
        })
      }
    }
  }, [componentShowState, inView])
  
  const dealPageScrollInfo = (res, pageScrollTrigger) => {
    const { displayHeight, offSetY } = getNativePageScrollRes(res) || {}
    if (
      typeof displayHeight === 'undefined' ||
      typeof offSetY === 'undefined'
    ) {
      const shopId = floorData?.floorExtInfo?.shopId
      if (!lazyLayoutLoadErrorShopId[`${shopId}`] && pageScrollTrigger) {
        const opt = {
          msg: `店铺楼层懒加载失败。楼层顺序-floorIdx: ${floorData?.floorIdx}。`,
          uid: floorData?.uid,
          floorIdx: floorData?.floorIdx,
          shopId: shopId,
          moduleId: floorData?.moduleId,
          moduleName: floorData?.moduleName,
          middleTemplateId: floorData?.middleTemplateId,
          modularPackResult:
            typeof floorData?.floorExtInfo?.modularPackResult == 'string'
              ? JSON.parse(floorData?.floorExtInfo?.modularPackResult)
              : floorData?.floorExtInfo?.modularPackResult,
        }
        sgmCustomReport({
          code: getSgmCustomCode(SgmCustomCode.FLOORLAZYLOAD_DATA),
          msg: opt,
        })
        lazyLayoutLoadErrorShopId[`${shopId}`] = true
      }
      return
    }
    if (componentLazyRef.current) {
      const eleClientRect = componentLazyRef.current.getBoundingClientRect()
      const getContainerHeightOffSetY = displayHeight + offSetY
      const eleOffsetTop = Math.ceil(eleClientRect.top)
      const eleOffsetHeight = Math.ceil(eleClientRect.height)
      const eleOffsetTopHeight = eleOffsetTop + eleOffsetHeight
      if (!componentShowStateRef.current) {
        if (getContainerHeightOffSetY > eleOffsetTop) {
          componentShowStateRef.current = true
          setComponentShowState(true)
          Taro.nextTick(() => {
            setComponentRenderShowState(true)
          })
        }
      }
    }
  }
  return isH5AndJdShopView && !needShowHighVersion ? (
    <div
      id={`${containerId}_lazy`}
      ref={componentLazyRef}
      className={classNames(
        lazyLayoutLoadStyle['d-app-floor-lazy-layout-load'],
        'd-app-floor-lazy-load',
      )}
      style={{
        minHeight: `${componentRenderShowState ? 'auto' : height + 'px'}`,
        backgroundColor: componentRenderShowState ? 'transparent' : '#ffffff',
      }}
    >
      {componentShowState ? children : placeholder}
    </div>
  ) : (
    <div
      id={`${containerId}_lazy`}
      className={classNames(
        lazyLayoutLoadStyle['d-mobile-floor-lazy-layout-load'],
        'd-mobile-floor-lazy-load',
        lazyNodeClassName,
      )}
      ref={ref}
      style={{
        minHeight: `${inView ? 'auto' : height + 'px'}`,
        backgroundColor: inView ? 'transparent' : '#ffffff',
      }}
    >
      {inView ? children : placeholder}
    </div>
  )
  sectionType:
    SECTION_HOME_TAB_NAME_TYPE[SECTION_HOME_TAB_TYPE.HOME_WELL_CHOSEN],
  type: LazyType.FLOOR, 
  children: null, 
  placeholder: null, 
  height: 200, 
  className: '',
  lazyNodeClassName: '',
+import Taro, { useRouter } from '@tarojs/taro'
  isH5AndJdShopView,
  isH5AndJdShopViewH5Scroll,
  sgmCustomReport,
  getSgmCustomCode,
  SECTION_HOME_TAB_TYPE,
  SECTION_HOME_TAB_NAME_TYPE,
  TaroEventType,
  latestFromNativeMsgStorage,
  nativePageRegisterMessage,
  Message_Type,
  getNativePageScrollRes,
  const {
    sectionType = SECTION_HOME_TAB_NAME_TYPE[
      SECTION_HOME_TAB_TYPE.HOME_WELL_CHOSEN
    ],
    type = LazyType.FLOOR, 
    children = null, 
    placeholder = null, 
    height = 200, 
    className = '',
    lazyNodeClassName = '',
    containerId,
    floorData = {},
  } = props
  const getRouterInfo = useRouter()
  const getQueryData = getRouterInfo?.params || {}
  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')
  const { ref, inView } = useInView({
    threshold: 0,
    triggerOnce: true,
    root: rootDom, 
    rootMargin: `0px 0px ${window.innerHeight}px 0px`, 
  })
  useEffect(() => {
    if (needShowHighVersion || !isH5AndJdShopView) return
    if (type === LazyType.FLOOR) {
      const latestRes =
        latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {}
      !componentShowStateRef.current && dealPageScrollInfo(latestRes, false)
      Taro.eventCenter.on(TaroEventType.PAGE_SCROLL, (res) => {
        !componentShowStateRef.current && dealPageScrollInfo(res, true)
      })
    }
  }, [])
  useEffect(() => {
    if (
      (!needShowHighVersion && componentShowState === true) ||
      (needShowHighVersion && inView && isH5AndJdShopView)
    ) {
      console.log(
        '>>>>>>>>>>>>>>>>>>> 楼层【id=' + containerId + '】已经渲染！',
      )
      const modularPackResult = floorData?.floorExtInfo?.modularPackResult
      const modularPackResultObj =
        typeof modularPackResult === 'string'
          ? JSON.parse(modularPackResult)
          : modularPackResult
      if (modularPackResultObj && modularPackResultObj.bundleUrl) {
        const { bundleUrl } = modularPackResultObj
        nativePageRegisterMessage(Message_Type.NATIVE_INJECT_JS_FILE, {
          data: {
            bundleUrl: [bundleUrl],
          },
        })
      }
    }
  }, [componentShowState, inView])
  
  const dealPageScrollInfo = (res, pageScrollTrigger) => {
    const { displayHeight, offSetY } = getNativePageScrollRes(res) || {}
    if (
      typeof displayHeight === 'undefined' ||
      typeof offSetY === 'undefined'
    ) {
      const shopId = floorData?.floorExtInfo?.shopId
      if (!lazyLayoutLoadErrorShopId[`${shopId}`] && pageScrollTrigger) {
        const opt = {
          msg: `店铺楼层懒加载失败。楼层顺序-floorIdx: ${floorData?.floorIdx}。`,
          uid: floorData?.uid,
          floorIdx: floorData?.floorIdx,
          shopId: shopId,
          moduleId: floorData?.moduleId,
          moduleName: floorData?.moduleName,
          middleTemplateId: floorData?.middleTemplateId,
        }
        sgmCustomReport({
          code: getSgmCustomCode(SgmCustomCode.FLOORLAZYLOAD_DATA),
          msg: opt,
        })
        lazyLayoutLoadErrorShopId[`${shopId}`] = true
      }
      return
    }
    if (componentLazyRef.current) {
      const eleClientRect = componentLazyRef.current.getBoundingClientRect()
      const getContainerHeightOffSetY = displayHeight + offSetY
      const eleOffsetTop = Math.ceil(eleClientRect.top)
      const eleOffsetHeight = Math.ceil(eleClientRect.height)
      const eleOffsetTopHeight = eleOffsetTop + eleOffsetHeight
      if (!componentShowStateRef.current) {
        if (getContainerHeightOffSetY > eleOffsetTop) {
          componentShowStateRef.current = true
          setComponentShowState(true)
          Taro.nextTick(() => {
            setComponentRenderShowState(true)
          })
        }
      }
    }
  }
  return isH5AndJdShopView && !needShowHighVersion ? (
    <div
      id={`${containerId}_lazy`}
      ref={componentLazyRef}
      className={classNames(
        lazyLayoutLoadStyle['d-app-floor-lazy-layout-load'],
        'd-app-floor-lazy-load',
      )}
      style={{
        minHeight: `${componentRenderShowState ? 'auto' : height + 'px'}`,
        backgroundColor: componentRenderShowState ? 'transparent' : '#ffffff',
      }}
    >
      {componentShowState ? children : placeholder}
    </div>
  ) : (
    <div
      id={`${containerId}_lazy`}
      className={classNames(
        lazyLayoutLoadStyle['d-mobile-floor-lazy-layout-load'],
        'd-mobile-floor-lazy-load',
        lazyNodeClassName,
      )}
      ref={ref}
      style={{
        minHeight: `${inView ? 'auto' : height + 'px'}`,
        backgroundColor: inView ? 'transparent' : '#ffffff',
      }}
    >
      {inView ? children : placeholder}
    </div>
  )