@draftbit/theme 50.6.2-eac111.2 → 50.6.2-fba047.2

package/src/Provider.tsx

@@ -7,7 +7,6 @@ import {
   Breakpoints,
   ChangeThemeOptions,
   ReadTheme,
-  ThemeValues,
   ValidatedTheme,
 } from "./types";
 
@@ -47,18 +46,16 @@ const Provider: React.FC<React.PropsWithChildren<ProviderProps>> = ({
 
   const changeTheme = React.useCallback(
     (themeName: string, options?: ChangeThemeOptions) => {
-      if (currentTheme.name !== themeName) {
-        const theme = themes.find((t) => t.name === themeName);
-        if (!theme) {
-          console.warn(
-            "Theme with name",
-            themeName,
-            "not found. Make sure it's passed into the top level ThemeProvider"
-          );
-          return;
-        }
-        setCurrentTheme(theme);
+      const theme = themes.find((t) => t.name === themeName);
+      if (!theme) {
+        console.warn(
+          "Theme with name",
+          themeName,
+          "not found. Make sure it's passed into the top level ThemeProvider"
+        );
+        return;
       }
+      setCurrentTheme(theme);
 
       if (options?.persistent === true) {
         AsyncStorage.setItem(SAVED_SELECTED_THEME_KEY, themeName).catch((e) => {
@@ -66,31 +63,53 @@ const Provider: React.FC<React.PropsWithChildren<ProviderProps>> = ({
         });
       }
     },
-    [themes, currentTheme.name, setCurrentTheme]
+    [themes, setCurrentTheme]
   );
 
-  const proxiedTheme: ReadTheme = React.useMemo(() => {
-    const createProxiedThemeValue = (value: ThemeValues | undefined) =>
-      createThemeValuesProxy({
-        value,
-        breakpoints,
-        deviceWidth,
-        devicePlatform: Platform.OS,
-        currentLightDarkSelection: lightDarkSelection,
-      });
-
-    return {
+  const proxiedTheme: ReadTheme = React.useMemo(
+    () => ({
       ...currentTheme,
       colors: {
-        branding: createProxiedThemeValue(currentTheme.colors.branding),
-        text: createProxiedThemeValue(currentTheme.colors.text),
-        background: createProxiedThemeValue(currentTheme.colors.background),
-        foreground: createProxiedThemeValue(currentTheme.colors.foreground),
-        border: createProxiedThemeValue(currentTheme.colors.border),
+        branding: createThemeValuesProxy(
+          currentTheme.colors.branding,
+          breakpoints,
+          deviceWidth,
+          Platform.OS,
+          lightDarkSelection
+        ),
+        text: createThemeValuesProxy(
+          currentTheme.colors.text,
+          breakpoints,
+          deviceWidth,
+          Platform.OS,
+          lightDarkSelection
+        ),
+        background: createThemeValuesProxy(
+          currentTheme.colors.background,
+          breakpoints,
+          deviceWidth,
+          Platform.OS,
+          lightDarkSelection
+        ),
+        foreground: createThemeValuesProxy(
+          currentTheme.colors.foreground,
+          breakpoints,
+          deviceWidth,
+          Platform.OS,
+          lightDarkSelection
+        ),
+        border: createThemeValuesProxy(
+          currentTheme.colors.border,
+          breakpoints,
+          deviceWidth,
+          Platform.OS,
+          lightDarkSelection
+        ),
       },
-      typography: createProxiedThemeValue(currentTheme.typography),
-    };
-  }, [currentTheme, deviceWidth, breakpoints, lightDarkSelection]);
+      typography: currentTheme.typography,
+    }),
+    [currentTheme, deviceWidth, breakpoints, lightDarkSelection]
+  );
 
   React.useEffect(() => {
     const listener = Dimensions.addEventListener("change", ({ window }) =>
@@ -106,19 +125,9 @@ const Provider: React.FC<React.PropsWithChildren<ProviderProps>> = ({
       const savedSelectedThemeName = await AsyncStorage.getItem(
         SAVED_SELECTED_THEME_KEY
       );
+
       if (savedSelectedThemeName) {
-        const themeExists = themes.some(
-          (t) => t.name === savedSelectedThemeName
-        );
-        console.log("RUNNING", savedSelectedThemeName);
-
-        if (themeExists) {
-          changeTheme(savedSelectedThemeName);
-        } else {
-          AsyncStorage.removeItem(SAVED_SELECTED_THEME_KEY).catch((e) => {
-            console.warn("Failed to reset persisted selected theme", e);
-          });
-        }
+        changeTheme(savedSelectedThemeName);
       }
     };
     run();

package/src/createTheme.js

@@ -1,5 +1,4 @@
-import { deepmergeCustom } from "deepmerge-ts";
-import { isTextStyleObject, validateBreakpoints, validatePalettes, validateTheme, } from "./validators";
+import merge from "deepmerge";
 /**
  * Custom deepmerge function to skip merging of typography/text style objects.
  *
@@ -12,24 +11,14 @@ import { isTextStyleObject, validateBreakpoints, validatePalettes, validateTheme
  * keys and the keys of the style object which breaks how the proxy is able to
  * return the correct value.
  */
-const themeMerge = deepmergeCustom({
-    enableImplicitDefaultMerging: true,
-    mergeRecords(values, utils, meta) {
-        const firstValue = values[0];
-        if (isTextStyleObject(firstValue)) {
-            return utils.defaultMergeFunctions.mergeRecords(values.slice(1), utils, meta);
-        }
-        return utils.defaultMergeFunctions.mergeRecords(values, utils, meta);
-    },
-});
-export default function createTheme({ breakpoints, palettes, theme, baseTheme, }) {
-    validateBreakpoints(breakpoints);
-    validatePalettes(palettes);
-    validateTheme(theme);
+export default function createTheme({ theme, baseTheme, }) {
+    // validateBreakpoints(breakpoints);
+    // validatePalettes(palettes);
+    // validateTheme(theme);
     let resultTheme = theme;
     if (baseTheme) {
-        validateTheme(baseTheme);
-        resultTheme = themeMerge(baseTheme, theme);
+        //validateTheme(baseTheme);
+        resultTheme = merge(baseTheme, theme);
     }
     return {
         ...resultTheme,

package/src/createTheme.js.map

@@ -1 +1 @@
-{"version":3,"file":"createTheme.js","sourceRoot":"","sources":["createTheme.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAO/C,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,EAChB,aAAa,GACd,MAAM,cAAc,CAAC;AAEtB;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,GAAG,eAAe,CAAC;IACjC,4BAA4B,EAAE,IAAI;IAClC,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI;QAC9B,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,iBAAiB,CAAC,UAAU,CAAC,EAAE;YACjC,OAAO,KAAK,CAAC,qBAAqB,CAAC,YAAY,CAC7C,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EACf,KAAK,EACL,IAAI,CACL,CAAC;SACH;QACD,OAAO,KAAK,CAAC,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IACvE,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,WAAW,EACX,QAAQ,EACR,KAAK,EACL,SAAS,GAMV;IACC,mBAAmB,CAAC,WAAW,CAAC,CAAC;IACjC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC3B,aAAa,CAAC,KAAK,CAAC,CAAC;IAErB,IAAI,WAAW,GAAG,KAAK,CAAC;IAExB,IAAI,SAAS,EAAE;QACb,aAAa,CAAC,SAAS,CAAC,CAAC;QACzB,WAAW,GAAG,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;KAC5C;IAED,OAAO;QACL,GAAG,WAAW;QACd,SAAS,EAAE,IAAI;KAChB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"createTheme.js","sourceRoot":"","sources":["createTheme.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,MAAM,WAAW,CAAC;AAE9B;;;;;;;;;;;GAWG;AAEH,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,KAAK,EACL,SAAS,GAMV;IACC,oCAAoC;IACpC,8BAA8B;IAC9B,wBAAwB;IAExB,IAAI,WAAW,GAAG,KAAK,CAAC;IAExB,IAAI,SAAS,EAAE;QACb,2BAA2B;QAC3B,WAAW,GAAG,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;KACvC;IAED,OAAO;QACL,GAAG,WAAW;QACd,SAAS,EAAE,IAAI;KAChB,CAAC;AACJ,CAAC"}

package/src/createTheme.ts

@@ -1,16 +1,11 @@
-import { deepmergeCustom } from "deepmerge-ts";
 import type {
   Breakpoints,
   Theme,
   ValidatedTheme,
   ColorPalettes,
 } from "./types";
-import {
-  isTextStyleObject,
-  validateBreakpoints,
-  validatePalettes,
-  validateTheme,
-} from "./validators";
+
+import merge from "deepmerge";
 
 /**
  * Custom deepmerge function to skip merging of typography/text style objects.
@@ -24,24 +19,8 @@ import {
  * keys and the keys of the style object which breaks how the proxy is able to
  * return the correct value.
  */
-const themeMerge = deepmergeCustom({
-  enableImplicitDefaultMerging: true,
-  mergeRecords(values, utils, meta) {
-    const firstValue = values[0];
-    if (isTextStyleObject(firstValue)) {
-      return utils.defaultMergeFunctions.mergeRecords(
-        values.slice(1),
-        utils,
-        meta
-      );
-    }
-    return utils.defaultMergeFunctions.mergeRecords(values, utils, meta);
-  },
-});
 
 export default function createTheme({
-  breakpoints,
-  palettes,
   theme,
   baseTheme,
 }: {
@@ -50,15 +29,15 @@ export default function createTheme({
   theme: Theme;
   baseTheme?: Theme;
 }): ValidatedTheme {
-  validateBreakpoints(breakpoints);
-  validatePalettes(palettes);
-  validateTheme(theme);
+  // validateBreakpoints(breakpoints);
+  // validatePalettes(palettes);
+  // validateTheme(theme);
 
   let resultTheme = theme;
 
   if (baseTheme) {
-    validateTheme(baseTheme);
-    resultTheme = themeMerge(baseTheme, theme);
+    //validateTheme(baseTheme);
+    resultTheme = merge(baseTheme, theme);
   }
 
   return {

package/src/createThemeValuesProxy.js

@@ -1,4 +1,4 @@
-import { asThemeValuesObject } from "./validators";
+import { isObject } from "lodash";
 /**
  * Creates a proxy for theme value objects to select a value whenever
  * multiple values are provided for different platforms, breakpoints, and/or light/dark modes
@@ -6,37 +6,32 @@ import { asThemeValuesObject } from "./validators";
  * Ex: {color: {ios: "blue", android: "red"}}
  *      -> theme.color returns "blue" when the platform is ios and "red" when android
  */
-export default function createThemeValuesProxy({ value, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection, }) {
+export default function createThemeValuesProxy(value, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection) {
     if (value === undefined || value === null) {
         return undefined;
     }
     return new Proxy(value, {
         get: (target, key) => {
             const currentValue = target[key];
-            const valueAsThemeValues = asThemeValuesObject(currentValue);
+            const valueAsThemeValues = isObject(currentValue)
+                ? currentValue
+                : undefined;
             if (valueAsThemeValues) {
                 const platformKeys = ["ios", "android", "web", "macos", "windows"];
                 const breakpointKeys = Object.keys(breakpoints);
                 const lightDarkKeys = ["light", "dark"];
                 const keysType = getKeysType(valueAsThemeValues, platformKeys, breakpointKeys, lightDarkKeys);
-                const input = {
-                    value: valueAsThemeValues,
-                    breakpoints,
-                    deviceWidth,
-                    devicePlatform,
-                    currentLightDarkSelection,
-                };
                 if (keysType === "default") {
-                    return createThemeValuesProxy(input);
+                    return createThemeValuesProxy(valueAsThemeValues, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection);
                 }
                 else if (keysType === "platform") {
-                    return getPlatformValue(input);
+                    return getPlatformValue(valueAsThemeValues, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection);
                 }
                 else if (keysType === "breakpoint") {
-                    return getBreakpointValue(input);
+                    return getBreakpointValue(valueAsThemeValues, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection);
                 }
                 else if (keysType === "lightDark") {
-                    return getLightDarkValue(input);
+                    return getLightDarkValue(valueAsThemeValues, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection);
                 }
                 else {
                     return undefined;
@@ -83,21 +78,21 @@ function onlyOneTrue(a, b, c, d) {
 function allFalse(a, b, c, d) {
     return [a, b, c, d].filter((x) => x).length === 0;
 }
-function getPlatformValue(input) {
+function getPlatformValue(value, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection) {
     var _a;
-    const { value, devicePlatform } = input;
     const currentPlatformValue = (_a = value === null || value === void 0 ? void 0 : value[devicePlatform]) !== null && _a !== void 0 ? _a : value === null || value === void 0 ? void 0 : value.default;
-    const valueAsThemeValues = asThemeValuesObject(currentPlatformValue);
+    const valueAsThemeValues = isObject(currentPlatformValue)
+        ? currentPlatformValue
+        : undefined;
     if (valueAsThemeValues) {
-        return createThemeValuesProxy({ ...input, value: valueAsThemeValues });
+        return createThemeValuesProxy(valueAsThemeValues, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection);
     }
     else {
         return currentPlatformValue;
     }
 }
-function getBreakpointValue(input) {
+function getBreakpointValue(value, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection) {
     var _a;
-    const { value, breakpoints, deviceWidth } = input;
     const keysToBreakpointValue = Object.keys(value !== null && value !== void 0 ? value : {}).map((key) => [key, breakpoints[key]]);
     const orderedBreakpoints = keysToBreakpointValue.sort(([_, val]) => val);
     let currentBreakpointKey = "";
@@ -107,21 +102,24 @@ function getBreakpointValue(input) {
         }
     }
     const currentBreakpointValue = (_a = value === null || value === void 0 ? void 0 : value[currentBreakpointKey]) !== null && _a !== void 0 ? _a : value === null || value === void 0 ? void 0 : value.default;
-    const valueAsThemeValues = asThemeValuesObject(currentBreakpointValue);
+    const valueAsThemeValues = isObject(currentBreakpointKey)
+        ? currentBreakpointKey
+        : undefined;
     if (valueAsThemeValues) {
-        return createThemeValuesProxy({ ...input, value: valueAsThemeValues });
+        return createThemeValuesProxy(valueAsThemeValues, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection);
     }
     else {
         return currentBreakpointValue;
     }
 }
-function getLightDarkValue(input) {
+function getLightDarkValue(value, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection) {
     var _a;
-    const { value, currentLightDarkSelection } = input;
     const currentLightDarkValue = (_a = value === null || value === void 0 ? void 0 : value[currentLightDarkSelection]) !== null && _a !== void 0 ? _a : value === null || value === void 0 ? void 0 : value.default;
-    const valueAsThemeValues = asThemeValuesObject(currentLightDarkValue);
+    const valueAsThemeValues = isObject(currentLightDarkSelection)
+        ? currentLightDarkSelection
+        : undefined;
     if (valueAsThemeValues) {
-        return createThemeValuesProxy({ ...input, value: valueAsThemeValues });
+        return createThemeValuesProxy(valueAsThemeValues, breakpoints, deviceWidth, devicePlatform, currentLightDarkSelection);
     }
     else {
         return currentLightDarkValue;

package/src/createThemeValuesProxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"createThemeValuesProxy.js","sourceRoot":"","sources":["createThemeValuesProxy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAUnD;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAC7C,KAAK,EACL,WAAW,EACX,WAAW,EACX,cAAc,EACd,yBAAyB,GACG;IAC5B,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE;QACzC,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,IAAI,KAAK,CAAC,KAAK,EAAE;QACtB,GAAG,EAAE,CACH,MAAmB,EACnB,GAAW,EAC4C,EAAE;YACzD,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YAEjC,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;YAE7D,IAAI,kBAAkB,EAAE;gBACtB,MAAM,YAAY,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;gBACnE,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAChD,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBAExC,MAAM,QAAQ,GAAG,WAAW,CAC1B,kBAAkB,EAClB,YAAY,EACZ,cAAc,EACd,aAAa,CACd,CAAC;gBAEF,MAAM,KAAK,GAAgC;oBACzC,KAAK,EAAE,kBAAkB;oBACzB,WAAW;oBACX,WAAW;oBACX,cAAc;oBACd,yBAAyB;iBAC1B,CAAC;gBAEF,IAAI,QAAQ,KAAK,SAAS,EAAE;oBAC1B,OAAO,sBAAsB,CAAC,KAAK,CAAC,CAAC;iBACtC;qBAAM,IAAI,QAAQ,KAAK,UAAU,EAAE;oBAClC,OAAO,gBAAgB,CAAC,KAAK,CAAC,CAAC;iBAChC;qBAAM,IAAI,QAAQ,KAAK,YAAY,EAAE;oBACpC,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;iBAClC;qBAAM,IAAI,QAAQ,KAAK,WAAW,EAAE;oBACnC,OAAO,iBAAiB,CAAC,KAAK,CAAC,CAAC;iBACjC;qBAAM;oBACL,OAAO,SAAS,CAAC;iBAClB;aACF;iBAAM;gBACL,OAAO,YAAY,CAAC;aACrB;QACH,CAAC;QACD,GAAG,EAAE,GAAG,EAAE;YACR,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACvE,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,WAAW,CAClB,KAAkB,EAClB,YAAsB,EACtB,cAAwB,EACxB,aAAuB;IAEvB,MAAM,eAAe,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,CAAC;IAC7E,MAAM,iBAAiB,GAAG,cAAc,CAAC,IAAI,CAC3C,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,SAAS,CAClC,CAAC;IACF,MAAM,gBAAgB,GAAG,aAAa,CAAC,IAAI,CACzC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,SAAS,CAClC,CAAC;IACF,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAChD,CAAC,GAAG,EAAE,EAAE,CACN,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC3B,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC7B,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC5B,GAAG,KAAK,SAAS,CACpB,CAAC;IAEF,IACE,CAAC,WAAW,CACV,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,CACjB;QACD,CAAC,QAAQ,CACP,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,CACjB,EACD;QACA,MAAM,IAAI,KAAK,CACb,gHAAgH;YAC9G,WAAW,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC7C,CAAC;KACH;SAAM,IAAI,eAAe,EAAE;QAC1B,OAAO,UAAU,CAAC;KACnB;SAAM,IAAI,iBAAiB,EAAE;QAC5B,OAAO,YAAY,CAAC;KACrB;SAAM,IAAI,gBAAgB,EAAE;QAC3B,OAAO,WAAW,CAAC;KACpB;SAAM;QACL,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAED,SAAS,WAAW,CAAC,CAAU,EAAE,CAAU,EAAE,CAAU,EAAE,CAAU;IACjE,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,QAAQ,CAAC,CAAU,EAAE,CAAU,EAAE,CAAU,EAAE,CAAU;IAC9D,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAkC;;IAC1D,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAExC,MAAM,oBAAoB,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAG,cAAc,CAAC,mCAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC;IACvE,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;IAErE,IAAI,kBAAkB,EAAE;QACtB,OAAO,sBAAsB,CAAC,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC;KACxE;SAAM;QACL,OAAO,oBAAoB,CAAC;KAC7B;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAkC;;IAC5D,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAElD,MAAM,qBAAqB,GAAuB,MAAM,CAAC,IAAI,CAC3D,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CACZ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACxC,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;IACzE,IAAI,oBAAoB,GAAG,EAAE,CAAC;IAC9B,KAAK,MAAM,CAAC,aAAa,EAAE,eAAe,CAAC,IAAI,kBAAkB,EAAE;QACjE,IAAI,WAAW,IAAI,eAAe,EAAE;YAClC,oBAAoB,GAAG,aAAa,CAAC;SACtC;KACF;IACD,MAAM,sBAAsB,GAC1B,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAG,oBAAoB,CAAC,mCAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC;IAClD,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,sBAAsB,CAAC,CAAC;IAEvE,IAAI,kBAAkB,EAAE;QACtB,OAAO,sBAAsB,CAAC,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC;KACxE;SAAM;QACL,OAAO,sBAAsB,CAAC;KAC/B;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAkC;;IAC3D,MAAM,EAAE,KAAK,EAAE,yBAAyB,EAAE,GAAG,KAAK,CAAC;IAEnD,MAAM,qBAAqB,GACzB,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAG,yBAAyB,CAAC,mCAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC;IACvD,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;IAEtE,IAAI,kBAAkB,EAAE;QACtB,OAAO,sBAAsB,CAAC,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC;KACxE;SAAM;QACL,OAAO,qBAAqB,CAAC;KAC9B;AACH,CAAC"}
+{"version":3,"file":"createThemeValuesProxy.js","sourceRoot":"","sources":["createThemeValuesProxy.ts"],"names":[],"mappings":"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"}

package/src/createThemeValuesProxy.ts

@@ -1,14 +1,6 @@
 import { ThemeValues, Breakpoints } from "./types";
 import { Platform, TextStyle } from "react-native";
-import { asThemeValuesObject } from "./validators";
-
-interface CreateThemeValuesProxyInput {
-  value: ThemeValues | undefined;
-  breakpoints: Breakpoints;
-  deviceWidth: number;
-  devicePlatform: typeof Platform.OS;
-  currentLightDarkSelection: "light" | "dark";
-}
+import { isObject } from "lodash";
 
 /**
  * Creates a proxy for theme value objects to select a value whenever
@@ -17,13 +9,13 @@ interface CreateThemeValuesProxyInput {
  * Ex: {color: {ios: "blue", android: "red"}}
  *      -> theme.color returns "blue" when the platform is ios and "red" when android
  */
-export default function createThemeValuesProxy({
-  value,
-  breakpoints,
-  deviceWidth,
-  devicePlatform,
-  currentLightDarkSelection,
-}: CreateThemeValuesProxyInput): any /* return type 'any' to allow arbitrary object references (object.example.another.there) */ {
+export default function createThemeValuesProxy(
+  value: ThemeValues | undefined,
+  breakpoints: Breakpoints,
+  deviceWidth: number,
+  devicePlatform: typeof Platform.OS,
+  currentLightDarkSelection: "light" | "dark"
+): any /* return type 'any' to allow arbitrary object references (object.example.another.there) */ {
   if (value === undefined || value === null) {
     return undefined;
   }
@@ -34,7 +26,9 @@ export default function createThemeValuesProxy({
     ): string | number | ThemeValues | TextStyle | undefined => {
       const currentValue = target[key];
 
-      const valueAsThemeValues = asThemeValuesObject(currentValue);
+      const valueAsThemeValues = isObject(currentValue)
+        ? (currentValue as ThemeValues)
+        : undefined;
 
       if (valueAsThemeValues) {
         const platformKeys = ["ios", "android", "web", "macos", "windows"];
@@ -48,22 +42,38 @@ export default function createThemeValuesProxy({
           lightDarkKeys
         );
 
-        const input: CreateThemeValuesProxyInput = {
-          value: valueAsThemeValues,
-          breakpoints,
-          deviceWidth,
-          devicePlatform,
-          currentLightDarkSelection,
-        };
-
         if (keysType === "default") {
-          return createThemeValuesProxy(input);
+          return createThemeValuesProxy(
+            valueAsThemeValues,
+            breakpoints,
+            deviceWidth,
+            devicePlatform,
+            currentLightDarkSelection
+          );
         } else if (keysType === "platform") {
-          return getPlatformValue(input);
+          return getPlatformValue(
+            valueAsThemeValues,
+            breakpoints,
+            deviceWidth,
+            devicePlatform,
+            currentLightDarkSelection
+          );
         } else if (keysType === "breakpoint") {
-          return getBreakpointValue(input);
+          return getBreakpointValue(
+            valueAsThemeValues,
+            breakpoints,
+            deviceWidth,
+            devicePlatform,
+            currentLightDarkSelection
+          );
         } else if (keysType === "lightDark") {
-          return getLightDarkValue(input);
+          return getLightDarkValue(
+            valueAsThemeValues,
+            breakpoints,
+            deviceWidth,
+            devicePlatform,
+            currentLightDarkSelection
+          );
         } else {
           return undefined;
         }
@@ -135,22 +145,38 @@ function allFalse(a: boolean, b: boolean, c: boolean, d: boolean) {
   return [a, b, c, d].filter((x) => x).length === 0;
 }
 
-function getPlatformValue(input: CreateThemeValuesProxyInput) {
-  const { value, devicePlatform } = input;
-
+function getPlatformValue(
+  value: ThemeValues | undefined,
+  breakpoints: Breakpoints,
+  deviceWidth: number,
+  devicePlatform: typeof Platform.OS,
+  currentLightDarkSelection: "light" | "dark"
+) {
   const currentPlatformValue = value?.[devicePlatform] ?? value?.default;
-  const valueAsThemeValues = asThemeValuesObject(currentPlatformValue);
+  const valueAsThemeValues = isObject(currentPlatformValue)
+    ? (currentPlatformValue as ThemeValues)
+    : undefined;
 
   if (valueAsThemeValues) {
-    return createThemeValuesProxy({ ...input, value: valueAsThemeValues });
+    return createThemeValuesProxy(
+      valueAsThemeValues,
+      breakpoints,
+      deviceWidth,
+      devicePlatform,
+      currentLightDarkSelection
+    );
   } else {
     return currentPlatformValue;
   }
 }
 
-function getBreakpointValue(input: CreateThemeValuesProxyInput) {
-  const { value, breakpoints, deviceWidth } = input;
-
+function getBreakpointValue(
+  value: ThemeValues | undefined,
+  breakpoints: Breakpoints,
+  deviceWidth: number,
+  devicePlatform: typeof Platform.OS,
+  currentLightDarkSelection: "light" | "dark"
+) {
   const keysToBreakpointValue: [string, number][] = Object.keys(
     value ?? {}
   ).map((key) => [key, breakpoints[key]]);
@@ -163,24 +189,44 @@ function getBreakpointValue(input: CreateThemeValuesProxyInput) {
   }
   const currentBreakpointValue =
     value?.[currentBreakpointKey] ?? value?.default;
-  const valueAsThemeValues = asThemeValuesObject(currentBreakpointValue);
+  const valueAsThemeValues = isObject(currentBreakpointKey)
+    ? (currentBreakpointKey as ThemeValues)
+    : undefined;
 
   if (valueAsThemeValues) {
-    return createThemeValuesProxy({ ...input, value: valueAsThemeValues });
+    return createThemeValuesProxy(
+      valueAsThemeValues,
+      breakpoints,
+      deviceWidth,
+      devicePlatform,
+      currentLightDarkSelection
+    );
   } else {
     return currentBreakpointValue;
   }
 }
 
-function getLightDarkValue(input: CreateThemeValuesProxyInput) {
-  const { value, currentLightDarkSelection } = input;
-
+function getLightDarkValue(
+  value: ThemeValues | undefined,
+  breakpoints: Breakpoints,
+  deviceWidth: number,
+  devicePlatform: typeof Platform.OS,
+  currentLightDarkSelection: "light" | "dark"
+) {
   const currentLightDarkValue =
     value?.[currentLightDarkSelection] ?? value?.default;
-  const valueAsThemeValues = asThemeValuesObject(currentLightDarkValue);
+  const valueAsThemeValues = isObject(currentLightDarkSelection)
+    ? (currentLightDarkSelection as ThemeValues)
+    : undefined;
 
   if (valueAsThemeValues) {
-    return createThemeValuesProxy({ ...input, value: valueAsThemeValues });
+    return createThemeValuesProxy(
+      valueAsThemeValues,
+      breakpoints,
+      deviceWidth,
+      devicePlatform,
+      currentLightDarkSelection
+    );
   } else {
     return currentLightDarkValue;
   }

package/src/validators.js

@@ -1,91 +1,17 @@
-import { z } from "zod";
-const PaletteSchema = z.record(z.string(), z.record(z.string(), z.string()));
-const BreakpointSchema = z.record(z.string(), z.number());
-const TextStyleSchema = z.union([
-    z.object({
-        fontSize: z.number(),
-    }),
-    z.object({
-        fontFamily: z.string(),
-    }),
-    z.object({
-        fontWeight: z.enum([
-            "normal",
-            "bold",
-            "100",
-            "200",
-            "300",
-            "400",
-            "500",
-            "600",
-            "700",
-            "800",
-            "900",
-        ]),
-    }),
-    z.object({
-        fontStyle: z.enum(["normal", "italic"]),
-    }),
-    z.object({
-        letterSpacing: z.number(),
-    }),
-    z.object({
-        lineHeight: z.number(),
-    }),
-]);
-const ThemeValuesSchema = z.record(z.string(), z.lazy(() => z.union([z.string(), z.number(), TextStyleSchema, ThemeValuesSchema])));
-const TextStyleOrThemeValuesSchema = z.union([TextStyleSchema, ThemeValuesSchema]);
-const ThemeSchema = z.object({
-    name: z.string(),
-    colors: z.object({
-        branding: ThemeValuesSchema.optional(),
-        text: ThemeValuesSchema.optional(),
-        background: ThemeValuesSchema.optional(),
-        foreground: ThemeValuesSchema.optional(),
-        border: ThemeValuesSchema.optional(),
-    }),
-    typography: z.object({
-        body1: TextStyleOrThemeValuesSchema.optional(),
-        body2: TextStyleOrThemeValuesSchema.optional(),
-        button: TextStyleOrThemeValuesSchema.optional(),
-        caption: TextStyleOrThemeValuesSchema.optional(),
-        headline1: TextStyleOrThemeValuesSchema.optional(),
-        headline2: TextStyleOrThemeValuesSchema.optional(),
-        headline3: TextStyleOrThemeValuesSchema.optional(),
-        headline4: TextStyleOrThemeValuesSchema.optional(),
-        headline5: TextStyleOrThemeValuesSchema.optional(),
-        headline6: TextStyleOrThemeValuesSchema.optional(),
-        overline: TextStyleOrThemeValuesSchema.optional(),
-        subtitle1: TextStyleOrThemeValuesSchema.optional(),
-        subtitle2: TextStyleOrThemeValuesSchema.optional(),
-    }),
-});
 export function validatePalettes(palettes) {
-    const result = PaletteSchema.safeParse(palettes);
-    if (!result.success) {
-        throw new Error("Invalid palettes object: " + result.error.message);
-    }
+    palettes;
 }
 export function validateBreakpoints(breakpoints) {
-    const result = BreakpointSchema.safeParse(breakpoints);
-    if (!result.success) {
-        throw new Error("Invalid breakpoints object: " + result.error.message);
-    }
+    breakpoints;
 }
 export function validateTheme(theme) {
-    const result = ThemeSchema.safeParse(theme);
-    if (!result.success) {
-        throw new Error("Invalid theme object: " + result.error.message);
-    }
+    theme;
 }
 export function isTextStyleObject(value) {
-    return TextStyleSchema.safeParse(value).success;
+    value;
+    return true;
 }
 export function asThemeValuesObject(value) {
-    // Text style matches the shape of ThemeValues, but we don't want to treat it as a ThemeValues
-    if (isTextStyleObject(value)) {
-        return null;
-    }
-    return ThemeValuesSchema.safeParse(value).success ? value : null;
+    return value;
 }
 //# sourceMappingURL=validators.js.map