@skbkontur/icons 2.0.0-beta.18 → 2.0.0-beta.21

package/i.d.ts

@@ -1,2 +1 @@
-type P = import("./src/internal/Icon.js").IconProps;
-export type C = import("react").FunctionComponent<P>;
+export type C = import("./src/types.js").IconComponent;

package/m.d.ts

@@ -1,2 +1,2 @@
-import type { IconProps } from "./src/internal/Icon.js";
-export declare const s: (viewBoxSize: number, paths: string[]) => (props: IconProps) => import("react").FunctionComponentElement<import("./src/internal/BaseIcon.js").BaseIconProps & import("react").RefAttributes<SVGSVGElement>>;
+import type { IconProps, IconSize } from "./types.js";
+export declare const s: (viewBoxSize: IconSize, paths: string[]) => (props: IconProps) => import("react").FunctionComponentElement<import("./src/BaseIcon.js").BaseIconProps & import("react").RefAttributes<SVGSVGElement>>;

package/m.js

@@ -1,3 +1,3 @@
 import { createElement } from "react";
-import { BaseIcon } from "./src/internal/BaseIcon.js";
+import { BaseIcon } from "./src/BaseIcon.js";
 export const s = (viewBoxSize, paths) => (props) => createElement(BaseIcon, { paths, viewBoxSize, ...props });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@skbkontur/icons",
-    "version": "2.0.0-beta.18",
+    "version": "2.0.0-beta.21",
     "type": "module",
     "license": "UNLICENSED",
     "files": [
@@ -12,6 +12,7 @@
     ],
     "exports": {
         "./package.json": "./package.json",
+        ".": "./src/types.js",
         "./IconAnimalPawLight16": "./IconAnimalPawLight16.js",
         "./IconAnimalPawLight20": "./IconAnimalPawLight20.js",
         "./IconAnimalPawRegular16": "./IconAnimalPawRegular16.js",

package/src/BaseIcon.d.ts

@@ -0,0 +1,7 @@
+import type { IconProps, IconSize } from "./types.js";
+export interface BaseIconProps extends IconProps {
+    viewBoxSize?: IconSize;
+    paths?: string[];
+}
+export type BaseIconRefType = SVGSVGElement;
+export declare const BaseIcon: import("./forwardRef.js").ReactUIComponentWithRef<SVGSVGElement, BaseIconProps>;

package/src/{internal/BaseIcon.js → BaseIcon.js}

@@ -1,10 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useRef, useState } from "react";
-import { forwardRef } from "../helpers/forwardRef.js";
-import { IconDataTids } from "./Icon.js";
+import { forwardRef } from "./forwardRef.js";
 import { useIsomorphicLayoutEffect } from "./useIsomorphicLayoutEffect.js";
 import { isDocument, isShadowRoot, ZERO_WIDTH_SPACE } from "./utils.js";
