@niibase/uniwind 1.6.3 → 1.7.0

package/dist/module/hoc/withUniwind.js

@@ -7,8 +7,8 @@ import { Logger } from "../core/logger.js";
 import { CSSListener, formatColor, getWebStyles } from "../core/web/index.js";
 import { classToColor, classToStyle, isClassProperty, isColorClassProperty, isStyleProperty } from "./withUniwindUtils.js";
 let warnedOnce = false;
-export const withUniwind = (Component2, options) => options ? withManualUniwind(Component2, options) : withAutoUniwind(Component2);
-const withAutoUniwind = (Component2) => (props) => {
+export const withUniwind = (Component, options) => options ? withManualUniwind(Component, options) : withAutoUniwind(Component);
+const withAutoUniwind = (Component) => (props) => {
   const uniwindContext = useUniwindContext();
   const { classNames, generatedProps } = Object.entries(props).reduce((acc, [propName, propValue]) => {
     if (isColorClassProperty(propName)) {
@@ -47,7 +47,7 @@ const withAutoUniwind = (Component2) => (props) => {
     return dispose;
   }, [classNames]);
   return /* @__PURE__ */ jsx(
-    Component2,
+    Component,
     {
       ...props,
       ...generatedProps,
@@ -55,7 +55,7 @@ const withAutoUniwind = (Component2) => (props) => {
     }
   );
 };
-const withManualUniwind = (Component2, options) => (props) => {
+const withManualUniwind = (Component, options) => (props) => {
   const uniwindContext = useUniwindContext();
   const { generatedProps, classNames } = Object.entries(options).reduce((acc, [propName, option]) => {
     const className = props[option.fromClassName];
@@ -81,7 +81,7 @@ const withManualUniwind = (Component2, options) => (props) => {
     return dispose;
   }, [classNames]);
   return /* @__PURE__ */ jsx(
-    Component2,
+    Component,
     {
       ...props,
       ...generatedProps,

package/dist/module/hoc/withUniwind.native.d.ts

@@ -1,2 +1,2 @@
-import { WithUniwind } from './types';
+import type { WithUniwind } from './types';
 export declare const withUniwind: WithUniwind;

package/dist/module/hoc/withUniwind.native.js

@@ -7,8 +7,8 @@ import { Logger } from "../core/logger.js";
 import { UniwindStore } from "../core/native/index.js";
 import { classToColor, classToStyle, isClassProperty, isColorClassProperty, isStyleProperty } from "./withUniwindUtils.js";
 let warnedOnce = false;
-export const withUniwind = (Component2, options) => options ? withManualUniwind(Component2, options) : withAutoUniwind(Component2);
-const withAutoUniwind = (Component2) => (props) => {
+export const withUniwind = (Component, options) => options ? withManualUniwind(Component, options) : withAutoUniwind(Component);
+const withAutoUniwind = (Component) => (props) => {
   const uniwindContext = useUniwindContext();
   const { dependencies, generatedProps } = Object.entries(props).reduce((acc, [propName, propValue]) => {
     if (isColorClassProperty(propName)) {
@@ -52,14 +52,14 @@ const withAutoUniwind = (Component2) => (props) => {
     return dispose;
   }, [dependencySum]);
   return /* @__PURE__ */ jsx(
-    Component2,
+    Component,
     {
       ...props,
       ...generatedProps
     }
   );
 };
-const withManualUniwind = (Component2, options) => (props) => {
+const withManualUniwind = (Component, options) => (props) => {
   const uniwindContext = useUniwindContext();
   const { generatedProps, dependencies } = Object.entries(options).reduce((acc, [propName, option]) => {
     const className = props[option.fromClassName];
@@ -99,7 +99,7 @@ const withManualUniwind = (Component2, options) => (props) => {
     return dispose;
   }, [dependencySum]);
   return /* @__PURE__ */ jsx(
-    Component2,
+    Component,
     {
       ...props,
       ...generatedProps

package/dist/module/hooks/useCSSVariable/getVariableValue.native.d.ts

@@ -1,2 +1,2 @@
-import { UniwindContextType } from '../../core/types';
+import type { UniwindContextType } from '../../core/types';
 export declare const getVariableValue: (name: string, uniwindContext: UniwindContextType) => unknown;

package/dist/module/hooks/useCSSVariable/index.d.ts

@@ -1 +1 @@
-export * from './useCSSVariable';
+export { useCSSVariable } from './useCSSVariable';

package/dist/module/hooks/useCSSVariable/index.js

@@ -1 +1 @@
-export * from "./useCSSVariable.js";
+export { useCSSVariable } from "./useCSSVariable.js";

package/dist/module/hooks/useCSSVariable/useCSSVariable.d.ts

@@ -1,6 +1,8 @@
+import type { UniwindContextType } from '../../core/types';
+export declare const getCSSVariable: (name: string | Array<string>, uniwindContext: UniwindContextType) => string | (string | undefined)[] | undefined;
 type IsGenericNumber<T> = T & 0 extends -1 ? false : true;
 type CreateArray<N extends number, Value, TAcc extends Array<Value> = []> = TAcc['length'] extends N ? TAcc : CreateArray<N, Value, [...TAcc, Value]>;
-type UseCSSVariable = {
+export type GetCSSVariable = {
     (name: string): string | number | undefined;
     <const T extends Array<string>>(names: T): IsGenericNumber<T['length']> extends true ? Array<string | number | undefined> : CreateArray<T['length'], string | number | undefined>;
 };
@@ -9,5 +11,5 @@ type UseCSSVariable = {
  * @param name Name / Array of names of the CSS variable.
  * @returns Value / Values of the CSS variable. On web it is always a string (1rem, #ff0000, etc.), but on native it can be a string or a number (16px, #ff0000)
  */
-export declare const useCSSVariable: UseCSSVariable;
+export declare const useCSSVariable: GetCSSVariable;
 export {};

package/dist/module/hooks/useCSSVariable/useCSSVariable.js

@@ -1,53 +1,60 @@
 import { useLayoutEffect, useRef, useState } from "react";
+import { Platform } from "react-native";
+import { StyleDependency } from "../../common/consts.js";
 import { arrayEquals } from "../../common/utils.js";
 import { useUniwindContext } from "../../core/context.js";
 import { UniwindListener } from "../../core/listener.js";
 import { Logger } from "../../core/logger.js";
-import { StyleDependency } from "../../types.js";
 import { getVariableValue } from "./getVariableValue.js";
-const getValue = (name, uniwindContext) => Array.isArray(name) ? name.map((name2) => getVariableValue(name2, uniwindContext)) : getVariableValue(name, uniwindContext);
 let warned = false;
 const logDevError = (name) => {
+  if (Platform.OS === "web" && (typeof document === "undefined" || typeof window === "undefined")) {
+    return;
+  }
   warned = true;
   Logger.warn(
     `We couldn't find your variable ${name}. Make sure it's used at least once in your className, or define it in a static theme as described in the docs: https://docs.uniwind.dev/api/use-css-variable`
   );
 };
+export const getCSSVariable = (name, uniwindContext) => {
+  const value = Array.isArray(name) ? name.map((name2) => getVariableValue(name2, uniwindContext)) : getVariableValue(name, uniwindContext);
+  if (Array.isArray(value)) {
+    value.forEach((val, index) => {
+      if (val === void 0 && __DEV__ && !warned) {
+        logDevError(name[index] ?? "");
+      }
+    });
+  }
+  if (value === void 0 && __DEV__ && !warned) {
+    logDevError(name);
+  }
+  return value;
+};
 export const useCSSVariable = (name) => {
   const uniwindContext = useUniwindContext();
-  const [value, setValue] = useState(getValue(name, uniwindContext));
+  const [value, setValue] = useState(getCSSVariable(name, uniwindContext));
   const nameRef = useRef(name);
   useLayoutEffect(() => {
     if (Array.isArray(name) && Array.isArray(nameRef.current)) {
       if (arrayEquals(name, nameRef.current)) {
         return;
       }
-      setValue(getValue(name, uniwindContext));
+      setValue(getCSSVariable(name, uniwindContext));
       nameRef.current = name;
       return;
     }
     if (name !== nameRef.current) {
-      setValue(getValue(name, uniwindContext));
+      setValue(getCSSVariable(name, uniwindContext));
       nameRef.current = name;
     }
   }, [name]);
   useLayoutEffect(() => {
-    const updateValue = () => setValue(getValue(nameRef.current, uniwindContext));
+    const updateValue = () => setValue(getCSSVariable(nameRef.current, uniwindContext));
     const dispose = UniwindListener.subscribe(
       updateValue,
       [StyleDependency.Theme, StyleDependency.Variables]
     );
     return dispose;
   }, [uniwindContext]);
-  if (Array.isArray(value)) {
-    value.forEach((val, index) => {
-      if (val === void 0 && __DEV__ && !warned) {
-        logDevError(name[index] ?? "");
-      }
-    });
-  }
-  if (value === void 0 && __DEV__ && !warned) {
-    logDevError(name);
-  }
   return value;
 };

package/dist/module/hooks/useResolveClassNames.d.ts

@@ -1,2 +1,2 @@
-import { RNStyle } from '../core/types';
+import type { RNStyle } from '../core/types';
 export declare const useResolveClassNames: (className: string) => RNStyle;

package/dist/module/hooks/useUniwind.d.ts

@@ -1,4 +1,4 @@
-import { ThemeName } from '../core/types';
+import type { ThemeName } from '../core/types';
 export declare const useUniwind: () => {
     theme: ThemeName;
     hasAdaptiveThemes: boolean;

package/dist/module/hooks/useUniwind.js

@@ -1,8 +1,8 @@
 import { useLayoutEffect, useState } from "react";
+import { StyleDependency } from "../common/consts.js";
 import { Uniwind } from "../core/index.js";
 import { useUniwindContext } from "../core/context.js";
 import { UniwindListener } from "../core/listener.js";
-import { StyleDependency } from "../types.js";
 export const useUniwind = () => {
   const uniwindContext = useUniwindContext();
   const [theme, setTheme] = useState(Uniwind.currentTheme);

package/dist/module/index.d.ts

@@ -1,7 +1,6 @@
 export * from './components/ScopedTheme';
 export { Uniwind } from './core';
-export type { ThemeName } from './core/types';
+export type { ThemeName, UniwindConfig } from './core/types';
 export { withUniwind } from './hoc';
 export type { ApplyUniwind, ApplyUniwindOptions } from './hoc/types';
 export { useCSSVariable, useResolveClassNames, useUniwind } from './hooks';
-export type { UniwindConfig } from './types';