4.3.1

CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.3.0](https://github.com/nandorojo/dripsy/compare/v4.2.0...v4.3.0) (2023-05-16)
+
+**Note:** Version bump only for package dripsy
+
+
+
+
+
 # [4.2.0](https://github.com/nandorojo/dripsy/compare/v4.1.0...v4.2.0) (2023-05-16)
 
 **Note:** Version bump only for package dripsy

babel.config.js

@@ -0,0 +1,11 @@
+module.exports = function (api) {
+  api.cache(true)
+
+  // only used for jest, right?
+  return {
+    presets: [
+      ['@babel/preset-env', { targets: { node: 'current' } }],
+      '@babel/preset-typescript',
+    ],
+  }
+}

examples/next-example/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.3.0](https://github.com/nandorojo/dripsy/compare/v4.2.0...v4.3.0) (2023-05-16)
+
+**Note:** Version bump only for package next-dripsy-example
+
+
+
+
+
 # [4.2.0](https://github.com/nandorojo/dripsy/compare/v4.1.0...v4.2.0) (2023-05-16)
 
 **Note:** Version bump only for package next-dripsy-example

examples/next-example/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-dripsy-example",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "main": "__generated__/AppEntry.js",
   "dependencies": {
     "expo": "^40.0.0",

lerna.json

@@ -4,7 +4,7 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "4.2.0",
+  "version": "4.3.0",
   "command": {
     "publish": {
       "allowBranch": "master",

packages/dripsy/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.3.0](https://github.com/nandorojo/dripsy/compare/v4.2.0...v4.3.0) (2023-05-16)
+
+**Note:** Version bump only for package dripsy
+
+
+
+
+
 # [4.2.0](https://github.com/nandorojo/dripsy/compare/v4.1.0...v4.2.0) (2023-05-16)
 
 **Note:** Version bump only for package dripsy

packages/dripsy/package.json

@@ -39,13 +39,6 @@
     "url": "https://github.com/nandorojo/dripsy/issues"
   },
   "homepage": "https://github.com/nandorojo/dripsy#readme",
-  "jest": {
-    "preset": "react-native",
-    "modulePathIgnorePatterns": [
-      "<rootDir>/example/node_modules",
-      "<rootDir>/lib/"
-    ]
-  },
   "eslintIgnore": [
     "node_modules/",
     "lib/"

packages/dripsy/src/core/components/TextInput.tsx

@@ -5,6 +5,7 @@ import { createThemedComponent } from '../css/create-themed-component'
 import { defaultFontStyle } from './defaultStyle'
 import { useDripsyTheme } from '../use-dripsy-theme'
 import { ColorPath, StyledProps } from '../types-v2/sx'
+import { get } from '../css/get'
 
 const DripsyInput = createThemedComponent(rTextInput, {
   themeKey: 'forms',
@@ -34,8 +35,8 @@ export const TextInput = forwardRef<rTextInput, DripsyTextInputProps>(
   function TextInput({ ...props }, ref) {
     const { theme } = useDripsyTheme()
     Object.keys(colorKeys).forEach((key) => {
-      if (props[key] && theme?.colors && key in theme.colors) {
-        props[key] = theme.colors[props[key]]
+      if (props[key] && theme?.colors) {
+        props[key] = get(theme.colors, props[key] as string) ?? props[key]
       }
     })
     return <DripsyInput {...props} ref={ref} />

packages/dripsy/src/core/components/activity-indicator.tsx

@@ -4,6 +4,7 @@ import { useDripsyTheme } from '../use-dripsy-theme'
 import { useSx } from '../use-sx'
 import { ColorPath, SxProp } from '../types-v2/sx'
 import { DripsyBaseTheme, DripsyFinalTheme } from '../types-v2/declarations'
+import { get } from '../css/get'
 
 type Props<Theme extends DripsyBaseTheme = DripsyFinalTheme> = Omit<
   ComponentProps<typeof NativeActivityIndicator>,
@@ -17,8 +18,8 @@ function Indicator(props: Props & { sx?: SxProp }) {
   const sx = useSx()
 
   let { color } = props
-  if (typeof color === 'string' && colors?.[color]) {
-    color = colors[color] as string
+  if (typeof color === 'string' && colors) {
+    color = get(colors, color) ?? color
   }
   return (
     <NativeActivityIndicator

packages/dripsy/src/core/css/get.test.ts

@@ -0,0 +1,5 @@
+import { get } from './get'
+
+describe('get', () => {
+  expect(get({ hi: { hey: true } }, 'hi.hey')).toEqual(true)
+})

packages/dripsy/src/gradient/index.tsx

@@ -10,6 +10,7 @@ import {
   DripsyBaseTheme,
   ColorPath,
 } from '../core'
+import { get } from '../core/css/get'
 
 type Props<Theme extends DripsyBaseTheme = DripsyFinalTheme> = Omit<
   React.ComponentProps<typeof ExpoLinearGradient>,
@@ -31,8 +32,8 @@ const Grad = styled(
       const colorArrayToTheme = (colorArray: typeof colors) => {
         // Return an empty array if the colors come back as undefined
         return (
-          colorArray?.map(
-            (color) => (themeColors?.[color] as string) ?? color
+          colorArray?.map((color) =>
+            themeColors ? get(themeColors, color) : color
           ) ?? []
         )
       }