-export const BaseIcon = forwardRef("BaseIcon", ({ color, size, style, "aria-hidden": ariaHidden = true, viewBoxSize = 16, align = "center", children, tabIndex, onKeyUp, onBlur, paths, ...rest }, ref) => {
+export const BaseIcon = forwardRef("BaseIcon", ({ color, size, style, "aria-hidden": ariaHidden = true, viewBoxSize = 16, align = "center", children, tabIndex, onKeyUp, onBlur, paths = [], ...rest }, ref) => {
     const zeroWidthSpaceRef = useRef(null);
     const [focusVisible, setFocusVisible] = useState(false);
     useIsomorphicLayoutEffect(() => {
@@ -37,7 +36,7 @@ export const BaseIcon = forwardRef("BaseIcon", ({ color, size, style, "aria-hidd
         focusVisible && setFocusVisible(false);
         onBlur?.(e);
     }, [focusVisible, onBlur]);
-    const icon = (_jsx("svg", { role: "img", "aria-label": "ui-icons", "data-tid": IconDataTids.root, ref: ref, width: size || viewBoxSize, height: size || viewBoxSize, style: {
+    const icon = (_jsx("svg", { role: "img", "aria-label": "ui-icons", "data-tid": "Icon__root", ref: ref, width: size || viewBoxSize, height: size || viewBoxSize, style: {
             fill: color ?? "currentColor",
             marginBottom: align === "none" || align === "center" ? 0 : "-0.1875em",
             flexShrink: 0,

package/src/forwardRef.d.ts

@@ -0,0 +1,17 @@
+import type { ForwardRefExoticComponent, NamedExoticComponent, PropsWithoutRef, ReactElement, RefAttributes } from "react";
+interface MutableRefObject<T> {
+    current: T;
+}
+type ForwardedRef<T> = ((instance: T | null) => void) | MutableRefObject<T | null> | null;
+interface ForwardRefRenderFunction<T, P = Record<string, unknown>> {
+    (props: P, ref: ForwardedRef<T>): ReactElement | null;
+    displayName?: string | undefined;
+    defaultProps?: never | undefined;
+    propTypes?: never | undefined;
+}
+export interface ReactUIComponentWithRef<T, P> extends NamedExoticComponent<PropsWithoutRef<P> & RefAttributes<T>>, Pick<ForwardRefExoticComponent<P>, "propTypes"> {
+    __KONTUR_REACT_UI__: string;
+    __KONTUR_ICON__: boolean;
+}
+export declare function forwardRef<ElementType, Props>(name: string, render: ForwardRefRenderFunction<ElementType, PropsWithoutRef<Props>>): ReactUIComponentWithRef<ElementType, Props>;
+export {};

package/src/{helpers/forwardRef.js → forwardRef.js}

@@ -1,4 +1,4 @@
-import React from "react";
+import { forwardRef as ReactForwardRef } from "react";
 function forwardNameAndTag(name, render) {
     render.displayName = name;
     render.__KONTUR_REACT_UI__ = name;
@@ -6,7 +6,5 @@ function forwardNameAndTag(name, render) {
     return render;
 }
 export function forwardRef(name, render) {
-    return forwardNameAndTag(name, 
-    // @ts-expect-error: 1
-    React.forwardRef(render));
+    return forwardNameAndTag(name, ReactForwardRef(render));
 }

package/src/types.d.ts

@@ -0,0 +1,10 @@
+import type { AllHTMLAttributes, AriaAttributes, FunctionComponent, SVGAttributes } from "react";
+export type IconSize = 16 | 20 | 24 | 32 | 64;
+export type IconWeight = "light" | "regular" | "solid";
+export interface IconProps extends SVGAttributes<SVGElement>, Pick<AllHTMLAttributes<SVGElement>, "role" | "title" | "tabIndex">, Pick<AriaAttributes, "aria-label" | "aria-hidden"> {
+    size?: number | undefined;
+    weight?: IconWeight | undefined;
+    color?: string | undefined;
+    align?: "center" | "baseline" | "none" | undefined;
+}
+export type IconComponent = FunctionComponent<IconProps>;

package/src/helpers/forwardRef.d.ts

@@ -1,7 +0,0 @@
-import React from "react";
-import type { ForwardRefRenderFunction } from "./types.js";
-export interface ReactUIComponentWithRef<T, P> extends React.NamedExoticComponent<React.PropsWithoutRef<P> & React.RefAttributes<T>>, Pick<React.ForwardRefExoticComponent<P>, "propTypes"> {
-    __KONTUR_REACT_UI__: string;
-    __KONTUR_ICON__: boolean;
-}
-export declare function forwardRef<ElementType, Props>(name: string, render: ForwardRefRenderFunction<ElementType, Props>): ReactUIComponentWithRef<ElementType, Props>;

package/src/helpers/types.d.ts

@@ -1,12 +0,0 @@
-import type { ReactElement } from "react";
-interface MutableRefObject<T> {
-    current: T;
-}
-type ForwardedRef<T> = ((instance: T | null) => void) | MutableRefObject<T | null> | null;
-export interface ForwardRefRenderFunction<T, P = Record<string, unknown>> {
-    (props: P, ref: ForwardedRef<T>): ReactElement | null;
-    displayName?: string | undefined;
-    defaultProps?: never | undefined;
-    propTypes?: never | undefined;
-}
-export {};

package/src/internal/BaseIcon.d.ts

@@ -1,7 +0,0 @@
-import type { breakpoints, IconProps } from "./Icon.js";
-export interface BaseIconProps extends IconProps {
-    viewBoxSize?: (typeof breakpoints)[number];
-    paths: string[];
-}
-export type BaseIconRefType = SVGSVGElement;
-export declare const BaseIcon: import("../helpers/forwardRef.js").ReactUIComponentWithRef<SVGSVGElement, BaseIconProps>;

package/src/internal/Icon.d.ts

@@ -1,16 +0,0 @@
-import type React from "react";
-import type { AllHTMLAttributes, AriaAttributes } from "react";
-export declare const breakpoints: number[];
-export declare const weights: readonly ["light", "regular", "solid"];
-export declare const MAX_LIGHT_POSITION = 1;
-export declare const MAX_SOLID_POSITION = 2;
-export type IconWeight = (typeof weights)[number];
-export interface IconProps extends React.SVGAttributes<SVGElement>, Pick<AllHTMLAttributes<SVGElement>, "role" | "title" | "tabIndex">, Pick<AriaAttributes, "aria-label" | "aria-hidden"> {
-    size?: number;
-    weight?: IconWeight;
-    color?: string;
-    align?: "center" | "baseline" | "none";
-}
-export declare const IconDataTids: {
-    root: string;
-};

package/src/internal/Icon.js

@@ -1,7 +0,0 @@
-export const breakpoints = [16, 20, 24, 32, 64];
-export const weights = ["light", "regular", "solid"];
-export const MAX_LIGHT_POSITION = 1;
-export const MAX_SOLID_POSITION = 2;
-export const IconDataTids = {
-    root: "Icon__root",
-};