ui-rn 2.0.9 → 2.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui-rn",
-  "version": "2.0.9",
+  "version": "2.1.1",
   "repository": "https://github.com/package-dev/ui-rn",
   "description": "ui-rn",
   "author": "Phamha98",

package/src/Icon/{PropsStyle.tsx → Props.tsx}

@@ -1,19 +1,12 @@
 import {
     RNVectorIcon,
 } from "./index"
-import React from 'react'
 import {
     FlexStyle,
     StyleProp,
-    StyleSheet,
-    TextProps,
     TextStyle,
-    TouchableOpacity,
-    ViewProps,
     ViewStyle,
 } from 'react-native'
-
-import { isArray, isEmpty, isNumber, isObject, isString } from "underscore";
 import { MakeProp } from "./makeProps";
 export interface Props extends MakeProp {
     name: string

package/src/Icon/index.tsx

@@ -35,7 +35,7 @@ export const RNVectorIcon = {
 
 export type IconType = keyof typeof RNVectorIcon;
 
-import { Props } from "./PropsStyle";
+import { Props } from "./Props";
 import { makeProps } from "./makeProps";
 
 export default class IconApp extends React.PureComponent<Props> {
@@ -45,14 +45,13 @@ export default class IconApp extends React.PureComponent<Props> {
     name: "home",
   };
 
-  res: { color: string; style: any; size: number };
-
   constructor(props: Props) {
     super(props);
     this.res = makeProps(props);
   }
   render() {
-    const { size, color, style } = this.res;
+    const res = makeProps(this.props);
+    const { size, color, style } = res;
     if (this.props.name === "none") return null;
     const IconView = RNVectorIcon[this.props.type || "Ionicons"];
     if (typeof this.props.onPress != "function") {

package/src/Layout.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import SafeAreaView, { ForceInsetProp } from 'react-native-safe-area-view';
 import { StyleProp, ViewStyle } from 'react-native';
-export interface ILayout {
+export interface LayoutProps {
   children?: any;
   forceInset?: ForceInsetProp;
   forceInsetBot?: ForceInsetProp;
@@ -19,7 +19,7 @@ export default function Layout({
   style,
   primary,
   bottomInset
-}: ILayout) {
+}: LayoutProps) {
   return (
     <SafeAreaView
       style={[

package/src/Text/Props.ts

@@ -1,5 +1,5 @@
 import React from 'react'
-import { TextProps, TextStyle } from 'react-native'
+import { TextProps as RNTextProps, TextStyle } from 'react-native'
 import { MakeProp } from './makeStyle'
 interface PropsParent {
     children?: React.ReactNode
@@ -13,7 +13,7 @@ interface PropsParent {
     background?: string
 }
 //@ts-ignore
-export interface Props extends TextProps, PropsParent, MakeProp {
+export interface TextProps extends RNTextProps, PropsParent, MakeProp {
     backgroundColor?: string
     primary?: boolean
     white?: boolean

package/src/Text/index.tsx

@@ -1,9 +1,9 @@
 import React, { isValidElement } from "react";
 import { StyleSheet, Text as RNText } from "react-native";
 import { Style } from "./Style";
-import { Props } from "./Props";
+import { TextProps } from "./Props";
 import { isArray, isObject } from "underscore";
-const Text: React.FC<Props> = ({ style, children, ...props }) => {
+const Text: React.FC<TextProps> = ({ style, children, ...props }) => {
   const Children = () => {
     const content = props?.lang ?? undefined;
     if (typeof content !== "undefined") {

package/src/Touch/TouchScale.tsx

@@ -3,14 +3,14 @@ import { Animated, TouchableOpacity, ViewProps } from "react-native";
 import { Style } from "./Style";
 import { Props } from "./Props";
 
-interface ButtonScaleProps extends Props {
+export interface TouchableScaleProps extends Props {
   scaleValue?: number;
   scale?: boolean;
   containerStyle?: ViewProps["style"];
 }
 type TouchableOpacityRef = React.ComponentRef<typeof TouchableOpacity>;
 
-const Touch = React.forwardRef<TouchableOpacityRef, ButtonScaleProps>(
+const Touch = React.forwardRef<TouchableOpacityRef, TouchableScaleProps>(
   ({ scaleValue = 1.1, style, background, containerStyle, ...props }, ref) => {
     if (props?.hidden) return <></>;
     const animatedButtonScale = React.useRef(new Animated.Value(1)).current;

package/src/index.tsx

@@ -1,6 +1,11 @@
 export { default as Touch } from './Touch/Touch'
-export { default as TouchScale } from './Touch/TouchScale'
 export { default as Block } from './Touch/Block'
+export { Props as TouchProps } from './Touch/Props'
+export { default as TouchScale } from './Touch/TouchScale'
+export { TouchableScaleProps } from './Touch/TouchScale'
 export { default as Text } from './Text'
+export { TextProps } from './Text/Props'
 export { default as Icon } from './Icon'
-export { default as Layout } from './Layout'
+export { Props as IconProps } from './Icon/Props'
+export { default as Layout } from './Layout'
+export { LayoutProps } from './Layout'