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

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

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
  isH5AndJdShopView,
  isH5AndJdShopViewH5Scroll,
  isAppClassifyPage,
  TaroEventType,
  WEBVIEW_STATE,
  M_H5_ROOT_ELE_NODE,
  latestFromNativeMsgStorage,
  getNativePageScrollRes,
  props: ComponentInterFace.InOrOutViewObserverProps,
  const {
    children,
    style,
    inViewCallback,
    outViewCallback,
    threshold = 0,
  } = props
  const [componentShowState, setComponentShowState] = useState(false)
  const componentObserverRef = useRef<HTMLElement | null>(null)
  const componentShowStateRef = useRef(false)
  const needShowHighVersion =
    isAppClassifyPage ||
    (isH5AndJdShopViewH5Scroll &&
      !(
        global.info.queryInfo?.downgraded &&
        global.info.queryInfo.downgraded === 'true'
      ))
  const rootDom =
    isH5AndJdShopView && needShowHighVersion
      ? null
      : document.querySelector(`${M_H5_ROOT_ELE_NODE}`)
  if (isH5AndJdShopView && !needShowHighVersion) {
    useEffect(() => {
      const latestRes =
        latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {}
      dealPageScrollInfo(latestRes)
      Taro.eventCenter.on(TaroEventType.PAGE_SCROLL, res => {
        dealPageScrollInfo(res)
      })
      Taro.eventCenter.on(
        TaroEventType.PAGE_DOCUMENT_VISIBILITY_CHANGE,
        state => {
          state === WEBVIEW_STATE.NOT_VISIBLE && handleInOrOutView(false)
        },
      )
      return function cleanup() {
        Taro.eventCenter.off(TaroEventType.PAGE_SCROLL, res => {
          dealPageScrollInfo(res)
        })
        Taro.eventCenter.off(
          TaroEventType.PAGE_DOCUMENT_VISIBILITY_CHANGE,
          state => {
            state === WEBVIEW_STATE.NOT_VISIBLE && handleInOrOutView(false)
          },
        )
      }
    }, [])
    useEffect(() => {
      if (componentShowState) {
        typeof inViewCallback === 'function' && inViewCallback()
        console.log('app=>in可视区域')
      } else {
        typeof outViewCallback === 'function' && outViewCallback()
        console.log('app=>out可视区域')
      }
    }, [componentShowState])
    
    const handleInOrOutView = (type: boolean) => {
      componentShowStateRef.current = type
      setComponentShowState(type)
    }
    
    const dealPageScrollInfo = res => {
      const { displayHeight, offSetY } = getNativePageScrollRes(res) || {}
      if (
        typeof displayHeight === 'undefined' ||
        typeof offSetY === 'undefined'
      )
        return
      if (componentObserverRef.current) {
        const eleClientRect = componentObserverRef.current.getBoundingClientRect()
        const eleOffsetTop = Math.ceil(eleClientRect.top)
        const eleHeight = Math.ceil(eleClientRect.height)
        if (eleOffsetTop >= 0 && eleOffsetTop < displayHeight) {
          const isOutView =
            offSetY > eleOffsetTop + Math.ceil(eleHeight * (1 - threshold)) ||
            displayHeight - (eleOffsetTop - offSetY) <
              Math.ceil(eleHeight * threshold)
          handleInOrOutView(!isOutView)
        } else {
          const isInView =
            offSetY >
              eleOffsetTop - displayHeight + Math.ceil(eleHeight * threshold) &&
            offSetY < eleOffsetTop + Math.ceil(eleHeight * (1 - threshold))
          handleInOrOutView(isInView)
        }
      }
    }
    return (
      <View ref={componentObserverRef} style={style}>
        {children}
      </View>
    )
  } else {
    const { ref, inView } = useInView({
      delay: 100,
      threshold, 
      triggerOnce: false, 
      root: rootDom || null, 
      rootMargin: `0px 0px 0px 0px`, 
    })
    useEffect(() => {
      if (inView) {
        typeof inViewCallback === 'function' && inViewCallback()
        console.log('其他h5=>in可视区域')
      } else {
        typeof outViewCallback === 'function' && outViewCallback()
        console.log('其他h5=>out可视区域')
      }
    }, [inView])
    return (
      <View ref={ref} style={style}>
        {children}
      </View>
    )
  }
  children: null, 
  style: {},
  className: '',
  inViewCallback: null, 
  outViewCallback: null, 
  threshold: 0, 
