@yakad/ui 1.3.138 → 1.3.139

package/dist/RenderByVisibility/RenderByVisibility.d.ts

@@ -1,8 +1,8 @@
 import React from "react";
 export interface RenderByVisibilityProps {
     extraRender?: number;
-    jump?: number;
-    stopRendering?: boolean;
+    jumpToIndex?: number;
+    stopNewRenders?: boolean;
     newChildRendered?: (index: number) => void;
     children?: React.ReactNode;
 }

package/dist/RenderByVisibility/RenderByVisibility.js

@@ -15,11 +15,17 @@ import React, { forwardRef, useEffect, useRef, useState } from "react";
 import { Card, LoadingIcon, Stack, WithInteractions } from "..";
 const data = Array.from({ length: 78 });
 export const RenderByVisibility = forwardRef(function RenderByVisibility(_a, ref) {
-    var { extraRender = 5, jump = 0, stopRendering, newChildRendered, children } = _a, restProps = __rest(_a, ["extraRender", "jump", "stopRendering", "newChildRendered", "children"]);
+    var { extraRender = 5, jumpToIndex = 0, stopNewRenders, newChildRendered, children } = _a, restProps = __rest(_a, ["extraRender", "jumpToIndex", "stopNewRenders", "newChildRendered", "children"]);
     const childRefs = useRef({});
+    const scrollTo = (i) => {
+        var _a;
+        return (_a = childRefs.current[i]) === null || _a === void 0 ? void 0 : _a.scrollIntoView({
+            behavior: "smooth",
+        });
+    };
     const childrenArray = React.Children.toArray(children);
     // Collect Visibility Status
-    const [visibled, setVisibled] = useState({ lowest: jump, highest: jump });
+    const [visibled, setVisibled] = useState({ lowest: jumpToIndex, highest: jumpToIndex });
     const handleOnVisible = (i) => {
         if (i < visibled.lowest)
             setVisibled(Object.assign(Object.assign({}, visibled), { lowest: i }));
@@ -27,43 +33,43 @@ export const RenderByVisibility = forwardRef(function RenderByVisibility(_a, ref
             setVisibled(Object.assign(Object.assign({}, visibled), { highest: i }));
     };
     // Collect Rendered Childs Status
-    const [rendered, setRendered] = useState({ lowest: jump, highest: jump });
+    const [rendered, setRendered] = useState({ lowest: jumpToIndex, highest: jumpToIndex });
     // Calculate Over Screen Renders
     const overRenderedOnLowSide = visibled.lowest - rendered.lowest;
     const overRenderedOnHighSide = rendered.highest - visibled.highest;
+    // Render new Childs if needed
     useEffect(() => {
-        if (!stopRendering) {
-            if (rendered.highest < data.length &&
-                overRenderedOnHighSide < extraRender) {
-                setRendered(Object.assign(Object.assign({}, rendered), { highest: rendered.highest + 1 }));
-                newChildRendered === null || newChildRendered === void 0 ? void 0 : newChildRendered(rendered.highest + 1);
+        if (!stopNewRenders) {
+            if (overRenderedOnHighSide <= overRenderedOnLowSide) {
+                if (rendered.highest < data.length &&
+                    overRenderedOnHighSide < extraRender) {
+                    setRendered(Object.assign(Object.assign({}, rendered), { highest: rendered.highest + 1 }));
+                    newChildRendered === null || newChildRendered === void 0 ? void 0 : newChildRendered(rendered.highest + 1);
+                }
             }
-            else if (rendered.lowest > 0 &&
-                overRenderedOnLowSide < extraRender) {
-                setRendered(Object.assign(Object.assign({}, rendered), { lowest: rendered.lowest - 1 }));
-                newChildRendered === null || newChildRendered === void 0 ? void 0 : newChildRendered(rendered.lowest - 1);
+            else {
+                if (rendered.lowest > 0 &&
+                    overRenderedOnLowSide < extraRender) {
+                    setRendered(Object.assign(Object.assign({}, rendered), { lowest: rendered.lowest - 1 }));
+                    newChildRendered === null || newChildRendered === void 0 ? void 0 : newChildRendered(rendered.lowest - 1);
+                    if (overRenderedOnLowSide === 0)
+                        scrollTo(visibled.lowest);
+                }
             }
         }
-    }, [visibled, rendered, stopRendering]);
-    useEffect(() => {
-        var _a;
-        if (overRenderedOnHighSide == 1) {
-            (_a = childRefs.current[jump]) === null || _a === void 0 ? void 0 : _a.scrollIntoView();
-            console.log("SCROLL TO JUMP");
-        }
-    }, [overRenderedOnHighSide]);
+    }, [visibled, rendered, stopNewRenders]);
+    // Scroll to jumpToIndex
     useEffect(() => {
         var _a;
-        if (overRenderedOnHighSide == 1) {
-            (_a = childRefs.current[jump]) === null || _a === void 0 ? void 0 : _a.scrollIntoView();
-            console.log("SCROLL TO JUMP");
-        }
-    }, [overRenderedOnHighSide]);
-    console.log("visibled", visibled);
-    console.log("rendered", rendered);
-    console.log("stopRendering", stopRendering);
-    return (_jsxs(Stack, Object.assign({ ref: ref }, restProps, { children: [rendered.lowest > 0 && (_jsx(Stack, { style: { height: "20rem" }, children: _jsx(LoadingIcon, { variant: "dots", size: "extraLarge" }) })), childrenArray.map((child, i) => i >= rendered.lowest &&
+        (_a = childRefs.current[jumpToIndex]) === null || _a === void 0 ? void 0 : _a.scrollIntoView({ behavior: "smooth" });
+        console.log("SCROLL TO JUMPToIndex:", jumpToIndex);
+    }, [jumpToIndex]);
+    // console.log("visibled", visibled);
+    // console.log("rendered", rendered);
+    // console.log("stopNewRenders", stopNewRenders);
+    return (_jsxs(Stack, Object.assign({ ref: ref }, restProps, { style: { minHeight: "100vh" }, children: [rendered.lowest > 0 && _jsx(LoadingBox, {}), childrenArray.map((child, i) => i >= rendered.lowest &&
                 i <= rendered.highest && (_jsx(WithInteractions, { ref: (el) => {
                     childRefs.current[i] = el;
-                }, onVisible: () => handleOnVisible(i), children: child }, i))), rendered.highest < data.length && (_jsx(Card, { children: _jsx(LoadingIcon, { variant: "dots", size: "extraLarge" }) }))] })));
+                }, onVisible: () => handleOnVisible(i), children: child }, i))), rendered.highest < data.length && _jsx(LoadingBox, {})] })));
 });
