@vitus-labs/attrs 2.0.0-alpha.9 → 2.0.0-beta.1

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-import { ComponentType, ForwardRefExoticComponent, PropsWithoutRef, RefAttributes } from "react";
+import { ComponentType, ReactElement } from "react";
 
 //#region src/types/attrs.d.ts
 /** Callback form of `.attrs()` — receives current props and returns partial overrides. */
@@ -11,7 +11,7 @@ type TFn = (...args: any) => any;
  * A React component type that accepts additional static properties.
  * Supports both class/function components and forwardRef components.
  */
-type ElementType<T extends TObj | unknown = any> = (ComponentType<T> & Partial<Record<string, any>>) | (ForwardRefExoticComponent<T> & Partial<Record<string, any>>);
+type ElementType<T extends TObj | unknown = any> = ComponentType<T> & Partial<Record<string, any>>;
 /**
  * Forces TypeScript to expand/flatten a type for better IDE display.
  * Short-circuits for `any` — the mapped type would turn `any` into
@@ -37,8 +37,8 @@ type Spread<A extends readonly [...any]> = A extends [infer L, ...infer R] ? Spr
 /** Recursively checks whether any element in the tuple is `any`. */
 type _HasAny<A> = A extends [infer L, ...infer R] ? 0 extends 1 & L ? true : _HasAny<R> : false;
 type MergeTypes<A extends readonly [...any]> = _HasAny<A> extends true ? any : ExtractNullableKeys<Spread<A>>;
-/** Extracts the props type from a React component type (class, function, or forwardRef). */
-type ExtractProps<TComponentOrTProps> = TComponentOrTProps extends ComponentType<infer TProps> ? TProps : TComponentOrTProps extends ForwardRefExoticComponent<infer TProps> ? TProps : TComponentOrTProps;
+/** Extracts the props type from a React component type (class or function). */
+type ExtractProps<TComponentOrTProps> = TComponentOrTProps extends ComponentType<infer TProps> ? TProps : TComponentOrTProps;
 //#endregion
 //#region src/types/config.d.ts
 /** A component that has been enhanced by attrs — identified by the `IS_ATTRS` marker. */
@@ -62,9 +62,6 @@ type GenericHoc = (component: ElementType) => ElementType;
 type ComposeParam = Record<string, GenericHoc | null | undefined | false>;
 //#endregion
 //#region src/types/AttrsComponent.d.ts
-type ExoticComponent<P extends Record<string, unknown> = {}> = ForwardRefExoticComponent<PropsWithoutRef<P> & RefAttributes<any>> & {
-  readonly $$typeof: symbol;
-};
 /**
  * @param OA   Origin component props params.
  * @param EA   Extended prop types
@@ -72,7 +69,10 @@ type ExoticComponent<P extends Record<string, unknown> = {}> = ForwardRefExoticC
  * @param HOC  High-order components
  * @param DFP  Calculated final component props
  */
-interface AttrsComponent<C extends ElementType = ElementType, OA extends TObj = {}, EA extends TObj = {}, S extends TObj = {}, HOC extends TObj = {}, DFP extends Record<string, any> = MergeTypes<[OA, EA]>> extends ExoticComponent<DFP> {
+interface AttrsComponent<C extends ElementType = ElementType, OA extends TObj = {}, EA extends TObj = {}, S extends TObj = {}, HOC extends TObj = {}, DFP extends Record<string, any> = MergeTypes<[OA, EA]>> {
+  (props: DFP & {
+    ref?: any;
+  }): ReactElement | null;
   /**
    * A chaining method to define default component theme
    * @param param  _object_

package/lib/index.js

@@ -1,5 +1,5 @@
 import { compose, hoistNonReactStatics, isEmpty, omit, pick } from "@vitus-labs/core";
-import { forwardRef, useImperativeHandle, useMemo, useRef } from "react";
+import { useImperativeHandle, useMemo, useRef } from "react";
 import { jsx } from "react/jsx-runtime";
 
 //#region src/utils/attrs.ts
@@ -31,22 +31,33 @@ const calculateChainOptions = (options) => (args) => {
 const createAttrsHOC = ({ attrs, priorityAttrs }) => {
 	const calculateAttrs = calculateChainOptions(attrs);
 	const calculatePriorityAttrs = calculateChainOptions(priorityAttrs);
-	const attrsHoc = (WrappedComponent) => forwardRef((props, ref) => {
-		const filteredProps = useMemo(() => removeUndefinedProps(props), [props]);
-		return /* @__PURE__ */ jsx(WrappedComponent, { ...useMemo(() => {
-			const prioritizedAttrs = calculatePriorityAttrs([filteredProps]);
-			const finalAttrs = calculateAttrs([{
-				...prioritizedAttrs,
-				...filteredProps
-			}]);
-			return {
-				$attrsRef: ref,
-				...prioritizedAttrs,
-				...finalAttrs,
-				...filteredProps
-			};
-		}, [filteredProps, ref]) });
-	});
+	const hasAttrs = (attrs?.length ?? 0) > 0;
+	const hasPriorityAttrs = (priorityAttrs?.length ?? 0) > 0;
+	const hasAnyChain = hasAttrs || hasPriorityAttrs;
+	const attrsHoc = (WrappedComponent) => {
+		const HOC = (allProps) => {
+			const { ref, ...props } = allProps;
+			const filteredProps = useMemo(() => removeUndefinedProps(props), [allProps]);
+			return /* @__PURE__ */ jsx(WrappedComponent, { ...useMemo(() => {
+				if (!hasAnyChain) return {
+					$attrsRef: ref,
+					...filteredProps
+				};
+				const prioritizedAttrs = hasPriorityAttrs ? calculatePriorityAttrs([filteredProps]) : null;
+				const finalAttrs = hasAttrs ? calculateAttrs([prioritizedAttrs ? {
+					...prioritizedAttrs,
+					...filteredProps
+				} : filteredProps]) : null;
+				return {
+					$attrsRef: ref,
+					...prioritizedAttrs,
+					...finalAttrs,
+					...filteredProps
+				};
+			}, [filteredProps, ref]) });
+		};
+		return HOC;
+	};
 	return attrsHoc;
 };
 