+import Taro from '@tarojs/taro'
  isH5AndJdShopView,
  isH5AndJdShopViewH5Scroll,
  isAppClassifyPage,
  TaroEventType,
  WEBVIEW_STATE,
  M_H5_ROOT_ELE_NODE,
  latestFromNativeMsgStorage,
  getNativePageScrollRes,
  props: ComponentInterFace.InOrOutViewObserverProps,
  const {
    children,
    style,
    inViewCallback,
    outViewCallback,
    threshold = 0,
  } = props
  const [componentShowState, setComponentShowState] = useState(false)
  const componentObserverRef = useRef<HTMLElement | null>(null)
  const componentShowStateRef = useRef(false)
  const needShowHighVersion =
    isAppClassifyPage ||
    (isH5AndJdShopViewH5Scroll &&
      !(
        global.info.queryInfo?.downgraded &&
        global.info.queryInfo.downgraded === 'true'
      ))
  const rootDom =
    isH5AndJdShopView && needShowHighVersion
      ? null
      : document.querySelector(`${M_H5_ROOT_ELE_NODE}`)
  if (isH5AndJdShopView && !needShowHighVersion) {
    console.log('视频========属于app原生滚动')
    useEffect(() => {
      const latestRes =
        latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {}
      dealPageScrollInfo(latestRes)
      Taro.eventCenter.on(TaroEventType.PAGE_SCROLL, res => {
        dealPageScrollInfo(res)
      })
      Taro.eventCenter.on(
        TaroEventType.PAGE_DOCUMENT_VISIBILITY_CHANGE,
        state => {
          state === WEBVIEW_STATE.NOT_VISIBLE && handleInOrOutView(false)
        },
      )
      return function cleanup() {
        Taro.eventCenter.off(TaroEventType.PAGE_SCROLL, res => {
          dealPageScrollInfo(res)
        })
        Taro.eventCenter.off(
          TaroEventType.PAGE_DOCUMENT_VISIBILITY_CHANGE,
          state => {
            state === WEBVIEW_STATE.NOT_VISIBLE && handleInOrOutView(false)
          },
        )
      }
    }, [])
    useEffect(() => {
      if (componentShowState) {
        typeof inViewCallback === 'function' && inViewCallback()
        console.log('app=>in可视区域')
      } else {
        typeof outViewCallback === 'function' && outViewCallback()
        console.log('app=>out可视区域')
      }
    }, [componentShowState])
    
    const handleInOrOutView = (type: boolean) => {
      componentShowStateRef.current = type
      setComponentShowState(type)
      console.log('handleInOrOutView', type)
    }
    
    const dealPageScrollInfo = res => {
      console.log('dealPageScrollInfo===', res)
      const { displayHeight, offSetY } = getNativePageScrollRes(res) || {}
      if (
        typeof displayHeight === 'undefined' ||
        typeof offSetY === 'undefined'
      )
        return
      console.log(
        '处理后dealPageScrollInfo===displayHeight=offSetY',
        displayHeight,
        offSetY,
      )
      if (componentObserverRef.current) {
        const eleClientRect = componentObserverRef.current.getBoundingClientRect()
        const eleOffsetTop = Math.ceil(eleClientRect.top)
        const eleHeight = Math.ceil(eleClientRect.height)
        console.log(
          '==========================eleOffsetTop, eleHeight',
          eleOffsetTop,
          eleHeight,
        )
        if (eleOffsetTop >= 0 && eleOffsetTop < displayHeight) {
          const isOutView =
            offSetY > eleOffsetTop + Math.ceil(eleHeight * (1 - threshold)) ||
            displayHeight - (eleOffsetTop - offSetY) <
              Math.ceil(eleHeight * threshold)
          console.log(
            '比较isOutView',
            isOutView,
            offSetY,
            eleOffsetTop + Math.ceil(eleHeight * (1 - threshold)),
            displayHeight - (eleOffsetTop - offSetY),
            Math.ceil(eleHeight * threshold),
          )
          handleInOrOutView(!isOutView)
        } else {
          const isInView =
            offSetY >
              eleOffsetTop - displayHeight + Math.ceil(eleHeight * threshold) &&
            offSetY < eleOffsetTop + Math.ceil(eleHeight * (1 - threshold))
          console.log(
            '比较isInView',
            isInView,
            offSetY,
            eleOffsetTop - displayHeight + Math.ceil(eleHeight * threshold),
            eleOffsetTop + Math.ceil(eleHeight * (1 - threshold)),
          )
          handleInOrOutView(isInView)
        }
      }
    }
    return (
      <View ref={componentObserverRef} style={style}>
        {children}
      </View>
    )
  } else {
    console.log('视频========h5滚动')
    const { ref, inView } = useInView({
      delay: 100,
      threshold, 
      triggerOnce: false, 
      root: rootDom || null, 
      rootMargin: `0px 0px 0px 0px`, 
    })
    useEffect(() => {
      if (inView) {
        typeof inViewCallback === 'function' && inViewCallback()
        console.log('其他h5=>in可视区域')
      } else {
        typeof outViewCallback === 'function' && outViewCallback()
        console.log('其他h5=>out可视区域')
      }
    }, [inView])
    return (
      <View ref={ref} style={style}>
        {children}
      </View>
    )
  }
  children: null, 
  style: {},
  className: '',
  inViewCallback: null, 
  outViewCallback: null, 
  threshold: 0, 

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 (
      <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,
+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,

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

@@ -1 +1 @@
-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>
  )
+import Taro from '@tarojs/taro'