+const LoadingBox = () => (_jsx(Card, { style: { height: "15rem" }, children: _jsx(LoadingIcon, { variant: "dots", size: "extraLarge" }) }));

package/dist/index.d.ts

@@ -32,7 +32,6 @@ export * from "./WithInteractions/WithInteractions";
 export * from "./WithOverlay/WithOverlay";
 export * from "./Dropdown/Dropdown";
 export * from "./Popup/Popup";
-export * from "./LoadingControl/LoadingControl";
 export * from "./RenderByVisibility/RenderByVisibility";
 export * from "./DisplayOnVisible/DisplayOnVisible";
 export * from "./RenderOnVisible/RenderOnVisible";

package/dist/index.js

@@ -39,7 +39,6 @@ export * from "./WithOverlay/WithOverlay";
 export * from "./Dropdown/Dropdown";
 export * from "./Popup/Popup";
 // Loading Control
-export * from "./LoadingControl/LoadingControl";
 export * from "./RenderByVisibility/RenderByVisibility";
 export * from "./DisplayOnVisible/DisplayOnVisible";
 export * from "./RenderOnVisible/RenderOnVisible";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@yakad/ui",
-    "version": "1.3.138",
+    "version": "1.3.139",
     "private": false,
     "author": "Natiq",
     "description": "UI components for NextJS/React",

package/dist/LoadingControl/LoadingControl.d.ts

@@ -1,12 +0,0 @@
-import React from "react";
-type LoadingControlChildren = React.ReactElement<{
-    index?: number;
-}>;
-export interface LoadingControlProps extends React.HTMLAttributes<HTMLDivElement> {
-    align?: "start" | "space" | "center" | "end";
-    fullWidth?: boolean;
-    loadingLimit?: number;
-    children: LoadingControlChildren;
-}
-export declare const LoadingControl: React.ForwardRefExoticComponent<LoadingControlProps & React.RefAttributes<HTMLDivElement>>;
-export {};

package/dist/LoadingControl/LoadingControl.js

