@vitus-labs/elements 2.0.0-alpha.8 → 2.0.0-beta.0

package/lib/index.js

@@ -1,6 +1,6 @@
 import { Provider, alignContent, extendCss, makeItResponsive, value } from "@vitus-labs/unistyle";
 import { config, context, isEmpty, omit, pick, render, throttle } from "@vitus-labs/core";
-import { Children, createContext, forwardRef, memo, useCallback, useContext, useEffect, useImperativeHandle, useLayoutEffect, useMemo, useRef, useState } from "react";
+import { Children, createContext, forwardRef, memo, useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { isFragment } from "react-is";
 import { createPortal } from "react-dom";
@@ -21,7 +21,7 @@ const IS_DEVELOPMENT = process.env.NODE_ENV !== "production";
 * equalCols flex distribution. The "content" slot gets `flex: 1` to
 * fill remaining space between before and after.
 */
-const { styled: styled$2, css: css$2, component: component$2 } = config;
+const { styled: styled$2, css: css$2, component: component$1 } = config;
 const equalColsCSS = `
   flex: 1;
 `;
@@ -67,7 +67,7 @@ const styles$2 = ({ css, theme: t, rootSize }) => css`
 
   ${t.extraStyles && extendCss(t.extraStyles)};
 `;
-const StyledComponent = styled$2(component$2)`
+const StyledComponent = styled$2(component$1)`
   ${`box-sizing: border-box;`};
 
   display: flex;
@@ -86,11 +86,22 @@ const StyledComponent = styled$2(component$2)`
 
 //#endregion
 //#region src/helpers/Content/component.tsx
-const Component$9 = ({ contentType, tag, parentDirection, direction, alignX, alignY, equalCols, gap, extendCss, ...props }) => {
+/**
+* Memoized content area used inside Element to render one of the three
+* layout slots (before, content, after). Passes alignment, direction,
+* gap, and equalCols styling props to the underlying styled component.
+* Adds a `data-vl-element` attribute in development for debugging.
+*
+* Children are passed as raw content and rendered inside the memo boundary
+* via core `render()` — this lets React.memo skip re-renders when the
+* content reference is stable (common for component-type or string content).
+*/
+const Component$9 = ({ contentType, tag, parentDirection, direction, alignX, alignY, equalCols, gap, extendCss, children, ...props }) => {
+	const debugProps = IS_DEVELOPMENT ? { "data-vl-element": contentType } : {};
 	return /* @__PURE__ */ jsx(StyledComponent, {
 		as: tag,
 		$contentType: contentType,
-		$element: {
+		$element: useMemo(() => ({
 			contentType,
 			parentDirection,
 			direction,
@@ -99,16 +110,26 @@ const Component$9 = ({ contentType, tag, parentDirection, direction, alignX, ali
 			equalCols,
 			gap,
 			extraStyles: extendCss
-		},
-		...IS_DEVELOPMENT ? { "data-vl-element": contentType } : {},
-		...props
+		}), [
+			contentType,
+			parentDirection,
+			direction,
+			alignX,
+			alignY,
+			equalCols,
+			gap,
+			extendCss
+		]),
+		...debugProps,
+		...props,
+		children: render(children)
 	});
 };
-var component_default = memo(Component$9);
+var component_default$1 = memo(Component$9);
 
 //#endregion
 //#region src/helpers/Content/index.ts
-var Content_default = component_default;
+var Content_default = component_default$1;
 
 //#endregion
 //#region src/helpers/Wrapper/styled.ts
@@ -119,7 +140,7 @@ var Content_default = component_default;
 * split flex behavior across two DOM nodes for button/fieldset/legend
 * elements where a single flex container is insufficient.
 */
-const { styled: styled$1, css: css$1, component: component$1 } = config;
+const { styled: styled$1, css: css$1, component } = config;
 const childFixCSS = `
   display: flex;
   flex: 1;
@@ -129,14 +150,12 @@ const childFixCSS = `
 const parentFixCSS = `
   flex-direction: column;
 `;
-const parentFixBlockCSS = `
-  width: 100%;
-`;
 const fullHeightCSS = `
   height: 100%;
 `;
 const blockCSS = `
   align-self: stretch;
+  width: 100%;
 `;
 const childFixPosition = (isBlock) => `display: ${isBlock ? "flex" : "inline-flex"};`;
 const styles$1 = ({ theme: t, css }) => css`
@@ -149,15 +168,15 @@ const styles$1 = ({ theme: t, css }) => css`
 })};
 
   ${t.block && blockCSS};
+  ${t.alignY === "block" && t.block && fullHeightCSS};
 
   ${!t.childFix && childFixPosition(t.block)};
-  ${t.parentFix && t.block && parentFixBlockCSS};
   ${t.parentFix && parentFixCSS};
 
   ${t.extraStyles && extendCss(t.extraStyles)};
 `;
 const platformCSS = `box-sizing: border-box;`;
-var styled_default$1 = styled$1(component$1)`
+var styled_default$1 = styled$1(component)`
   position: relative;
   ${platformCSS};
 
@@ -208,36 +227,52 @@ const Component$8 = forwardRef(({ children, tag, block, extendCss, direction, al
 		ref,
 		as: tag
 	};
-	if (!(!props.dangerouslySetInnerHTML && isWebFixNeeded(tag)) || false) return /* @__PURE__ */ jsx(styled_default$1, {
+	const needsFix = !props.dangerouslySetInnerHTML && isWebFixNeeded(tag);
+	const normalElement = useMemo(() => ({
+		block,
+		direction,
+		alignX,
+		alignY,
+		equalCols,
+		extraStyles: extendCss
+	}), [
+		block,
+		direction,
+		alignX,
+		alignY,
+		equalCols,
+		extendCss
+	]);
+	const parentFixElement = useMemo(() => ({
+		parentFix: true,
+		block,
+		extraStyles: extendCss
+	}), [block, extendCss]);
+	const childFixElement = useMemo(() => ({
+		childFix: true,
+		direction,
+		alignX,
+		alignY,
+		equalCols
+	}), [
+		direction,
+		alignX,
+		alignY,
+		equalCols
+	]);
+	if (!needsFix || false) return /* @__PURE__ */ jsx(styled_default$1, {
 		...COMMON_PROPS,
-		$element: {
-			block,
-			direction,
-			alignX,
-			alignY,
-			equalCols,
-			extraStyles: extendCss
-		},
+		$element: normalElement,
 		children
 	});
 	const asTag = isInline ? "span" : "div";
 	return /* @__PURE__ */ jsx(styled_default$1, {
 		...COMMON_PROPS,
-		$element: {
-			parentFix: true,
-			block,
-			extraStyles: extendCss
-		},
+		$element: parentFixElement,
 		children: /* @__PURE__ */ jsx(styled_default$1, {
 			as: asTag,
 			$childFix: true,
-			$element: {
-				childFix: true,
-				direction,
-				alignX,
-				alignY,
-				equalCols
-			},
+			$element: childFixElement,
 			children
 		})
 	});
@@ -332,11 +367,26 @@ const getShouldBeEmpty = (tag) => {
 * like void elements (input, img) and inline elements (span, a) by
 * skipping children or switching sub-tags accordingly.
 */
+const equalize = (el, direction) => {
+	const beforeEl = el.firstElementChild;
+	const afterEl = el.lastElementChild;
+	if (beforeEl && afterEl && beforeEl !== afterEl) {
+		const type = direction === "rows" ? "height" : "width";
+		const prop = type === "height" ? "offsetHeight" : "offsetWidth";
+		const beforeSize = beforeEl[prop];
+		const afterSize = afterEl[prop];
+		if (Number.isInteger(beforeSize) && Number.isInteger(afterSize)) {
+			const maxSize = `${Math.max(beforeSize, afterSize)}px`;
+			beforeEl.style[type] = maxSize;
+			afterEl.style[type] = maxSize;
+		}
+	}
+};
 const defaultDirection = "inline";
 const defaultContentDirection = "rows";
 const defaultAlignX = "left";
 const defaultAlignY = "center";
-const Component$7 = forwardRef(({ innerRef, tag, label, content, children, beforeContent, afterContent, block, equalCols, gap, direction, alignX = defaultAlignX, alignY = defaultAlignY, css, contentCss, beforeContentCss, afterContentCss, contentDirection = defaultContentDirection, contentAlignX = defaultAlignX, contentAlignY = defaultAlignY, beforeContentDirection = defaultDirection, beforeContentAlignX = defaultAlignX, beforeContentAlignY = defaultAlignY, afterContentDirection = defaultDirection, afterContentAlignX = defaultAlignX, afterContentAlignY = defaultAlignY, ...props }, ref) => {
+const Component$7 = forwardRef(({ innerRef, tag, label, content, children, beforeContent, afterContent, equalBeforeAfter, block, equalCols, gap, direction, alignX = defaultAlignX, alignY = defaultAlignY, css, contentCss, beforeContentCss, afterContentCss, contentDirection = defaultContentDirection, contentAlignX = defaultAlignX, contentAlignY = defaultAlignY, beforeContentDirection = defaultDirection, beforeContentAlignX = defaultAlignX, beforeContentAlignY = defaultAlignY, afterContentDirection = defaultDirection, afterContentAlignX = defaultAlignX, afterContentAlignY = defaultAlignY, ...props }, ref) => {
 	const shouldBeEmpty = !!props.dangerouslySetInnerHTML || getShouldBeEmpty(tag);
 	const isSimpleElement = !beforeContent && !afterContent;
 	const CHILDREN = children ?? content ?? label;
@@ -366,8 +416,24 @@ const Component$7 = forwardRef(({ innerRef, tag, label, content, children, befor
 		alignY,
 		direction
 	]);
+	const equalizeRef = useRef(null);
+	const externalRef = ref ?? innerRef;
+	const mergedRef = useCallback((node) => {
+		equalizeRef.current = node;
+		if (typeof externalRef === "function") externalRef(node);
+		else if (externalRef != null) externalRef.current = node;
+	}, [externalRef]);
+	useLayoutEffect(() => {
+		if (!equalBeforeAfter || !beforeContent || !afterContent) return;
+		if (equalizeRef.current) equalize(equalizeRef.current, direction);
+	}, [
+		equalBeforeAfter,
+		beforeContent,
+		afterContent,
+		direction
+	]);
 	const WRAPPER_PROPS = {
-		ref: ref ?? innerRef,
+		ref: mergedRef,
 		extendCss: css,
 		tag,
 		block,
@@ -380,7 +446,6 @@ const Component$7 = forwardRef(({ innerRef, tag, label, content, children, befor
 		...props,
 		...WRAPPER_PROPS
 	});
-	const contentRenderOutput = render(CHILDREN);
 	return /* @__PURE__ */ jsxs(Wrapper_default, {
 		...props,
 		...WRAPPER_PROPS,
@@ -396,9 +461,9 @@ const Component$7 = forwardRef(({ innerRef, tag, label, content, children, befor
 				alignY: beforeContentAlignY,
 				equalCols,
 				gap,
-				children: render(beforeContent)
+				children: beforeContent
 			}),
-			isSimpleElement ? contentRenderOutput : /* @__PURE__ */ jsx(Content_default, {
+			isSimpleElement ? render(CHILDREN) : /* @__PURE__ */ jsx(Content_default, {
 				tag: SUB_TAG,
 				contentType: "content",
 				parentDirection: wrapperDirection,
@@ -407,7 +472,7 @@ const Component$7 = forwardRef(({ innerRef, tag, label, content, children, befor
 				alignX: contentAlignX,
 				alignY: contentAlignY,
 				equalCols,
-				children: contentRenderOutput
+				children: CHILDREN
 			}),
 			afterContent && /* @__PURE__ */ jsx(Content_default, {
 				tag: SUB_TAG,
@@ -419,7 +484,7 @@ const Component$7 = forwardRef(({ innerRef, tag, label, content, children, befor
 				alignY: afterContentAlignY,
 				equalCols,
 				gap,
-				children: render(afterContent)
+				children: afterContent
 			})
 		]
 	});
@@ -429,53 +494,6 @@ Component$7.displayName = name$5;
 Component$7.pkgName = PKG_NAME;
 Component$7.VITUS_LABS__COMPONENT = name$5;
 
-//#endregion
-//#region src/Element/withEqualSizeBeforeAfter.tsx
-/**
-* HOC that equalizes the dimensions of beforeContent and afterContent areas.
-* After render, it measures both DOM nodes via useLayoutEffect and sets the
-* larger dimension on both so they match. Uses width for inline direction
-* and height for rows direction. This is useful for centering the main
-* content when before/after slots have different intrinsic sizes.
-*/
-const types = {
-	height: "offsetHeight",
-	width: "offsetWidth"
-};
-const equalize = (beforeEl, afterEl, type) => {
-	const prop = types[type];
-	const beforeSize = beforeEl[prop];
-	const afterSize = afterEl[prop];
-	if (Number.isInteger(beforeSize) && Number.isInteger(afterSize)) {
-		const maxSize = `${Math.max(beforeSize, afterSize)}px`;
-		beforeEl.style[type] = maxSize;
-		afterEl.style[type] = maxSize;
-	}
-};
-const withEqualBeforeAfter = (WrappedComponent) => {
-	const displayName = WrappedComponent.displayName ?? WrappedComponent.name ?? "Component";
-	const Enhanced = ({ equalBeforeAfter, direction, afterContent, beforeContent, ref, ...rest }) => {
-		const internalRef = useRef(null);
-		useImperativeHandle(ref, () => internalRef.current);
-		useLayoutEffect(() => {
-			if (!equalBeforeAfter || !beforeContent || !afterContent) return;
-			if (!internalRef.current) return;
-			const el = internalRef.current;
-			const beforeEl = el.firstElementChild;
-			const afterEl = el.lastElementChild;
-			if (beforeEl && afterEl && beforeEl !== afterEl) equalize(beforeEl, afterEl, direction === "rows" ? "height" : "width");
-		});
-		return /* @__PURE__ */ jsx(WrappedComponent, {
-			...rest,
-			afterContent,
-			beforeContent,
-			ref: internalRef
-		});
-	};
-	Enhanced.displayName = `withEqualSizeBeforeAfter(${displayName})`;
-	return Enhanced;
-};
-
 //#endregion
 //#region src/Element/index.ts
 var Element_default = Component$7;
@@ -633,12 +651,14 @@ const Component$6 = (props) => {
 	};
 	return renderItems();
 };
-Component$6.isIterator = true;
-Component$6.RESERVED_PROPS = RESERVED_PROPS;
+var component_default = Object.assign(memo(Component$6), {
+	isIterator: true,
+	RESERVED_PROPS
+});
 
 //#endregion
 //#region src/helpers/Iterator/index.ts
-var Iterator_default = Component$6;
+var Iterator_default = component_default;
 
 //#endregion
 //#region src/List/component.tsx
@@ -663,108 +683,6 @@ Component$5.displayName = name$4;
 Component$5.pkgName = PKG_NAME;
 Component$5.VITUS_LABS__COMPONENT = name$4;
 
-//#endregion
-//#region src/List/withActiveState.tsx
-/**
-* HOC that adds single or multi selection state management to a list component.
-* Tracks which items are active via a scalar key (single mode) or a Map of
-* key-to-boolean entries (multi mode). Injects `itemProps` callback that
-* provides each item with `active`, `handleItemActive`, `toggleItemActive`,
-* and other selection helpers. Supports `activeItemRequired` to prevent
-* deselecting the last active item.
-*/
-const RESERVED_KEYS = [
-	"type",
-	"activeItems",
-	"itemProps",
-	"activeItemRequired"
-];
-const component = (WrappedComponent) => {
-	const displayName = WrappedComponent.displayName || WrappedComponent.name || "Component";
-	const Enhanced = (props) => {
-		const { type = "single", activeItemRequired, activeItems, itemProps = {}, ...rest } = props;
-		const initActiveItems = () => {
-			if (type === "single") {
-				if (!Array.isArray(activeItems)) return activeItems;
-			} else if (type === "multi") {
-				const activeItemsHelper = Array.isArray(activeItems) ? activeItems : [activeItems];
-				return new Map(activeItemsHelper.map((id) => [id, true]));
-			}
-		};
-		const [innerActiveItems, setActiveItems] = useState(initActiveItems());
-		const countActiveItems = (data) => {
-			let result = 0;
-			data.forEach((value) => {
-				if (value) result += 1;
-			});
-			return result;
-		};
-		const updateItemState = (key) => {
-			if (type === "single") setActiveItems((prevState) => {
-				if (activeItemRequired) return key;
-				if (prevState === key) return void 0;
-				return key;
-			});
-			else if (type === "multi") setActiveItems((prevState) => {
-				const activeItems = new Map(prevState);
-				if (activeItemRequired && activeItems.get(key) && countActiveItems(activeItems) === 1) return activeItems;
-				activeItems.set(key, !activeItems.get(key));
-				return activeItems;
-			});
-			else setActiveItems(void 0);
-		};
-		const handleItemActive = (key) => {
-			updateItemState(key);
-		};
-		const updateAllItemsState = (status) => {
-			if (!status) setActiveItems(/* @__PURE__ */ new Map());
-		};
-		const setItemActive = (key) => {
-			updateItemState(key);
-		};
-		const unsetItemActive = (key) => {
-			updateItemState(key);
-		};
-		const toggleItemActive = (key) => {
-			updateItemState(key);
-		};
-		const unsetAllItemsActive = () => {
-			updateAllItemsState(false);
-		};
-		const isItemActive = (key) => {
-			if (!innerActiveItems) return false;
-			if (type === "single") return innerActiveItems === key;
-			if (type === "multi" && innerActiveItems instanceof Map) return !!innerActiveItems.get(key);
-			return false;
-		};
-		const attachMultipleProps = { unsetAllItemsActive };
-		const attachItemProps = (props) => {
-			const { key } = props;
-			return {
-				...typeof itemProps === "object" ? itemProps : itemProps(props),
-				active: isItemActive(key),
-				handleItemActive: () => handleItemActive(key),
-				setItemActive,
-				unsetItemActive,
-				toggleItemActive,
-				...type === "multi" ? attachMultipleProps : {}
-			};
-		};
-		useEffect(() => {
-			if (type === "single" && Array.isArray(activeItems)) {
-				if (process.env.NODE_ENV !== "production") console.warn("[@vitus-labs/elements] List/withActiveState: `activeItems` was passed as an array but `type` is \"single\". In single selection mode, `activeItems` should be a single key (string | number). The array value will be ignored.");
-			}
-		}, [type, activeItems]);
-		return /* @__PURE__ */ jsx(WrappedComponent, {
-			...rest,
-			itemProps: attachItemProps
-		});
-	};
-	Enhanced.RESERVED_KEYS = RESERVED_KEYS;
-	Enhanced.displayName = `@vitus-labs/elements/List/withActiveState(${displayName})`;
-	return Enhanced;
-};
-
 //#endregion
 //#region src/List/index.ts
 var List_default = Component$5;
@@ -1163,6 +1081,8 @@ const useOverlay = ({ isOpen = false, openOn = "click", closeOn = "click", type
 		window.addEventListener("resize", handleContentPosition);
 		window.addEventListener("scroll", onScroll, { passive: true });
 		return () => {
+			handleContentPosition.cancel();
+			handleVisibility.cancel();
 			if (shouldSetOverflow) document.body.style.overflow = "";
 			window.removeEventListener("resize", handleContentPosition);
 			window.removeEventListener("scroll", onScroll);
@@ -1269,10 +1189,8 @@ const useOverlay = ({ isOpen = false, openOn = "click", closeOn = "click", type
 	return {
 		triggerRef,
 		contentRef: useCallback((node) => {
-			if (node) {
-				contentRef.current = node;
-				setContentLoaded(true);
-			}
+			contentRef.current = node;
+			setContentLoaded(!!node);
 		}, []),
 		active,
 		align,
@@ -1348,9 +1266,11 @@ const styles = ({ css, theme: t }) => css`
   ${t.extraStyles && extendCss(t.extraStyles)};
 `;
 var styled_default = styled(textComponent)`
-  color: inherit;
-  font-weight: inherit;
-  line-height: 1;
+  ${css`
+    color: inherit;
+    font-weight: inherit;
+    line-height: 1;
+  `};
 
   ${makeItResponsive({
 	key: "$text",
@@ -1409,5 +1329,5 @@ Component$1.VITUS_LABS__COMPONENT = name;
 var Util_default = Component$1;
 
 //#endregion
-export { Element_default as Element, List_default as List, Overlay_default as Overlay, Component as OverlayProvider, Portal_default as Portal, Provider, Text_default as Text, Util_default as Util, useOverlay, component as withActiveState, withEqualBeforeAfter as withEqualSizeBeforeAfter };
+export { Element_default as Element, List_default as List, Overlay_default as Overlay, Component as OverlayProvider, Portal_default as Portal, Provider, Text_default as Text, Util_default as Util, useOverlay };
 //# sourceMappingURL=index.js.map