@@ -109,7 +120,7 @@ const cloneAndEnhance = (defaultOpts, opts) => attrsComponent({
 /**
 * Core factory that builds an attrs-enhanced React component.
 *
-* Creates a `forwardRef` component that:
+* Creates a component that:
 * 1. Wraps the original with attrsHoc (default props) + user HOCs from `.compose()`.
 * 2. Manages ref forwarding through the HOC chain via `$attrsRef`.
 * 3. Filters out internal props listed in `filterAttrs`.
@@ -122,7 +133,7 @@ const attrsComponent = (options) => {
 	const componentName = options.name ?? options.component.displayName ?? options.component.name;
 	const RenderComponent = options.component;
 	const hocsFuncs = [createAttrsHOC(options), ...calculateHocsFuncs(options.compose)];
-	const EnhancedComponent = forwardRef(({ $attrsRef, ...props }, ref) => {
+	const EnhancedComponent = ({ $attrsRef, ref, ...props }) => {
 		const internalRef = useAttrsStyleRef({
 			$attrsRef,
 			ref
@@ -138,7 +149,7 @@ const attrsComponent = (options) => {
 			...filteredProps,
 			"data-attrs": componentName
 		} : filteredProps });
-	});
+	};
 	const AttrsComponent = compose(...hocsFuncs)(EnhancedComponent);
 	AttrsComponent.IS_ATTRS = true;
 	AttrsComponent.displayName = componentName;
@@ -193,7 +204,7 @@ const attrs = ({ name, component }) => {
 //#region src/isAttrsComponent.tsx
 /** Runtime type guard — checks if a component was created by `attrs()`. */
 const isAttrsComponent = (component) => {
-	if (component && typeof component === "object" && component !== null && Object.hasOwn(component, "IS_ATTRS")) return true;
+	if (component && (typeof component === "object" || typeof component === "function") && Object.hasOwn(component, "IS_ATTRS")) return true;
 	return false;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitus-labs/attrs",
-  "version": "2.0.0-alpha.9+f2f47db",
+  "version": "2.0.0-beta.1",
   "license": "MIT",
   "author": "Vit Bokisch <vit@bokisch.cz>",
   "maintainers": [
@@ -13,6 +13,8 @@
     "import": "./lib/index.js",
     "types": "./lib/index.d.ts"
   },
+  "types": "./lib/index.d.ts",
+  "main": "./lib/index.js",
   "files": [
     "lib",
     "!lib/**/*.map",
@@ -53,18 +55,18 @@
     "test:coverage": "vitest run --coverage",
     "test:watch": "vitest",
     "cover": "coveralls < .coverage/lcov.info",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit",
+    "version": "node ../../scripts/sync-peer-deps.mjs"
   },
   "peerDependencies": {
-    "@vitus-labs/core": "^1.4.0",
+    "@vitus-labs/core": "2.0.0-beta.1",
     "react": ">= 19"
   },
   "devDependencies": {
-    "@vitus-labs/core": "2.0.0-alpha.9+f2f47db",
-    "@vitus-labs/elements": "2.0.0-alpha.9+f2f47db",
-    "@vitus-labs/tools-rolldown": "^1.6.0",
-    "@vitus-labs/tools-storybook": "^1.6.0",
-    "@vitus-labs/tools-typescript": "^1.6.0"
-  },
-  "gitHead": "f2f47db887d6a846ee5f9e96f290c59cdde4772a"
+    "@vitus-labs/core": "workspace:*",
+    "@vitus-labs/elements": "workspace:*",
+    "@vitus-labs/tools-rolldown": "2.2.0",
+    "@vitus-labs/tools-storybook": "2.2.0",
+    "@vitus-labs/tools-typescript": "2.1.0"
+  }
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023-present Vit Bokisch
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.