@@ -1,95 +0,0 @@
-"use client";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-import { jsx as _jsx } from "react/jsx-runtime";
-import React, { forwardRef, useEffect, useState } from "react";
-import classNames from "classnames";
-import boxingStyles from "../boxing.module.css";
-import { DisplayOnVisible } from "..";
-export const LoadingControl = forwardRef(function LoadingControl(_a, ref) {
-    var { align, fullWidth = true, loadingLimit = 200, className, children } = _a, restProps = __rest(_a, ["align", "fullWidth", "loadingLimit", "className", "children"]);
-    const [maxTotalVisibledItems, setMaxTotalVisibledItems] = useState(3); // Min: default
-    const extraLoading = maxTotalVisibledItems * 2;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const [loadedItems, setLoadedItems] = useState([
-        React.cloneElement(children, {
-            index: 0,
-        }),
-    ]);
-    const [visibilityStatus, setVisibilityStatus] = useState({});
-    const handleOnVisibilityChange = (visible, i) => {
-        if (i !== undefined)
-            if (visibilityStatus[i] !== visible)
-                setVisibilityStatus((prev) => (Object.assign(Object.assign({}, prev), { [i]: visible })));
-    };
-    const visibleIndexes = Object.entries(visibilityStatus)
-        // eslint-disable-next-line
-        .filter(([_, isVisible]) => isVisible)
-        .map(([index]) => parseInt(index));
-    const visibleCount = Object.values(visibilityStatus).filter(Boolean).length;
-    const lowestVisibleItemIndex = visibleIndexes.length
-        ? Math.min(...visibleIndexes)
-        : 0;
-    const highestVisibleItemIndex = visibleIndexes.length
-        ? Math.max(...visibleIndexes)
-        : 0;
-    const lowestLoadedItemIndex = loadedItems[0].props.index;
-    const highestLoadedItemIndex = loadedItems[loadedItems.length - 1].props.index;
-    useEffect(() => {
-        if (highestLoadedItemIndex < loadingLimit &&
-            highestLoadedItemIndex < highestVisibleItemIndex + extraLoading) {
-            setLoadedItems([
-                ...loadedItems,
-                React.cloneElement(children, {
-                    index: highestLoadedItemIndex + 1,
-                }),
-            ].slice(
-            // Slice from start
-            lowestVisibleItemIndex - lowestLoadedItemIndex >
-                extraLoading
-                ? 1
-                : 0));
-            console.log(">>>>>>>>>>>>>>>>>>>>>>>> ++++ Item ", highestLoadedItemIndex + 1, " Added to end");
-        }
-        if (lowestLoadedItemIndex > 0 &&
-            lowestLoadedItemIndex > lowestVisibleItemIndex - extraLoading) {
-            setLoadedItems([
-                React.cloneElement(children, {
-                    index: lowestLoadedItemIndex - 1,
-                }),
-                ...loadedItems,
-            ].slice(
-            // Slice from end
-            0, highestLoadedItemIndex - highestVisibleItemIndex >
-                extraLoading
-                ? -1
-                : undefined));
-            console.log(">>>>>>>>>>>> ---- Item ", lowestLoadedItemIndex - 1, " Added to start");
-        }
-        if (visibleCount > maxTotalVisibledItems) {
-            setMaxTotalVisibledItems(visibleCount);
-        }
-        // eslint-disable-next-line
-    }, [visibilityStatus]);
-    console.log("###### ", "Total Loaded:", loadedItems.length, "extraLoading:", extraLoading, " ##### ", "L:", lowestLoadedItemIndex, "V:", lowestVisibleItemIndex, "D:", -(lowestLoadedItemIndex - lowestVisibleItemIndex), "|", "V:", visibleCount, "|", "D:", highestLoadedItemIndex - highestVisibleItemIndex, "V:", highestVisibleItemIndex, "L:", highestLoadedItemIndex);
-    // console.log("visibilityStatus", visibilityStatus);
-    // console.log(
-    //     "loadedItems",
-    //     loadedItems.map((item) => item.props.index)
-    // );
-    // console.log(
-    //     "visibilityStatus.length",
-    //     Object.keys(visibilityStatus).length
-    // );
-    const joinedClassNames = classNames(boxingStyles.flexColumnBox, { [boxingStyles[align]]: align }, { fullWidth: fullWidth }, className);
-    return (_jsx("div", Object.assign({ ref: ref, className: joinedClassNames }, restProps, { children: loadedItems.map((item) => (_jsx(DisplayOnVisible, { onVisibilityChange: (visible) => handleOnVisibilityChange(visible, item.props.index), children: item }, item.props.index))) })));
-});