@niibase/uniwind 1.0.10 → 1.0.11

package/dist/module/components/{native/react-native-gesture-handler → react-native-gesture-handler/native}/TouchableOpacity.js

@@ -1,8 +1,8 @@
 import { jsx } from "react/jsx-runtime";
 import { useState } from "react";
 import { TouchableOpacity as RNGHTouchableOpacity } from "react-native-gesture-handler";
+import { useStyle } from "../../native/useStyle.js";
 import { copyComponentProperties } from "../../utils.js";
-import { useStyle } from "../useStyle.js";
 export const TouchableOpacity = copyComponentProperties(
   RNGHTouchableOpacity,
   (props) => {

package/dist/module/components/{native/react-native-gesture-handler → react-native-gesture-handler/native}/TouchableWithoutFeedback.js

@@ -3,8 +3,8 @@ import { useState } from "react";
 import {
   TouchableWithoutFeedback as RNGHTouchableWithoutFeedback
 } from "react-native-gesture-handler";
+import { useStyle } from "../../native/useStyle.js";
 import { copyComponentProperties } from "../../utils.js";
-import { useStyle } from "../useStyle.js";
 export const TouchableWithoutFeedback = copyComponentProperties(
   RNGHTouchableWithoutFeedback,
   (props) => {

package/dist/module/components/react-native-svg/index.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/module/components/react-native-svg/index.js

@@ -0,0 +1,10 @@
+import * as Svg from "react-native-svg";
+module.exports = {
+  ...Svg,
+  get Svg() {
+    return require("./native/Svg").Svg;
+  },
+  get default() {
+    return require("./native/Svg").default;
+  }
+};

package/dist/module/components/{native/react-native-svg → react-native-svg/native}/Svg.js

@@ -1,7 +1,7 @@
 import { jsx } from "react/jsx-runtime";
 import { Svg as RNSvg } from "react-native-svg";
+import { useStyle } from "../../native/useStyle.js";
 import { copyComponentProperties } from "../../utils.js";
-import { useStyle } from "../useStyle.js";
 export const Svg = copyComponentProperties(RNSvg, (props) => {
   const style = useStyle(props.className);
   return /* @__PURE__ */ jsx(

package/dist/module/components/react-native-svg/web/Svg.d.ts

@@ -0,0 +1,3 @@
+import { Svg as RNSvg } from 'react-native-svg';
+export declare const Svg: typeof RNSvg;
+export default Svg;

package/dist/module/components/react-native-svg/web/Svg.js

@@ -0,0 +1,14 @@
+import { jsx } from "react/jsx-runtime";
+import { Svg as RNSvg } from "react-native-svg";
+import { copyComponentProperties } from "../../utils.js";
+import { toRNWClassName } from "../../web/rnw.js";
+export const Svg = copyComponentProperties(RNSvg, (props) => {
+  return /* @__PURE__ */ jsx(
+    RNSvg,
+    {
+      ...props,
+      style: [toRNWClassName(props.className), props.style]
+    }
+  );
+});
+export default Svg;

package/package.json

@@ -1,7 +1,7 @@
 {
     "private": false,
     "name": "@niibase/uniwind",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "description": "The fastest Tailwind bindings for React Native",
     "homepage": "https://uniwind.dev",
     "author": "Unistack",

package/src/components/{native/react-native-gesture-handler → react-native-gesture-handler}/index.ts

@@ -1,54 +1,54 @@
 module.exports = {
     get BaseButton() {
-        return require('./BaseButton').BaseButton
+        return require('./native/BaseButton').BaseButton
     },
     get BorderlessButton() {
-        return require('./BorderlessButton').BorderlessButton
+        return require('./native/BorderlessButton').BorderlessButton
     },
     get DrawerLayoutAndroid() {
-        return require('./DrawerLayoutAndroid').DrawerLayoutAndroid
+        return require('./native/DrawerLayoutAndroid').DrawerLayoutAndroid
     },
     get FlatList() {
-        return require('./FlatList').FlatList
+        return require('./native/FlatList').FlatList
     },
     get GestureHandlerRootView() {
-        return require('./GestureHandlerRootView').GestureHandlerRootView
+        return require('./native/GestureHandlerRootView').GestureHandlerRootView
     },
     get Pressable() {
-        return require('./Pressable').Pressable
+        return require('./native/Pressable').Pressable
     },
     get PureNativeButton() {
-        return require('./PureNativeButton').PureNativeButton
+        return require('./native/PureNativeButton').PureNativeButton
     },
     get RawButton() {
-        return require('./RawButton').RawButton
+        return require('./native/RawButton').RawButton
     },
     get RectButton() {
-        return require('./RectButton').RectButton
+        return require('./native/RectButton').RectButton
     },
     get RefreshControl() {
-        return require('./RefreshControl').RefreshControl
+        return require('./native/RefreshControl').RefreshControl
     },
     get ScrollView() {
-        return require('./ScrollView').ScrollView
+        return require('./native/ScrollView').ScrollView
     },
     get Switch() {
-        return require('./Switch').Switch
+        return require('./native/Switch').Switch
     },
     get Text() {
-        return require('./Text').Text
+        return require('./native/Text').Text
     },
     get TextInput() {
-        return require('./TextInput').TextInput
+        return require('./native/TextInput').TextInput
     },
     get TouchableNativeFeedback() {
-        return require('./TouchableNativeFeedback').TouchableNativeFeedback
+        return require('./native/TouchableNativeFeedback').TouchableNativeFeedback
     },
     get TouchableOpacity() {
-        return require('./TouchableOpacity').TouchableOpacity
+        return require('./native/TouchableOpacity').TouchableOpacity
     },
     get TouchableWithoutFeedback() {
-        return require('./TouchableWithoutFeedback').TouchableWithoutFeedback
+        return require('./native/TouchableWithoutFeedback').TouchableWithoutFeedback
     },
 
     // Re-export non-component exports from react-native-gesture-handler

package/src/components/{native/react-native-gesture-handler → react-native-gesture-handler/native}/BaseButton.tsx

@@ -1,6 +1,6 @@
 import { BaseButton as RNGHBaseButton, BaseButtonProps } from 'react-native-gesture-handler'
+import { useStyle } from '../../native/useStyle'
 import { copyComponentProperties } from '../../utils'
-import { useStyle } from '../useStyle'
 
 type BaseButtonPropsWithClassName = BaseButtonProps & { className?: string }
 

package/src/components/{native/react-native-gesture-handler → react-native-gesture-handler/native}/BorderlessButton.tsx

@@ -1,6 +1,6 @@
 import { BorderlessButton as RNGHBorderlessButton, BorderlessButtonProps } from 'react-native-gesture-handler'
+import { useStyle } from '../../native/useStyle'
 import { copyComponentProperties } from '../../utils'
-import { useStyle } from '../useStyle'
 
 export const BorderlessButton = copyComponentProperties(
     RNGHBorderlessButton,

package/src/components/{native/react-native-gesture-handler → react-native-gesture-handler/native}/DrawerLayoutAndroid.tsx

@@ -1,7 +1,7 @@
 import { DrawerLayoutAndroidProps } from 'react-native'
 import { DrawerLayoutAndroid as RNGHDrawerLayoutAndroid } from 'react-native-gesture-handler'
+import { useStyle } from '../../native/useStyle'
 import { copyComponentProperties } from '../../utils'
-import { useStyle } from '../useStyle'
 
 export const DrawerLayoutAndroid = copyComponentProperties(
     RNGHDrawerLayoutAndroid,

package/src/components/{native/react-native-gesture-handler → react-native-gesture-handler/native}/FlatList.tsx

@@ -1,8 +1,8 @@
 import { FlatListProps } from 'react-native'
 import { FlatList as RNGHFlatList } from 'react-native-gesture-handler'
 import { useUniwindAccent } from '../../../hooks'
+import { useStyle } from '../../native/useStyle'
 import { copyComponentProperties } from '../../utils'
-import { useStyle } from '../useStyle'
 
 export const FlatList = copyComponentProperties(RNGHFlatList, (props: FlatListProps<unknown>) => {
     const style = useStyle(props.className)

package/src/components/{native/react-native-gesture-handler → react-native-gesture-handler/native}/GestureHandlerRootView.tsx

@@ -1,7 +1,7 @@
 import { GestureHandlerRootView as RNGestureHandlerRootView } from 'react-native-gesture-handler'
 import { GestureHandlerRootViewProps } from 'react-native-gesture-handler/lib/typescript/components/GestureHandlerRootView'
+import { useStyle } from '../../native/useStyle'
 import { copyComponentProperties } from '../../utils'
-import { useStyle } from '../useStyle'
 
 export const GestureHandlerRootView = copyComponentProperties(
     RNGestureHandlerRootView,

package/src/components/{native/react-native-gesture-handler → react-native-gesture-handler/native}/Pressable.tsx

@@ -1,7 +1,7 @@
 import { Pressable as RNGHPressable, PressableProps } from 'react-native-gesture-handler'
 import { UniwindStore } from '../../../core/native'
+import { useStyle } from '../../native/useStyle'
 import { copyComponentProperties } from '../../utils'
-import { useStyle } from '../useStyle'
 
 export const Pressable = copyComponentProperties(RNGHPressable, (props: PressableProps) => {
     const style = useStyle(props.className, {

package/src/components/{native/react-native-gesture-handler → react-native-gesture-handler/native}/PureNativeButton.tsx

@@ -1,6 +1,6 @@
 import { PureNativeButton as RNGHPureNativeButton, RawButtonProps } from 'react-native-gesture-handler'
+import { useStyle } from '../../native/useStyle'
 import { copyComponentProperties } from '../../utils'
-import { useStyle } from '../useStyle'
 
 export const PureNativeButton = copyComponentProperties(RNGHPureNativeButton, (props: RawButtonProps) => {
     const style = useStyle(props.className)

package/src/components/{native/react-native-gesture-handler → react-native-gesture-handler/native}/RawButton.tsx

@@ -1,6 +1,6 @@
 import { RawButton as RNGHRawButton, RawButtonProps } from 'react-native-gesture-handler'
+import { useStyle } from '../../native/useStyle'
 import { copyComponentProperties } from '../../utils'
-import { useStyle } from '../useStyle'
 
 export const RawButton = copyComponentProperties(RNGHRawButton, (props: RawButtonProps) => {
     const style = useStyle(props.className)

package/src/components/{native/react-native-gesture-handler → react-native-gesture-handler/native}/RectButton.tsx

@@ -1,6 +1,6 @@
 import { RectButton as RNGHRectButton, RectButtonProps } from 'react-native-gesture-handler'
+import { useStyle } from '../../native/useStyle'
 import { copyComponentProperties } from '../../utils'
-import { useStyle } from '../useStyle'
 
 export const RectButton = copyComponentProperties(RNGHRectButton, (props: RectButtonProps) => {
     const style = useStyle(props.className)

package/src/components/{native/react-native-gesture-handler → react-native-gesture-handler/native}/RefreshControl.tsx

@@ -1,8 +1,8 @@
 import { RefreshControlProps } from 'react-native'
 import { RefreshControl as RNGHRefreshControl } from 'react-native-gesture-handler'
 import { useUniwindAccent } from '../../../hooks'
+import { useStyle } from '../../native/useStyle'
 import { copyComponentProperties } from '../../utils'
-import { useStyle } from '../useStyle'
 
 export const RefreshControl = copyComponentProperties(RNGHRefreshControl, (props: RefreshControlProps) => {
     const style = useStyle(props.className)

package/src/components/{native/react-native-gesture-handler → react-native-gesture-handler/native}/ScrollView.tsx

@@ -1,8 +1,8 @@
 import { ScrollViewProps } from 'react-native'
 import { ScrollView as RNGHScrollView } from 'react-native-gesture-handler'
 import { useUniwindAccent } from '../../../hooks'
+import { useStyle } from '../../native/useStyle'
 import { copyComponentProperties } from '../../utils'
-import { useStyle } from '../useStyle'
 
 export const ScrollView = copyComponentProperties(RNGHScrollView, (props: ScrollViewProps) => {
     const style = useStyle(props.className)

package/src/components/{native/react-native-gesture-handler → react-native-gesture-handler/native}/Switch.tsx

@@ -2,8 +2,8 @@ import { SwitchProps } from 'react-native'
 import { Switch as RNGHSwitch } from 'react-native-gesture-handler'
 import { ComponentState } from '../../../core/types'
 import { useUniwindAccent } from '../../../hooks/useUniwindAccent.native'
+import { useStyle } from '../../native/useStyle'
 import { copyComponentProperties } from '../../utils'
-import { useStyle } from '../useStyle'
 
 export const Switch = copyComponentProperties(RNGHSwitch, (props: SwitchProps) => {
     const state = {

package/src/components/{native/react-native-gesture-handler → react-native-gesture-handler/native}/Text.tsx

@@ -3,8 +3,8 @@ import { TextProps } from 'react-native'
 import { Text as RNGHText } from 'react-native-gesture-handler'
 import { ComponentState } from '../../../core/types'
 import { useUniwindAccent } from '../../../hooks/useUniwindAccent.native'
+import { useStyle } from '../../native/useStyle'
 import { copyComponentProperties } from '../../utils'
-import { useStyle } from '../useStyle'
 
 type StyleWithWebkitLineClamp = {
     WebkitLineClamp?: number

package/src/components/{native/react-native-gesture-handler → react-native-gesture-handler/native}/TextInput.tsx

@@ -3,8 +3,8 @@ import { TextInputProps } from 'react-native'
 import { TextInput as RNGHTextInput } from 'react-native-gesture-handler'
 import { ComponentState } from '../../../core/types'
 import { useUniwindAccent } from '../../../hooks/useUniwindAccent.native'
+import { useStyle } from '../../native/useStyle'
 import { copyComponentProperties } from '../../utils'
-import { useStyle } from '../useStyle'
 
 export const TextInput = copyComponentProperties(RNGHTextInput, (props: TextInputProps) => {
     const [isFocused, setIsFocused] = useState(false)

package/src/components/{native/react-native-gesture-handler → react-native-gesture-handler/native}/TouchableNativeFeedback.tsx

@@ -2,8 +2,8 @@ import { useState } from 'react'
 import { TouchableNativeFeedbackProps } from 'react-native'
 import { TouchableNativeFeedback as RNGHTouchableNativeFeedback } from 'react-native-gesture-handler'
 import { ComponentState } from '../../../core/types'
+import { useStyle } from '../../native/useStyle'
 import { copyComponentProperties } from '../../utils'
-import { useStyle } from '../useStyle'
 
 export const TouchableNativeFeedback = copyComponentProperties(
     RNGHTouchableNativeFeedback,

package/src/components/{native/react-native-gesture-handler → react-native-gesture-handler/native}/TouchableOpacity.tsx

@@ -1,8 +1,8 @@
 import { useState } from 'react'
 import { TouchableOpacity as RNGHTouchableOpacity, TouchableOpacityProps } from 'react-native-gesture-handler'
 import { ComponentState } from '../../../core/types'
+import { useStyle } from '../../native/useStyle'
 import { copyComponentProperties } from '../../utils'
-import { useStyle } from '../useStyle'
 
 export const TouchableOpacity = copyComponentProperties(
     RNGHTouchableOpacity,

package/src/components/{native/react-native-gesture-handler → react-native-gesture-handler/native}/TouchableWithoutFeedback.tsx

@@ -4,8 +4,8 @@ import {
     TouchableWithoutFeedbackProps,
 } from 'react-native-gesture-handler'
 import { ComponentState } from '../../../core/types'
+import { useStyle } from '../../native/useStyle'
 import { copyComponentProperties } from '../../utils'
-import { useStyle } from '../useStyle'
 
 export const TouchableWithoutFeedback = copyComponentProperties(
     RNGHTouchableWithoutFeedback,

package/src/components/react-native-svg/index.ts

@@ -0,0 +1,12 @@
+// Re-export everything from react-native-svg
+import * as Svg from 'react-native-svg'
+
+module.exports = {
+    ...Svg,
+    get Svg() {
+        return require('./native/Svg').Svg
+    },
+    get default() {
+        return require('./native/Svg').default
+    },
+}

package/src/components/{native/react-native-svg → react-native-svg/native}/Svg.tsx

@@ -1,6 +1,6 @@
 import { Svg as RNSvg, SvgProps } from 'react-native-svg'
+import { useStyle } from '../../native/useStyle'
 import { copyComponentProperties } from '../../utils'
-import { useStyle } from '../useStyle'
 
 export const Svg = copyComponentProperties(RNSvg, (props: SvgProps) => {
     const style = useStyle(props.className)

package/src/components/react-native-svg/web/Svg.tsx

@@ -0,0 +1,14 @@
+import { Svg as RNSvg, SvgProps } from 'react-native-svg'
+import { copyComponentProperties } from '../../utils'
+import { toRNWClassName } from '../../web/rnw'
+
+export const Svg = copyComponentProperties(RNSvg, (props: SvgProps) => {
+    return (
+        <RNSvg
+            {...props}
+            style={[toRNWClassName(props.className), props.style]}
+        />
+    )
+})
+
+export default Svg

package/src/metro/resolvers.ts

@@ -1,6 +1,6 @@
 import { CustomResolutionContext, CustomResolver } from 'metro-resolver'
 import { basename, resolve, sep } from 'node:path'
-import { name } from '../../package.json'
+import { name as packageName } from '../../package.json'
 
 type ResolverConfig = {
     platform: string | null
@@ -11,8 +11,10 @@ type ResolverConfig = {
 
 const thisModuleDist = resolve(__dirname, '../../dist')
 const thisModuleSrc = resolve(__dirname, '../../src')
+const nodeModulesPath = resolve(__dirname, '../../../')
 
 const isFromThisModule = (filename: string) => filename.startsWith(thisModuleDist) || filename.startsWith(thisModuleSrc)
+const name = basename(nodeModulesPath) === 'node_modules' ? basename(resolve(__dirname, '../../')) : packageName
 
 const SUPPORTED_COMPONENTS = [
     'ActivityIndicator',
@@ -61,11 +63,11 @@ export const nativeResolver = (extraComponents: Record<string, string>) =>
     }
 
     if (moduleName === 'react-native-gesture-handler') {
-        return resolver(context, `${name}/components/native/react-native-gesture-handler`, platform)
+        return resolver(context, `${name}/components/react-native-gesture-handler`, platform)
     }
 
     if (moduleName === 'react-native-svg') {
-        return resolver(context, `${name}/components/native/react-native-svg`, platform)
+        return resolver(context, `${name}/components/react-native-svg`, platform)
     }
 
     if (

package/dist/common/components/native/react-native-svg/index.js

@@ -1,35 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _exportNames = {
-  Svg: true
-};
-Object.defineProperty(exports, "Svg", {
-  enumerable: true,
-  get: function () {
-    return _Svg.Svg;
-  }
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function () {
-    return _Svg.default;
-  }
-});
-var _reactNativeSvg = require("react-native-svg");
-Object.keys(_reactNativeSvg).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _reactNativeSvg[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _reactNativeSvg[key];
-    }
-  });
-});
-var _Svg = _interopRequireWildcard(require("./Svg"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

package/dist/module/components/native/react-native-svg/index.d.ts

@@ -1,3 +0,0 @@
-export * from 'react-native-svg';
-export { Svg } from './Svg';
-export { default } from './Svg';

package/dist/module/components/native/react-native-svg/index.js

@@ -1,3 +0,0 @@
-export * from "react-native-svg";
-export { Svg } from "./Svg.js";
-export { default } from "./Svg.js";

package/src/components/native/react-native-svg/index.ts

@@ -1,5 +0,0 @@
-// Re-export everything from react-native-svg
-export * from 'react-native-svg'
-
-export { Svg } from './Svg'
-export { default } from './Svg'