rn-css 2.0.0 → 2.0.2

package/dist/styleComponent.js

@@ -26,7 +26,7 @@ function buildCSSString(chunks, functs, props, shared) {
         .map((chunk, i) => ([chunk, (functs[i] instanceof Function) ? functs[i]({ shared, theme: shared, ...props }) : functs[i]]))
         .flat()
         // Convert the objects to string if the result is not a primitive
-        .map(chunk => typeof chunk === 'object' ? (0, rnToCss_1.default)(chunk) : chunk)
+        .map(chunk => chunk && typeof chunk === 'object' ? (0, rnToCss_1.default)(chunk) : chunk)
         .join('');
     if (props.rnCSS)
         computedString += props.rnCSS.replace(/=/gm, ':') + ';';

package/dist/useTheme.d.ts

@@ -9,10 +9,10 @@ export declare const ThemeProvider: ({ theme, children }: {
  * Returns the Theme
  * @returns The Theme object
  */
-export declare const useTheme: () => unknown;
+export declare const useTheme: <T extends DefaultTheme = DefaultTheme>() => T;
 /**
  * Adds the theme prop to a non rn-css component
  * @param Component A non rn-css component
  * @returns A component with the theme prop
  */
-export declare const withTheme: <T>(Component: React.ComponentType<T>) => React.ForwardRefExoticComponent<React.PropsWithoutRef<T> & React.RefAttributes<React.Component<{}, {}, any>>>;
+export declare const withTheme: <T extends DefaultTheme = DefaultTheme>(Component: React.ComponentType<T>) => React.ForwardRefExoticComponent<React.PropsWithoutRef<T> & React.RefAttributes<React.Component<{}, {}, any>>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rn-css",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "exports": {
     ".": {
       "import": "./dist/index.js",

package/src/styleComponent.tsx

@@ -44,7 +44,7 @@ function buildCSSString<T extends { rnCSS?: string }> (chunks: TemplateStringsAr
     .map((chunk, i) => ([chunk, (functs[i] instanceof Function) ? (functs[i] as Functs<T>)({ shared, theme: (shared as DefaultTheme), ...props }) : functs[i]]))
     .flat()
     // Convert the objects to string if the result is not a primitive
-    .map(chunk => typeof chunk === 'object' ? rnToCSS(chunk as Partial<CompleteStyle>) : chunk)
+    .map(chunk => chunk && typeof chunk === 'object' ? rnToCSS(chunk as Partial<CompleteStyle>) : chunk)
     .join('')
   if (props.rnCSS) computedString += props.rnCSS.replace(/=/gm, ':') + ';'
   return computedString

package/src/useTheme.tsx

@@ -12,16 +12,16 @@ export const ThemeProvider = ({ theme, children }: { theme: DefaultTheme; childr
  * Returns the Theme
  * @returns The Theme object
  */
-export const useTheme = () => React.useContext(SharedValue)
+export const useTheme = <T extends DefaultTheme = DefaultTheme>() => React.useContext(SharedValue) as T
 
 /**
  * Adds the theme prop to a non rn-css component
  * @param Component A non rn-css component
  * @returns A component with the theme prop
  */
-export const withTheme = <T, >(Component: React.ComponentType<T>) => {
+export const withTheme = <T extends DefaultTheme = DefaultTheme, >(Component: React.ComponentType<T>) => {
   const ThemedComponent = React.forwardRef<React.Component, T>((props, ref) => {
-    const theme = useTheme()
+    const theme = useTheme<T>()
     return <Component ref={ref} theme={theme} {...(props as unknown as T)} />
   })
   ThemedComponent.displayName = 'ThemedComponent'